View | Details | Raw Unified | Return to bug 204703 | Differences between
and this patch

Collapse All | Expand All

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

Return to bug 204703