Attachment #197256 for bug #222745




#
# Feature:	gssapi
# Usage:	USES=gssapi or USES=gssapi:ARGS
# Valid ARGS:	base (default, implicit, before 1200070), heimdal,
#		mit (default, implicit, after 1200070).
#		"bootstrap" is a special prefix only for krb5 or heimdal ports.
#		("bootstrap,mit")
#		flags is a special suffix to define CFLAGS, LDFLAGS, and LDADD.


.undef _FIXUP_KRB5CONFIG
.if empty(gssapi_ARGS)
.if exists(/usr/lib/libcom_err.so)
gssapi_ARGS=	base
.else
gssapi_ARGS=	mit
.endif
.endif
.for _A in ${gssapi_ARGS}
_local:=	${_A}
.if ${_local} == "base" && exists(/usr/lib/libcom_err.so)
.  if ${SSL_DEFAULT} != base
IGNORE=	You are using OpenSSL from ports and have selected GSSAPI from base, please select another GSSAPI value
.  endif

Lines 13-20 LICENSE= GPLv2+ Link Here

(-)b/devel/cvs/Makefile (-3 / +17 lines)
13		13
14	CONFLICTS_INSTALL?= cvs+ipv6-[12]* cvs-devel-[12]*	14	CONFLICTS_INSTALL?= cvs+ipv6-[12]* cvs-devel-[12]*
15		15
16	OPTIONS_DEFINE= IPV6 KERBEROS EXAMPLES	16	OPTIONS_DEFINE= IPV6 EXAMPLES
17	OPTIONS_DEFAULT=KERBEROS	17	OPTIONS_SINGLE= GSSAPI
		18	.if exists(/usr/lib/libcom_err.so)
		19	OPTIONS_SINGLE_GSSAPI= GSSAPI_BASE GSSAPI_HEIMDAL GSSAPI_MIT GSSAPI_NONE
		20	.else
		21	OPTIONS_SINGLE_GSSAPI= GSSAPI_HEIMDAL GSSAPI_MIT GSSAPI_NONE
		22	.endif
		23	OPTIONS_DEFAULT= GSSAPI_HEIMDAL
18	.if !make(makesum)	24	.if !make(makesum)
19	OPTIONS_EXCLUDE?=IPV6	25	OPTIONS_EXCLUDE?=IPV6
20	.endif	26	.endif
Lines 22-28 OPTIONS_EXCLUDE?=IPV6 Link Here
22	IPV6_CATEGORIES= ipv6	28	IPV6_CATEGORIES= ipv6
23	IPV6_PATCH_SITES= ftp://ftp.kame.net/pub/kame/misc/	29	IPV6_PATCH_SITES= ftp://ftp.kame.net/pub/kame/misc/
24	IPV6_PATCHFILES= ${DISTNAME}-v6-20140105.diff.gz:-p1	30	IPV6_PATCHFILES= ${DISTNAME}-v6-20140105.diff.gz:-p1
25	KERBEROS_MAKE_ARGS= KERBEROS_SUPPORT=yes	31	GSSAPI_BASE_USES= gssapi:base,flags
		32	GSSAPI_BASE_CFLAGS= -I${GSSAPIINCDIR} -L${GSSAPILIBDIR}
		33	GSSAPI_BASE_MAKE_ARGS= KERBEROS_SUPPORT=base
		34	GSSAPI_HEIMDAL_USES= gssapi:heimdal,flags
		35	GSSAPI_HEIMDAL_CFLAGS= -I${GSSAPIINCDIR} -L${GSSAPILIBDIR}
		36	GSSAPI_HEIMDAL_MAKE_ARGS= KERBEROS_SUPPORT=heimdal
		37	GSSAPI_MIT_USES= gssapi:mit,flags
		38	GSSAPI_MIT_CFLAGS= -I${GSSAPIINCDIR} -L${GSSAPILIBDIR}
		39	GSSAPI_MIT_MAKE_ARGS= KERBEROS_SUPPORT=mit
26		40
27	USES= cpe makeinfo shebangfix tar:xz uidfix	41	USES= cpe makeinfo shebangfix tar:xz uidfix
28	CPE_VENDOR= gnu	42	CPE_VENDOR= gnu




--- ../cvs-build/cvs/Makefile.orig	2012-09-05 19:25:43.000000000 -0700
+++ ../cvs-build/cvs/Makefile	2018-04-19 22:42:32.057681000 -0700
@@ -32,11 +32,12 @@
 DPADD=	${LIBCVS} ${LIBDIFF} ${LIBGNUREGEX} ${LIBMD} ${LIBCRYPT} ${LIBZ}
 LDADD=	${LIBCVS} ${LIBDIFF} -lgnuregex -lmd -lcrypt -lz
 
-.if ${MK_KERBEROS_SUPPORT} != "no"
+.if defined(KERBEROS_SUPPORT) && ${KERBEROS_SUPPORT} == "heimdal"
 CFLAGS+= -DHAVE_GSSAPI -DENCRYPTION
 LDADD+= -lgssapi -lkrb5 -lhx509 -lasn1 -lcrypto -lroken -lcrypt -lcom_err
-DPADD+= ${LIBGSSAPI} ${LIBKRB5} ${LIBHX509} ${LIBASN1} ${LIBCRYPTO} ${LIBROKEN}
-DPADD+= ${LIBCRYPT} ${LIBCOM_ERR}
+.elif defined(KERBEROS_SUPPORT) && ${KERBEROS_SUPPORT} == "mit"
+CFLAGS+= -DHAVE_GSSAPI -DENCRYPTION
+LDADD+= -lgssapi_krb5 -lkrb5 -lk5crypto -lcrypt -lcom_err
 .endif

 #




LICENSE_FILE=	${INSTALL_WRKSRC}/ss.h

OPTIONS_EXCLUDE=	DOCS EXAMPLES IPV6 NLS
OPTIONS_SINGLE=	GSSAPI
.if exists(/usr/lib/libcom_err.so)
OPTIONS_SINGLE_GSSAPI=  GSSAPI_BASE GSSAPI_HEIMDAL GSSAPI_MIT
OPTIONS_DEFAULT=	GSSAPI_BASE
.else
OPTIONS_SINGLE_GSSAPI=  GSSAPI_HEIMDAL GSSAPI_MIT
# XXX Should default be GSSAPI_HEIMDAL?
OPTIONS_DEFAULT=	GSSAPI_MIT
.endif

GSSAPI_BASE_USES=       gssapi:base,flags
GSSAPI_HEIMDAL_USES=    gssapi:heimdal,flags
GSSAPI_MIT_USES=        gssapi:mit,flags

CONFIGURE_ARGS=	--enable-elf-shlibs
MASTERDIR=	${.CURDIR}/../../sysutils/e2fsprogs
GNU_CONFIGURE=	yes

BUILD_WRKSRC=	${WRKSRC}/lib/ss
INSTALL_WRKSRC=	${WRKSRC}/lib/ss
FILESDIR=	${.CURDIR}/files
LDFLAGS=	${GSSAPILDFLAGS}

PKGDIR=		${.CURDIR}


Lines 35-40 CONFIGURE_ARGS+= \ Link Here

(-)b/dns/samba-nsupdate/Makefile (-6 / +17 lines)
35	--without-idn \	35	--without-idn \
36	--with-randomdev=/dev/random	36	--with-randomdev=/dev/random
37		37
		38	CFLAGS+= -Wno-implicit-function-declaration
		39
38	OPTIONS_DEFINE= IPV6	40	OPTIONS_DEFINE= IPV6
39		41
40	SIGCHASE_CONFIGURE_ARGS+= STD_CDEFINES="-DDIG_SIGCHASE=1"	42	SIGCHASE_CONFIGURE_ARGS+= STD_CDEFINES="-DDIG_SIGCHASE=1"
Lines 52-66 ARCH= x86_64 Link Here
52	# Enable OpenSSL API	54	# Enable OpenSSL API
53	CONFIGURE_ARGS+= --with-openssl=${OPENSSLBASE}	55	CONFIGURE_ARGS+= --with-openssl=${OPENSSLBASE}
54	# Try to find appropriate GSSAPI libs	56	# Try to find appropriate GSSAPI libs
55	.if defined(KRB5_HOME) && exists(${KRB5_HOME}/lib/libgssapi_krb5.so)	57	.if exists(${LOCALBASE}/lib/libgssapi_krb5.so)
56	CONFIGURE_ARGS+= --with-gssapi="${KRB5_HOME}"	58	CONFIGURE_ARGS+= --with-gssapi="${LOCALBASE}"
57	.elif defined(HEIMDAL_HOME) && exists(${HEIMDAL_HOME}/lib/libgssapi.so)	59	USES+= gssapi:mit,flags
58	CONFIGURE_ARGS+= --with-gssapi="${HEIMDAL_HOME}"	60	.elif exists(${LOCALBASE}/lib/heimdal/libgssapi.so)
59	.elif exists(/usr/lib/libkrb5.so) && exists(/usr/bin/krb5-config)	61	CONFIGURE_ARGS+= --libdir=${LOCALBASE}/lib/heimdal \
		62	--includedir=${LOCALBASE}/include/heimdal
		63	CFLAGS+= -L${LOCALBASE}/lib/heimdal \
		64	-I${LOCALBASE}/include/heimdal
		65	USES+= gssapi:heimdal,flags
		66	.else
		67	.if exists(/usr/lib/libcom_err.so)
60	CONFIGURE_ARGS+= --with-gssapi="/usr"	68	CONFIGURE_ARGS+= --with-gssapi="/usr"
		69	# USES+= gssapi:base
61	.else	70	.else
62	LIB_DEPENDS+= libkrb5.so:security/heimdal	71	BROKEN= Heimdal Kerberos or MIT Kerberos must be installed.
63	CONFIGURE_ARGS+= --with-gssapi="${LOCALBASE}"	72	CONFIGURE_ARGS+= --with-gssapi="${LOCALBASE}"
		73	USES+= gssapi:mit,flags
		74	.endif
64	.endif	75	.endif
65		76
66	post-patch:	77	post-patch:




--- configure.in.orig	2013-09-04 22:19:53.000000000 -0700
+++ configure.in	2018-09-07 17:54:05.909595000 -0700
@@ -1013,7 +1013,8 @@
 		    "-lgssapi" \
 		    "-lgssapi -lkrb5 -ldes -lcrypt -lasn1 -lroken -lcom_err" \

 		do
 		    # Note that this does not include $saved_libs, because
 		    # on FreeBSD machines this configure script has added
