Attachment 197256 Details for Bug 222745 – Ports patch

[patch] Ports patch

private-ports.diff (text/plain), 31.98 KB, created by Cy Schubert on 2018-09-20 01:59:39 UTC

(hide)

Description:

Filename:

MIME Type:

Creator: Cy Schubert

Created: 2018-09-20 01:59:39 UTC

Size: 31.98 KB

patch

obsolete

>diff --git a/Mk/Uses/gssapi.mk b/Mk/Uses/gssapi.mk
>index f1e76ffc40b3..a809711f4c2b 100644
>--- a/Mk/Uses/gssapi.mk
>+++ b/Mk/Uses/gssapi.mk
>@@ -4,7 +4,8 @@
> #
> # Feature:	gssapi
> # Usage:	USES=gssapi or USES=gssapi:ARGS
>-# Valid ARGS:	base (default, implicit), heimdal, mit.
>+# 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.
>@@ -81,11 +82,15 @@ _HEADERS=	sys/types.h sys/stat.h stdint.h
> 
> .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"
>+.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
>diff --git a/devel/cvs/Makefile b/devel/cvs/Makefile
>index dec9fbb2fcd1..e08de7886129 100644
>--- a/devel/cvs/Makefile
>+++ b/devel/cvs/Makefile
>@@ -13,8 +13,14 @@ LICENSE=	GPLv2+
> 
> CONFLICTS_INSTALL?=	cvs+ipv6-[12]* cvs-devel-[12]*
> 
>-OPTIONS_DEFINE=	IPV6 KERBEROS EXAMPLES
>-OPTIONS_DEFAULT=KERBEROS
>+OPTIONS_DEFINE=	IPV6 EXAMPLES
>+OPTIONS_SINGLE=	GSSAPI
>+.if exists(/usr/lib/libcom_err.so)
>+OPTIONS_SINGLE_GSSAPI=	GSSAPI_BASE GSSAPI_HEIMDAL GSSAPI_MIT GSSAPI_NONE
>+.else
>+OPTIONS_SINGLE_GSSAPI=	GSSAPI_HEIMDAL GSSAPI_MIT GSSAPI_NONE
>+.endif
>+OPTIONS_DEFAULT=	GSSAPI_HEIMDAL
> .if !make(makesum)
> OPTIONS_EXCLUDE?=IPV6
> .endif
>@@ -22,7 +28,15 @@ OPTIONS_EXCLUDE?=IPV6
> IPV6_CATEGORIES=	ipv6
> IPV6_PATCH_SITES=	ftp://ftp.kame.net/pub/kame/misc/
> IPV6_PATCHFILES=	${DISTNAME}-v6-20140105.diff.gz:-p1
>-KERBEROS_MAKE_ARGS=	KERBEROS_SUPPORT=yes
>+GSSAPI_BASE_USES=	gssapi:base,flags
>+GSSAPI_BASE_CFLAGS=	-I${GSSAPIINCDIR} -L${GSSAPILIBDIR}
>+GSSAPI_BASE_MAKE_ARGS=	KERBEROS_SUPPORT=base
>+GSSAPI_HEIMDAL_USES=	gssapi:heimdal,flags
>+GSSAPI_HEIMDAL_CFLAGS=	-I${GSSAPIINCDIR} -L${GSSAPILIBDIR}
>+GSSAPI_HEIMDAL_MAKE_ARGS=	KERBEROS_SUPPORT=heimdal
>+GSSAPI_MIT_USES=	gssapi:mit,flags
>+GSSAPI_MIT_CFLAGS=	-I${GSSAPIINCDIR} -L${GSSAPILIBDIR}
>+GSSAPI_MIT_MAKE_ARGS=	KERBEROS_SUPPORT=mit
> 
> USES=		cpe makeinfo shebangfix tar:xz uidfix
> CPE_VENDOR=	gnu
>diff --git a/devel/cvs/files/patch-cvs__Makefile b/devel/cvs/files/patch-cvs__Makefile
>index d2b0c67fbfe3..18837ae2faf8 100644
>--- a/devel/cvs/files/patch-cvs__Makefile
>+++ b/devel/cvs/files/patch-cvs__Makefile
>@@ -1,11 +1,18 @@
>---- ../cvs-build/cvs/Makefile.orig	2012-09-06 06:25:43.000000000 +0400
>-+++ ../cvs-build/cvs/Makefile	2014-07-15 12:37:28.000000000 +0400
>-@@ -32,7 +32,7 @@
>+--- ../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)
>++.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+= ${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
>+
>+ #
>diff --git a/devel/e2fsprogs-libss/Makefile b/devel/e2fsprogs-libss/Makefile
>index aacdc684f927..8066b6e181b3 100644
>--- a/devel/e2fsprogs-libss/Makefile
>+++ b/devel/e2fsprogs-libss/Makefile
>@@ -12,6 +12,20 @@ LICENSE=	MIT
> 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
>@@ -19,6 +33,7 @@ USE_LDCONFIG=	yes
> BUILD_WRKSRC=	${WRKSRC}/lib/ss
> INSTALL_WRKSRC=	${WRKSRC}/lib/ss
> FILESDIR=	${.CURDIR}/files
>+LDFLAGS=	${GSSAPILDFLAGS}
> 
> PKGDIR=		${.CURDIR}
> 
>diff --git a/dns/samba-nsupdate/Makefile b/dns/samba-nsupdate/Makefile
>index 21e4baee8189..0569569edadd 100644
>--- a/dns/samba-nsupdate/Makefile
>+++ b/dns/samba-nsupdate/Makefile
>@@ -35,6 +35,8 @@ CONFIGURE_ARGS+=	\
> 			--without-idn \
> 			--with-randomdev=/dev/random
> 
>+CFLAGS+=		-Wno-implicit-function-declaration
>+
> OPTIONS_DEFINE=	IPV6
> 
> SIGCHASE_CONFIGURE_ARGS+=	STD_CDEFINES="-DDIG_SIGCHASE=1"
>@@ -52,15 +54,24 @@ ARCH=		x86_64
> # Enable OpenSSL API
> CONFIGURE_ARGS+=	--with-openssl=${OPENSSLBASE}
> # Try to find appropriate GSSAPI libs
>-.if defined(KRB5_HOME) && exists(${KRB5_HOME}/lib/libgssapi_krb5.so)
>-CONFIGURE_ARGS+=	--with-gssapi="${KRB5_HOME}"
>-.elif defined(HEIMDAL_HOME) && exists(${HEIMDAL_HOME}/lib/libgssapi.so)
>-CONFIGURE_ARGS+=	--with-gssapi="${HEIMDAL_HOME}"
>-.elif exists(/usr/lib/libkrb5.so) && exists(/usr/bin/krb5-config)
>+.if exists(${LOCALBASE}/lib/libgssapi_krb5.so)
>+CONFIGURE_ARGS+=	--with-gssapi="${LOCALBASE}"
>+USES+=			gssapi:mit,flags
>+.elif exists(${LOCALBASE}/lib/heimdal/libgssapi.so)
>+CONFIGURE_ARGS+=	--libdir=${LOCALBASE}/lib/heimdal \
>+			--includedir=${LOCALBASE}/include/heimdal
>+CFLAGS+=		-L${LOCALBASE}/lib/heimdal \
>+			-I${LOCALBASE}/include/heimdal
>+USES+=			gssapi:heimdal,flags
>+.else
>+.if exists(/usr/lib/libcom_err.so)
> CONFIGURE_ARGS+=	--with-gssapi="/usr"
>+# USES+=			gssapi:base
> .else
>-LIB_DEPENDS+=		libkrb5.so:security/heimdal
>+BROKEN=			Heimdal Kerberos or MIT Kerberos must be installed.
> CONFIGURE_ARGS+=	--with-gssapi="${LOCALBASE}"
>+USES+=			gssapi:mit,flags
>+.endif
> .endif
> 
> post-patch:
>diff --git a/dns/samba-nsupdate/files/patch-configure.in b/dns/samba-nsupdate/files/patch-configure.in
>index b0a9e2c84f9a..d4e170955cb0 100644
>--- a/dns/samba-nsupdate/files/patch-configure.in
>+++ b/dns/samba-nsupdate/files/patch-configure.in
>@@ -1,5 +1,5 @@
>---- configure.in.orig	2013-09-05 05:19:53.000000000 +0000
>-+++ configure.in	2013-10-18 14:30:21.711727438 +0000
>+--- 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" \
>@@ -10,12 +10,19 @@
>  		do
>  		    # Note that this does not include $saved_libs, because
>  		    # on FreeBSD machines this configure script has added
>-@@ -1027,7 +1028,7 @@
>+@@ -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) ;;
>diff --git a/ftp/curl/Makefile b/ftp/curl/Makefile
>index 3b673567e0fa..07455ed51252 100644
>--- a/ftp/curl/Makefile
>+++ b/ftp/curl/Makefile
>@@ -19,7 +19,11 @@ OPTIONS_RADIO=	SSL
> OPTIONS_SINGLE=	GSSAPI RESOLV
> OPTIONS_GROUP_PROTOCOL=	DICT FTP GOPHER HTTP HTTP2 IMAP LDAP LDAPS LIBSSH2 POP3 RTMP RTSP SMB SMTP TELNET TFTP
> OPTIONS_RADIO_SSL=	GNUTLS NSS OPENSSL WOLFSSL
>+.if exists(/usr/lib/libcom_err.so)
> OPTIONS_SINGLE_GSSAPI=	GSSAPI_BASE GSSAPI_HEIMDAL GSSAPI_MIT GSSAPI_NONE
>+.else
>+OPTIONS_SINGLE_GSSAPI=	GSSAPI_HEIMDAL GSSAPI_MIT GSSAPI_NONE
>+.endif
> OPTIONS_SINGLE_RESOLV=	CARES THREADED_RESOLVER
> 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
> CA_BUNDLE_DESC=		Enable CA bundle for OpenSSL/GnuTLS/mbedTLS
>diff --git a/mail/dovecot/Makefile b/mail/dovecot/Makefile
>index 701e778dccd7..ca0096c4c8ca 100644
>--- a/mail/dovecot/Makefile
>+++ b/mail/dovecot/Makefile
>@@ -47,7 +47,11 @@ OPTIONS_GROUP_DB=	CDB LDAP MYSQL PGSQL SQLITE
> OPTIONS_GROUP_FTS=	ICU LUCENE SOLR TEXTCAT
> 
> OPTIONS_SINGLE=		GSSAPI
>+.if exists(/usr/lib/libcom_err.so)
> OPTIONS_SINGLE_GSSAPI=	GSSAPI_NONE GSSAPI_BASE GSSAPI_HEIMDAL GSSAPI_MIT
>+.else
>+OPTIONS_SINGLE_GSSAPI=	GSSAPI_NONE GSSAPI_HEIMDAL GSSAPI_MIT
>+.endif
> 
> LZ4_DESC=	LZ4 compression support
> VPOPMAIL_DESC=	vpopmail support
>diff --git a/mail/dovecot22/Makefile b/mail/dovecot22/Makefile
>index b0f8a97ba56d..a4ededa63032 100644
>--- a/mail/dovecot22/Makefile
>+++ b/mail/dovecot22/Makefile
>@@ -53,7 +53,11 @@ OPTIONS_GROUP_DB=	CDB LDAP MYSQL PGSQL SQLITE
> OPTIONS_GROUP_FTS=	ICU LUCENE SOLR TEXTCAT
> 
> OPTIONS_SINGLE=		GSSAPI
>+.if exists(/usr/lib/libcom_err.so)
> OPTIONS_SINGLE_GSSAPI=	GSSAPI_NONE GSSAPI_BASE GSSAPI_HEIMDAL GSSAPI_MIT
>+.else
>+OPTIONS_SINGLE_GSSAPI=	GSSAPI_NONE GSSAPI_HEIMDAL GSSAPI_MIT
>+.endif
> 
> LZ4_DESC=	LZ4 compression support
> VPOPMAIL_DESC=	vpopmail support
>diff --git a/mail/fetchmail/Makefile b/mail/fetchmail/Makefile
>index 87fe6d8e8d77..f2c9292ddef5 100644
>--- a/mail/fetchmail/Makefile
>+++ b/mail/fetchmail/Makefile
>@@ -35,8 +35,13 @@ LDFLAGS+=	-L${LOCALBASE}/lib
> 
> OPTIONS_DEFINE=	X11 NLS NTLM POP2 DOCS
> OPTIONS_SINGLE=	GSSAPI
>+.if exists(/usr/lib/libcom_err.so)
> OPTIONS_SINGLE_GSSAPI=	GSSAPI_BASE GSSAPI_HEIMDAL GSSAPI_MIT GSSAPI_NONE
> OPTIONS_DEFAULT=	GSSAPI_BASE
>+.else
>+OPTIONS_SINGLE_GSSAPI=	GSSAPI_HEIMDAL GSSAPI_MIT GSSAPI_NONE
>+OPTIONS_DEFAULT=	GSSAPI_NONE
>+.endif
> OPTIONS_SUB=	yes
> 
> GSSAPI_BASE_USES=	gssapi
>@@ -67,12 +72,15 @@ PORTDOCS=	FAQ FEATURES NEWS NOTES README README.SSL \
> 		design-notes.html fetchmail-FAQ.html fetchmail-features.html \
> 		esrs-design-notes.html
> 
>-#.include <bsd.port.options.mk>
>+.include <bsd.port.options.mk>
> 
> post-patch:
> .if !exists(/usr/lib/libcom_err.so)
> 	@${REINPLACE_CMD} -e "s,-lcom_err,,g" ${WRKSRC}/configure
> .endif
>+.if ${PORT_OPTIONS:MGSSAPI_HEIMDAL}
>+	@${GREP} -lr gssapi_krb5 ${WRKSRC}/ | ${XARGS} ${REINPLACE_CMD} -e 's/gssapi_krb5/gssapi/g'
>+.endif
> 
> post-build:
> 	@${MAKE_CMD} -C ${WRKSRC} check
>diff --git a/net-mgmt/adcli/Makefile b/net-mgmt/adcli/Makefile
>index b8b7284ed816..bd190547cf60 100644
>--- a/net-mgmt/adcli/Makefile
>+++ b/net-mgmt/adcli/Makefile
>@@ -22,8 +22,13 @@ TEST_TARGET=	check
> 
> OPTIONS_DEFINE=	DOCS
> 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
>+OPTIONS_DEFAULT=	GSSAPI_MIT
>+.endif
> 
> CONFIGURE_ENV+=	ac_cv_path_KRB5_CONFIG=${KRB5CONFIG}	\
> 		ac_cv_path_XMLTO=${TRUE}
>diff --git a/net/freeradius3/Makefile b/net/freeradius3/Makefile
>index 1416927aec9d..9eea53711a52 100644
>--- a/net/freeradius3/Makefile
>+++ b/net/freeradius3/Makefile
>@@ -52,9 +52,17 @@ OPTIONS_DEFINE=	USER LDAP MYSQL PGSQL UNIXODBC FIREBIRD REDIS \
> 		EXPERIMENTAL UDPFROMTO DEVELOPER EDIR PERL REST \
> 		FREETDS IDN DOCS SQLITE3 PYTHON RUBY UNBOUND PCRE \
> 		WINBIND EXAMPLES
>+.if exists(/usr/lib/libcom_err.so)
> OPTIONS_DEFAULT=USER PERL HEIMDAL UDPFROMTO
>+.else
>+OPTIONS_DEFAULT=USER PERL HEIMDAL_PORT UDPFROMTO
>+.endif
> OPTIONS_SINGLE=	KRB
>+.if exists(/usr/lib/libcom_err.so)
> OPTIONS_SINGLE_KRB=	NOKRB HEIMDAL HEIMDAL_PORT MITKRB_PORT
>+.else
>+OPTIONS_SINGLE_KRB=	NOKRB HEIMDAL_PORT MITKRB_PORT
>+.endif
> 
> USER_DESC=		Run as user freeradius, group freeradius
> KRB_DESC=		${KERBEROS_DESC}
>diff --git a/net/nss_ldap/Makefile b/net/nss_ldap/Makefile
>index 08bc9d15f533..e9393ac3a026 100644
>--- a/net/nss_ldap/Makefile
>+++ b/net/nss_ldap/Makefile
>@@ -22,8 +22,20 @@ GNU_CONFIGURE=	yes
> 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
> 
>diff --git a/security/cyrus-sasl2-gssapi/Makefile b/security/cyrus-sasl2-gssapi/Makefile
>index 48bd9795a85b..cbd4152970d6 100644
>--- a/security/cyrus-sasl2-gssapi/Makefile
>+++ b/security/cyrus-sasl2-gssapi/Makefile
>@@ -6,8 +6,14 @@ PORTREVISION=	7
> COMMENT=	SASL GSSAPI authentication plugin
> 
> 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 assume MIT is default
>+OPTIONS_DEFAULT=		GSSAPI_MIT
>+.endif
> GSSAPI_BASE_USES=		gssapi:base
> GSSAPI_BASE_CONFIGURE_ON=	--enable-gssapi="${GSSAPIBASEDIR}" \
> 				--with-gss_impl=heimdal
>diff --git a/security/kstart/Makefile b/security/kstart/Makefile
>index 9042ecc6cec3..1290d6197160 100644
>--- a/security/kstart/Makefile
>+++ b/security/kstart/Makefile
>@@ -13,6 +13,20 @@ COMMENT=	Automated Kerberos ticket cache and keytab management utilities
> 
> 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
> 
>diff --git a/security/openconnect/Makefile b/security/openconnect/Makefile
>index 84c00d2ed7f0..2c715fb32dbd 100644
>--- a/security/openconnect/Makefile
>+++ b/security/openconnect/Makefile
>@@ -27,8 +27,19 @@ INSTALL_TARGET=	install-strip
> USE_LDCONFIG=	yes
> PORTDOCS=	*
> 
>+.if exists(/usr/lib/libcom_err.so)
> OPTIONS_DEFINE=	DOCS PROXY GNUTLS GSSAPI LZ4 P11 STOKEN
> OPTIONS_DEFAULT=GSSAPI
>+.else
>+OPTIONS_SINGLE=	GSSAPI
>+OPTIONS_DEFINE=	DOCS PROXY GNUTLS LZ4 P11 STOKEN
>+OPTIONS_DEFAULT=GSSAPI_HEIMDAL
>+OPTIONS_SINGLE_GSSAPI=	GSSAPI_NONE GSSAPI_HEIMDAL GSSAPI_MIT
>+
>+GSSAPI_NONE_DESC=	Build without GSSAPI support
>+GSSAPI_HEIMDAL_DESC=	Use Heimdal GSSAPI from security/heimdal
>+GSSAPI_MIT_DESC=	Use MIT GSSAPI from security/krb5
>+.endif
> 
> LZ4_DESC=		LZ4-based compression
> LZ4_LIB_DEPENDS=	liblz4.so:archivers/liblz4
>@@ -42,7 +53,15 @@ GNUTLS_DESC=		Use GnuTLS instead of OpenSSL (experimental)
> GNUTLS_LIB_DEPENDS=	libgnutls.so:security/gnutls
> GNUTLS_CONFIGURE_WITH=	gnutls
> 
>+.if exists(/usr/lib/libcom_err.so)
> GSSAPI_CONFIGURE_WITH=	gssapi
>+.else
>+GSSAPI_HEIMDAL_USES=            gssapi:heimdal
>+GSSAPI_MIT_USES=                gssapi:mit
>+GSSAPI_NONE_CONFIGURE_ON=       --without-gssapi
>+GSSAPI_HEIMDAL_CONFIGURE_WITH=	gssapi
>+GSSAPI_MIT_CONFIGURE_WITH=	gssapi
>+.endif
> 
> P11_DESC=		PKCS#11 support via libp11
> P11_LIB_DEPENDS=	libp11.so:security/libp11
>diff --git a/security/p5-Authen-Krb5-Simple/Makefile b/security/p5-Authen-Krb5-Simple/Makefile
>index f7071ffb17ed..2128118b0eed 100644
>--- a/security/p5-Authen-Krb5-Simple/Makefile
>+++ b/security/p5-Authen-Krb5-Simple/Makefile
>@@ -14,8 +14,13 @@ USE_PERL5=	configure
> CONFIGURE_ENV=	GSSAPIBASEDIR="${GSSAPIBASEDIR}"
> 
> 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
>+OPTIONS_DEFAULT=	GSSAPI_MIT
>+.endif
> 
> GSSAPI_BASE_USES=	gssapi
> GSSAPI_BASE_CONFIGURE_ENV=	HAVE_HEIMDAL=1
>diff --git a/security/p5-Authen-Krb5/Makefile b/security/p5-Authen-Krb5/Makefile
>index 2efed6259bac..db3cdcc79cfa 100644
>--- a/security/p5-Authen-Krb5/Makefile
>+++ b/security/p5-Authen-Krb5/Makefile
>@@ -17,8 +17,13 @@ USE_PERL5=	configure
> CONFIGURE_ENV=	GSSAPIBASEDIR="${GSSAPIBASEDIR}"
> 
> 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
>+OPTIONS_DEFAULT=	GSSAPI_MIT
>+.endif
> 
> GSSAPI_BASE_USES=	gssapi
> GSSAPI_BASE_CONFIGURE_ENV=	HAVE_HEIMDAL=1
>diff --git a/security/p5-Heimdal-Kadm5/Makefile b/security/p5-Heimdal-Kadm5/Makefile
>index efa1a552f71a..d51c28c3b3b9 100644
>--- a/security/p5-Heimdal-Kadm5/Makefile
>+++ b/security/p5-Heimdal-Kadm5/Makefile
>@@ -11,15 +11,20 @@ MAINTAINER=	hrs@FreeBSD.org
> 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
>diff --git a/security/pam_krb5-rh/Makefile b/security/pam_krb5-rh/Makefile
>index 03309b05efb1..662f720280b2 100644
>--- a/security/pam_krb5-rh/Makefile
>+++ b/security/pam_krb5-rh/Makefile
>@@ -16,6 +16,14 @@ LICENSE_COMB=	dual
> 
> CONFLICTS=	pam_krb5-4.*
> 
>+OPTIONS_SINGLE=	LINK
>+OPTIONS_SINGLE_LINK=	MIT HEIMDAL
>+OPTIONS_DEFAULT=	MIT
>+MIT_DESC=	Link against MIT Kerberos
>+MIT_USES=	gssapi:mit
>+HEIMDAL_DESC=	Link against Heimdal in ports Kerberos
>+HEIMDAL_USES=	gssapi:heimdal
>+
> USES=		iconv libtool ssl
> GNU_CONFIGURE=	yes
> CONFIGURE_ARGS=	--without-afs --without-keyutils --without-krb4
>diff --git a/security/pam_krb5/Makefile b/security/pam_krb5/Makefile
>index a708be305eec..c1ce773a2a19 100644
>--- a/security/pam_krb5/Makefile
>+++ b/security/pam_krb5/Makefile
>@@ -20,7 +20,11 @@ USES=			gmake libtool perl5
> USE_PERL5=		build
> 
> OPTIONS_SINGLE=		LINK
>+.if exists(/usr/lib/libcom_err.so)
> OPTIONS_SINGLE_LINK=	MIT HEIMDAL_BASE HEIMDAL_PORT
>+.else
>+OPTIONS_SINGLE_LINK=	MIT HEIMDAL_PORT
>+.endif
> OPTIONS_DEFAULT=	MIT
> MIT_DESC=		Link against MIT Kerberos
> MIT_USES=		gssapi:mit
>diff --git a/security/putty/Makefile b/security/putty/Makefile
>index 0fedc2788c81..d0c2b2172df8 100644
>--- a/security/putty/Makefile
>+++ b/security/putty/Makefile
>@@ -25,10 +25,19 @@ PLIST_FILES+=	man/man1/plink.1.gz man/man1/pscp.1.gz man/man1/psftp.1.gz man/man
> 
> OPTIONS_RADIO=		TOOLKIT
> OPTIONS_RADIO_TOOLKIT=	GTK2 GTK3
>+.if exists(/usr/lib/libcom_err.so)
> OPTIONS_DEFAULT=GSSAPI_BASE GTK3
>+.else
>+OPTIONS_DEFAULT=GSSAPI_MIT GTK3
>+.endif
> OPTIONS_SINGLE=	GSSAPI_SELECT
>+.if exists(/usr/lib/libcom_err.so)
> OPTIONS_SINGLE_GSSAPI_SELECT=	GSSAPI_NONE GSSAPI_BASE GSSAPI_HEIMDAL \
> 				GSSAPI_MIT
>+.else
>+OPTIONS_SINGLE_GSSAPI_SELECT=	GSSAPI_NONE GSSAPI_HEIMDAL \
>+				GSSAPI_MIT
>+.endif
> 
> CONFLICTS_INSTALL?=	pssh-[0-9]* putty-gtk2-[0-9]* putty-nogtk-[0-9]*
> 
>diff --git a/security/py-kerberos/Makefile b/security/py-kerberos/Makefile
>index 406e2ce3c932..437f1224307b 100644
>--- a/security/py-kerberos/Makefile
>+++ b/security/py-kerberos/Makefile
>@@ -13,9 +13,17 @@ COMMENT=	Kerberos bindings for python
> 
> LICENSE=	APACHE20
> 
>+.if exists(/usr/lib/libcom_err.so)
> OPTIONS_DEFAULT=	GSSAPI_BASE
>+.else
>+OPTIONS_DEFAULT=	GSSAPI_MIT
>+.endif
> OPTIONS_SINGLE=		GSSAPI
>+.if exists(/usr/lib/libcom_err.so)
> OPTIONS_SINGLE_GSSAPI=	GSSAPI_BASE GSSAPI_HEIMDAL GSSAPI_MIT
>+.else
>+OPTIONS_SINGLE_GSSAPI=	GSSAPI_HEIMDAL GSSAPI_MIT
>+.endif
> 
> GSSAPI_BASE_USES=		gssapi
> GSSAPI_HEIMDAL_USES=		gssapi:heimdal
>diff --git a/sysutils/e2fsprogs/Makefile b/sysutils/e2fsprogs/Makefile
>index 6cfd636e73c2..03ded92ed9ff 100644
>--- a/sysutils/e2fsprogs/Makefile
>+++ b/sysutils/e2fsprogs/Makefile
>@@ -43,7 +43,7 @@ CONFIGURE_ARGS?=--disable-fsck \
> 		--includedir='${PREFIX}/include/e2fsprogs/' \
> 		--with-root-prefix='${PREFIX}' \
> 		--without-included-gettext \
>-		LDFLAGS='${LDFLAGS} -L${LOCALBASE}/lib -Wl,--rpath -Wl,${LOCALBASE}/lib/e2fsprogs'
>+		LDFLAGS='${LDFLAGS} -L${LOCALBASE}/lib -Wl,--rpath -Wl,${LOCALBASE}/lib/e2fsprogs ${GSSAPILDFLAGS}'
> CPPFLAGS+=	-I${WRKSRC}/lib -I${LOCALBASE}/include # -D_EXT2_USE_C_VERSIONS
> MAKE_ARGS+=	pkgconfigdir='${PREFIX}/libdata/pkgconfig'
> MAKE_ENV+=	CHECK_CMD=@true
>@@ -55,9 +55,17 @@ OPTIONS_DEFINE=		DOCS NLS FUSEFS PARALLELTESTS SLOWTESTS BASHTESTS
> OPTIONS_EXCLUDE+=	EXAMPLES
> OPTIONS_SUB=		yes
> 
>-OPTIONS_SINGLE=			SELFTEST
>+OPTIONS_SINGLE=			SELFTEST GSSAPI
> OPTIONS_SINGLE_SELFTEST=	NOTESTS SMALLTESTS ALLTESTS
> OPTIONS_DEFAULT=		SMALLTESTS
>+.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 the defalut be GSSAPI_HEIMDAL?
>+OPTIONS_DEFAULT+=	GSSAPI_MIT
>+.endif
> FUSEFS_DESC=	Build user-land ext2/3/4 FUSE module (slow!)
> SELFTEST_DESC=	Choose which set of self-tests to run
> NOTESTS_DESC=	Do not run any self-tests (Tier-1, DISCOURAGED)
>@@ -72,6 +80,12 @@ FUSEFS_CONFIGURE_ENABLE=	fuse2fs
> BUILD_DEPENDS+=	gdd:sysutils/coreutils
> BASHTEST_BUILD_DEPENDS=	bash:shells/bash
> 
>+GSSAPI_BASE_USES=	gssapi:base,flags
>+GSSAPI_HEIMDAL_USES=	gssapi:heimdal,flags
>+GSSAPI_MIT_USES=	gssapi:mit,flags
>+
>+CPPFLAGS+=	${GSSAPICPPFLAGS}
>+
> LIB_DEPENDS+=	libblkid.so:misc/e2fsprogs-libblkid
> LIB_DEPENDS+=	libss.so:devel/e2fsprogs-libss
> LIB_DEPENDS+=	libuuid.so:misc/e2fsprogs-libuuid
>diff --git a/sysutils/msktutil/Makefile b/sysutils/msktutil/Makefile
>index d4a8916edf98..ddddc5fca7fc 100644
>--- a/sysutils/msktutil/Makefile
>+++ b/sysutils/msktutil/Makefile
>@@ -22,9 +22,14 @@ WANT_OPENLDAP_SASL=	yes
> CONFIGURE_ARGS+=--with-sasldir=${LOCALBASE} --with-ldapdir=${LOCALBASE}
> 
> 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
>+OPTIONS_DEFAULT=GSSAPI_MIT
>+.endif
> 
> GSSAPI_BASE_USES=	gssapi
> GSSAPI_HEIMDAL_USES=	gssapi:heimdal
>diff --git a/sysutils/slurm-wlm/Makefile b/sysutils/slurm-wlm/Makefile
>index f0a0bd12a7b0..be403b078540 100644
>--- a/sysutils/slurm-wlm/Makefile
>+++ b/sysutils/slurm-wlm/Makefile
>@@ -39,6 +39,14 @@ OPTIONS_DEFINE=	CURL DOCS GTK2 HDF5 HWLOC IPMI MYSQL RRD LINUX
> OPTIONS_DEFAULT=HDF5 HWLOC
> OPTIONS_SUB=	yes
> 
>+.if !exists(/usr/lib/libcom_err.so)
>+OPTIONS_SINGLE=	GSSAPI_SELECT
>+OPTIONS_SINGLE_GSSAPI_SELECT=	GSSAPI_NONE GSSAPI_HEIMDAL GSSAPI_MIT
>+OPTIONS_DEFAULT+=	GSSAPI_NONE
>+GSSAPI_HEIMDAL_USES=		gssapi:heimdal,flags
>+GSSAPI_MIT_USES=		gssapi:mit,flags
>+.endif
>+
> CURL_DESC=	Require cURL for elasticsearch plugins
> GTK2_DESC=	Build sview GUI config tool
> HDF5_DESC=	Job profiling using HDF5
>@@ -81,6 +89,12 @@ LINUX_USES=		linux
> 
> CFLAGS+=	-I${WRKSRC}/slurm -I${LOCALBASE}/include
> LDFLAGS+=	-L${LOCALBASE}/lib -lsysinfo -lkvm
>+GSSAPI_NONE_EXTRA_PATCHES=	${FILESDIR}/extra-patch-noheimdal
>+GSSAPI_MIT_EXTRA_PATCHES=	${FILESDIR}/extra-patch-noheimdal
>+GSSAPI_HEIMDAL_CFLAGS=	-I${GSSAPIINCDIR} ${GSSAPICPPFLAGS}
>+GSSAPI_MIT_CFLAGS=	-I${GSSAPIINCDIR} ${GSSAPICPPFLAGS}
>+GSSAPI_HEIMDAL_LDFLAGS=	-L${GSSAPILIBDIR} ${GSSAPILDFLAGS} ${GSSAPILIBS}
>+GSSAPI_MIT_LDFLAGS=	-L${GSSAPILIBDIR} ${GSSAPILDFLAGS} ${GSSAPILIBS}
> 
> # SLURM's configure enables interactive jobs if pty.h exists.  Replacing
> # #include <pty.h> with appropriate headers will therefore not work, so instead
>diff --git a/sysutils/slurm-wlm/files/patch-nokerberos b/sysutils/slurm-wlm/files/patch-nokerberos
>deleted file mode 100644
>index ade036ab8850..000000000000
>--- a/sysutils/slurm-wlm/files/patch-nokerberos
>+++ /dev/null
>@@ -1,41 +0,0 @@
>-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
>-+ 
>diff --git a/www/mod_auth_kerb2/Makefile b/www/mod_auth_kerb2/Makefile
>index 34d208c8ee70..0ebbe63725c0 100644
>--- a/www/mod_auth_kerb2/Makefile
>+++ b/www/mod_auth_kerb2/Makefile
>@@ -24,8 +24,13 @@ GNU_CONFIGURE=	yes
> CONFIGURE_ARGS=	-with-krb5=${GSSAPIBASEDIR} --without-krb4
> 
> OPTIONS_SINGLE=		GSSAPI
>+.if exists(/usr/lib/libcom_err.so)
> OPTIONS_DEFAULT=	GSSAPI_BASE
> OPTIONS_SINGLE_GSSAPI=	GSSAPI_BASE GSSAPI_HEIMDAL GSSAPI_MIT
>+.else
>+OPTIONS_DEFAULT=	GSSAPI_MIT
>+OPTIONS_SINGLE_GSSAPI=	GSSAPI_HEIMDAL GSSAPI_MIT
>+.endif
> GSSAPI_BASE_DESC=	Use Base version of GSS API
> GSSAPI_HEIMDAL_DESC=	Use Heimdal implementation of GSS API
> GSSAPI_MIT_DESC=	Use MIT implementation of GSS API
>diff --git a/www/nginx-devel/Makefile b/www/nginx-devel/Makefile
>index 0132ec2cb151..627058a3f7c8 100644
>--- a/www/nginx-devel/Makefile
>+++ b/www/nginx-devel/Makefile
>@@ -94,7 +94,11 @@ OPTIONS_DEFAULT?=	DSO FILE_AIO HTTP HTTP_ADDITION HTTP_AUTH_REQ HTTP_CACHE \
> 		THREADS WWW
> 
> OPTIONS_RADIO+=		GSSAPI
>+.if exists(/usr/lib/libcom_err.so)
> OPTIONS_RADIO_GSSAPI=	GSSAPI_BASE GSSAPI_HEIMDAL GSSAPI_MIT
>+.else
>+OPTIONS_RADIO_GSSAPI=	GSSAPI_HEIMDAL GSSAPI_MIT
>+.endif
> GSSAPI_BASE_USES=	gssapi
> GSSAPI_HEIMDAL_USES=	gssapi:heimdal,flags
> GSSAPI_MIT_USES=	gssapi:mit
>@@ -268,6 +272,9 @@ post-patch-GRIDFS-on:
> post-patch-HTTP_AUTH_KRB5-on:
> 	@${REINPLACE_CMD} 's!%%GSSAPILIBS%%!${GSSAPILIBS}!g; \
> 		s!%%GSSAPIINCDIR%%!${GSSAPIINCDIR}!g' ${WRKSRC_auth_krb5}/config
>+	@${REINPLACE_CMD} 's!%%GSSAPILIBDIR%%!${GSSAPILIBDIR}!' ${WRKSRC_auth_krb5}/config
>+	@${REINPLACE_CMD} 's!%%GSSAPILDFLAGS%%!${GSSAPILDFLAGS}!' ${WRKSRC_auth_krb5}/config
>+
> 
> post-patch-HTTP_TARANTOOL-on:
> 	@${REINPLACE_CMD} 's!%%PREFIX%%!${LOCALBASE}!g' ${WRKSRC_nginx_tarantool}/config
>diff --git a/www/nginx-devel/files/extra-patch-spnego-http-auth-nginx-module-config b/www/nginx-devel/files/extra-patch-spnego-http-auth-nginx-module-config
>index 9c55d455ebed..18d760b81a5d 100644
>--- a/www/nginx-devel/files/extra-patch-spnego-http-auth-nginx-module-config
>+++ b/www/nginx-devel/files/extra-patch-spnego-http-auth-nginx-module-config
>@@ -7,14 +7,15 @@
> -if uname -o | grep -q FreeBSD; then
> -    ngx_feature_libs="$ngx_feature_libs -lgssapi"
> -fi
>-+ngx_feature_libs="%%GSSAPILIBS%%"
>++ngx_feature_libs="%%GSSAPILIBS%% %%GSSAPILDFLAGS%%"
> +ngx_module_incs="%%GSSAPIINCDIR%%"
>  
>  if test -n "$ngx_module_link"; then
>      ngx_module_type=HTTP
>-@@ -16,3 +13,5 @@ else
>+@@ -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%% $LDFLAGS"
>++LDFLAGS="-L%%GSSAPILIBDIR%%  %%GSSAPILDFLAGS%% $LDFLAGS"
>++CFLAGS="-I%%GSSAPIINCDIR%% -L%%GSSAPILIBDIR%% %%GSSAPILDFLAGS%% $CFLAGS"
>diff --git a/www/nginx/Makefile b/www/nginx/Makefile
>index 38a4fc023e02..5b1ee31ea107 100644
>--- a/www/nginx/Makefile
>+++ b/www/nginx/Makefile
>@@ -93,7 +93,11 @@ OPTIONS_DEFAULT?=	DSO FILE_AIO HTTP HTTP_ADDITION HTTP_AUTH_REQ HTTP_CACHE \
> 		THREADS WWW
> 
> OPTIONS_RADIO+=		GSSAPI
>+.if exists(/usr/lib/libcom_err.so)
> OPTIONS_RADIO_GSSAPI=	GSSAPI_BASE GSSAPI_HEIMDAL GSSAPI_MIT
>+.else
>+OPTIONS_RADIO_GSSAPI=	GSSAPI_HEIMDAL GSSAPI_MIT
>+.endif
> GSSAPI_BASE_USES=	gssapi
> GSSAPI_HEIMDAL_USES=	gssapi:heimdal,flags
> GSSAPI_MIT_USES=	gssapi:mit
>@@ -266,6 +270,9 @@ post-patch-GRIDFS-on:
> 
> post-patch-HTTP_AUTH_KRB5-on:
> 	@${REINPLACE_CMD} 's!%%GSSAPILIBS%%!${GSSAPILIBS}!' ${WRKSRC_auth_krb5}/config
>+	@${REINPLACE_CMD} 's!%%GSSAPIINCDIR%%!${GSSAPIINCDIR}!' ${WRKSRC_auth_krb5}/config
>+	@${REINPLACE_CMD} 's!%%GSSAPILIBDIR%%!${GSSAPILIBDIR}!' ${WRKSRC_auth_krb5}/config
>+	@${REINPLACE_CMD} 's!%%GSSAPILDFLAGS%%!${GSSAPILDFLAGS}!' ${WRKSRC_auth_krb5}/config
> 
> post-patch-HTTP_TARANTOOL-on:
> 	@${REINPLACE_CMD} 's!%%PREFIX%%!${LOCALBASE}!g' ${WRKSRC_nginx_tarantool}/config
>diff --git a/www/nginx/files/extra-patch-spnego-http-auth-nginx-module-config b/www/nginx/files/extra-patch-spnego-http-auth-nginx-module-config
>index 37543286589a..18d760b81a5d 100644
>--- a/www/nginx/files/extra-patch-spnego-http-auth-nginx-module-config
>+++ b/www/nginx/files/extra-patch-spnego-http-auth-nginx-module-config
>@@ -7,14 +7,15 @@
> -if uname -o | grep -q FreeBSD; then
> -    ngx_feature_libs="$ngx_feature_libs -lgssapi"
> -fi
>-+ngx_feature_libs="%%GSSAPILIBS%%"
>-+ngx_module_incs="%%GSSAPINCDIR%%"
>++ngx_feature_libs="%%GSSAPILIBS%% %%GSSAPILDFLAGS%%"
>++ngx_module_incs="%%GSSAPIINCDIR%%"
>  
>  if test -n "$ngx_module_link"; then
>      ngx_module_type=HTTP
>-@@ -16,3 +13,5 @@ else
>+@@ -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%% $LDFLAGS"
>++LDFLAGS="-L%%GSSAPILIBDIR%%  %%GSSAPILDFLAGS%% $LDFLAGS"
>++CFLAGS="-I%%GSSAPIINCDIR%% -L%%GSSAPILIBDIR%% %%GSSAPILDFLAGS%% $CFLAGS"
>diff --git a/www/squid-devel/Makefile b/www/squid-devel/Makefile
>index 6348d6c571e0..15ef6cda8b82 100644
>--- a/www/squid-devel/Makefile
>+++ b/www/squid-devel/Makefile
>@@ -55,12 +55,23 @@ OPTIONS_DEFINE=	ARP_ACL BDB CACHE_DIGESTS DEBUG DELAY_POOLS DOCS ECAP ESI EXAMPL
> 		STACKTRACES VIA_DB WCCP WCCPV2
> 
> OPTIONS_SINGLE=	GSSAPI
>+.if exists(/usr/lib/libcom_err.so)
> OPTIONS_SINGLE_GSSAPI=	GSSAPI_NONE GSSAPI_BASE GSSAPI_HEIMDAL GSSAPI_MIT
>+.else
>+OPTIONS_SINGLE_GSSAPI=	GSSAPI_NONE GSSAPI_HEIMDAL GSSAPI_MIT
>+.endif
> 
>+.if exists(/usr/lib/libcom_err.so)
> OPTIONS_DEFAULT=ARP_ACL AUTH_NIS CACHE_DIGESTS DELAY_POOLS FOLLOW_XFF FS_AUFS \
> 		FS_DISKD FS_ROCK GSSAPI_BASE HTCP ICAP ICMP IDENT KQUEUE \
> 		LARGEFILE LAX_HTTP PCRE SNMP SSL SSL_CRTD TP_IPFW VIA_DB WCCP \
> 		WCCPV2
>+.else
>+OPTIONS_DEFAULT=ARP_ACL AUTH_NIS CACHE_DIGESTS DELAY_POOLS FOLLOW_XFF FS_AUFS \
>+		FS_DISKD FS_ROCK GSSAPI_NONE HTCP ICAP ICMP IDENT KQUEUE \
>+		LARGEFILE LAX_HTTP PCRE SNMP SSL SSL_CRTD TP_IPFW VIA_DB WCCP \
>+		WCCPV2
>+.endif
> 
> ARP_ACL_CONFIGURE_ENABLE=	eui
> AUTH_LDAP_CFLAGS=		-I${LOCALBASE}/include
>diff --git a/www/squid/Makefile b/www/squid/Makefile
>index a50f061caf64..a704ff400d04 100644
>--- a/www/squid/Makefile
>+++ b/www/squid/Makefile
>@@ -55,12 +55,23 @@ OPTIONS_DEFINE=	ARP_ACL BDB CACHE_DIGESTS DEBUG DELAY_POOLS DOCS ECAP ESI EXAMPL
> 		STACKTRACES VIA_DB WCCP WCCPV2
> 
> OPTIONS_SINGLE=	GSSAPI
>+.if exists(/usr/lib/libcom_err.so)
> OPTIONS_SINGLE_GSSAPI=	GSSAPI_NONE GSSAPI_BASE GSSAPI_HEIMDAL GSSAPI_MIT
>+.else
>+OPTIONS_SINGLE_GSSAPI=	GSSAPI_NONE GSSAPI_HEIMDAL GSSAPI_MIT
>+.endif
> 
>+.if exists(/usr/lib/libcom_err.so)
> OPTIONS_DEFAULT=ARP_ACL AUTH_NIS CACHE_DIGESTS DELAY_POOLS FOLLOW_XFF FS_AUFS \
> 		FS_DISKD FS_ROCK GSSAPI_BASE HTCP ICAP ICMP IDENT KQUEUE \
> 		LARGEFILE LAX_HTTP PCRE SNMP SSL SSL_CRTD TP_IPFW VIA_DB WCCP \
> 		WCCPV2
>+.else
>+OPTIONS_DEFAULT=ARP_ACL AUTH_NIS CACHE_DIGESTS DELAY_POOLS FOLLOW_XFF FS_AUFS \
>+		FS_DISKD FS_ROCK GSSAPI_NONE HTCP ICAP ICMP IDENT KQUEUE \
>+		LARGEFILE LAX_HTTP PCRE SNMP SSL SSL_CRTD TP_IPFW VIA_DB WCCP \
>+		WCCPV2
>+.endif
> 
> ARP_ACL_CONFIGURE_ENABLE=	eui
> AUTH_LDAP_CFLAGS=		-I${LOCALBASE}/include

Actions: View | Diff

Attachments on bug 222745: 186891 | 192316 | 194828 | 194829 | 197116 | 197117 | 197256