Date: Sun, 23 Aug 2015 14:51:09 +0000 (UTC) From: Jun Kuriyama <kuriyama@FreeBSD.org> To: ports-committers@freebsd.org, svn-ports-all@freebsd.org, svn-ports-head@freebsd.org Subject: svn commit: r395094 - in head/comms/conserver-com: . files Message-ID: <201508231451.t7NEp97M053406@repo.freebsd.org>
next in thread | raw e-mail | index | archive | help
Author: kuriyama Date: Sun Aug 23 14:51:08 2015 New Revision: 395094 URL: https://svnweb.freebsd.org/changeset/ports/395094 Log: Fix GSSAPI related (wrongly removed in previous commit). PR: ports/202278 Submitted by: peter Added: head/comms/conserver-com/files/patch-configure (contents, props changed) head/comms/conserver-com/files/patch-conserver__consent.c (contents, props changed) head/comms/conserver-com/files/patch-conserver__group.c (contents, props changed) Modified: head/comms/conserver-com/Makefile Modified: head/comms/conserver-com/Makefile ============================================================================== --- head/comms/conserver-com/Makefile Sun Aug 23 14:35:55 2015 (r395093) +++ head/comms/conserver-com/Makefile Sun Aug 23 14:51:08 2015 (r395094) @@ -2,6 +2,7 @@ PORTNAME= conserver PORTVERSION= 8.2.1 +PORTREVISION= 1 CATEGORIES= comms MASTER_SITES= http://www.conserver.com/ \ ftp://ftp.conserver.com/conserver/ Added: head/comms/conserver-com/files/patch-configure ============================================================================== --- /dev/null 00:00:00 1970 (empty, because file is newly added) +++ head/comms/conserver-com/files/patch-configure Sun Aug 23 14:51:08 2015 (r395094) @@ -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 <stdio.h> + #include <gssapi/gssapi.h> + + 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 <stdio.h> + #include <gssapi/gssapi.h> + + 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 <stdio.h> + #include <gssapi/gssapi.h> + + int Added: head/comms/conserver-com/files/patch-conserver__consent.c ============================================================================== --- /dev/null 00:00:00 1970 (empty, because file is newly added) +++ head/comms/conserver-com/files/patch-conserver__consent.c Sun Aug 23 14:51:08 2015 (r395094) @@ -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"; + } Added: head/comms/conserver-com/files/patch-conserver__group.c ============================================================================== --- /dev/null 00:00:00 1970 (empty, because file is newly added) +++ head/comms/conserver-com/files/patch-conserver__group.c Sun Aug 23 14:51:08 2015 (r395094) @@ -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 <master.h> + #include <main.h> + #include <version.h> ++#include <stdio.h> + + #if HAVE_PAM + #include <security/pam_appl.h> +@@ -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:
Want to link to this message? Use this URL: <https://mail-archive.FreeBSD.org/cgi/mid.cgi?201508231451.t7NEp97M053406>