@@ -1027,8 +1028,14 @@
 			    LIBS="-L$use_gssapi/lib $TRY_LIBS"
 		    fi
 		    AC_MSG_CHECKING(linking as $TRY_LIBS)
-		    AC_TRY_LINK( , [gss_acquire_cred();krb5_init_context()],
+		    AC_TRY_LINK( , [gss_acquire_cred();krb5_init_context();gsskrb5_register_acceptor_identity("krb5");],
 				gssapi_linked=yes, gssapi_linked=no)
+		    case $gssapi_linked in
+		    no)
+			AC_TRY_LINK( , [gss_acquire_cred();krb5_init_context();krb5_gss_register_acceptor_identity("krb5");],
+				gssapi_linked=yes, gssapi_linked=no)
+			;;
+		    esac
 		    case $gssapi_linked in
 		    yes) AC_MSG_RESULT(yes); break ;;
 		    no)  AC_MSG_RESULT(no) ;;

Lines 19-25 OPTIONS_RADIO= SSL Link Here

(-)b/ftp/curl/Makefile (+4 lines)
19	OPTIONS_SINGLE= GSSAPI RESOLV	19	OPTIONS_SINGLE= GSSAPI RESOLV
20	OPTIONS_GROUP_PROTOCOL= DICT FTP GOPHER HTTP HTTP2 IMAP LDAP LDAPS LIBSSH2 POP3 RTMP RTSP SMB SMTP TELNET TFTP	20	OPTIONS_GROUP_PROTOCOL= DICT FTP GOPHER HTTP HTTP2 IMAP LDAP LDAPS LIBSSH2 POP3 RTMP RTSP SMB SMTP TELNET TFTP
21	OPTIONS_RADIO_SSL= GNUTLS NSS OPENSSL WOLFSSL	21	OPTIONS_RADIO_SSL= GNUTLS NSS OPENSSL WOLFSSL
		22	.if exists(/usr/lib/libcom_err.so)
22	OPTIONS_SINGLE_GSSAPI= GSSAPI_BASE GSSAPI_HEIMDAL GSSAPI_MIT GSSAPI_NONE	23	OPTIONS_SINGLE_GSSAPI= GSSAPI_BASE GSSAPI_HEIMDAL GSSAPI_MIT GSSAPI_NONE
		24	.else
		25	OPTIONS_SINGLE_GSSAPI= GSSAPI_HEIMDAL GSSAPI_MIT GSSAPI_NONE
		26	.endif
23	OPTIONS_SINGLE_RESOLV= CARES THREADED_RESOLVER	27	OPTIONS_SINGLE_RESOLV= CARES THREADED_RESOLVER
24	OPTIONS_DEFAULT= CA_BUNDLE COOKIES GSSAPI_${${SSL_DEFAULT} == base :?BASE :NONE} DICT FTP GOPHER HTTP HTTP2 IMAP OPENSSL POP3 PROXY RESOLV RTSP SMTP TELNET TFTP THREADED_RESOLVER TLS_SRP	28	OPTIONS_DEFAULT= CA_BUNDLE COOKIES GSSAPI_${${SSL_DEFAULT} == base :?BASE :NONE} DICT FTP GOPHER HTTP HTTP2 IMAP OPENSSL POP3 PROXY RESOLV RTSP SMTP TELNET TFTP THREADED_RESOLVER TLS_SRP
25	CA_BUNDLE_DESC= Enable CA bundle for OpenSSL/GnuTLS/mbedTLS	29	CA_BUNDLE_DESC= Enable CA bundle for OpenSSL/GnuTLS/mbedTLS

Lines 47-53 OPTIONS_GROUP_DB= CDB LDAP MYSQL PGSQL SQLITE Link Here

(-)b/mail/dovecot/Makefile (+4 lines)
47	OPTIONS_GROUP_FTS= ICU LUCENE SOLR TEXTCAT	47	OPTIONS_GROUP_FTS= ICU LUCENE SOLR TEXTCAT
48		48
49	OPTIONS_SINGLE= GSSAPI	49	OPTIONS_SINGLE= GSSAPI
		50	.if exists(/usr/lib/libcom_err.so)
50	OPTIONS_SINGLE_GSSAPI= GSSAPI_NONE GSSAPI_BASE GSSAPI_HEIMDAL GSSAPI_MIT	51	OPTIONS_SINGLE_GSSAPI= GSSAPI_NONE GSSAPI_BASE GSSAPI_HEIMDAL GSSAPI_MIT
		52	.else
		53	OPTIONS_SINGLE_GSSAPI= GSSAPI_NONE GSSAPI_HEIMDAL GSSAPI_MIT
		54	.endif
51		55
52	LZ4_DESC= LZ4 compression support	56	LZ4_DESC= LZ4 compression support
53	VPOPMAIL_DESC= vpopmail support	57	VPOPMAIL_DESC= vpopmail support

Lines 53-59 OPTIONS_GROUP_DB= CDB LDAP MYSQL PGSQL SQLITE Link Here

(-)b/mail/dovecot22/Makefile (+4 lines)
53	OPTIONS_GROUP_FTS= ICU LUCENE SOLR TEXTCAT	53	OPTIONS_GROUP_FTS= ICU LUCENE SOLR TEXTCAT
54		54
55	OPTIONS_SINGLE= GSSAPI	55	OPTIONS_SINGLE= GSSAPI
		56	.if exists(/usr/lib/libcom_err.so)
56	OPTIONS_SINGLE_GSSAPI= GSSAPI_NONE GSSAPI_BASE GSSAPI_HEIMDAL GSSAPI_MIT	57	OPTIONS_SINGLE_GSSAPI= GSSAPI_NONE GSSAPI_BASE GSSAPI_HEIMDAL GSSAPI_MIT
		58	.else
		59	OPTIONS_SINGLE_GSSAPI= GSSAPI_NONE GSSAPI_HEIMDAL GSSAPI_MIT
		60	.endif
57		61
58	LZ4_DESC= LZ4 compression support	62	LZ4_DESC= LZ4 compression support
59	VPOPMAIL_DESC= vpopmail support	63	VPOPMAIL_DESC= vpopmail support

Lines 35-42 LDFLAGS+= -L${LOCALBASE}/lib Link Here

(-)b/mail/fetchmail/Makefile (-1 / +9 lines)
35		35
36	OPTIONS_DEFINE= X11 NLS NTLM POP2 DOCS	36	OPTIONS_DEFINE= X11 NLS NTLM POP2 DOCS
37	OPTIONS_SINGLE= GSSAPI	37	OPTIONS_SINGLE= GSSAPI
		38	.if exists(/usr/lib/libcom_err.so)
38	OPTIONS_SINGLE_GSSAPI= GSSAPI_BASE GSSAPI_HEIMDAL GSSAPI_MIT GSSAPI_NONE	39	OPTIONS_SINGLE_GSSAPI= GSSAPI_BASE GSSAPI_HEIMDAL GSSAPI_MIT GSSAPI_NONE
39	OPTIONS_DEFAULT= GSSAPI_BASE	40	OPTIONS_DEFAULT= GSSAPI_BASE
		41	.else
		42	OPTIONS_SINGLE_GSSAPI= GSSAPI_HEIMDAL GSSAPI_MIT GSSAPI_NONE
		43	OPTIONS_DEFAULT= GSSAPI_NONE
		44	.endif
40	OPTIONS_SUB= yes	45	OPTIONS_SUB= yes
41		46
42	GSSAPI_BASE_USES= gssapi	47	GSSAPI_BASE_USES= gssapi
Lines 67-78 PORTDOCS= FAQ FEATURES NEWS NOTES README README.SSL \ Link Here
67	design-notes.html fetchmail-FAQ.html fetchmail-features.html \	72	design-notes.html fetchmail-FAQ.html fetchmail-features.html \
68	esrs-design-notes.html	73	esrs-design-notes.html
69		74
70	#.include <bsd.port.options.mk>	75	.include <bsd.port.options.mk>
71		76
72	post-patch:	77	post-patch:
73	.if !exists(/usr/lib/libcom_err.so)	78	.if !exists(/usr/lib/libcom_err.so)
74	@${REINPLACE_CMD} -e "s,-lcom_err,,g" ${WRKSRC}/configure	79	@${REINPLACE_CMD} -e "s,-lcom_err,,g" ${WRKSRC}/configure
75	.endif	80	.endif
		81	.if ${PORT_OPTIONS:MGSSAPI_HEIMDAL}
		82	@${GREP} -lr gssapi_krb5 ${WRKSRC}/ \| ${XARGS} ${REINPLACE_CMD} -e 's/gssapi_krb5/gssapi/g'
		83	.endif
76		84
77	post-build:	85	post-build:
78	@${MAKE_CMD} -C ${WRKSRC} check	86	@${MAKE_CMD} -C ${WRKSRC} check

Lines 22-29 TEST_TARGET= check Link Here

(-)b/net-mgmt/adcli/Makefile (+5 lines)
22		22
23	OPTIONS_DEFINE= DOCS	23	OPTIONS_DEFINE= DOCS
24	OPTIONS_SINGLE= GSSAPI	24	OPTIONS_SINGLE= GSSAPI
		25	.if exists(/usr/lib/libcom_err.so)
25	OPTIONS_SINGLE_GSSAPI= GSSAPI_BASE GSSAPI_HEIMDAL GSSAPI_MIT	26	OPTIONS_SINGLE_GSSAPI= GSSAPI_BASE GSSAPI_HEIMDAL GSSAPI_MIT
26	OPTIONS_DEFAULT= GSSAPI_BASE	27	OPTIONS_DEFAULT= GSSAPI_BASE
		28	.else
		29	OPTIONS_SINGLE_GSSAPI= GSSAPI_HEIMDAL GSSAPI_MIT
		30	OPTIONS_DEFAULT= GSSAPI_MIT
		31	.endif
27		32
28	CONFIGURE_ENV+= ac_cv_path_KRB5_CONFIG=${KRB5CONFIG} \	33	CONFIGURE_ENV+= ac_cv_path_KRB5_CONFIG=${KRB5CONFIG} \
29	ac_cv_path_XMLTO=${TRUE}	34	ac_cv_path_XMLTO=${TRUE}

Lines 52-60 OPTIONS_DEFINE= USER LDAP MYSQL PGSQL UNIXODBC FIREBIRD REDIS \ Link Here

(-)b/net/freeradius3/Makefile (+8 lines)
52	EXPERIMENTAL UDPFROMTO DEVELOPER EDIR PERL REST \	52	EXPERIMENTAL UDPFROMTO DEVELOPER EDIR PERL REST \
53	FREETDS IDN DOCS SQLITE3 PYTHON RUBY UNBOUND PCRE \	53	FREETDS IDN DOCS SQLITE3 PYTHON RUBY UNBOUND PCRE \
54	WINBIND EXAMPLES	54	WINBIND EXAMPLES
		55	.if exists(/usr/lib/libcom_err.so)
