Index: head/comms/conserver-com/Makefile =================================================================== --- head/comms/conserver-com/Makefile (revision 395093) +++ head/comms/conserver-com/Makefile (revision 395094) @@ -1,39 +1,40 @@ # $FreeBSD$ PORTNAME= conserver PORTVERSION= 8.2.1 +PORTREVISION= 1 CATEGORIES= comms MASTER_SITES= http://www.conserver.com/ \ ftp://ftp.conserver.com/conserver/ PKGNAMESUFFIX= -com MAINTAINER= kuriyama@FreeBSD.org COMMENT= Application that allows multiple users to watch serial consoles 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 GSSAPIONLY_DESC=Never prompt for a password when using GSSAPI STRIPREALM_IMPLIES= GSSAPI GSSAPIONLY_IMPLIES= GSSAPI DEFAULTPORT?= 782 DEFAULTHOST?= localhost UDS_CONFIGURE_WITH= uds GSSAPI_CONFIGURE_WITH= gssapi STRIPREALM_CONFIGURE_WITH= striprealm GSSAPIONLY_EXTRA_PATCHES= ${FILESDIR}/extra-patch-conserver__master.c post-install: @${STRIP_CMD} ${STAGEDIR}${PREFIX}/sbin/conserver-convert .include Index: head/comms/conserver-com/files/patch-configure =================================================================== --- head/comms/conserver-com/files/patch-configure (nonexistent) +++ head/comms/conserver-com/files/patch-configure (revision 395094) @@ -0,0 +1,26 @@ +--- configure.orig 2014-04-17 21:55:40.000000000 -0700 ++++ configure 2015-08-12 13:31:26.015249000 -0700 +@@ -5307,6 +5307,7 @@ + $as_echo_n "checking for gssapi library -lgssapi... " >&6; } + cat confdefs.h - <<_ACEOF >conftest.$ac_ext + /* end confdefs.h. */ ++#include + #include + + int +@@ -5332,6 +5333,7 @@ + $as_echo_n "checking for gssapi library -lgssglue... " >&6; } + cat confdefs.h - <<_ACEOF >conftest.$ac_ext + /* end confdefs.h. */ ++#include + #include + + int +@@ -5357,6 +5359,7 @@ + $as_echo_n "checking for gssapi library -lgss... " >&6; } + cat confdefs.h - <<_ACEOF >conftest.$ac_ext + /* end confdefs.h. */ ++#include + #include + + int Property changes on: head/comms/conserver-com/files/patch-configure ___________________________________________________________________ Added: fbsd:nokeywords ## -0,0 +1 ## +yes \ No newline at end of property Added: svn:eol-style ## -0,0 +1 ## +native \ No newline at end of property Added: svn:mime-type ## -0,0 +1 ## +text/plain \ No newline at end of property Index: head/comms/conserver-com/files/patch-conserver__consent.c =================================================================== --- head/comms/conserver-com/files/patch-conserver__consent.c (nonexistent) +++ head/comms/conserver-com/files/patch-conserver__consent.c (revision 395094) @@ -0,0 +1,13 @@ +--- conserver/consent.c.dist 2015-08-12 13:38:39.837321000 -0700 ++++ conserver/consent.c 2015-08-12 13:38:01.860668000 -0700 +@@ -687,6 +687,10 @@ + case INSSLSHUTDOWN: + return "SSL_shutdown"; + #endif ++#if HAVE_GSSAPI ++ case INGSSACCEPT: ++ return "GSSAPI_accept"; ++#endif + case ISFLUSHING: + return "flushing"; + } Property changes on: head/comms/conserver-com/files/patch-conserver__consent.c ___________________________________________________________________ Added: fbsd:nokeywords ## -0,0 +1 ## +yes \ No newline at end of property Added: svn:eol-style ## -0,0 +1 ## +native \ No newline at end of property Added: svn:mime-type ## -0,0 +1 ## +text/plain \ No newline at end of property Index: head/comms/conserver-com/files/patch-conserver__group.c =================================================================== --- head/comms/conserver-com/files/patch-conserver__group.c (nonexistent) +++ head/comms/conserver-com/files/patch-conserver__group.c (revision 395094) @@ -0,0 +1,28 @@ +--- ./conserver/group.c.orig 2009-09-26 05:58:05.000000000 -0400 ++++ ./conserver/group.c 2013-02-15 18:34:20.000000000 -0500 +@@ -72,6 +72,7 @@ + #include + #include + #include ++#include + + #if HAVE_PAM + #include +@@ -1930,7 +1931,7 @@ + FileWrite(pCL->fd, FLAGFALSE, sendtok.value, sendtok.length); + FileSetQuoteIAC(pCL->fd, FLAGTRUE); + pCL->iState = S_NORMAL; +- gss_release_buffer(NULL, &sendtok); ++ gss_release_buffer(&stmin, &sendtok); + BuildString((char *)0, pCL->username); + BuildString((char *)0, pCL->acid); + stmaj = gss_display_name(&stmin, user, &dbuf, NULL); +@@ -1940,7 +1941,7 @@ + BuildStringChar('@', pCL->acid); + BuildString(pCL->peername->string, pCL->acid); + gss_release_name(&stmin, &user); +- gss_release_buffer(NULL, &dbuf); ++ gss_release_buffer(&stmin, &dbuf); + ret = 1; + break; + case GSS_S_CREDENTIALS_EXPIRED: Property changes on: head/comms/conserver-com/files/patch-conserver__group.c ___________________________________________________________________ Added: fbsd:nokeywords ## -0,0 +1 ## +yes \ No newline at end of property Added: svn:eol-style ## -0,0 +1 ## +native \ No newline at end of property Added: svn:mime-type ## -0,0 +1 ## +text/plain \ No newline at end of property