Attachment 172239 Details for Bug 204703 – fix (C|LD)FLAGS for freeipmi support

[patch] fix (C|LD)FLAGS for freeipmi support

conserver-com_20160708.patch (text/plain), 4.48 KB, created by ru_M1cRO on 2016-07-08 13:00:33 UTC

(hide)

Description:

Filename:

MIME Type:

Creator: ru_M1cRO

Created: 2016-07-08 13:00:33 UTC

Size: 4.48 KB

patch

obsolete

>diff --git a/comms/conserver-com/Makefile b/comms/conserver-com/Makefile
>index 047c64ae..fddb2f8 100644
>--- a/comms/conserver-com/Makefile
>+++ b/comms/conserver-com/Makefile
>@@ -11,28 +11,37 @@ PKGNAMESUFFIX=	-com
> MAINTAINER=	kuriyama@FreeBSD.org
> COMMENT=	Application that allows multiple users to watch serial consoles
> 
>+LICENSE=	BSD2CLAUSE
>+
> CONFLICTS_INSTALL=	conserver-[0-9]*
> 
> GNU_CONFIGURE=	yes
> CONFIGURE_ARGS=	--with-master=${DEFAULTHOST} --with-port=${DEFAULTPORT} \
> 		--with-pam --with-libwrap --with-openssl
>+
> USE_OPENSSL=	yes
> USE_RC_SUBR=	conserver
> 
>-OPTIONS_DEFINE=	UDS GSSAPI GSSAPIONLY STRIPREALM
>-UDS_DESC=	Use Unix domain sockets for client/server
>-STRIPREALM_DESC=Strip @REALM when using GSSAPI
>+OPTIONS_DEFINE=	FREEIPMI GSSAPI GSSAPIONLY STRIPREALM UDS
>+FREEIPMI_DESC=	Compile in FreeIPMI support
> GSSAPIONLY_DESC=Never prompt for a password when using GSSAPI
>-STRIPREALM_IMPLIES=	GSSAPI
> GSSAPIONLY_IMPLIES=	GSSAPI
>+STRIPREALM_DESC=Strip @REALM when using GSSAPI
>+STRIPREALM_IMPLIES=	GSSAPI
>+UDS_DESC=	Use Unix domain sockets for client/server
> 
> DEFAULTPORT?=	782
> DEFAULTHOST?=	localhost
> 
>-UDS_CONFIGURE_WITH=	uds
>+FREEIPMI_CONFIGURE_ON=	--with-freeipmi=${LOCALBASE}
>+FREEIPMI_LIB_DEPENDS=	libfreeipmi.so:${PORTSDIR}/sysutils/freeipmi
> GSSAPI_CONFIGURE_WITH=	gssapi
>-STRIPREALM_CONFIGURE_WITH=	striprealm
> GSSAPIONLY_EXTRA_PATCHES=		${FILESDIR}/extra-patch-conserver__master.c
>+STRIPREALM_CONFIGURE_WITH=	striprealm
>+UDS_CONFIGURE_WITH=	uds
>+
>+post-patch:
>+	@${REINPLACE_CMD} -e 's,impi,ipmi,' ${WRKSRC}/conserver.cf/conserver.cf.man
> 
> post-install:
> 	@${STRIP_CMD} ${STAGEDIR}${PREFIX}/sbin/conserver-convert
>diff --git a/comms/conserver-com/files/patch-Makefile.in b/comms/conserver-com/files/patch-Makefile.in
>index 64b2881..719beb1 100644
>--- a/comms/conserver-com/files/patch-Makefile.in
>+++ b/comms/conserver-com/files/patch-Makefile.in
>@@ -1,5 +1,5 @@
>---- conserver/Makefile.in.orig	Fri Dec  2 07:32:43 2005
>-+++ conserver/Makefile.in	Fri Dec  2 07:33:08 2005
>+--- conserver/Makefile.in.orig	Fri Dec  2 07:32:43 2005 UTC
>++++ conserver/Makefile.in	Fri Dec  2 07:33:08 2005 UTC
> @@ -65,7 +65,6 @@
>  	$(INSTALL) conserver.man $(DESTDIR)$(mandir)/man8/conserver.8
>  	$(MKDIR) $(DESTDIR)$(exampledir)
>diff --git a/comms/conserver-com/files/patch-configure b/comms/conserver-com/files/patch-configure
>index 33c2519..82d03ed 100644
>--- a/comms/conserver-com/files/patch-configure
>+++ b/comms/conserver-com/files/patch-configure
>@@ -1,5 +1,5 @@
>---- configure.orig	2014-04-17 21:55:40.000000000 -0700
>-+++ configure	2015-08-12 13:31:26.015249000 -0700
>+--- configure.orig	2014-04-18 04:55:40.000000000 UTC
>++++ configure	2015-08-12 20:31:26.015249000 UTC
> @@ -5307,6 +5307,7 @@
>  $as_echo_n "checking for gssapi library -lgssapi... " >&6; }
>  	    cat confdefs.h - <<_ACEOF >conftest.$ac_ext
>diff --git a/comms/conserver-com/files/patch-conserver__consent.c b/comms/conserver-com/files/patch-conserver__consent.c
>index 493f486..b314f0e 100644
>--- a/comms/conserver-com/files/patch-conserver__consent.c
>+++ b/comms/conserver-com/files/patch-conserver__consent.c
>@@ -1,5 +1,5 @@
>---- conserver/consent.c.dist	2015-08-12 13:38:39.837321000 -0700
>-+++ conserver/consent.c	2015-08-12 13:38:01.860668000 -0700
>+--- conserver/consent.c.dist	2015-08-12 22:38:39.837321000 UTC
>++++ conserver/consent.c	2015-08-12 22:38:01.860668000 UTC
> @@ -687,6 +687,10 @@
>  	case INSSLSHUTDOWN:
>  	    return "SSL_shutdown";
>diff --git a/comms/conserver-com/files/patch-conserver__group.c b/comms/conserver-com/files/patch-conserver__group.c
>index 6221166..9f7d3e2 100644
>--- a/comms/conserver-com/files/patch-conserver__group.c
>+++ b/comms/conserver-com/files/patch-conserver__group.c
>@@ -1,5 +1,5 @@
>---- ./conserver/group.c.orig	2009-09-26 05:58:05.000000000 -0400
>-+++ ./conserver/group.c	2013-02-15 18:34:20.000000000 -0500
>+--- ./conserver/group.c.orig	2009-09-26 09:58:05.000000000 UTC
>++++ ./conserver/group.c	2013-02-15 23:34:20.000000000 UTC
> @@ -72,6 +72,7 @@
>  #include <master.h>
>  #include <main.h>
>diff --git a/comms/conserver-com/files/patch-cutil.c b/comms/conserver-com/files/patch-cutil.c
>index 1cc0309..1dffa2d 100644
>--- a/comms/conserver-com/files/patch-cutil.c
>+++ b/comms/conserver-com/files/patch-cutil.c
>@@ -1,5 +1,5 @@
>---- ./conserver/cutil.c.orig	2015-06-03 02:19:31.000000000 +0900
>-+++ ./conserver/cutil.c	2015-06-13 18:00:11.685862531 +0900
>+--- ./conserver/cutil.c.orig	2015-06-02 17:19:31.000000000 UTC
>++++ ./conserver/cutil.c	2015-06-13 09:00:11.685862531 UTC
> @@ -1939,7 +1939,7 @@
>  	if ((ifc.ifc_len - r) < sizeof(*ifr))
>  	    break;

Flags:

rum1cro: maintainer-approval+

Actions: View | Diff

Attachments on bug 204703: 163354 | 172239