55	OPTIONS_DEFAULT=USER PERL HEIMDAL UDPFROMTO	56	OPTIONS_DEFAULT=USER PERL HEIMDAL UDPFROMTO
		57	.else
		58	OPTIONS_DEFAULT=USER PERL HEIMDAL_PORT UDPFROMTO
		59	.endif
56	OPTIONS_SINGLE= KRB	60	OPTIONS_SINGLE= KRB
		61	.if exists(/usr/lib/libcom_err.so)
57	OPTIONS_SINGLE_KRB= NOKRB HEIMDAL HEIMDAL_PORT MITKRB_PORT	62	OPTIONS_SINGLE_KRB= NOKRB HEIMDAL HEIMDAL_PORT MITKRB_PORT
		63	.else
		64	OPTIONS_SINGLE_KRB= NOKRB HEIMDAL_PORT MITKRB_PORT
		65	.endif
58		66
59	USER_DESC= Run as user freeradius, group freeradius	67	USER_DESC= Run as user freeradius, group freeradius
60	KRB_DESC= ${KERBEROS_DESC}	68	KRB_DESC= ${KERBEROS_DESC}




USE_LDCONFIG=	yes
USE_OPENLDAP=	yes

.if exists(/usr/lib/libcom_err.so)
OPTIONS_DEFINE=	LCLASS KERBEROS SASL
OPTIONS_DEFAULT=LCLASS KERBEROS
.else
OPTIONS_DEFINE=	LCLASS SASL
OPTIONS_DEFAULT=LCLASS
OPTIONS_SINGLE=	KERBEROS
OPTIONS_SINGLE_KERBEROS=	MIT HEIMDAL
OPTIONS_DEFAULT=LCLASS MIT
MIT_DESC=	Link against MIT Kerberos
MIT_USES=	gssapi:mit
HEIMDAL_DESC=	Link against Heimdal in ports Kerberos
HEIMDAL_USES=	gssapi:heimdal
.endif

LCLASS_DESC=	Enable login classes via the loginClass attribute


Lines 6-13 PORTREVISION= 7 Link Here

(-)b/security/cyrus-sasl2-gssapi/Makefile (+6 lines)
6	COMMENT= SASL GSSAPI authentication plugin	6	COMMENT= SASL GSSAPI authentication plugin
7		7
8	OPTIONS_SINGLE= GSSAPI	8	OPTIONS_SINGLE= GSSAPI
		9	.if exists(/usr/lib/libcom_err.so)
9	OPTIONS_SINGLE_GSSAPI= GSSAPI_BASE GSSAPI_HEIMDAL GSSAPI_MIT	10	OPTIONS_SINGLE_GSSAPI= GSSAPI_BASE GSSAPI_HEIMDAL GSSAPI_MIT
10	OPTIONS_DEFAULT= GSSAPI_BASE	11	OPTIONS_DEFAULT= GSSAPI_BASE
		12	.else
		13	OPTIONS_SINGLE_GSSAPI= GSSAPI_HEIMDAL GSSAPI_MIT
		14	# XXX assume MIT is default
		15	OPTIONS_DEFAULT= GSSAPI_MIT
		16	.endif
11	GSSAPI_BASE_USES= gssapi:base	17	GSSAPI_BASE_USES= gssapi:base
12	GSSAPI_BASE_CONFIGURE_ON= --enable-gssapi="${GSSAPIBASEDIR}" \	18	GSSAPI_BASE_CONFIGURE_ON= --enable-gssapi="${GSSAPIBASEDIR}" \
13	--with-gss_impl=heimdal	19	--with-gss_impl=heimdal





USE_RC_SUBR=	${PORTNAME}
HAS_CONFIGURE=	yes

.if !exists(/usr/lib/libcom_err.so)
CONFIGURE_ARGS+=	--with-krb5="${GSSAPIBASEDIR}" \
			--with-krb5-includes="${GSSAPIINCDIR}" \
			${GSSAPI_CONFIGURE_ARGS}

OPTIONS_RADIO=	KERBEROS
KERBEROS_DESC=	Kerberos 5 authentication
OPTIONS_RADIO_KERBEROS=	GSSAPI_HEIMDAL GSSAPI_MIT
OPTIONS_DEFAULT=	GSSAPI_MIT
USES_GSSAPI_MIT=	gssapi:mit
USES_GSSAPI_HEIMDAL=	gssapi:heimdal
.endif

PLIST_FILES=	bin/k5start bin/krenew \
		man/man1/k5start.1.gz man/man1/krenew.1.gz


Lines 27-34 INSTALL_TARGET= install-strip Link Here

(-)b/security/openconnect/Makefile (+19 lines)
27	USE_LDCONFIG= yes	27	USE_LDCONFIG= yes
28	PORTDOCS= *	28	PORTDOCS= *
29		29
		30	.if exists(/usr/lib/libcom_err.so)
30	OPTIONS_DEFINE= DOCS PROXY GNUTLS GSSAPI LZ4 P11 STOKEN	31	OPTIONS_DEFINE= DOCS PROXY GNUTLS GSSAPI LZ4 P11 STOKEN
31	OPTIONS_DEFAULT=GSSAPI	32	OPTIONS_DEFAULT=GSSAPI
		33	.else
		34	OPTIONS_SINGLE= GSSAPI
		35	OPTIONS_DEFINE= DOCS PROXY GNUTLS LZ4 P11 STOKEN
		36	OPTIONS_DEFAULT=GSSAPI_HEIMDAL
		37	OPTIONS_SINGLE_GSSAPI= GSSAPI_NONE GSSAPI_HEIMDAL GSSAPI_MIT
		38
		39	GSSAPI_NONE_DESC= Build without GSSAPI support
		40	GSSAPI_HEIMDAL_DESC= Use Heimdal GSSAPI from security/heimdal
		41	GSSAPI_MIT_DESC= Use MIT GSSAPI from security/krb5
		42	.endif
32		43
33	LZ4_DESC= LZ4-based compression	44	LZ4_DESC= LZ4-based compression
34	LZ4_LIB_DEPENDS= liblz4.so:archivers/liblz4	45	LZ4_LIB_DEPENDS= liblz4.so:archivers/liblz4
Lines 42-48 GNUTLS_DESC= Use GnuTLS instead of OpenSSL (experimental) Link Here
42	GNUTLS_LIB_DEPENDS= libgnutls.so:security/gnutls	53	GNUTLS_LIB_DEPENDS= libgnutls.so:security/gnutls
43	GNUTLS_CONFIGURE_WITH= gnutls	54	GNUTLS_CONFIGURE_WITH= gnutls
44		55
		56	.if exists(/usr/lib/libcom_err.so)
45	GSSAPI_CONFIGURE_WITH= gssapi	57	GSSAPI_CONFIGURE_WITH= gssapi
		58	.else
		59	GSSAPI_HEIMDAL_USES= gssapi:heimdal
		60	GSSAPI_MIT_USES= gssapi:mit
		61	GSSAPI_NONE_CONFIGURE_ON= --without-gssapi
		62	GSSAPI_HEIMDAL_CONFIGURE_WITH= gssapi
		63	GSSAPI_MIT_CONFIGURE_WITH= gssapi
		64	.endif
46		65
47	P11_DESC= PKCS#11 support via libp11	66	P11_DESC= PKCS#11 support via libp11
48	P11_LIB_DEPENDS= libp11.so:security/libp11	67	P11_LIB_DEPENDS= libp11.so:security/libp11

Lines 14-21 USE_PERL5= configure Link Here

(-)b/security/p5-Authen-Krb5-Simple/Makefile (+5 lines)
14	CONFIGURE_ENV= GSSAPIBASEDIR="${GSSAPIBASEDIR}"	14	CONFIGURE_ENV= GSSAPIBASEDIR="${GSSAPIBASEDIR}"
15		15
16	OPTIONS_SINGLE= GSSAPI	16	OPTIONS_SINGLE= GSSAPI
		17	.if exists(/usr/lib/libcom_err.so)
17	OPTIONS_SINGLE_GSSAPI= GSSAPI_BASE GSSAPI_HEIMDAL GSSAPI_MIT	18	OPTIONS_SINGLE_GSSAPI= GSSAPI_BASE GSSAPI_HEIMDAL GSSAPI_MIT
18	OPTIONS_DEFAULT= GSSAPI_BASE	19	OPTIONS_DEFAULT= GSSAPI_BASE
		20	.else
		21	OPTIONS_SINGLE_GSSAPI= GSSAPI_HEIMDAL GSSAPI_MIT
		22	OPTIONS_DEFAULT= GSSAPI_MIT
		23	.endif
19		24
20	GSSAPI_BASE_USES= gssapi	25	GSSAPI_BASE_USES= gssapi
21	GSSAPI_BASE_CONFIGURE_ENV= HAVE_HEIMDAL=1	26	GSSAPI_BASE_CONFIGURE_ENV= HAVE_HEIMDAL=1

Lines 17-24 USE_PERL5= configure Link Here

(-)b/security/p5-Authen-Krb5/Makefile (+5 lines)
17	CONFIGURE_ENV= GSSAPIBASEDIR="${GSSAPIBASEDIR}"	17	CONFIGURE_ENV= GSSAPIBASEDIR="${GSSAPIBASEDIR}"
18		18
19	OPTIONS_SINGLE= GSSAPI	19	OPTIONS_SINGLE= GSSAPI
		20	.if exists(/usr/lib/libcom_err.so)
20	OPTIONS_SINGLE_GSSAPI= GSSAPI_BASE GSSAPI_HEIMDAL GSSAPI_MIT	21	OPTIONS_SINGLE_GSSAPI= GSSAPI_BASE GSSAPI_HEIMDAL GSSAPI_MIT
21	OPTIONS_DEFAULT= GSSAPI_BASE	22	OPTIONS_DEFAULT= GSSAPI_BASE
		23	.else
		24	OPTIONS_SINGLE_GSSAPI= GSSAPI_HEIMDAL GSSAPI_MIT
		25	OPTIONS_DEFAULT= GSSAPI_MIT
		26	.endif
22		27
23	GSSAPI_BASE_USES= gssapi	28	GSSAPI_BASE_USES= gssapi
24	GSSAPI_BASE_CONFIGURE_ENV= HAVE_HEIMDAL=1	29	GSSAPI_BASE_CONFIGURE_ENV= HAVE_HEIMDAL=1




COMMENT=	Perl extension for Heimdal administrative client library

USES=		perl5
.if !exists(/usr/lib/libcom_err.so)
USES+=		gssapi:heimdal
.endif
USE_PERL5=	configure
CONFIGURE_ENV=	GSSAPIBASEDIR="${GSSAPIBASEDIR}"

.if exists(/usr/lib/libcom_err.so)
OPTIONS_SINGLE=		GSSAPI
OPTIONS_SINGLE_GSSAPI=	GSSAPI_BASE GSSAPI_HEIMDAL
OPTIONS_DEFAULT=	GSSAPI_BASE

GSSAPI_BASE_USES=	gssapi
GSSAPI_HEIMDAL_USES=	gssapi:heimdal
.endif

post-build:
	${STRIP_CMD} ${WRKSRC}/blib/arch/auto/Heimdal/Kadm5/Kadm5.so

Lines 16-21 LICENSE_COMB= dual Link Here

(-)b/security/pam_krb5-rh/Makefile (+8 lines)
16		16
17	CONFLICTS= pam_krb5-4.*	17	CONFLICTS= pam_krb5-4.*
18		18
		19	OPTIONS_SINGLE= LINK
		20	OPTIONS_SINGLE_LINK= MIT HEIMDAL
		21	OPTIONS_DEFAULT= MIT
		22	MIT_DESC= Link against MIT Kerberos
		23	MIT_USES= gssapi:mit
		24	HEIMDAL_DESC= Link against Heimdal in ports Kerberos
		25	HEIMDAL_USES= gssapi:heimdal
		26
19	USES= iconv libtool ssl	27	USES= iconv libtool ssl
20	GNU_CONFIGURE= yes	28	GNU_CONFIGURE= yes
21	CONFIGURE_ARGS= --without-afs --without-keyutils --without-krb4	29	CONFIGURE_ARGS= --without-afs --without-keyutils --without-krb4

Lines 20-26 USES= gmake libtool perl5 Link Here

(-)b/security/pam_krb5/Makefile (+4 lines)
20	USE_PERL5= build	20	USE_PERL5= build
21		21
22	OPTIONS_SINGLE= LINK	22	OPTIONS_SINGLE= LINK
		23	.if exists(/usr/lib/libcom_err.so)
23	OPTIONS_SINGLE_LINK= MIT HEIMDAL_BASE HEIMDAL_PORT	24	OPTIONS_SINGLE_LINK= MIT HEIMDAL_BASE HEIMDAL_PORT
		25	.else
		26	OPTIONS_SINGLE_LINK= MIT HEIMDAL_PORT
		27	.endif
24	OPTIONS_DEFAULT= MIT	28	OPTIONS_DEFAULT= MIT
25	MIT_DESC= Link against MIT Kerberos	29	MIT_DESC= Link against MIT Kerberos
26	MIT_USES= gssapi:mit	30	MIT_USES= gssapi:mit

Lines 25-34 PLIST_FILES+= man/man1/plink.1.gz man/man1/pscp.1.gz man/man1/psftp.1.gz man/man Link Here

(-)b/security/putty/Makefile (+9 lines)
25		25
26	OPTIONS_RADIO= TOOLKIT	26	OPTIONS_RADIO= TOOLKIT
27	OPTIONS_RADIO_TOOLKIT= GTK2 GTK3	27	OPTIONS_RADIO_TOOLKIT= GTK2 GTK3
		28	.if exists(/usr/lib/libcom_err.so)
28	OPTIONS_DEFAULT=GSSAPI_BASE GTK3	29	OPTIONS_DEFAULT=GSSAPI_BASE GTK3
		30	.else
		31	OPTIONS_DEFAULT=GSSAPI_MIT GTK3
		32	.endif
29	OPTIONS_SINGLE= GSSAPI_SELECT	33	OPTIONS_SINGLE= GSSAPI_SELECT
		34	.if exists(/usr/lib/libcom_err.so)
30	OPTIONS_SINGLE_GSSAPI_SELECT= GSSAPI_NONE GSSAPI_BASE GSSAPI_HEIMDAL \	35	OPTIONS_SINGLE_GSSAPI_SELECT= GSSAPI_NONE GSSAPI_BASE GSSAPI_HEIMDAL \
31	GSSAPI_MIT	36	GSSAPI_MIT
		37	.else
		38	OPTIONS_SINGLE_GSSAPI_SELECT= GSSAPI_NONE GSSAPI_HEIMDAL \
		39	GSSAPI_MIT
		40	.endif
32		41
33	CONFLICTS_INSTALL?= pssh-[0-9]* putty-gtk2-[0-9]* putty-nogtk-[0-9]*	42	CONFLICTS_INSTALL?= pssh-[0-9]* putty-gtk2-[0-9]* putty-nogtk-[0-9]*
34		43

Lines 13-21 COMMENT= Kerberos bindings for python Link Here

(-)b/security/py-kerberos/Makefile (+8 lines)
13		13
14	LICENSE= APACHE20	14	LICENSE= APACHE20
15		15
		16	.if exists(/usr/lib/libcom_err.so)
16	OPTIONS_DEFAULT= GSSAPI_BASE	17	OPTIONS_DEFAULT= GSSAPI_BASE
		18	.else
		19	OPTIONS_DEFAULT= GSSAPI_MIT
		20	.endif
17	OPTIONS_SINGLE= GSSAPI	21	OPTIONS_SINGLE= GSSAPI
		22	.if exists(/usr/lib/libcom_err.so)
18	OPTIONS_SINGLE_GSSAPI= GSSAPI_BASE GSSAPI_HEIMDAL GSSAPI_MIT	23	OPTIONS_SINGLE_GSSAPI= GSSAPI_BASE GSSAPI_HEIMDAL GSSAPI_MIT
		24	.else
		25	OPTIONS_SINGLE_GSSAPI= GSSAPI_HEIMDAL GSSAPI_MIT
		26	.endif
19		27
20	GSSAPI_BASE_USES= gssapi	28	GSSAPI_BASE_USES= gssapi
21	GSSAPI_HEIMDAL_USES= gssapi:heimdal	29	GSSAPI_HEIMDAL_USES= gssapi:heimdal

Lines 43-49 CONFIGURE_ARGS?=--disable-fsck \ Link Here

(-)b/sysutils/e2fsprogs/Makefile (-2 / +16 lines)
43	--includedir='${PREFIX}/include/e2fsprogs/' \	43	--includedir='${PREFIX}/include/e2fsprogs/' \
44	--with-root-prefix='${PREFIX}' \	44	--with-root-prefix='${PREFIX}' \
45	--without-included-gettext \	45	--without-included-gettext \
46	LDFLAGS='${LDFLAGS} -L${LOCALBASE}/lib -Wl,--rpath -Wl,${LOCALBASE}/lib/e2fsprogs'	46	LDFLAGS='${LDFLAGS} -L${LOCALBASE}/lib -Wl,--rpath -Wl,${LOCALBASE}/lib/e2fsprogs ${GSSAPILDFLAGS}'
47	CPPFLAGS+= -I${WRKSRC}/lib -I${LOCALBASE}/include # -D_EXT2_USE_C_VERSIONS	47	CPPFLAGS+= -I${WRKSRC}/lib -I${LOCALBASE}/include # -D_EXT2_USE_C_VERSIONS
48	MAKE_ARGS+= pkgconfigdir='${PREFIX}/libdata/pkgconfig'	48	MAKE_ARGS+= pkgconfigdir='${PREFIX}/libdata/pkgconfig'
49	MAKE_ENV+= CHECK_CMD=@true	49	MAKE_ENV+= CHECK_CMD=@true
Lines 55-63 OPTIONS_DEFINE= DOCS NLS FUSEFS PARALLELTESTS SLOWTESTS BASHTESTS Link Here
55	OPTIONS_EXCLUDE+= EXAMPLES	55	OPTIONS_EXCLUDE+= EXAMPLES
56	OPTIONS_SUB= yes	56	OPTIONS_SUB= yes
57		57
58	OPTIONS_SINGLE= SELFTEST	58	OPTIONS_SINGLE= SELFTEST GSSAPI
59	OPTIONS_SINGLE_SELFTEST= NOTESTS SMALLTESTS ALLTESTS	59	OPTIONS_SINGLE_SELFTEST= NOTESTS SMALLTESTS ALLTESTS
60	OPTIONS_DEFAULT= SMALLTESTS	60	OPTIONS_DEFAULT= SMALLTESTS
		61	.if exists(/usr/lib/libcom_err.so)
		62	OPTIONS_SINGLE_GSSAPI= GSSAPI_BASE GSSAPI_HEIMDAL GSSAPI_MIT
		63	OPTIONS_DEFAULT+= GSSAPI_BASE
		64	.else
		65	OPTIONS_SINGLE_GSSAPI= GSSAPI_HEIMDAL GSSAPI_MIT
		66	# XXX Should the defalut be GSSAPI_HEIMDAL?
		67	OPTIONS_DEFAULT+= GSSAPI_MIT
		68	.endif
61	FUSEFS_DESC= Build user-land ext2/3/4 FUSE module (slow!)	69	FUSEFS_DESC= Build user-land ext2/3/4 FUSE module (slow!)
62	SELFTEST_DESC= Choose which set of self-tests to run	70	SELFTEST_DESC= Choose which set of self-tests to run
63	NOTESTS_DESC= Do not run any self-tests (Tier-1, DISCOURAGED)	71	NOTESTS_DESC= Do not run any self-tests (Tier-1, DISCOURAGED)
Lines 72-77 FUSEFS_CONFIGURE_ENABLE= fuse2fs Link Here
72	BUILD_DEPENDS+= gdd:sysutils/coreutils	80	BUILD_DEPENDS+= gdd:sysutils/coreutils
73	BASHTEST_BUILD_DEPENDS= bash:shells/bash	81	BASHTEST_BUILD_DEPENDS= bash:shells/bash
74		82
		83	GSSAPI_BASE_USES= gssapi:base,flags
		84	GSSAPI_HEIMDAL_USES= gssapi:heimdal,flags
		85	GSSAPI_MIT_USES= gssapi:mit,flags
		86
		87	CPPFLAGS+= ${GSSAPICPPFLAGS}
		88
75	LIB_DEPENDS+= libblkid.so:misc/e2fsprogs-libblkid	89	LIB_DEPENDS+= libblkid.so:misc/e2fsprogs-libblkid
76	LIB_DEPENDS+= libss.so:devel/e2fsprogs-libss	90	LIB_DEPENDS+= libss.so:devel/e2fsprogs-libss
77	LIB_DEPENDS+= libuuid.so:misc/e2fsprogs-libuuid	91	LIB_DEPENDS+= libuuid.so:misc/e2fsprogs-libuuid

Lines 22-30 WANT_OPENLDAP_SASL= yes Link Here

(-)b/sysutils/msktutil/Makefile (+5 lines)
22	CONFIGURE_ARGS+=--with-sasldir=${LOCALBASE} --with-ldapdir=${LOCALBASE}	22	CONFIGURE_ARGS+=--with-sasldir=${LOCALBASE} --with-ldapdir=${LOCALBASE}
23		23
24	OPTIONS_SINGLE= GSSAPI	24	OPTIONS_SINGLE= GSSAPI
		25	.if exists(/usr/lib/libcom_err.so)
25	OPTIONS_SINGLE_GSSAPI= GSSAPI_BASE GSSAPI_HEIMDAL GSSAPI_MIT	26	OPTIONS_SINGLE_GSSAPI= GSSAPI_BASE GSSAPI_HEIMDAL GSSAPI_MIT
26		27
27	OPTIONS_DEFAULT=GSSAPI_BASE	28	OPTIONS_DEFAULT=GSSAPI_BASE
		29	.else
		30	OPTIONS_SINGLE_GSSAPI= GSSAPI_HEIMDAL GSSAPI_MIT
		31	OPTIONS_DEFAULT=GSSAPI_MIT
		32	.endif
28		33
29	GSSAPI_BASE_USES= gssapi	34	GSSAPI_BASE_USES= gssapi
30	GSSAPI_HEIMDAL_USES= gssapi:heimdal	35	GSSAPI_HEIMDAL_USES= gssapi:heimdal

Lines 39-44 OPTIONS_DEFINE= CURL DOCS GTK2 HDF5 HWLOC IPMI MYSQL RRD LINUX Link Here

(-)b/sysutils/slurm-wlm/Makefile (+14 lines)
39	OPTIONS_DEFAULT=HDF5 HWLOC	39	OPTIONS_DEFAULT=HDF5 HWLOC
40	OPTIONS_SUB= yes	40	OPTIONS_SUB= yes
41		41
		42	.if !exists(/usr/lib/libcom_err.so)
		43	OPTIONS_SINGLE= GSSAPI_SELECT
		44	OPTIONS_SINGLE_GSSAPI_SELECT= GSSAPI_NONE GSSAPI_HEIMDAL GSSAPI_MIT
		45	OPTIONS_DEFAULT+= GSSAPI_NONE
		46	GSSAPI_HEIMDAL_USES= gssapi:heimdal,flags
		47	GSSAPI_MIT_USES= gssapi:mit,flags
		48	.endif
		49
42	CURL_DESC= Require cURL for elasticsearch plugins	50	CURL_DESC= Require cURL for elasticsearch plugins
43	GTK2_DESC= Build sview GUI config tool	51	GTK2_DESC= Build sview GUI config tool
44	HDF5_DESC= Job profiling using HDF5	52	HDF5_DESC= Job profiling using HDF5
Lines 81-86 LINUX_USES= linux Link Here
81		89
82	CFLAGS+= -I${WRKSRC}/slurm -I${LOCALBASE}/include	90	CFLAGS+= -I${WRKSRC}/slurm -I${LOCALBASE}/include
83	LDFLAGS+= -L${LOCALBASE}/lib -lsysinfo -lkvm	91	LDFLAGS+= -L${LOCALBASE}/lib -lsysinfo -lkvm
		92	GSSAPI_NONE_EXTRA_PATCHES= ${FILESDIR}/extra-patch-noheimdal
		93	GSSAPI_MIT_EXTRA_PATCHES= ${FILESDIR}/extra-patch-noheimdal
		94	GSSAPI_HEIMDAL_CFLAGS= -I${GSSAPIINCDIR} ${GSSAPICPPFLAGS}
		95	GSSAPI_MIT_CFLAGS= -I${GSSAPIINCDIR} ${GSSAPICPPFLAGS}
		96	GSSAPI_HEIMDAL_LDFLAGS= -L${GSSAPILIBDIR} ${GSSAPILDFLAGS} ${GSSAPILIBS}
		97	GSSAPI_MIT_LDFLAGS= -L${GSSAPILIBDIR} ${GSSAPILDFLAGS} ${GSSAPILIBS}
84		98
85	# SLURM's configure enables interactive jobs if pty.h exists. Replacing	99	# SLURM's configure enables interactive jobs if pty.h exists. Replacing
86	# #include <pty.h> with appropriate headers will therefore not work, so instead	100	# #include <pty.h> with appropriate headers will therefore not work, so instead




Index: sysutils/slurm-wlm/files/patch-src-plugins-mpi-pmi2-agent.c
===================================================================
--- sysutils/slurm-wlm/files/patch-src-plugins-mpi-pmi2-agent.c.orig	2018-02-20 02:40:20 UTC
+++ sysutils/slurm-wlm/files/patch-src-plugins-mpi-pmi2-agent.c
@@ -0,0 +1,10 @@
+--- src/plugins/mpi/pmi2/agent.c.orig	2017-11-01 01:04:16 UTC
++++ src/plugins/mpi/pmi2/agent.c
+@@ -39,7 +39,6 @@
+ \*****************************************************************************/
+ 
+ #if defined(__FreeBSD__)
+-#include <roken.h>
+ #include <sys/socket.h>	/* AF_INET */
+ #endif
+ 
--- sysutils/slurm-wlm/files/patch-src-plugins-mpi-pmi2-pmi1.c.orig	2018-02-20 02:40:20 UTC
+++ sysutils/slurm-wlm/files/patch-src-plugins-mpi-pmi2-pmi1.c
@@ -0,0 +1,10 @@
+--- src/plugins/mpi/pmi2/pmi1.c.orig	2017-11-01 01:04:16 UTC
++++ src/plugins/mpi/pmi2/pmi1.c
+@@ -38,7 +38,6 @@
+ #include "config.h"
+ 
+ #if defined(__FreeBSD__)
+-#include <roken.h>
+ #include <sys/socket.h> /* AF_INET */
+ #endif
+ 
--- sysutils/slurm-wlm/files/patch-src-plugins-mpi-pmi2-pmi2.c.orig	2018-02-20 02:40:20 UTC
+++ sysutils/slurm-wlm/files/patch-src-plugins-mpi-pmi2-pmi2.c
@@ -0,0 +1,10 @@
+--- src/plugins/mpi/pmi2/pmi2.c.orig	2017-11-01 01:04:16 UTC
++++ src/plugins/mpi/pmi2/pmi2.c
+@@ -36,7 +36,6 @@
+ \*****************************************************************************/
+ 
+ #if defined(__FreeBSD__)
+-#include <roken.h>
+ #include <sys/socket.h> /* AF_INET */
+ #endif
+ 

Lines 24-31 GNU_CONFIGURE= yes Link Here

(-)b/www/mod_auth_kerb2/Makefile (+5 lines)
24	CONFIGURE_ARGS= -with-krb5=${GSSAPIBASEDIR} --without-krb4	24	CONFIGURE_ARGS= -with-krb5=${GSSAPIBASEDIR} --without-krb4
25		25
26	OPTIONS_SINGLE= GSSAPI	26	OPTIONS_SINGLE= GSSAPI
		27	.if exists(/usr/lib/libcom_err.so)
27	OPTIONS_DEFAULT= GSSAPI_BASE	28	OPTIONS_DEFAULT= GSSAPI_BASE
28	OPTIONS_SINGLE_GSSAPI= GSSAPI_BASE GSSAPI_HEIMDAL GSSAPI_MIT	29	OPTIONS_SINGLE_GSSAPI= GSSAPI_BASE GSSAPI_HEIMDAL GSSAPI_MIT
		30	.else
		31	OPTIONS_DEFAULT= GSSAPI_MIT
		32	OPTIONS_SINGLE_GSSAPI= GSSAPI_HEIMDAL GSSAPI_MIT
		33	.endif
29	GSSAPI_BASE_DESC= Use Base version of GSS API	34	GSSAPI_BASE_DESC= Use Base version of GSS API
30	GSSAPI_HEIMDAL_DESC= Use Heimdal implementation of GSS API	35	GSSAPI_HEIMDAL_DESC= Use Heimdal implementation of GSS API
31	GSSAPI_MIT_DESC= Use MIT implementation of GSS API	36	GSSAPI_MIT_DESC= Use MIT implementation of GSS API

Lines 94-100 OPTIONS_DEFAULT?= DSO FILE_AIO HTTP HTTP_ADDITION HTTP_AUTH_REQ HTTP_CACHE \ Link Here

(-)b/www/nginx-devel/Makefile (+7 lines)
94	THREADS WWW	94	THREADS WWW
95		95
96	OPTIONS_RADIO+= GSSAPI	96	OPTIONS_RADIO+= GSSAPI
		97	.if exists(/usr/lib/libcom_err.so)
97	OPTIONS_RADIO_GSSAPI= GSSAPI_BASE GSSAPI_HEIMDAL GSSAPI_MIT	98	OPTIONS_RADIO_GSSAPI= GSSAPI_BASE GSSAPI_HEIMDAL GSSAPI_MIT
		99	.else
		100	OPTIONS_RADIO_GSSAPI= GSSAPI_HEIMDAL GSSAPI_MIT
		101	.endif
98	GSSAPI_BASE_USES= gssapi	102	GSSAPI_BASE_USES= gssapi
99	GSSAPI_HEIMDAL_USES= gssapi:heimdal,flags	103	GSSAPI_HEIMDAL_USES= gssapi:heimdal,flags
100	GSSAPI_MIT_USES= gssapi:mit	104	GSSAPI_MIT_USES= gssapi:mit
Lines 268-273 post-patch-GRIDFS-on: Link Here
268	post-patch-HTTP_AUTH_KRB5-on:	272	post-patch-HTTP_AUTH_KRB5-on:
269	@${REINPLACE_CMD} 's!%%GSSAPILIBS%%!${GSSAPILIBS}!g; \	273	@${REINPLACE_CMD} 's!%%GSSAPILIBS%%!${GSSAPILIBS}!g; \
270	s!%%GSSAPIINCDIR%%!${GSSAPIINCDIR}!g' ${WRKSRC_auth_krb5}/config	274	s!%%GSSAPIINCDIR%%!${GSSAPIINCDIR}!g' ${WRKSRC_auth_krb5}/config
		275	@${REINPLACE_CMD} 's!%%GSSAPILIBDIR%%!${GSSAPILIBDIR}!' ${WRKSRC_auth_krb5}/config
		276	@${REINPLACE_CMD} 's!%%GSSAPILDFLAGS%%!${GSSAPILDFLAGS}!' ${WRKSRC_auth_krb5}/config
		277
271		278
272	post-patch-HTTP_TARANTOOL-on:	279	post-patch-HTTP_TARANTOOL-on:
273	@${REINPLACE_CMD} 's!%%PREFIX%%!${LOCALBASE}!g' ${WRKSRC_nginx_tarantool}/config	280	@${REINPLACE_CMD} 's!%%PREFIX%%!${LOCALBASE}!g' ${WRKSRC_nginx_tarantool}/config




-if uname -o | grep -q FreeBSD; then
-    ngx_feature_libs="$ngx_feature_libs -lgssapi"
-fi
+ngx_feature_libs="%%GSSAPILIBS%% %%GSSAPILDFLAGS%%"
+ngx_module_incs="%%GSSAPIINCDIR%%"
 
 if test -n "$ngx_module_link"; then
     ngx_module_type=HTTP
@@ -16,3 +13,6 @@ else
     NGX_ADDON_SRCS="$NGX_ADDON_SRCS $ngx_addon_dir/ngx_http_auth_spnego_module.c"
     CORE_LIBS="$CORE_LIBS $ngx_feature_libs"
 fi
+
+LDFLAGS="-L%%GSSAPILIBDIR%%  %%GSSAPILDFLAGS%% $LDFLAGS"
+CFLAGS="-I%%GSSAPIINCDIR%% -L%%GSSAPILIBDIR%% %%GSSAPILDFLAGS%% $CFLAGS"

Lines 93-99 OPTIONS_DEFAULT?= DSO FILE_AIO HTTP HTTP_ADDITION HTTP_AUTH_REQ HTTP_CACHE \ Link Here

(-)b/www/nginx/Makefile (+7 lines)
93	THREADS WWW	93	THREADS WWW
94		94
95	OPTIONS_RADIO+= GSSAPI	95	OPTIONS_RADIO+= GSSAPI
		96	.if exists(/usr/lib/libcom_err.so)
96	OPTIONS_RADIO_GSSAPI= GSSAPI_BASE GSSAPI_HEIMDAL GSSAPI_MIT	97	OPTIONS_RADIO_GSSAPI= GSSAPI_BASE GSSAPI_HEIMDAL GSSAPI_MIT
		98	.else
		99	OPTIONS_RADIO_GSSAPI= GSSAPI_HEIMDAL GSSAPI_MIT
		100	.endif
97	GSSAPI_BASE_USES= gssapi	101	GSSAPI_BASE_USES= gssapi
98	GSSAPI_HEIMDAL_USES= gssapi:heimdal,flags	102	GSSAPI_HEIMDAL_USES= gssapi:heimdal,flags
99	GSSAPI_MIT_USES= gssapi:mit	103	GSSAPI_MIT_USES= gssapi:mit
Lines 266-271 post-patch-GRIDFS-on: Link Here
266		270
267	post-patch-HTTP_AUTH_KRB5-on:	271	post-patch-HTTP_AUTH_KRB5-on:
268	@${REINPLACE_CMD} 's!%%GSSAPILIBS%%!${GSSAPILIBS}!' ${WRKSRC_auth_krb5}/config	272	@${REINPLACE_CMD} 's!%%GSSAPILIBS%%!${GSSAPILIBS}!' ${WRKSRC_auth_krb5}/config
		273	@${REINPLACE_CMD} 's!%%GSSAPIINCDIR%%!${GSSAPIINCDIR}!' ${WRKSRC_auth_krb5}/config
		274	@${REINPLACE_CMD} 's!%%GSSAPILIBDIR%%!${GSSAPILIBDIR}!' ${WRKSRC_auth_krb5}/config
		275	@${REINPLACE_CMD} 's!%%GSSAPILDFLAGS%%!${GSSAPILDFLAGS}!' ${WRKSRC_auth_krb5}/config
269		276
270	post-patch-HTTP_TARANTOOL-on:	277	post-patch-HTTP_TARANTOOL-on:
271	@${REINPLACE_CMD} 's!%%PREFIX%%!${LOCALBASE}!g' ${WRKSRC_nginx_tarantool}/config	278	@${REINPLACE_CMD} 's!%%PREFIX%%!${LOCALBASE}!g' ${WRKSRC_nginx_tarantool}/config




-if uname -o | grep -q FreeBSD; then
-    ngx_feature_libs="$ngx_feature_libs -lgssapi"
-fi
+ngx_feature_libs="%%GSSAPILIBS%% %%GSSAPILDFLAGS%%"
+ngx_module_incs="%%GSSAPIINCDIR%%"
 
 if test -n "$ngx_module_link"; then
     ngx_module_type=HTTP
@@ -16,3 +13,6 @@ else
     NGX_ADDON_SRCS="$NGX_ADDON_SRCS $ngx_addon_dir/ngx_http_auth_spnego_module.c"
     CORE_LIBS="$CORE_LIBS $ngx_feature_libs"
 fi
+
+LDFLAGS="-L%%GSSAPILIBDIR%%  %%GSSAPILDFLAGS%% $LDFLAGS"
+CFLAGS="-I%%GSSAPIINCDIR%% -L%%GSSAPILIBDIR%% %%GSSAPILDFLAGS%% $CFLAGS"

Lines 55-66 OPTIONS_DEFINE= ARP_ACL BDB CACHE_DIGESTS DEBUG DELAY_POOLS DOCS ECAP ESI EXAMPL Link Here

(-)b/www/squid-devel/Makefile (+11 lines)
55	STACKTRACES VIA_DB WCCP WCCPV2	55	STACKTRACES VIA_DB WCCP WCCPV2
56		56
57	OPTIONS_SINGLE= GSSAPI	57	OPTIONS_SINGLE= GSSAPI
		58	.if exists(/usr/lib/libcom_err.so)
58	OPTIONS_SINGLE_GSSAPI= GSSAPI_NONE GSSAPI_BASE GSSAPI_HEIMDAL GSSAPI_MIT	59	OPTIONS_SINGLE_GSSAPI= GSSAPI_NONE GSSAPI_BASE GSSAPI_HEIMDAL GSSAPI_MIT
		60	.else
		61	OPTIONS_SINGLE_GSSAPI= GSSAPI_NONE GSSAPI_HEIMDAL GSSAPI_MIT
		62	.endif
59		63
		64	.if exists(/usr/lib/libcom_err.so)
60	OPTIONS_DEFAULT=ARP_ACL AUTH_NIS CACHE_DIGESTS DELAY_POOLS FOLLOW_XFF FS_AUFS \	65	OPTIONS_DEFAULT=ARP_ACL AUTH_NIS CACHE_DIGESTS DELAY_POOLS FOLLOW_XFF FS_AUFS \
61	FS_DISKD FS_ROCK GSSAPI_BASE HTCP ICAP ICMP IDENT KQUEUE \	66	FS_DISKD FS_ROCK GSSAPI_BASE HTCP ICAP ICMP IDENT KQUEUE \
62	LARGEFILE LAX_HTTP PCRE SNMP SSL SSL_CRTD TP_IPFW VIA_DB WCCP \	67	LARGEFILE LAX_HTTP PCRE SNMP SSL SSL_CRTD TP_IPFW VIA_DB WCCP \
63	WCCPV2	68	WCCPV2
		69	.else
		70	OPTIONS_DEFAULT=ARP_ACL AUTH_NIS CACHE_DIGESTS DELAY_POOLS FOLLOW_XFF FS_AUFS \
		71	FS_DISKD FS_ROCK GSSAPI_NONE HTCP ICAP ICMP IDENT KQUEUE \
		72	LARGEFILE LAX_HTTP PCRE SNMP SSL SSL_CRTD TP_IPFW VIA_DB WCCP \
		73	WCCPV2
		74	.endif
64		75
65	ARP_ACL_CONFIGURE_ENABLE= eui	76	ARP_ACL_CONFIGURE_ENABLE= eui
66	AUTH_LDAP_CFLAGS= -I${LOCALBASE}/include	77	AUTH_LDAP_CFLAGS= -I${LOCALBASE}/include

Lines 55-66 OPTIONS_DEFINE= ARP_ACL BDB CACHE_DIGESTS DEBUG DELAY_POOLS DOCS ECAP ESI EXAMPL Link Here

(-)b/www/squid/Makefile (+11 lines)
55	STACKTRACES VIA_DB WCCP WCCPV2	55	STACKTRACES VIA_DB WCCP WCCPV2
56		56
57	OPTIONS_SINGLE= GSSAPI	57	OPTIONS_SINGLE= GSSAPI
		58	.if exists(/usr/lib/libcom_err.so)
58	OPTIONS_SINGLE_GSSAPI= GSSAPI_NONE GSSAPI_BASE GSSAPI_HEIMDAL GSSAPI_MIT	59	OPTIONS_SINGLE_GSSAPI= GSSAPI_NONE GSSAPI_BASE GSSAPI_HEIMDAL GSSAPI_MIT
		60	.else
		61	OPTIONS_SINGLE_GSSAPI= GSSAPI_NONE GSSAPI_HEIMDAL GSSAPI_MIT
		62	.endif
59		63
		64	.if exists(/usr/lib/libcom_err.so)
60	OPTIONS_DEFAULT=ARP_ACL AUTH_NIS CACHE_DIGESTS DELAY_POOLS FOLLOW_XFF FS_AUFS \	65	OPTIONS_DEFAULT=ARP_ACL AUTH_NIS CACHE_DIGESTS DELAY_POOLS FOLLOW_XFF FS_AUFS \
61	FS_DISKD FS_ROCK GSSAPI_BASE HTCP ICAP ICMP IDENT KQUEUE \	66	FS_DISKD FS_ROCK GSSAPI_BASE HTCP ICAP ICMP IDENT KQUEUE \
62	LARGEFILE LAX_HTTP PCRE SNMP SSL SSL_CRTD TP_IPFW VIA_DB WCCP \	67	LARGEFILE LAX_HTTP PCRE SNMP SSL SSL_CRTD TP_IPFW VIA_DB WCCP \
63	WCCPV2	68	WCCPV2
		69	.else
		70	OPTIONS_DEFAULT=ARP_ACL AUTH_NIS CACHE_DIGESTS DELAY_POOLS FOLLOW_XFF FS_AUFS \
		71	FS_DISKD FS_ROCK GSSAPI_NONE HTCP ICAP ICMP IDENT KQUEUE \
		72	LARGEFILE LAX_HTTP PCRE SNMP SSL SSL_CRTD TP_IPFW VIA_DB WCCP \
		73	WCCPV2
		74	.endif
64		75
65	ARP_ACL_CONFIGURE_ENABLE= eui	76	ARP_ACL_CONFIGURE_ENABLE= eui
66	AUTH_LDAP_CFLAGS= -I${LOCALBASE}/include	77	AUTH_LDAP_CFLAGS= -I${LOCALBASE}/include

Return to bug 222745

Lines 4-10 Link Here

(-)b/Mk/Uses/gssapi.mk (-2 / +7 lines)
4	#	4	#
5	# Feature: gssapi	5	# Feature: gssapi
6	# Usage: USES=gssapi or USES=gssapi:ARGS	6	# Usage: USES=gssapi or USES=gssapi:ARGS
7	# Valid ARGS: base (default, implicit), heimdal, mit.	7	# Valid ARGS: base (default, implicit, before 1200070), heimdal,
		8	# mit (default, implicit, after 1200070).
8	# "bootstrap" is a special prefix only for krb5 or heimdal ports.	9	# "bootstrap" is a special prefix only for krb5 or heimdal ports.
9	# ("bootstrap,mit")	10	# ("bootstrap,mit")
10	# flags is a special suffix to define CFLAGS, LDFLAGS, and LDADD.	11	# flags is a special suffix to define CFLAGS, LDFLAGS, and LDADD.
Lines 81-91 _HEADERS= sys/types.h sys/stat.h stdint.h Link Here
81		82
82	.undef _FIXUP_KRB5CONFIG	83	.undef _FIXUP_KRB5CONFIG
83	.if empty(gssapi_ARGS)	84	.if empty(gssapi_ARGS)
		85	.if exists(/usr/lib/libcom_err.so)
84	gssapi_ARGS= base	86	gssapi_ARGS= base
		87	.else
		88	gssapi_ARGS= mit
		89	.endif
85	.endif	90	.endif
86	.for _A in ${gssapi_ARGS}	91	.for _A in ${gssapi_ARGS}
87	_local:= ${_A}	92	_local:= ${_A}
88	.if ${_local} == "base"	93	.if ${_local} == "base" && exists(/usr/lib/libcom_err.so)
89	. if ${SSL_DEFAULT} != base	94	. if ${SSL_DEFAULT} != base
90	IGNORE= You are using OpenSSL from ports and have selected GSSAPI from base, please select another GSSAPI value	95	IGNORE= You are using OpenSSL from ports and have selected GSSAPI from base, please select another GSSAPI value
91	. endif	96	. endif

Lines 1-11 Link Here

(-)b/devel/cvs/files/patch-cvs__Makefile (-5 / +12 lines)
1	--- ../cvs-build/cvs/Makefile.orig 2012-09-06 06:25:43.000000000 +0400	1	--- ../cvs-build/cvs/Makefile.orig 2012-09-05 19:25:43.000000000 -0700
2	+++ ../cvs-build/cvs/Makefile 2014-07-15 12:37:28.000000000 +0400	2	+++ ../cvs-build/cvs/Makefile 2018-04-19 22:42:32.057681000 -0700
3	@@ -32,7 +32,7 @@	3	@@ -32,11 +32,12 @@
4	DPADD= ${LIBCVS} ${LIBDIFF} ${LIBGNUREGEX} ${LIBMD} ${LIBCRYPT} ${LIBZ}	4	DPADD= ${LIBCVS} ${LIBDIFF} ${LIBGNUREGEX} ${LIBMD} ${LIBCRYPT} ${LIBZ}
5	LDADD= ${LIBCVS} ${LIBDIFF} -lgnuregex -lmd -lcrypt -lz	5	LDADD= ${LIBCVS} ${LIBDIFF} -lgnuregex -lmd -lcrypt -lz
6		6
7	-.if ${MK_KERBEROS_SUPPORT} != "no"	7	-.if ${MK_KERBEROS_SUPPORT} != "no"
8	+.if defined(KERBEROS_SUPPORT)	8	+.if defined(KERBEROS_SUPPORT) && ${KERBEROS_SUPPORT} == "heimdal"
9	CFLAGS+= -DHAVE_GSSAPI -DENCRYPTION	9	CFLAGS+= -DHAVE_GSSAPI -DENCRYPTION
10	LDADD+= -lgssapi -lkrb5 -lhx509 -lasn1 -lcrypto -lroken -lcrypt -lcom_err	10	LDADD+= -lgssapi -lkrb5 -lhx509 -lasn1 -lcrypto -lroken -lcrypt -lcom_err
11	DPADD+= ${LIBGSSAPI} ${LIBKRB5} ${LIBHX509} ${LIBASN1} ${LIBCRYPTO} ${LIBROKEN}	11	-DPADD+= ${LIBGSSAPI} ${LIBKRB5} ${LIBHX509} ${LIBASN1} ${LIBCRYPTO} ${LIBROKEN}
		12	-DPADD+= ${LIBCRYPT} ${LIBCOM_ERR}
		13	+.elif defined(KERBEROS_SUPPORT) && ${KERBEROS_SUPPORT} == "mit"
		14	+CFLAGS+= -DHAVE_GSSAPI -DENCRYPTION
		15	+LDADD+= -lgssapi_krb5 -lkrb5 -lk5crypto -lcrypt -lcom_err
		16	.endif
		17
		18	#

Lines 12-17 LICENSE= MIT Link Here

(-)b/devel/e2fsprogs-libss/Makefile (+15 lines)
12	LICENSE_FILE= ${INSTALL_WRKSRC}/ss.h	12	LICENSE_FILE= ${INSTALL_WRKSRC}/ss.h
13		13
14	OPTIONS_EXCLUDE= DOCS EXAMPLES IPV6 NLS	14	OPTIONS_EXCLUDE= DOCS EXAMPLES IPV6 NLS
		15	OPTIONS_SINGLE= GSSAPI
		16	.if exists(/usr/lib/libcom_err.so)
		17	OPTIONS_SINGLE_GSSAPI= GSSAPI_BASE GSSAPI_HEIMDAL GSSAPI_MIT
		18	OPTIONS_DEFAULT= GSSAPI_BASE
		19	.else
		20	OPTIONS_SINGLE_GSSAPI= GSSAPI_HEIMDAL GSSAPI_MIT
		21	# XXX Should default be GSSAPI_HEIMDAL?
		22	OPTIONS_DEFAULT= GSSAPI_MIT
		23	.endif
		24
		25	GSSAPI_BASE_USES= gssapi:base,flags
		26	GSSAPI_HEIMDAL_USES= gssapi:heimdal,flags
		27	GSSAPI_MIT_USES= gssapi:mit,flags
		28
15	CONFIGURE_ARGS= --enable-elf-shlibs	29	CONFIGURE_ARGS= --enable-elf-shlibs
16	MASTERDIR= ${.CURDIR}/../../sysutils/e2fsprogs	30	MASTERDIR= ${.CURDIR}/../../sysutils/e2fsprogs
17	GNU_CONFIGURE= yes	31	GNU_CONFIGURE= yes
Lines 19-24 USE_LDCONFIG= yes Link Here
19	BUILD_WRKSRC= ${WRKSRC}/lib/ss	33	BUILD_WRKSRC= ${WRKSRC}/lib/ss
20	INSTALL_WRKSRC= ${WRKSRC}/lib/ss	34	INSTALL_WRKSRC= ${WRKSRC}/lib/ss
21	FILESDIR= ${.CURDIR}/files	35	FILESDIR= ${.CURDIR}/files
		36	LDFLAGS= ${GSSAPILDFLAGS}
22		37
23	PKGDIR= ${.CURDIR}	38	PKGDIR= ${.CURDIR}
24		39

Lines 1-5 Link Here

(-)b/dns/samba-nsupdate/files/patch-configure.in (-3 / +10 lines)
1	--- configure.in.orig 2013-09-05 05:19:53.000000000 +0000	1	--- configure.in.orig 2013-09-04 22:19:53.000000000 -0700
2	+++ configure.in 2013-10-18 14:30:21.711727438 +0000	2	+++ configure.in 2018-09-07 17:54:05.909595000 -0700
3	@@ -1013,7 +1013,8 @@	3	@@ -1013,7 +1013,8 @@
4	"-lgssapi" \	4	"-lgssapi" \
5	"-lgssapi -lkrb5 -ldes -lcrypt -lasn1 -lroken -lcom_err" \	5	"-lgssapi -lkrb5 -ldes -lcrypt -lasn1 -lroken -lcom_err" \
Lines 10-21 Link Here
10	do	10	do
11	# Note that this does not include $saved_libs, because	11	# Note that this does not include $saved_libs, because
12	# on FreeBSD machines this configure script has added	12	# on FreeBSD machines this configure script has added
13	@@ -1027,7 +1028,7 @@	13	@@ -1027,8 +1028,14 @@
14	LIBS="-L$use_gssapi/lib $TRY_LIBS"	14	LIBS="-L$use_gssapi/lib $TRY_LIBS"
15	fi	15	fi
16	AC_MSG_CHECKING(linking as $TRY_LIBS)	16	AC_MSG_CHECKING(linking as $TRY_LIBS)
17	- AC_TRY_LINK( , [gss_acquire_cred();krb5_init_context()],	17	- AC_TRY_LINK( , [gss_acquire_cred();krb5_init_context()],
18	+ AC_TRY_LINK( , [gss_acquire_cred();krb5_init_context();gsskrb5_register_acceptor_identity("krb5");],	18	+ AC_TRY_LINK( , [gss_acquire_cred();krb5_init_context();gsskrb5_register_acceptor_identity("krb5");],
19	gssapi_linked=yes, gssapi_linked=no)	19	gssapi_linked=yes, gssapi_linked=no)
		20	+ case $gssapi_linked in
		21	+ no)
		22	+ AC_TRY_LINK( , [gss_acquire_cred();krb5_init_context();krb5_gss_register_acceptor_identity("krb5");],
		23	+ gssapi_linked=yes, gssapi_linked=no)
		24	+ ;;
		25	+ esac
20	case $gssapi_linked in	26	case $gssapi_linked in
21	yes) AC_MSG_RESULT(yes); break ;;	27	yes) AC_MSG_RESULT(yes); break ;;
		28	no) AC_MSG_RESULT(no) ;;

Lines 22-29 GNU_CONFIGURE= yes Link Here

(-)b/net/nss_ldap/Makefile (+12 lines)
22	USE_LDCONFIG= yes	22	USE_LDCONFIG= yes
23	USE_OPENLDAP= yes	23	USE_OPENLDAP= yes
24		24
		25	.if exists(/usr/lib/libcom_err.so)
25	OPTIONS_DEFINE= LCLASS KERBEROS SASL	26	OPTIONS_DEFINE= LCLASS KERBEROS SASL
26	OPTIONS_DEFAULT=LCLASS KERBEROS	27	OPTIONS_DEFAULT=LCLASS KERBEROS
		28	.else
		29	OPTIONS_DEFINE= LCLASS SASL
		30	OPTIONS_DEFAULT=LCLASS
		31	OPTIONS_SINGLE= KERBEROS
		32	OPTIONS_SINGLE_KERBEROS= MIT HEIMDAL
		33	OPTIONS_DEFAULT=LCLASS MIT
		34	MIT_DESC= Link against MIT Kerberos
		35	MIT_USES= gssapi:mit
		36	HEIMDAL_DESC= Link against Heimdal in ports Kerberos
		37	HEIMDAL_USES= gssapi:heimdal
		38	.endif
27		39
28	LCLASS_DESC= Enable login classes via the loginClass attribute	40	LCLASS_DESC= Enable login classes via the loginClass attribute
29		41

Lines 13-18 COMMENT= Automated Kerberos ticket cache and keytab management utilities Link Here

(-)b/security/kstart/Makefile (+14 lines)
13		13
14	USE_RC_SUBR= ${PORTNAME}	14	USE_RC_SUBR= ${PORTNAME}
15	HAS_CONFIGURE= yes	15	HAS_CONFIGURE= yes
		16
		17	.if !exists(/usr/lib/libcom_err.so)
		18	CONFIGURE_ARGS+= --with-krb5="${GSSAPIBASEDIR}" \
		19	--with-krb5-includes="${GSSAPIINCDIR}" \
		20	${GSSAPI_CONFIGURE_ARGS}
		21
		22	OPTIONS_RADIO= KERBEROS
		23	KERBEROS_DESC= Kerberos 5 authentication
		24	OPTIONS_RADIO_KERBEROS= GSSAPI_HEIMDAL GSSAPI_MIT
		25	OPTIONS_DEFAULT= GSSAPI_MIT
		26	USES_GSSAPI_MIT= gssapi:mit
		27	USES_GSSAPI_HEIMDAL= gssapi:heimdal
		28	.endif
		29
16	PLIST_FILES= bin/k5start bin/krenew \	30	PLIST_FILES= bin/k5start bin/krenew \
17	man/man1/k5start.1.gz man/man1/krenew.1.gz	31	man/man1/k5start.1.gz man/man1/krenew.1.gz
18		32

Lines 11-25 MAINTAINER= hrs@FreeBSD.org Link Here

(-)b/security/p5-Heimdal-Kadm5/Makefile (+5 lines)
11	COMMENT= Perl extension for Heimdal administrative client library	11	COMMENT= Perl extension for Heimdal administrative client library
12		12
13	USES= perl5	13	USES= perl5
		14	.if !exists(/usr/lib/libcom_err.so)
		15	USES+= gssapi:heimdal
		16	.endif
14	USE_PERL5= configure	17	USE_PERL5= configure
15	CONFIGURE_ENV= GSSAPIBASEDIR="${GSSAPIBASEDIR}"	18	CONFIGURE_ENV= GSSAPIBASEDIR="${GSSAPIBASEDIR}"
16		19
		20	.if exists(/usr/lib/libcom_err.so)
17	OPTIONS_SINGLE= GSSAPI	21	OPTIONS_SINGLE= GSSAPI
18	OPTIONS_SINGLE_GSSAPI= GSSAPI_BASE GSSAPI_HEIMDAL	22	OPTIONS_SINGLE_GSSAPI= GSSAPI_BASE GSSAPI_HEIMDAL
19	OPTIONS_DEFAULT= GSSAPI_BASE	23	OPTIONS_DEFAULT= GSSAPI_BASE
20		24
21	GSSAPI_BASE_USES= gssapi	25	GSSAPI_BASE_USES= gssapi
22	GSSAPI_HEIMDAL_USES= gssapi:heimdal	26	GSSAPI_HEIMDAL_USES= gssapi:heimdal
		27	.endif
23		28
24	post-build:	29	post-build:
25	${STRIP_CMD} ${WRKSRC}/blib/arch/auto/Heimdal/Kadm5/Kadm5.so	30	${STRIP_CMD} ${WRKSRC}/blib/arch/auto/Heimdal/Kadm5/Kadm5.so

Removed Link Here

(-)a/sysutils/slurm-wlm/files/patch-nokerberos (-41 lines)
1	Index: sysutils/slurm-wlm/files/patch-src-plugins-mpi-pmi2-agent.c
2	===================================================================
3	--- sysutils/slurm-wlm/files/patch-src-plugins-mpi-pmi2-agent.c.orig 2018-02-20 02:40:20 UTC
4	+++ sysutils/slurm-wlm/files/patch-src-plugins-mpi-pmi2-agent.c
5	@@ -0,0 +1,10 @@
6	+--- src/plugins/mpi/pmi2/agent.c.orig 2017-11-01 01:04:16 UTC
7	++++ src/plugins/mpi/pmi2/agent.c
8	+@@ -39,7 +39,6 @@
9	+ \*****************************************************************************/
10	+
11	+ #if defined(__FreeBSD__)
12	+-#include <roken.h>
13	+ #include <sys/socket.h> /* AF_INET */
14	+ #endif
15	+
16	--- sysutils/slurm-wlm/files/patch-src-plugins-mpi-pmi2-pmi1.c.orig 2018-02-20 02:40:20 UTC
17	+++ sysutils/slurm-wlm/files/patch-src-plugins-mpi-pmi2-pmi1.c
18	@@ -0,0 +1,10 @@
19	+--- src/plugins/mpi/pmi2/pmi1.c.orig 2017-11-01 01:04:16 UTC
20	++++ src/plugins/mpi/pmi2/pmi1.c
21	+@@ -38,7 +38,6 @@
22	+ #include "config.h"
23	+
24	+ #if defined(__FreeBSD__)
25	+-#include <roken.h>
26	+ #include <sys/socket.h> /* AF_INET */
27	+ #endif
28	+
29	--- sysutils/slurm-wlm/files/patch-src-plugins-mpi-pmi2-pmi2.c.orig 2018-02-20 02:40:20 UTC
30	+++ sysutils/slurm-wlm/files/patch-src-plugins-mpi-pmi2-pmi2.c
31	@@ -0,0 +1,10 @@
32	+--- src/plugins/mpi/pmi2/pmi2.c.orig 2017-11-01 01:04:16 UTC
33	++++ src/plugins/mpi/pmi2/pmi2.c
34	+@@ -36,7 +36,6 @@
35	+ \*****************************************************************************/
36	+
37	+ #if defined(__FreeBSD__)
38	+-#include <roken.h>
39	+ #include <sys/socket.h> /* AF_INET */
40	+ #endif
41	+

Lines 7-20 Link Here

(-)b/www/nginx-devel/files/extra-patch-spnego-http-auth-nginx-module-config (-3 / +4 lines)
7	-if uname -o \| grep -q FreeBSD; then	7	-if uname -o \| grep -q FreeBSD; then
8	- ngx_feature_libs="$ngx_feature_libs -lgssapi"	8	- ngx_feature_libs="$ngx_feature_libs -lgssapi"
9	-fi	9	-fi
10	+ngx_feature_libs="%%GSSAPILIBS%%"	10	+ngx_feature_libs="%%GSSAPILIBS%% %%GSSAPILDFLAGS%%"
11	+ngx_module_incs="%%GSSAPIINCDIR%%"	11	+ngx_module_incs="%%GSSAPIINCDIR%%"
12		12
13	if test -n "$ngx_module_link"; then	13	if test -n "$ngx_module_link"; then
14	ngx_module_type=HTTP	14	ngx_module_type=HTTP
15	@@ -16,3 +13,5 @@ else	15	@@ -16,3 +13,6 @@ else
16	NGX_ADDON_SRCS="$NGX_ADDON_SRCS $ngx_addon_dir/ngx_http_auth_spnego_module.c"	16	NGX_ADDON_SRCS="$NGX_ADDON_SRCS $ngx_addon_dir/ngx_http_auth_spnego_module.c"
17	CORE_LIBS="$CORE_LIBS $ngx_feature_libs"	17	CORE_LIBS="$CORE_LIBS $ngx_feature_libs"
18	fi	18	fi
19	+	19	+
20	+LDFLAGS="-L%%GSSAPILIBDIR%% $LDFLAGS"	20	+LDFLAGS="-L%%GSSAPILIBDIR%% %%GSSAPILDFLAGS%% $LDFLAGS"
		21	+CFLAGS="-I%%GSSAPIINCDIR%% -L%%GSSAPILIBDIR%% %%GSSAPILDFLAGS%% $CFLAGS"

Lines 7-20 Link Here

(-)b/www/nginx/files/extra-patch-spnego-http-auth-nginx-module-config (-4 / +5 lines)
7	-if uname -o \| grep -q FreeBSD; then	7	-if uname -o \| grep -q FreeBSD; then
8	- ngx_feature_libs="$ngx_feature_libs -lgssapi"	8	- ngx_feature_libs="$ngx_feature_libs -lgssapi"
9	-fi	9	-fi
10	+ngx_feature_libs="%%GSSAPILIBS%%"	10	+ngx_feature_libs="%%GSSAPILIBS%% %%GSSAPILDFLAGS%%"
11	+ngx_module_incs="%%GSSAPINCDIR%%"	11	+ngx_module_incs="%%GSSAPIINCDIR%%"
12		12
13	if test -n "$ngx_module_link"; then	13	if test -n "$ngx_module_link"; then
14	ngx_module_type=HTTP	14	ngx_module_type=HTTP
15	@@ -16,3 +13,5 @@ else	15	@@ -16,3 +13,6 @@ else
16	NGX_ADDON_SRCS="$NGX_ADDON_SRCS $ngx_addon_dir/ngx_http_auth_spnego_module.c"	16	NGX_ADDON_SRCS="$NGX_ADDON_SRCS $ngx_addon_dir/ngx_http_auth_spnego_module.c"
17	CORE_LIBS="$CORE_LIBS $ngx_feature_libs"	17	CORE_LIBS="$CORE_LIBS $ngx_feature_libs"
18	fi	18	fi
19	+	19	+
20	+LDFLAGS="-L%%GSSAPILIBDIR%% $LDFLAGS"	20	+LDFLAGS="-L%%GSSAPILIBDIR%% %%GSSAPILDFLAGS%% $LDFLAGS"
		21	+CFLAGS="-I%%GSSAPIINCDIR%% -L%%GSSAPILIBDIR%% %%GSSAPILDFLAGS%% $CFLAGS"