Attachment #194829 for bug #222745




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


.undef _FIXUP_KRB5CONFIG
.if empty(gssapi_ARGS)
gssapi_ARGS=	mit
.endif
.for _A in ${gssapi_ARGS}
_local:=	${_A}
.if ${_local} == "heimdal"
.  if ${SSL_DEFAULT} != base
IGNORE=	You are using OpenSSL from ports and have selected GSSAPI from base, please select another GSSAPI value
.  endif
HEIMDAL_HOME=	/usr
GSSAPIBASEDIR=	${HEIMDAL_HOME}
GSSAPILIBDIR=	${GSSAPIBASEDIR}/lib
GSSAPIINCDIR=	${GSSAPIBASEDIR}/include
_HEADERS+=	gssapi/gssapi.h gssapi/gssapi_krb5.h krb5.h
GSSAPICPPFLAGS=	-I"${GSSAPIINCDIR}"
GSSAPILIBS=	-lkrb5 -lgssapi -lgssapi_krb5
GSSAPILDFLAGS=	-L"${GSSAPILIBDIR}"
.if empty(OSREL:N9.3)
_FIXUP_KRB5CONFIG=	yes
.endif
.elif ${_local} == "heimdal"
HEIMDAL_HOME?=	${LOCALBASE}
GSSAPIBASEDIR=	${HEIMDAL_HOME}
GSSAPILIBDIR=	${GSSAPIBASEDIR}/lib/heimdal

Lines 13-20 LICENSE= GPLv2+ Link Here

(-)b/devel/cvs/Makefile (-3 / +10 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= KERBEROS
		18	OPTIONS_SINGLE_KERBEROS= HEIMDAL MIT NONE
		19	OPTIONS_DEFAULT=HEIMDAL
18	.if !make(makesum)	20	.if !make(makesum)
19	OPTIONS_EXCLUDE?=IPV6	21	OPTIONS_EXCLUDE?=IPV6
20	.endif	22	.endif
Lines 22-28 OPTIONS_EXCLUDE?=IPV6 Link Here
22	IPV6_CATEGORIES= ipv6	24	IPV6_CATEGORIES= ipv6
23	IPV6_PATCH_SITES= ftp://ftp.kame.net/pub/kame/misc/	25	IPV6_PATCH_SITES= ftp://ftp.kame.net/pub/kame/misc/
24	IPV6_PATCHFILES= ${DISTNAME}-v6-20140105.diff.gz:-p1	26	IPV6_PATCHFILES= ${DISTNAME}-v6-20140105.diff.gz:-p1
25	KERBEROS_MAKE_ARGS= KERBEROS_SUPPORT=yes	27	HEIMDAL_USES= gssapi:heimdal
		28	HEIMDAL_CFLAGS= -I${GSSAPIINCDIR} -L${GSSAPILIBDIR}
		29	HEIMDAL_MAKE_ARGS= KERBEROS_SUPPORT=yes
		30	MIT_USES= gssapi:mit
		31	MIT_CFLAGS= -I${GSSAPIINCDIR} -L${GSSAPILIBDIR}
		32	MIT_MAKE_ARGS= KERBEROS_SUPPORT=yes
26		33
27	USES= cpe makeinfo shebangfix tar:xz uidfix	34	USES= cpe makeinfo shebangfix tar:xz uidfix
28	CPE_VENDOR= gnu	35	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
 
 #




# Created by: Ben Kaduk <kaduk@mit.edu>
# $FreeBSD$

PORTREVISION=	1
CATEGORIES=	devel
PKGNAMESUFFIX=	-libss


LICENSE=	MIT
LICENSE_FILE=	${INSTALL_WRKSRC}/ss.h

CONFLICTS=	heimdal-[0-9]*
CONFLICTS+=	krb4-[0-9]*

OPTIONS_EXCLUDE=	DOCS EXAMPLES IPV6 NLS
CONFIGURE_ARGS=	--enable-elf-shlibs
MASTERDIR=	${.CURDIR}/../../sysutils/e2fsprogs

Lines 35-40 CONFIGURE_ARGS+= \ Link Here

(-)b/dns/samba-nsupdate/Makefile (-8 / +13 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}"
57	.elif defined(HEIMDAL_HOME) && exists(${HEIMDAL_HOME}/lib/libgssapi.so)
58	CONFIGURE_ARGS+= --with-gssapi="${HEIMDAL_HOME}"
59	.elif exists(/usr/lib/libkrb5.so) && exists(/usr/bin/krb5-config)
60	CONFIGURE_ARGS+= --with-gssapi="/usr"
61	.else
62	LIB_DEPENDS+= libkrb5.so:security/heimdal
63	CONFIGURE_ARGS+= --with-gssapi="${LOCALBASE}"	58	CONFIGURE_ARGS+= --with-gssapi="${LOCALBASE}"
		59	USES+= gssapi:mit:flags
		60	.elif exists(${LOCALBASE}/lib/heimdal/libgssapi.so)
		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	USES+= gssapi:heimdal:flags
		68	CONFIGURE_ARGS+= --with-gssapi="${GSSAPIBASEDIR}"
64	.endif	69	.endif
65		70
66	post-patch:	71	post-patch:

Lines 1-5 Link Here

(-)b/dns/samba-nsupdate/files/patch-configure.in (-3 / +5 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-06-17 22:35:03.447461000 -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,7 +1028,9 @@
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)
		20	+ AC_TRY_LINK( , [gss_acquire_cred();krb5_init_context();krb5_gss_register_acceptor_identity("krb5");],
19	gssapi_linked=yes, gssapi_linked=no)	21	gssapi_linked=yes, gssapi_linked=no)
20	case $gssapi_linked in	22	case $gssapi_linked in
21	yes) AC_MSG_RESULT(yes); break ;;	23	yes) AC_MSG_RESULT(yes); break ;;




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
OPTIONS_SINGLE_GSSAPI=	GSSAPI_HEIMDAL GSSAPI_MIT GSSAPI_NONE
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

GNUTLS_LIB_DEPENDS=	libgnutls.so:security/gnutls \
			libnettle.so:security/nettle
GOPHER_CONFIGURE_ENABLE=gopher
GSSAPI_BASE_CONFIGURE_ON=	--with-gssapi=${GSSAPIBASEDIR} ${GSSAPI_CONFIGURE_ARGS}
GSSAPI_BASE_CPPFLAGS=	${GSSAPICPPFLAGS}
GSSAPI_BASE_LDFLAGS=	${GSSAPILDFLAGS}
GSSAPI_BASE_LIBS=	${GSSAPILIBS}
GSSAPI_BASE_USES=	gssapi
GSSAPI_HEIMDAL_CONFIGURE_ON=	--with-gssapi=${GSSAPIBASEDIR} ${GSSAPI_CONFIGURE_ARGS}
GSSAPI_HEIMDAL_CPPFLAGS=${GSSAPICPPFLAGS}
GSSAPI_HEIMDAL_LDFLAGS=	${GSSAPILDFLAGS}




OPTIONS_GROUP_FTS=	ICU LUCENE SOLR TEXTCAT

OPTIONS_SINGLE=		GSSAPI
OPTIONS_SINGLE_GSSAPI=	GSSAPI_NONE GSSAPI_HEIMDAL GSSAPI_MIT

LZ4_DESC=	LZ4 compression support
VPOPMAIL_DESC=	vpopmail support

TEXTCAT_DESC=	Libtextcat FTS support

GSSAPI_NONE_DESC=	Build without GSSAPI support
GSSAPI_BASE_DESC=	Use GSSAPI from base
GSSAPI_HEIMDAL_DESC=	Use Heimdal GSSAPI from security/heimdal
GSSAPI_MIT_DESC=	Use MIT GSSAPI from security/krb5


# GSSAPI
GSSAPI_NONE_CONFIGURE_ON=	--without-gssapi
GSSAPI_NONE_CONFIGURE_OFF=	--with-gssapi ${GSSAPI_CONFIGURE_ARGS}
GSSAPI_BASE_USES=		gssapi
GSSAPI_HEIMDAL_USES=		gssapi:heimdal
GSSAPI_MIT_USES=		gssapi:mit





OPTIONS_GROUP_FTS=	ICU LUCENE SOLR TEXTCAT

OPTIONS_SINGLE=		GSSAPI
OPTIONS_SINGLE_GSSAPI=	GSSAPI_NONE GSSAPI_HEIMDAL GSSAPI_MIT

LZ4_DESC=	LZ4 compression support
VPOPMAIL_DESC=	vpopmail support

TEXTCAT_DESC=	Libtextcat FTS support

GSSAPI_NONE_DESC=	Build without GSSAPI support
GSSAPI_BASE_DESC=	Use GSSAPI from base
GSSAPI_HEIMDAL_DESC=	Use Heimdal GSSAPI from security/heimdal
GSSAPI_MIT_DESC=	Use MIT GSSAPI from security/krb5


# GSSAPI
GSSAPI_NONE_CONFIGURE_ON=	--without-gssapi
GSSAPI_NONE_CONFIGURE_OFF=	--with-gssapi ${GSSAPI_CONFIGURE_ARGS}
GSSAPI_BASE_USES=		gssapi
GSSAPI_HEIMDAL_USES=		gssapi:heimdal
GSSAPI_MIT_USES=		gssapi:mit






OPTIONS_DEFINE=	X11 NLS NTLM POP2 DOCS
OPTIONS_SINGLE=	GSSAPI
OPTIONS_SINGLE_GSSAPI=	GSSAPI_HEIMDAL GSSAPI_MIT GSSAPI_NONE
OPTIONS_DEFAULT=	GSSAPI_NONE
OPTIONS_SUB=	yes

GSSAPI_BASE_USES=	gssapi
GSSAPI_BASE_CONFIGURE_ON=	--with-gssapi=${GSSAPIBASEDIR} ${GSSAPI_CONFIGURE_ARGS}
GSSAPI_HEIMDAL_USES=	gssapi:heimdal
GSSAPI_HEIMDAL_CONFIGURE_ON=	--with-gssapi=${GSSAPIBASEDIR} ${GSSAPI_CONFIGURE_ARGS}
GSSAPI_MIT_USES=	gssapi:mit

		design-notes.html fetchmail-FAQ.html fetchmail-features.html \
		esrs-design-notes.html

.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




CPPFLAGS+=	-I${LOCALBASE}/include

OPTIONS_DEFINE=		HEIMDAL
OPTIONS_DEFAULT=	HEIMDAL
HEIMDAL_DESC=		Link against libss.so from security/heimdal

.include <bsd.port.pre.mk>

.endif

.if ${PORT_OPTIONS:MHEIMDAL}
USES+=		gssapi:heimdal
LIB_DEPENDS+=	libss.so.1:security/heimdal
.if defined(HEIMDAL_HOME)
KRB5_DIR?=	${HEIMDAL_HOME}
.else
KRB5_DIR?=	${LOCALBASE}
.endif
.else
BROKEN=		Does not build without Heimdal in base
KRB5_DIR?=	${DESTDIR}/usr
.endif

LIB_DEPENDS+=	libss.so.2:devel/e2fsprogs-libss

# try to fix parallel (-jX) builds: add missing inter-source dependencies
post-patch:
	@${REINPLACE_CMD} -e \




TEST_TARGET=	check

OPTIONS_SINGLE=		GSSAPI
OPTIONS_SINGLE_GSSAPI=	GSSAPI_HEIMDAL GSSAPI_MIT
OPTIONS_DEFAULT=	GSSAPI_MIT

CONFIGURE_ENV+=	ac_cv_path_KRB5_CONFIG=${KRB5CONFIG}	\
		ac_cv_path_XMLTO=${TRUE}

CFLAGS+=	-I${LOCALBASE}/include -DLDAP_DEPRECATED=0
LDFLAGS+=	-L${LOCALBASE}/lib

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

GSSAPI_BASE_CONFIGURE_ARGS=	--sysconfdir=/etc
GSSAPI_BASE_CONFIGURE_ENV=	KRB5_CFLAGS="-I${GSSAPIINCDIR}"	\
				KRB5_LIBS="${GSSAPILIBS}"
GSSAPI_HEIMDAL_CONFIGURE_ARGS=	--sysconfdir=${LOCALBASE}/etc
GSSAPI_HEIMDAL_CONFIGURE_ENV=	KRB5_CFLAGS="-I${GSSAPIINCDIR}/heimdal" \
				KRB5_LIBS="${GSSAPILDFLAGS} ${GSSAPILIBS}"

GSSAPI_MIT_CONFIGURE_ENV=	KRB5_CFLAGS="-I${GSSAPIINCDIR}/gssapi" \
				KRB5_LIBS="${GSSAPILDFLAGS} ${GSSAPILIBS} -lk5crypto"
# Quiets down warnings inside MIT's headers:
GSSAPI_BASE_CFLAGS+=	-DHEIMDAL
GSSAPI_HEIMDAL_CFLAGS+=	-DHEIMDAL
GSSAPI_MIT_CFLAGS+=	-DTARGET_OS_MAC=0





		EXPERIMENTAL UDPFROMTO DEVELOPER EDIR PERL REST \
		FREETDS IDN DOCS SQLITE3 PYTHON RUBY UNBOUND PCRE \
		WINBIND
OPTIONS_DEFAULT=USER PERL MITKRB_PORT UDPFROMTO
OPTIONS_SINGLE=	KRB
OPTIONS_SINGLE_KRB=	NOKRB HEIMDAL_PORT MITKRB_PORT

USER_DESC=		Run as user freeradius, group freeradius
KRB_DESC=		${KERBEROS_DESC}
NOKRB_DESC=		Without Kerberos support
HEIMDAL_DESC=		With Heimdal Kerberos support
HEIMDAL_PORT_DESC=	With Heimdal Kerberos from ports
MITKRB_PORT_DESC=	With MIT Kerberos from ports
UNIXODBC_DESC=		With unixODBC database support

FREETDS_CONFIGURE_WITH=		rlm_freetds
FREETDS_CONFIGURE_OFF=		--without-freetds
FREETDS_LIB_DEPENDS=		libct.so:databases/freetds
HEIMDAL_CONFIGURE_ON=		--with-rlm-krb5-dir=/
HEIMDAL_PORT_LIB_DEPENDS=	libkrb5.so:security/heimdal
HEIMDAL_PORT_CONFIGURE_ON=	--with-rlm-krb5-dir=${LOCALBASE}
HEIMDAL_CONFLICTS_BUILD=	krb5-[0-9].*
IDN_CONFIGURE_WITH=		rlm_idn
IDN_LIB_DEPENDS=		libidn.so:dns/libidn
FIREBIRD_CONFIGURE_WITH=	rlm_sql_firebird

	@${REINPLACE_CMD} -Ee 's: ..R...sbindir./rc.radiusd : :' \
		${WRKSRC}/scripts/all.mk

# If we're using Heimdal from base, alter the LIBS variable
.if ${PORT_OPTIONS:MHEIMDAL} && empty(PORT_OPTIONS:MHEIMDAL_PORT)
	@${REINPLACE_CMD} -e 's|LIBS|KRB5LIBS|g' ${WRKSRC}/src/modules/rlm_krb5/configure
	@${REINPLACE_CMD} -e 's|-lkrb5|$$(${KRB5_CONFIG})|g' \
		${WRKSRC}/src/modules/rlm_krb5/configure
.endif
.if empty(PORT_OPTIONS:MRUBY)
	@${RM} -r ${WRKSRC}/src/modules/rlm_ruby/
.endif

Lines 22-29 GNU_CONFIGURE= yes Link Here

(-)b/net/nss_ldap/Makefile (-2 / +8 lines)
22	USE_LDCONFIG= yes	22	USE_LDCONFIG= yes
23	USE_OPENLDAP= yes	23	USE_OPENLDAP= yes
24		24
25	OPTIONS_DEFINE= LCLASS KERBEROS SASL	25	OPTIONS_DEFINE= LCLASS SASL
26	OPTIONS_DEFAULT=LCLASS KERBEROS	26	OPTIONS_DEFAULT=LCLASS
		27	OPTIONS_SINGLE= KERBEROS
		28	OPTIONS_SINGLE_KERBEROS= MIT HEIMDAL
		29	MIT_DESC= Link against MIT Kerberos
		30	MIT_USES= gssapi:mit
		31	HEIMDAL_DESC= Link against Heimdal in ports Kerberos
		32	HEIMDAL_USES= gssapi:heimdal
27		33
28	LCLASS_DESC= Enable login classes via the loginClass attribute	34	LCLASS_DESC= Enable login classes via the loginClass attribute
29		35

Lines 6-16 PORTREVISION= 7 Link Here

(-)b/security/cyrus-sasl2-gssapi/Makefile (-5 / +2 lines)
6	COMMENT= SASL GSSAPI authentication plugin	6	COMMENT= SASL GSSAPI authentication plugin
7		7
8	OPTIONS_SINGLE= GSSAPI	8	OPTIONS_SINGLE= GSSAPI
9	OPTIONS_SINGLE_GSSAPI= GSSAPI_BASE GSSAPI_HEIMDAL GSSAPI_MIT	9	OPTIONS_SINGLE_GSSAPI= GSSAPI_HEIMDAL GSSAPI_MIT
10	OPTIONS_DEFAULT= GSSAPI_BASE	10	OPTIONS_DEFAULT= GSSAPI_MIT
11	GSSAPI_BASE_USES= gssapi:base
12	GSSAPI_BASE_CONFIGURE_ON= --enable-gssapi="${GSSAPIBASEDIR}" \
13	--with-gss_impl=heimdal
14	GSSAPI_HEIMDAL_USES= gssapi:heimdal,flags	11	GSSAPI_HEIMDAL_USES= gssapi:heimdal,flags
15	GSSAPI_HEIMDAL_CONFIGURE_ON= --enable-gssapi="${GSSAPIBASEDIR}" \	12	GSSAPI_HEIMDAL_CONFIGURE_ON= --enable-gssapi="${GSSAPIBASEDIR}" \
16	--with-gss_impl=heimdal	13	--with-gss_impl=heimdal





USE_RC_SUBR=	${PORTNAME}
HAS_CONFIGURE=	yes
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
USES_GSSAPI_MIT=	gssapi:mit
USES_GSSAPI_HEIMDAL=	gssapi:heimdal

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 (-3 / +14 lines)
27	USE_LDCONFIG= yes	27	USE_LDCONFIG= yes
28	PORTDOCS= *	28	PORTDOCS= *
29		29
30	OPTIONS_DEFINE= PROXY GNUTLS GSSAPI LZ4 P11 STOKEN	30	OPTIONS_SINGLE= GSSAPI
31	OPTIONS_DEFAULT=GSSAPI	31	OPTIONS_DEFINE= PROXY GNUTLS LZ4 P11 STOKEN
		32	OPTIONS_DEFAULT=GSSAPI_HEIMDAL
		33	OPTIONS_SINGLE_GSSAPI= GSSAPI_NONE GSSAPI_HEIMDAL GSSAPI_MIT
		34
		35	GSSAPI_NONE_DESC= Build without GSSAPI support
		36	GSSAPI_HEIMDAL_DESC= Use Heimdal GSSAPI from security/heimdal
		37	GSSAPI_MIT_DESC= Use MIT GSSAPI from security/krb5
32		38
33	LZ4_DESC= LZ4-based compression	39	LZ4_DESC= LZ4-based compression
34	LZ4_LIB_DEPENDS= liblz4.so:archivers/liblz4	40	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	48	GNUTLS_LIB_DEPENDS= libgnutls.so:security/gnutls
43	GNUTLS_CONFIGURE_WITH= gnutls	49	GNUTLS_CONFIGURE_WITH= gnutls
44		50
45	GSSAPI_CONFIGURE_WITH= gssapi	51	GSSAPI_HEIMDAL_USES= gssapi:heimdal
		52	GSSAPI_MIT_USES= gssapi:mit
		53	GSSAPI_NONE_CONFIGURE_ON= --without-gssapi
		54	GSSAPI_HEIMDAL_CONFIGURE_WITH= gssapi
		55	GSSAPI_MIT_CONFIGURE_WITH= gssapi
		56
46		57
47	P11_DESC= PKCS#11 support via libp11	58	P11_DESC= PKCS#11 support via libp11
48	P11_LIB_DEPENDS= libp11.so:security/libp11	59	P11_LIB_DEPENDS= libp11.so:security/libp11

Lines 14-24 USE_PERL5= configure Link Here

(-)b/security/p5-Authen-Krb5-Simple/Makefile (-4 / +2 lines)
14	CONFIGURE_ENV= GSSAPIBASEDIR="${GSSAPIBASEDIR}"	14	CONFIGURE_ENV= GSSAPIBASEDIR="${GSSAPIBASEDIR}"
15		15
16	OPTIONS_SINGLE= GSSAPI	16	OPTIONS_SINGLE= GSSAPI
17	OPTIONS_SINGLE_GSSAPI= GSSAPI_BASE GSSAPI_HEIMDAL GSSAPI_MIT	17	OPTIONS_SINGLE_GSSAPI= GSSAPI_HEIMDAL GSSAPI_MIT
18	OPTIONS_DEFAULT= GSSAPI_BASE	18	OPTIONS_DEFAULT= GSSAPI_MIT
19		19
20	GSSAPI_BASE_USES= gssapi
21	GSSAPI_BASE_CONFIGURE_ENV= HAVE_HEIMDAL=1
22	GSSAPI_HEIMDAL_USES= gssapi:heimdal	20	GSSAPI_HEIMDAL_USES= gssapi:heimdal
23	GSSAPI_HEIMDAL_CONFIGURE_ENV= HAVE_HEIMDAL=1	21	GSSAPI_HEIMDAL_CONFIGURE_ENV= HAVE_HEIMDAL=1
24	GSSAPI_MIT_USES= gssapi:mit	22	GSSAPI_MIT_USES= gssapi:mit

Lines 17-27 USE_PERL5= configure Link Here

(-)b/security/p5-Authen-Krb5/Makefile (-4 / +2 lines)
17	CONFIGURE_ENV= GSSAPIBASEDIR="${GSSAPIBASEDIR}"	17	CONFIGURE_ENV= GSSAPIBASEDIR="${GSSAPIBASEDIR}"
18		18
19	OPTIONS_SINGLE= GSSAPI	19	OPTIONS_SINGLE= GSSAPI
20	OPTIONS_SINGLE_GSSAPI= GSSAPI_BASE GSSAPI_HEIMDAL GSSAPI_MIT	20	OPTIONS_SINGLE_GSSAPI= GSSAPI_HEIMDAL GSSAPI_MIT
21	OPTIONS_DEFAULT= GSSAPI_BASE	21	OPTIONS_DEFAULT= GSSAPI_MIT
22		22
23	GSSAPI_BASE_USES= gssapi
24	GSSAPI_BASE_CONFIGURE_ENV= HAVE_HEIMDAL=1
25	GSSAPI_HEIMDAL_USES= gssapi:heimdal	23	GSSAPI_HEIMDAL_USES= gssapi:heimdal
26	GSSAPI_HEIMDAL_CONFIGURE_ENV= HAVE_HEIMDAL=1	24	GSSAPI_HEIMDAL_CONFIGURE_ENV= HAVE_HEIMDAL=1
27	GSSAPI_MIT_USES= gssapi:mit	25	GSSAPI_MIT_USES= gssapi:mit




MAINTAINER=	hrs@FreeBSD.org
COMMENT=	Perl extension for Heimdal administrative client library

USES=		gssapi:heimdal perl5
USE_PERL5=	configure
CONFIGURE_ENV=	GSSAPIBASEDIR="${GSSAPIBASEDIR}"

OPTIONS_SINGLE=		GSSAPI
OPTIONS_SINGLE_GSSAPI=	GSSAPI_BASE GSSAPI_HEIMDAL
OPTIONS_DEFAULT=	GSSAPI_BASE

GSSAPI_BASE_USES=	gssapi
GSSAPI_HEIMDAL_USES=	gssapi:heimdal

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




USE_PERL5=		build

OPTIONS_SINGLE=		LINK
OPTIONS_SINGLE_LINK=	MIT HEIMDAL_PORT
OPTIONS_DEFAULT=	MIT
MIT_DESC=		Link against MIT Kerberos
MIT_USES=		gssapi:mit
HEIMDAL_PORT_DESC=	Link against Heimdal in ports Kerberos
HEIMDAL_PORT_USES=	gssapi:heimdal
HEIMDAL_BASE_DESC=	Link against Heimdal in base Kerberos
HEIMDAL_BASE_USES=	gssapi:base

CONFIGURE_ARGS+=	--with-krb5="${GSSAPIBASEDIR}" \
			--with-krb5-include="${GSSAPIINCDIR}" \





OPTIONS_RADIO=		TOOLKIT
OPTIONS_RADIO_TOOLKIT=	GTK2 GTK3
OPTIONS_DEFAULT=GSSAPI_MIT GTK3
OPTIONS_SINGLE=	GSSAPI_SELECT
OPTIONS_SINGLE_GSSAPI_SELECT=	GSSAPI_NONE GSSAPI_HEIMDAL \
				GSSAPI_MIT

CONFLICTS_INSTALL?=	pssh-[0-9]* putty-gtk2-[0-9]* putty-nogtk-[0-9]*

MAKE_ARGS+=	GTK_CONFIG=:
.endif

.if ${PORT_OPTIONS:MGSSAPI_HEIMDAL}
_COMPAT=		-DSTATIC_GSSAPI
USES+=		gssapi:base,flags
MAKE_ARGS+=	KRB5CONFIG=${KRB5CONFIG}
.elif ${PORT_OPTIONS:MGSSAPI_HEIMDAL}
_COMPAT=		-DSTATIC_GSSAPI
USES+=		gssapi:heimdal,flags
MAKE_ARGS+=	KRB5CONFIG=${KRB5CONFIG}





LICENSE=	APACHE20

OPTIONS_DEFAULT=	GSSAPI_HEIMDAL
OPTIONS_SINGLE=		GSSAPI
OPTIONS_SINGLE_GSSAPI=	GSSAPI_HEIMDAL GSSAPI_MIT

GSSAPI_BASE_USES=		gssapi
GSSAPI_HEIMDAL_USES=		gssapi:heimdal
GSSAPI_MIT_USES=		gssapi:mit

USES=		python
USE_PYTHON=	distutils autoplist

GSSAPI_HEIMDAL_EXTRA_PATCHES=	${PATCHDIR}/extra-patch-src_kerberosbasic.h \
				${PATCHDIR}/extra-patch-src_kerberosgss.c \
				${PATCHDIR}/extra-patch-src_kerberosgss.h \
				${PATCHDIR}/extra-patch-src_kerberospw.h

GSSAPI_HEIMDAL_EXTRA_PATCHES=	${GSSAPI_BASE_EXTRA_PATCHES}

post-patch:
	@${REINPLACE_CMD} -e 's|getoutput("krb5-config|getoutput("${GSSAPIBASEDIR}/bin/krb5-config|g' ${WRKSRC}/setup.py





CONFIGURE_ARGS+=--with-sasldir=${LOCALBASE} --with-ldapdir=${LOCALBASE}

OPTIONS_SINGLE=	GSSAPI
OPTIONS_SINGLE_GSSAPI=	GSSAPI_HEIMDAL GSSAPI_MIT

OPTIONS_DEFAULT=GSSAPI_MIT

GSSAPI_BASE_USES=	gssapi
GSSAPI_HEIMDAL_USES=	gssapi:heimdal
GSSAPI_MIT_USES=	gssapi:mit

GSSAPI_BASE_CONFIGURE_ON=	--with-krb5=heimdal
GSSAPI_HEIMDAL_CONFIGURE_ON=	--with-krb5=heimdal
GSSAPI_MIT_CONFIGURE_ON=	--with-krb5=mit
CONFIGURE_ARGS+=		--with-krb5-config=${KRB5CONFIG}

Lines 22-28 LIB_DEPENDS= libjson-c.so:devel/json-c \ Link Here

(-)b/sysutils/slurm-wlm/Makefile (-3 / +6 lines)
22	USERS= slurm	22	USERS= slurm
23	GROUPS= ${USERS}	23	GROUPS= ${USERS}
24		24
25	USES= gmake libtool pkgconfig python:build readline:port shebangfix \	25	USES= gmake gssapi:heimdal,flags \
		26	libtool pkgconfig python:build readline:port shebangfix \
26	ssl tar:bz2	27	ssl tar:bz2
27	USE_LDCONFIG= yes	28	USE_LDCONFIG= yes
28	USE_PERL5= configure	29	USE_PERL5= configure
Lines 78-85 RRD_CONFIGURE_WITH= rrdtool Link Here
78		79
79	LINUX_USES= linux	80	LINUX_USES= linux
80		81
81	CFLAGS+= -I${WRKSRC}/slurm -I${LOCALBASE}/include	82	CFLAGS+= -I${WRKSRC}/slurm -I${LOCALBASE}/include \
82	LDFLAGS+= -L${LOCALBASE}/lib -lsysinfo -lkvm	83	-I${GSSAPIINCDIR} ${GSSAPICPPFLAGS}
		84	LDFLAGS+= -L${LOCALBASE}/lib -lsysinfo -lkvm \
		85	-L${GSSAPILIBDIR} ${GSSAPILDFLAGS} ${GSSAPILIBS}
83		86
84	# SLURM's configure enables interactive jobs if pty.h exists. Replacing	87	# SLURM's configure enables interactive jobs if pty.h exists. Replacing
85	# #include <pty.h> with appropriate headers will therefore not work, so instead	88	# #include <pty.h> with appropriate headers will therefore not work, so instead




CONFIGURE_ARGS=	-with-krb5=${GSSAPIBASEDIR} --without-krb4

OPTIONS_SINGLE=		GSSAPI
OPTIONS_DEFAULT=	GSSAPI_MIT
OPTIONS_SINGLE_GSSAPI=	GSSAPI_HEIMDAL GSSAPI_MIT
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
GSSAPI_DESC=		Use Base version of GSS API
GSSAPI_BASE_USES=	gssapi
GSSAPI_HEIMDAL_USES=	gssapi:heimdal
GSSAPI_MIT_USES=	gssapi:mit


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

(-)b/www/nginx-devel/Makefile (-3 / +4 lines)
94	THREADS WWW	94	THREADS WWW
95		95
96	OPTIONS_RADIO+= GSSAPI	96	OPTIONS_RADIO+= GSSAPI
97	OPTIONS_RADIO_GSSAPI= GSSAPI_BASE GSSAPI_HEIMDAL GSSAPI_MIT	97	OPTIONS_RADIO_GSSAPI= GSSAPI_HEIMDAL GSSAPI_MIT
98	GSSAPI_BASE_USES= gssapi
99	GSSAPI_HEIMDAL_USES= gssapi:heimdal,flags	98	GSSAPI_HEIMDAL_USES= gssapi:heimdal,flags
100	GSSAPI_MIT_USES= gssapi:mit	99	GSSAPI_MIT_USES= gssapi:mit
101		100
Lines 111-117 ${opt}_IMPLIES= MAIL Link Here
111	${opt}_IMPLIES= HTTP	110	${opt}_IMPLIES= HTTP
112	.endfor	111	.endfor
113		112
114	GSSAPI_BASE_IMPLIES= HTTP_AUTH_KRB5
115	GSSAPI_HEIMDAL_IMPLIES= HTTP_AUTH_KRB5	113	GSSAPI_HEIMDAL_IMPLIES= HTTP_AUTH_KRB5
116	GSSAPI_MIT_IMPLIES= HTTP_AUTH_KRB5	114	GSSAPI_MIT_IMPLIES= HTTP_AUTH_KRB5
117		115
Lines 262-267 post-patch-GRIDFS-on: Link Here
262	post-patch-HTTP_AUTH_KRB5-on:	260	post-patch-HTTP_AUTH_KRB5-on:
263	@${REINPLACE_CMD} 's!%%GSSAPILIBS%%!${GSSAPILIBS}!g; \	261	@${REINPLACE_CMD} 's!%%GSSAPILIBS%%!${GSSAPILIBS}!g; \
264	s!%%GSSAPIINCDIR%%!${GSSAPIINCDIR}!g' ${WRKSRC_auth_krb5}/config	262	s!%%GSSAPIINCDIR%%!${GSSAPIINCDIR}!g' ${WRKSRC_auth_krb5}/config
		263	@${REINPLACE_CMD} 's!%%GSSAPILIBDIR%%!${GSSAPILIBDIR}!' ${WRKSRC_auth_krb5}/config
		264	@${REINPLACE_CMD} 's!%%GSSAPILDFLAGS%%!${GSSAPILDFLAGS}!' ${WRKSRC_auth_krb5}/config
		265
265		266
266	post-patch-HTTP_TARANTOOL-on:	267	post-patch-HTTP_TARANTOOL-on:
267	@${REINPLACE_CMD} 's!%%PREFIX%%!${LOCALBASE}!g' ${WRKSRC_nginx_tarantool}/config	268	@${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-100 OPTIONS_DEFAULT?= DSO FILE_AIO HTTP HTTP_ADDITION HTTP_AUTH_REQ HTTP_CACHE \ Link Here

(-)b/www/nginx/Makefile (-3 / +4 lines)
93	THREADS WWW	93	THREADS WWW
94		94
95	OPTIONS_RADIO+= GSSAPI	95	OPTIONS_RADIO+= GSSAPI
96	OPTIONS_RADIO_GSSAPI= GSSAPI_BASE GSSAPI_HEIMDAL GSSAPI_MIT	96	OPTIONS_RADIO_GSSAPI= GSSAPI_HEIMDAL GSSAPI_MIT
97	GSSAPI_BASE_USES= gssapi
98	GSSAPI_HEIMDAL_USES= gssapi:heimdal,flags	97	GSSAPI_HEIMDAL_USES= gssapi:heimdal,flags
99	GSSAPI_MIT_USES= gssapi:mit	98	GSSAPI_MIT_USES= gssapi:mit
100		99
Lines 110-116 ${opt}_IMPLIES= MAIL Link Here
110	${opt}_IMPLIES= HTTP	109	${opt}_IMPLIES= HTTP
111	.endfor	110	.endfor
112		111
113	GSSAPI_BASE_IMPLIES= HTTP_AUTH_KRB5
114	GSSAPI_HEIMDAL_IMPLIES= HTTP_AUTH_KRB5	112	GSSAPI_HEIMDAL_IMPLIES= HTTP_AUTH_KRB5
115	GSSAPI_MIT_IMPLIES= HTTP_AUTH_KRB5	113	GSSAPI_MIT_IMPLIES= HTTP_AUTH_KRB5
116		114
Lines 260-265 post-patch-GRIDFS-on: Link Here
260		258
261	post-patch-HTTP_AUTH_KRB5-on:	259	post-patch-HTTP_AUTH_KRB5-on:
262	@${REINPLACE_CMD} 's!%%GSSAPILIBS%%!${GSSAPILIBS}!' ${WRKSRC_auth_krb5}/config	260	@${REINPLACE_CMD} 's!%%GSSAPILIBS%%!${GSSAPILIBS}!' ${WRKSRC_auth_krb5}/config
		261	@${REINPLACE_CMD} 's!%%GSSAPIINCDIR%%!${GSSAPIINCDIR}!' ${WRKSRC_auth_krb5}/config
		262	@${REINPLACE_CMD} 's!%%GSSAPILIBDIR%%!${GSSAPILIBDIR}!' ${WRKSRC_auth_krb5}/config
		263	@${REINPLACE_CMD} 's!%%GSSAPILDFLAGS%%!${GSSAPILDFLAGS}!' ${WRKSRC_auth_krb5}/config
263		264
264	post-patch-HTTP_TARANTOOL-on:	265	post-patch-HTTP_TARANTOOL-on:
265	@${REINPLACE_CMD} 's!%%PREFIX%%!${LOCALBASE}!g' ${WRKSRC_nginx_tarantool}/config	266	@${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"




		STACKTRACES VIA_DB WCCP WCCPV2

OPTIONS_SINGLE=	GSSAPI
OPTIONS_SINGLE_GSSAPI=	GSSAPI_NONE GSSAPI_HEIMDAL GSSAPI_MIT

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


				--without-mit-krb5 \
				--without-gss

GSSAPI_BASE_USES=		gssapi
GSSAPI_BASE_CONFIGURE_ON=	--with-heimdal-krb5=${GSSAPIBASEDIR} ${GSSAPI_CONFIGURE_ARGS}
GSSAPI_BASE_PLIST_SUB=		AUTH_KERB=""

GSSAPI_HEIMDAL_USES=		gssapi:heimdal
GSSAPI_HEIMDAL_CONFIGURE_ON=	--with-heimdal-krb5=${GSSAPIBASEDIR} ${GSSAPI_CONFIGURE_ARGS}
GSSAPI_HEIMDAL_PLIST_SUB=	AUTH_KERB=""




		STACKTRACES VIA_DB WCCP WCCPV2

OPTIONS_SINGLE=	GSSAPI
OPTIONS_SINGLE_GSSAPI=	GSSAPI_NONE GSSAPI_HEIMDAL GSSAPI_MIT

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


				--without-mit-krb5 \
				--without-gss

GSSAPI_BASE_USES=		gssapi
GSSAPI_BASE_CONFIGURE_ON=	--with-heimdal-krb5=${GSSAPIBASEDIR} ${GSSAPI_CONFIGURE_ARGS}
GSSAPI_BASE_PLIST_SUB=		AUTH_KERB=""

GSSAPI_HEIMDAL_USES=		gssapi:heimdal
GSSAPI_HEIMDAL_CONFIGURE_ON=	--with-heimdal-krb5=${GSSAPIBASEDIR} ${GSSAPI_CONFIGURE_ARGS}
GSSAPI_HEIMDAL_PLIST_SUB=	AUTH_KERB=""

Return to bug 222745

Lines 4-14 Link Here

(-)b/Mk/Uses/gssapi.mk (-19 / +4 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: mit (default, implicit), heimdal
8	# "bootstrap" is a special prefix only for krb5 or heimdal ports.	8	# "bootstrap" is a special prefix only for krb5 or heimdal ports.
9	# ("bootstrap,mit")	9	# ("bootstrap,mit")
10	# flags is a special suffix to define CFLAGS, LDFLAGS, and LDADD.	10	# flags is a special suffix to define CFLAGS, LDFLAGS, and LDADD.
11	# ("base,flags")	11	# ("heimdal,flags")
12	#	12	#
13	# MAINTAINER: hrs@FreeBSD.org	13	# MAINTAINER: hrs@FreeBSD.org
14	#	14	#
Lines 81-106 _HEADERS= sys/types.h sys/stat.h stdint.h Link Here
81		81
82	.undef _FIXUP_KRB5CONFIG	82	.undef _FIXUP_KRB5CONFIG
83	.if empty(gssapi_ARGS)	83	.if empty(gssapi_ARGS)
84	gssapi_ARGS= base	84	gssapi_ARGS= mit
85	.endif	85	.endif
86	.for _A in ${gssapi_ARGS}	86	.for _A in ${gssapi_ARGS}
87	_local:= ${_A}	87	_local:= ${_A}
88	.if ${_local} == "base"	88	.if ${_local} == "heimdal"
89	. if ${SSL_DEFAULT} != base
90	IGNORE= You are using OpenSSL from ports and have selected GSSAPI from base, please select another GSSAPI value
91	. endif
92	HEIMDAL_HOME= /usr
93	GSSAPIBASEDIR= ${HEIMDAL_HOME}
94	GSSAPILIBDIR= ${GSSAPIBASEDIR}/lib
95	GSSAPIINCDIR= ${GSSAPIBASEDIR}/include
96	_HEADERS+= gssapi/gssapi.h gssapi/gssapi_krb5.h krb5.h
97	GSSAPICPPFLAGS= -I"${GSSAPIINCDIR}"
98	GSSAPILIBS= -lkrb5 -lgssapi -lgssapi_krb5
99	GSSAPILDFLAGS= -L"${GSSAPILIBDIR}"
100	.if empty(OSREL:N9.3)
101	_FIXUP_KRB5CONFIG= yes
102	.endif
103	.elif ${_local} == "heimdal"
104	HEIMDAL_HOME?= ${LOCALBASE}	89	HEIMDAL_HOME?= ${LOCALBASE}
105	GSSAPIBASEDIR= ${HEIMDAL_HOME}	90	GSSAPIBASEDIR= ${HEIMDAL_HOME}
106	GSSAPILIBDIR= ${GSSAPIBASEDIR}/lib/heimdal	91	GSSAPILIBDIR= ${GSSAPIBASEDIR}/lib/heimdal

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 1-7 Link Here

(-)b/devel/e2fsprogs-libss/Makefile (-4 / +1 lines)
1	# Created by: Ben Kaduk <kaduk@mit.edu>	1	# Created by: Ben Kaduk <kaduk@mit.edu>
2	# $FreeBSD$	2	# $FreeBSD$
3		3
4	PORTREVISION= 0	4	PORTREVISION= 1
5	CATEGORIES= devel	5	CATEGORIES= devel
6	PKGNAMESUFFIX= -libss	6	PKGNAMESUFFIX= -libss
7		7
Lines 11-19 COMMENT= Command-line interface parsing library from e2fsprogs Link Here
11	LICENSE= MIT	11	LICENSE= MIT
12	LICENSE_FILE= ${INSTALL_WRKSRC}/ss.h	12	LICENSE_FILE= ${INSTALL_WRKSRC}/ss.h
13		13
14	CONFLICTS= heimdal-[0-9]*
15	CONFLICTS+= krb4-[0-9]*
16
17	OPTIONS_EXCLUDE= DOCS EXAMPLES IPV6 NLS	14	OPTIONS_EXCLUDE= DOCS EXAMPLES IPV6 NLS
18	CONFIGURE_ARGS= --enable-elf-shlibs	15	CONFIGURE_ARGS= --enable-elf-shlibs
19	MASTERDIR= ${.CURDIR}/../../sysutils/e2fsprogs	16	MASTERDIR= ${.CURDIR}/../../sysutils/e2fsprogs

Lines 19-25 OPTIONS_RADIO= SSL Link Here

(-)b/ftp/curl/Makefile (-6 / +1 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	OPTIONS_SINGLE_GSSAPI= GSSAPI_BASE GSSAPI_HEIMDAL GSSAPI_MIT GSSAPI_NONE	22	OPTIONS_SINGLE_GSSAPI= GSSAPI_HEIMDAL GSSAPI_MIT GSSAPI_NONE
23	OPTIONS_SINGLE_RESOLV= CARES THREADED_RESOLVER	23	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	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
25	CA_BUNDLE_DESC= Enable CA bundle for OpenSSL/GnuTLS/mbedTLS	25	CA_BUNDLE_DESC= Enable CA bundle for OpenSSL/GnuTLS/mbedTLS
Lines 83-93 GNUTLS_CONFIGURE_WITH= gnutls Link Here
83	GNUTLS_LIB_DEPENDS= libgnutls.so:security/gnutls \	83	GNUTLS_LIB_DEPENDS= libgnutls.so:security/gnutls \
84	libnettle.so:security/nettle	84	libnettle.so:security/nettle
85	GOPHER_CONFIGURE_ENABLE=gopher	85	GOPHER_CONFIGURE_ENABLE=gopher
86	GSSAPI_BASE_CONFIGURE_ON= --with-gssapi=${GSSAPIBASEDIR} ${GSSAPI_CONFIGURE_ARGS}
87	GSSAPI_BASE_CPPFLAGS= ${GSSAPICPPFLAGS}
88	GSSAPI_BASE_LDFLAGS= ${GSSAPILDFLAGS}
89	GSSAPI_BASE_LIBS= ${GSSAPILIBS}
90	GSSAPI_BASE_USES= gssapi
91	GSSAPI_HEIMDAL_CONFIGURE_ON= --with-gssapi=${GSSAPIBASEDIR} ${GSSAPI_CONFIGURE_ARGS}	86	GSSAPI_HEIMDAL_CONFIGURE_ON= --with-gssapi=${GSSAPIBASEDIR} ${GSSAPI_CONFIGURE_ARGS}
92	GSSAPI_HEIMDAL_CPPFLAGS=${GSSAPICPPFLAGS}	87	GSSAPI_HEIMDAL_CPPFLAGS=${GSSAPICPPFLAGS}
93	GSSAPI_HEIMDAL_LDFLAGS= ${GSSAPILDFLAGS}	88	GSSAPI_HEIMDAL_LDFLAGS= ${GSSAPILDFLAGS}

Lines 46-52 OPTIONS_GROUP_DB= CDB LDAP MYSQL PGSQL SQLITE Link Here

(-)b/mail/dovecot/Makefile (-3 / +1 lines)
46	OPTIONS_GROUP_FTS= ICU LUCENE SOLR TEXTCAT	46	OPTIONS_GROUP_FTS= ICU LUCENE SOLR TEXTCAT
47		47
48	OPTIONS_SINGLE= GSSAPI	48	OPTIONS_SINGLE= GSSAPI
49	OPTIONS_SINGLE_GSSAPI= GSSAPI_NONE GSSAPI_BASE GSSAPI_HEIMDAL GSSAPI_MIT	49	OPTIONS_SINGLE_GSSAPI= GSSAPI_NONE GSSAPI_HEIMDAL GSSAPI_MIT
50		50
51	LZ4_DESC= LZ4 compression support	51	LZ4_DESC= LZ4 compression support
52	VPOPMAIL_DESC= vpopmail support	52	VPOPMAIL_DESC= vpopmail support
Lines 61-67 SOLR_DESC= Solr FTS support Link Here
61	TEXTCAT_DESC= Libtextcat FTS support	61	TEXTCAT_DESC= Libtextcat FTS support
62		62
63	GSSAPI_NONE_DESC= Build without GSSAPI support	63	GSSAPI_NONE_DESC= Build without GSSAPI support
64	GSSAPI_BASE_DESC= Use GSSAPI from base
65	GSSAPI_HEIMDAL_DESC= Use Heimdal GSSAPI from security/heimdal	64	GSSAPI_HEIMDAL_DESC= Use Heimdal GSSAPI from security/heimdal
66	GSSAPI_MIT_DESC= Use MIT GSSAPI from security/krb5	65	GSSAPI_MIT_DESC= Use MIT GSSAPI from security/krb5
67		66
Lines 111-117 TEXTCAT_LIB_DEPENDS= libtextcat.so:textproc/libtextcat Link Here
111	# GSSAPI	110	# GSSAPI
112	GSSAPI_NONE_CONFIGURE_ON= --without-gssapi	111	GSSAPI_NONE_CONFIGURE_ON= --without-gssapi
113	GSSAPI_NONE_CONFIGURE_OFF= --with-gssapi ${GSSAPI_CONFIGURE_ARGS}	112	GSSAPI_NONE_CONFIGURE_OFF= --with-gssapi ${GSSAPI_CONFIGURE_ARGS}
114	GSSAPI_BASE_USES= gssapi
115	GSSAPI_HEIMDAL_USES= gssapi:heimdal	113	GSSAPI_HEIMDAL_USES= gssapi:heimdal
116	GSSAPI_MIT_USES= gssapi:mit	114	GSSAPI_MIT_USES= gssapi:mit
117		115

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

(-)b/mail/dovecot22/Makefile (-3 / +1 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	OPTIONS_SINGLE_GSSAPI= GSSAPI_NONE GSSAPI_BASE GSSAPI_HEIMDAL GSSAPI_MIT	56	OPTIONS_SINGLE_GSSAPI= GSSAPI_NONE GSSAPI_HEIMDAL GSSAPI_MIT
57		57
58	LZ4_DESC= LZ4 compression support	58	LZ4_DESC= LZ4 compression support
59	VPOPMAIL_DESC= vpopmail support	59	VPOPMAIL_DESC= vpopmail support
Lines 68-74 SOLR_DESC= Solr FTS support Link Here
68	TEXTCAT_DESC= Libtextcat FTS support	68	TEXTCAT_DESC= Libtextcat FTS support
69		69
70	GSSAPI_NONE_DESC= Build without GSSAPI support	70	GSSAPI_NONE_DESC= Build without GSSAPI support
71	GSSAPI_BASE_DESC= Use GSSAPI from base
72	GSSAPI_HEIMDAL_DESC= Use Heimdal GSSAPI from security/heimdal	71	GSSAPI_HEIMDAL_DESC= Use Heimdal GSSAPI from security/heimdal
73	GSSAPI_MIT_DESC= Use MIT GSSAPI from security/krb5	72	GSSAPI_MIT_DESC= Use MIT GSSAPI from security/krb5
74		73
Lines 115-121 TEXTCAT_LIB_DEPENDS= libtextcat.so:textproc/libtextcat Link Here
115	# GSSAPI	114	# GSSAPI
116	GSSAPI_NONE_CONFIGURE_ON= --without-gssapi	115	GSSAPI_NONE_CONFIGURE_ON= --without-gssapi
117	GSSAPI_NONE_CONFIGURE_OFF= --with-gssapi ${GSSAPI_CONFIGURE_ARGS}	116	GSSAPI_NONE_CONFIGURE_OFF= --with-gssapi ${GSSAPI_CONFIGURE_ARGS}
118	GSSAPI_BASE_USES= gssapi
119	GSSAPI_HEIMDAL_USES= gssapi:heimdal	117	GSSAPI_HEIMDAL_USES= gssapi:heimdal
120	GSSAPI_MIT_USES= gssapi:mit	118	GSSAPI_MIT_USES= gssapi:mit
121		119

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

(-)b/mail/fetchmail/Makefile (-5 / +6 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	OPTIONS_SINGLE_GSSAPI= GSSAPI_BASE GSSAPI_HEIMDAL GSSAPI_MIT GSSAPI_NONE	38	OPTIONS_SINGLE_GSSAPI= GSSAPI_HEIMDAL GSSAPI_MIT GSSAPI_NONE
39	OPTIONS_DEFAULT= GSSAPI_BASE	39	OPTIONS_DEFAULT= GSSAPI_NONE
40	OPTIONS_SUB= yes	40	OPTIONS_SUB= yes
41		41
42	GSSAPI_BASE_USES= gssapi
43	GSSAPI_BASE_CONFIGURE_ON= --with-gssapi=${GSSAPIBASEDIR} ${GSSAPI_CONFIGURE_ARGS}
44	GSSAPI_HEIMDAL_USES= gssapi:heimdal	42	GSSAPI_HEIMDAL_USES= gssapi:heimdal
45	GSSAPI_HEIMDAL_CONFIGURE_ON= --with-gssapi=${GSSAPIBASEDIR} ${GSSAPI_CONFIGURE_ARGS}	43	GSSAPI_HEIMDAL_CONFIGURE_ON= --with-gssapi=${GSSAPIBASEDIR} ${GSSAPI_CONFIGURE_ARGS}
46	GSSAPI_MIT_USES= gssapi:mit	44	GSSAPI_MIT_USES= gssapi:mit
Lines 67-78 PORTDOCS= FAQ FEATURES NEWS NOTES README README.SSL \ Link Here
67	design-notes.html fetchmail-FAQ.html fetchmail-features.html \	65	design-notes.html fetchmail-FAQ.html fetchmail-features.html \
68	esrs-design-notes.html	66	esrs-design-notes.html
69		67
70	#.include <bsd.port.options.mk>	68	.include <bsd.port.options.mk>
71		69
72	post-patch:	70	post-patch:
73	.if !exists(/usr/lib/libcom_err.so)	71	.if !exists(/usr/lib/libcom_err.so)
74	@${REINPLACE_CMD} -e "s,-lcom_err,,g" ${WRKSRC}/configure	72	@${REINPLACE_CMD} -e "s,-lcom_err,,g" ${WRKSRC}/configure
75	.endif	73	.endif
		74	.if ${PORT_OPTIONS:MGSSAPI_HEIMDAL}
		75	@${GREP} -lr gssapi_krb5 ${WRKSRC}/ \| ${XARGS} ${REINPLACE_CMD} -e 's/gssapi_krb5/gssapi/g'
		76	.endif
76		77
77	post-build:	78	post-build:
78	@${MAKE_CMD} -C ${WRKSRC} check	79	@${MAKE_CMD} -C ${WRKSRC} check

Lines 26-31 LDFLAGS+= -L${LOCALBASE}/lib Link Here

(-)b/net-im/zephyr/Makefile (-4 / +5 lines)
26	CPPFLAGS+= -I${LOCALBASE}/include	26	CPPFLAGS+= -I${LOCALBASE}/include
27		27
28	OPTIONS_DEFINE= HEIMDAL	28	OPTIONS_DEFINE= HEIMDAL
		29	OPTIONS_DEFAULT= HEIMDAL
29	HEIMDAL_DESC= Link against libss.so from security/heimdal	30	HEIMDAL_DESC= Link against libss.so from security/heimdal
30		31
31	.include <bsd.port.pre.mk>	32	.include <bsd.port.pre.mk>
Lines 35-52 CONFIGURE_ARGS+=ac_cv_lib_iconv_libiconv_open=no Link Here
35	.endif	36	.endif
36		37
37	.if ${PORT_OPTIONS:MHEIMDAL}	38	.if ${PORT_OPTIONS:MHEIMDAL}
38	BROKEN= bad depobj	39	USES+= gssapi:heimdal
39	LIB_DEPENDS+= libss.so.1:security/heimdal
40	.if defined(HEIMDAL_HOME)	40	.if defined(HEIMDAL_HOME)
41	KRB5_DIR?= ${HEIMDAL_HOME}	41	KRB5_DIR?= ${HEIMDAL_HOME}
42	.else	42	.else
43	KRB5_DIR?= ${LOCALBASE}	43	KRB5_DIR?= ${LOCALBASE}
44	.endif	44	.endif
45	.else	45	.else
46	LIB_DEPENDS+= libss.so.2:devel/e2fsprogs-libss	46	BROKEN= Does not build without Heimdal in base
47	KRB5_DIR?= ${DESTDIR}/usr
48	.endif	47	.endif
49		48
		49	LIB_DEPENDS+= libss.so.2:devel/e2fsprogs-libss
		50
50	# try to fix parallel (-jX) builds: add missing inter-source dependencies	51	# try to fix parallel (-jX) builds: add missing inter-source dependencies
51	post-patch:	52	post-patch:
52	@${REINPLACE_CMD} -e \	53	@${REINPLACE_CMD} -e \

Lines 21-28 GNU_CONFIGURE= yes Link Here

(-)b/net-mgmt/adcli/Makefile (-7 / +2 lines)
21	TEST_TARGET= check	21	TEST_TARGET= check
22		22
23	OPTIONS_SINGLE= GSSAPI	23	OPTIONS_SINGLE= GSSAPI
24	OPTIONS_SINGLE_GSSAPI= GSSAPI_BASE GSSAPI_HEIMDAL GSSAPI_MIT	24	OPTIONS_SINGLE_GSSAPI= GSSAPI_HEIMDAL GSSAPI_MIT
25	OPTIONS_DEFAULT= GSSAPI_BASE	25	OPTIONS_DEFAULT= GSSAPI_MIT
26		26
27	CONFIGURE_ENV+= ac_cv_path_KRB5_CONFIG=${KRB5CONFIG} \	27	CONFIGURE_ENV+= ac_cv_path_KRB5_CONFIG=${KRB5CONFIG} \
28	ac_cv_path_XMLTO=${TRUE}	28	ac_cv_path_XMLTO=${TRUE}
Lines 32-44 CONFIGURE_ARGS= --sysconfdir=/etc Link Here
32	CFLAGS+= -I${LOCALBASE}/include -DLDAP_DEPRECATED=0	32	CFLAGS+= -I${LOCALBASE}/include -DLDAP_DEPRECATED=0
33	LDFLAGS+= -L${LOCALBASE}/lib	33	LDFLAGS+= -L${LOCALBASE}/lib
34		34
35	GSSAPI_BASE_USES= gssapi
36	GSSAPI_MIT_USES= gssapi:mit,flags	35	GSSAPI_MIT_USES= gssapi:mit,flags
37	GSSAPI_HEIMDAL_USES= gssapi:heimdal,flags	36	GSSAPI_HEIMDAL_USES= gssapi:heimdal,flags
38		37
39	GSSAPI_BASE_CONFIGURE_ARGS= --sysconfdir=/etc
40	GSSAPI_BASE_CONFIGURE_ENV= KRB5_CFLAGS="-I${GSSAPIINCDIR}" \
41	KRB5_LIBS="${GSSAPILIBS}"
42	GSSAPI_HEIMDAL_CONFIGURE_ARGS= --sysconfdir=${LOCALBASE}/etc	38	GSSAPI_HEIMDAL_CONFIGURE_ARGS= --sysconfdir=${LOCALBASE}/etc
43	GSSAPI_HEIMDAL_CONFIGURE_ENV= KRB5_CFLAGS="-I${GSSAPIINCDIR}/heimdal" \	39	GSSAPI_HEIMDAL_CONFIGURE_ENV= KRB5_CFLAGS="-I${GSSAPIINCDIR}/heimdal" \
44	KRB5_LIBS="${GSSAPILDFLAGS} ${GSSAPILIBS}"	40	KRB5_LIBS="${GSSAPILDFLAGS} ${GSSAPILIBS}"
Lines 46-52 GSSAPI_MIT_CONFIGURE_ARGS= --sysconfdir=${LOCALBASE}/etc Link Here
46	GSSAPI_MIT_CONFIGURE_ENV= KRB5_CFLAGS="-I${GSSAPIINCDIR}/gssapi" \	42	GSSAPI_MIT_CONFIGURE_ENV= KRB5_CFLAGS="-I${GSSAPIINCDIR}/gssapi" \
47	KRB5_LIBS="${GSSAPILDFLAGS} ${GSSAPILIBS} -lk5crypto"	43	KRB5_LIBS="${GSSAPILDFLAGS} ${GSSAPILIBS} -lk5crypto"
48	# Quiets down warnings inside MIT's headers:	44	# Quiets down warnings inside MIT's headers:
49	GSSAPI_BASE_CFLAGS+= -DHEIMDAL
50	GSSAPI_HEIMDAL_CFLAGS+= -DHEIMDAL	45	GSSAPI_HEIMDAL_CFLAGS+= -DHEIMDAL
51	GSSAPI_MIT_CFLAGS+= -DTARGET_OS_MAC=0	46	GSSAPI_MIT_CFLAGS+= -DTARGET_OS_MAC=0
52		47

Lines 51-64 OPTIONS_DEFINE= USER LDAP MYSQL PGSQL UNIXODBC FIREBIRD REDIS \ Link Here

(-)b/net/freeradius3/Makefile (-11 / +2 lines)
51	EXPERIMENTAL UDPFROMTO DEVELOPER EDIR PERL REST \	51	EXPERIMENTAL UDPFROMTO DEVELOPER EDIR PERL REST \
52	FREETDS IDN DOCS SQLITE3 PYTHON RUBY UNBOUND PCRE \	52	FREETDS IDN DOCS SQLITE3 PYTHON RUBY UNBOUND PCRE \
53	WINBIND	53	WINBIND
54	OPTIONS_DEFAULT=USER PERL HEIMDAL UDPFROMTO	54	OPTIONS_DEFAULT=USER PERL MITKRB_PORT UDPFROMTO
55	OPTIONS_SINGLE= KRB	55	OPTIONS_SINGLE= KRB
56	OPTIONS_SINGLE_KRB= NOKRB HEIMDAL HEIMDAL_PORT MITKRB_PORT	56	OPTIONS_SINGLE_KRB= NOKRB HEIMDAL_PORT MITKRB_PORT
57		57
58	USER_DESC= Run as user freeradius, group freeradius	58	USER_DESC= Run as user freeradius, group freeradius
59	KRB_DESC= ${KERBEROS_DESC}	59	KRB_DESC= ${KERBEROS_DESC}
60	NOKRB_DESC= Without Kerberos support	60	NOKRB_DESC= Without Kerberos support
61	HEIMDAL_DESC= With Heimdal Kerberos support
62	HEIMDAL_PORT_DESC= With Heimdal Kerberos from ports	61	HEIMDAL_PORT_DESC= With Heimdal Kerberos from ports
63	MITKRB_PORT_DESC= With MIT Kerberos from ports	62	MITKRB_PORT_DESC= With MIT Kerberos from ports
64	UNIXODBC_DESC= With unixODBC database support	63	UNIXODBC_DESC= With unixODBC database support
Lines 76-85 EDIR_IMPLIES= LDAP Link Here
76	FREETDS_CONFIGURE_WITH= rlm_freetds	75	FREETDS_CONFIGURE_WITH= rlm_freetds
77	FREETDS_CONFIGURE_OFF= --without-freetds	76	FREETDS_CONFIGURE_OFF= --without-freetds
78	FREETDS_LIB_DEPENDS= libct.so:databases/freetds	77	FREETDS_LIB_DEPENDS= libct.so:databases/freetds
79	HEIMDAL_CONFIGURE_ON= --with-rlm-krb5-dir=/
80	HEIMDAL_PORT_LIB_DEPENDS= libkrb5.so:security/heimdal	78	HEIMDAL_PORT_LIB_DEPENDS= libkrb5.so:security/heimdal
81	HEIMDAL_PORT_CONFIGURE_ON= --with-rlm-krb5-dir=${LOCALBASE}	79	HEIMDAL_PORT_CONFIGURE_ON= --with-rlm-krb5-dir=${LOCALBASE}
82	HEIMDAL_CONFLICTS_BUILD= krb5-[0-9].*
83	IDN_CONFIGURE_WITH= rlm_idn	80	IDN_CONFIGURE_WITH= rlm_idn
84	IDN_LIB_DEPENDS= libidn.so:dns/libidn	81	IDN_LIB_DEPENDS= libidn.so:dns/libidn
85	FIREBIRD_CONFIGURE_WITH= rlm_sql_firebird	82	FIREBIRD_CONFIGURE_WITH= rlm_sql_firebird
Lines 262-273 post-patch: Link Here
262	@${REINPLACE_CMD} -Ee 's: ..R...sbindir./rc.radiusd : :' \	259	@${REINPLACE_CMD} -Ee 's: ..R...sbindir./rc.radiusd : :' \
263	${WRKSRC}/scripts/all.mk	260	${WRKSRC}/scripts/all.mk
264		261
265	# If we're using Heimdal from base, alter the LIBS variable
266	.if ${PORT_OPTIONS:MHEIMDAL} && empty(PORT_OPTIONS:MHEIMDAL_PORT)
267	@${REINPLACE_CMD} -e 's\|LIBS\|KRB5LIBS\|g' ${WRKSRC}/src/modules/rlm_krb5/configure
268	@${REINPLACE_CMD} -e 's\|-lkrb5\|$$(${KRB5_CONFIG})\|g' \
269	${WRKSRC}/src/modules/rlm_krb5/configure
270	.endif
271	.if empty(PORT_OPTIONS:MRUBY)	262	.if empty(PORT_OPTIONS:MRUBY)
272	@${RM} -r ${WRKSRC}/src/modules/rlm_ruby/	263	@${RM} -r ${WRKSRC}/src/modules/rlm_ruby/
273	.endif	264	.endif

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

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

Lines 10-26 PKGNAMEPREFIX= p5- Link Here

(-)b/security/p5-Heimdal-Kadm5/Makefile (-8 / +1 lines)
10	MAINTAINER= hrs@FreeBSD.org	10	MAINTAINER= hrs@FreeBSD.org
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= gssapi:heimdal perl5
14	USE_PERL5= configure	14	USE_PERL5= configure
15	CONFIGURE_ENV= GSSAPIBASEDIR="${GSSAPIBASEDIR}"	15	CONFIGURE_ENV= GSSAPIBASEDIR="${GSSAPIBASEDIR}"
16		16
17	OPTIONS_SINGLE= GSSAPI
18	OPTIONS_SINGLE_GSSAPI= GSSAPI_BASE GSSAPI_HEIMDAL
19	OPTIONS_DEFAULT= GSSAPI_BASE
20
21	GSSAPI_BASE_USES= gssapi
22	GSSAPI_HEIMDAL_USES= gssapi:heimdal
23
24	post-build:	17	post-build:
25	${STRIP_CMD} ${WRKSRC}/blib/arch/auto/Heimdal/Kadm5/Kadm5.so	18	${STRIP_CMD} ${WRKSRC}/blib/arch/auto/Heimdal/Kadm5/Kadm5.so
26		19

Lines 20-33 USES= gmake libtool perl5 Link Here

(-)b/security/pam_krb5/Makefile (-3 / +1 lines)
20	USE_PERL5= build	20	USE_PERL5= build
21		21
22	OPTIONS_SINGLE= LINK	22	OPTIONS_SINGLE= LINK
23	OPTIONS_SINGLE_LINK= MIT HEIMDAL_BASE HEIMDAL_PORT	23	OPTIONS_SINGLE_LINK= MIT HEIMDAL_PORT
24	OPTIONS_DEFAULT= MIT	24	OPTIONS_DEFAULT= MIT
25	MIT_DESC= Link against MIT Kerberos	25	MIT_DESC= Link against MIT Kerberos
26	MIT_USES= gssapi:mit	26	MIT_USES= gssapi:mit
27	HEIMDAL_PORT_DESC= Link against Heimdal in ports Kerberos	27	HEIMDAL_PORT_DESC= Link against Heimdal in ports Kerberos
28	HEIMDAL_PORT_USES= gssapi:heimdal	28	HEIMDAL_PORT_USES= gssapi:heimdal
29	HEIMDAL_BASE_DESC= Link against Heimdal in base Kerberos
30	HEIMDAL_BASE_USES= gssapi:base
31		29
32	CONFIGURE_ARGS+= --with-krb5="${GSSAPIBASEDIR}" \	30	CONFIGURE_ARGS+= --with-krb5="${GSSAPIBASEDIR}" \
33	--with-krb5-include="${GSSAPIINCDIR}" \	31	--with-krb5-include="${GSSAPIINCDIR}" \

Lines 25-33 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 (-7 / +3 lines)
25		25
26	OPTIONS_RADIO= TOOLKIT	26	OPTIONS_RADIO= TOOLKIT
27	OPTIONS_RADIO_TOOLKIT= GTK2 GTK3	27	OPTIONS_RADIO_TOOLKIT= GTK2 GTK3
28	OPTIONS_DEFAULT=GSSAPI_BASE GTK3	28	OPTIONS_DEFAULT=GSSAPI_MIT GTK3
29	OPTIONS_SINGLE= GSSAPI_SELECT	29	OPTIONS_SINGLE= GSSAPI_SELECT
30	OPTIONS_SINGLE_GSSAPI_SELECT= GSSAPI_NONE GSSAPI_BASE GSSAPI_HEIMDAL \	30	OPTIONS_SINGLE_GSSAPI_SELECT= GSSAPI_NONE GSSAPI_HEIMDAL \
31	GSSAPI_MIT	31	GSSAPI_MIT
32		32
33	CONFLICTS_INSTALL?= pssh-[0-9]* putty-gtk2-[0-9]* putty-nogtk-[0-9]*	33	CONFLICTS_INSTALL?= pssh-[0-9]* putty-gtk2-[0-9]* putty-nogtk-[0-9]*
Lines 61-71 DESKTOP_ENTRIES="PuTTY" \ Link Here
61	MAKE_ARGS+= GTK_CONFIG=:	61	MAKE_ARGS+= GTK_CONFIG=:
62	.endif	62	.endif
63		63
64	.if ${PORT_OPTIONS:MGSSAPI_BASE}	64	.if ${PORT_OPTIONS:MGSSAPI_HEIMDAL}
65	_COMPAT= -DSTATIC_GSSAPI
66	USES+= gssapi:base,flags
67	MAKE_ARGS+= KRB5CONFIG=${KRB5CONFIG}
68	.elif ${PORT_OPTIONS:MGSSAPI_HEIMDAL}
69	_COMPAT= -DSTATIC_GSSAPI	65	_COMPAT= -DSTATIC_GSSAPI
70	USES+= gssapi:heimdal,flags	66	USES+= gssapi:heimdal,flags
71	MAKE_ARGS+= KRB5CONFIG=${KRB5CONFIG}	67	MAKE_ARGS+= KRB5CONFIG=${KRB5CONFIG}

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

(-)b/security/py-kerberos/Makefile (-6 / +3 lines)
13		13
14	LICENSE= APACHE20	14	LICENSE= APACHE20
15		15
16	OPTIONS_DEFAULT= GSSAPI_BASE	16	OPTIONS_DEFAULT= GSSAPI_HEIMDAL
17	OPTIONS_SINGLE= GSSAPI	17	OPTIONS_SINGLE= GSSAPI
18	OPTIONS_SINGLE_GSSAPI= GSSAPI_BASE GSSAPI_HEIMDAL GSSAPI_MIT	18	OPTIONS_SINGLE_GSSAPI= GSSAPI_HEIMDAL GSSAPI_MIT
19		19
20	GSSAPI_BASE_USES= gssapi
21	GSSAPI_HEIMDAL_USES= gssapi:heimdal	20	GSSAPI_HEIMDAL_USES= gssapi:heimdal
22	GSSAPI_MIT_USES= gssapi:mit	21	GSSAPI_MIT_USES= gssapi:mit
23		22
24	USES= python	23	USES= python
25	USE_PYTHON= distutils autoplist	24	USE_PYTHON= distutils autoplist
26		25
27	GSSAPI_BASE_EXTRA_PATCHES= ${PATCHDIR}/extra-patch-src_kerberosbasic.h \	26	GSSAPI_HEIMDAL_EXTRA_PATCHES= ${PATCHDIR}/extra-patch-src_kerberosbasic.h \
28	${PATCHDIR}/extra-patch-src_kerberosgss.c \	27	${PATCHDIR}/extra-patch-src_kerberosgss.c \
29	${PATCHDIR}/extra-patch-src_kerberosgss.h \	28	${PATCHDIR}/extra-patch-src_kerberosgss.h \
30	${PATCHDIR}/extra-patch-src_kerberospw.h	29	${PATCHDIR}/extra-patch-src_kerberospw.h
31		30
32	GSSAPI_HEIMDAL_EXTRA_PATCHES= ${GSSAPI_BASE_EXTRA_PATCHES}
33
34	post-patch:	31	post-patch:
35	@${REINPLACE_CMD} -e 's\|getoutput("krb5-config\|getoutput("${GSSAPIBASEDIR}/bin/krb5-config\|g' ${WRKSRC}/setup.py	32	@${REINPLACE_CMD} -e 's\|getoutput("krb5-config\|getoutput("${GSSAPIBASEDIR}/bin/krb5-config\|g' ${WRKSRC}/setup.py
36		33

Lines 22-36 WANT_OPENLDAP_SASL= yes Link Here

(-)b/sysutils/msktutil/Makefile (-4 / +2 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	OPTIONS_SINGLE_GSSAPI= GSSAPI_BASE GSSAPI_HEIMDAL GSSAPI_MIT	25	OPTIONS_SINGLE_GSSAPI= GSSAPI_HEIMDAL GSSAPI_MIT
26		26
27	OPTIONS_DEFAULT=GSSAPI_BASE	27	OPTIONS_DEFAULT=GSSAPI_MIT
28		28
29	GSSAPI_BASE_USES= gssapi
30	GSSAPI_HEIMDAL_USES= gssapi:heimdal	29	GSSAPI_HEIMDAL_USES= gssapi:heimdal
31	GSSAPI_MIT_USES= gssapi:mit	30	GSSAPI_MIT_USES= gssapi:mit
32		31
33	GSSAPI_BASE_CONFIGURE_ON= --with-krb5=heimdal
34	GSSAPI_HEIMDAL_CONFIGURE_ON= --with-krb5=heimdal	32	GSSAPI_HEIMDAL_CONFIGURE_ON= --with-krb5=heimdal
35	GSSAPI_MIT_CONFIGURE_ON= --with-krb5=mit	33	GSSAPI_MIT_CONFIGURE_ON= --with-krb5=mit
36	CONFIGURE_ARGS+= --with-krb5-config=${KRB5CONFIG}	34	CONFIGURE_ARGS+= --with-krb5-config=${KRB5CONFIG}

Lines 24-36 GNU_CONFIGURE= yes Link Here

(-)b/www/mod_auth_kerb2/Makefile (-4 / +2 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	OPTIONS_DEFAULT= GSSAPI_BASE	27	OPTIONS_DEFAULT= GSSAPI_MIT
28	OPTIONS_SINGLE_GSSAPI= GSSAPI_BASE GSSAPI_HEIMDAL GSSAPI_MIT	28	OPTIONS_SINGLE_GSSAPI= GSSAPI_HEIMDAL GSSAPI_MIT
29	GSSAPI_BASE_DESC= Use Base version of GSS API
30	GSSAPI_HEIMDAL_DESC= Use Heimdal implementation of GSS API	29	GSSAPI_HEIMDAL_DESC= Use Heimdal implementation of GSS API
31	GSSAPI_MIT_DESC= Use MIT implementation of GSS API	30	GSSAPI_MIT_DESC= Use MIT implementation of GSS API
32	GSSAPI_DESC= Use Base version of GSS API	31	GSSAPI_DESC= Use Base version of GSS API
33	GSSAPI_BASE_USES= gssapi
34	GSSAPI_HEIMDAL_USES= gssapi:heimdal	32	GSSAPI_HEIMDAL_USES= gssapi:heimdal
35	GSSAPI_MIT_USES= gssapi:mit	33	GSSAPI_MIT_USES= gssapi:mit
36		34

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"

Lines 54-63 OPTIONS_DEFINE= ARP_ACL BDB CACHE_DIGESTS DEBUG DELAY_POOLS DOCS ECAP ESI EXAMPL Link Here

(-)b/www/squid-devel/Makefile (-6 / +2 lines)
54	STACKTRACES VIA_DB WCCP WCCPV2	54	STACKTRACES VIA_DB WCCP WCCPV2
55		55
56	OPTIONS_SINGLE= GSSAPI	56	OPTIONS_SINGLE= GSSAPI
57	OPTIONS_SINGLE_GSSAPI= GSSAPI_NONE GSSAPI_BASE GSSAPI_HEIMDAL GSSAPI_MIT	57	OPTIONS_SINGLE_GSSAPI= GSSAPI_NONE GSSAPI_HEIMDAL GSSAPI_MIT
58		58
59	OPTIONS_DEFAULT=ARP_ACL AUTH_NIS CACHE_DIGESTS DELAY_POOLS FOLLOW_XFF FS_AUFS \	59	OPTIONS_DEFAULT=ARP_ACL AUTH_NIS CACHE_DIGESTS DELAY_POOLS FOLLOW_XFF FS_AUFS \
60	FS_DISKD FS_ROCK GSSAPI_BASE HTCP ICAP ICMP IDENT KQUEUE \	60	FS_DISKD FS_ROCK GSSAPI_NONE HTCP ICAP ICMP IDENT KQUEUE \
61	LARGEFILE LAX_HTTP PCRE SNMP SSL SSL_CRTD TP_IPFW VIA_DB WCCP \	61	LARGEFILE LAX_HTTP PCRE SNMP SSL SSL_CRTD TP_IPFW VIA_DB WCCP \
62	WCCPV2	62	WCCPV2
63		63
Lines 137-146 GSSAPI_NONE_CONFIGURE_ON= --without-heimdal-krb5 \ Link Here
137	--without-mit-krb5 \	137	--without-mit-krb5 \
138	--without-gss	138	--without-gss
139		139
140	GSSAPI_BASE_USES= gssapi
141	GSSAPI_BASE_CONFIGURE_ON= --with-heimdal-krb5=${GSSAPIBASEDIR} ${GSSAPI_CONFIGURE_ARGS}
142	GSSAPI_BASE_PLIST_SUB= AUTH_KERB=""
143
144	GSSAPI_HEIMDAL_USES= gssapi:heimdal	140	GSSAPI_HEIMDAL_USES= gssapi:heimdal
145	GSSAPI_HEIMDAL_CONFIGURE_ON= --with-heimdal-krb5=${GSSAPIBASEDIR} ${GSSAPI_CONFIGURE_ARGS}	141	GSSAPI_HEIMDAL_CONFIGURE_ON= --with-heimdal-krb5=${GSSAPIBASEDIR} ${GSSAPI_CONFIGURE_ARGS}
146	GSSAPI_HEIMDAL_PLIST_SUB= AUTH_KERB=""	142	GSSAPI_HEIMDAL_PLIST_SUB= AUTH_KERB=""

Lines 55-64 OPTIONS_DEFINE= ARP_ACL CACHE_DIGESTS DEBUG DELAY_POOLS DOCS ECAP ESI EXAMPLES \ Link Here

(-)b/www/squid/Makefile (-6 / +2 lines)
55	STACKTRACES VIA_DB WCCP WCCPV2	55	STACKTRACES VIA_DB WCCP WCCPV2
56		56
57	OPTIONS_SINGLE= GSSAPI	57	OPTIONS_SINGLE= GSSAPI
58	OPTIONS_SINGLE_GSSAPI= GSSAPI_NONE GSSAPI_BASE GSSAPI_HEIMDAL GSSAPI_MIT	58	OPTIONS_SINGLE_GSSAPI= GSSAPI_NONE GSSAPI_HEIMDAL GSSAPI_MIT
59		59
60	OPTIONS_DEFAULT=ARP_ACL AUTH_NIS CACHE_DIGESTS DELAY_POOLS FOLLOW_XFF FS_AUFS \	60	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 \	61	FS_DISKD FS_ROCK GSSAPI_NONE HTCP ICAP ICMP IDENT KQUEUE \
62	LARGEFILE LAX_HTTP PCRE SNMP SSL SSL_CRTD TP_IPFW VIA_DB WCCP \	62	LARGEFILE LAX_HTTP PCRE SNMP SSL SSL_CRTD TP_IPFW VIA_DB WCCP \
63	WCCPV2	63	WCCPV2
64		64
Lines 135-144 GSSAPI_NONE_CONFIGURE_ON= --without-heimdal-krb5 \ Link Here
135	--without-mit-krb5 \	135	--without-mit-krb5 \
136	--without-gss	136	--without-gss
137		137
138	GSSAPI_BASE_USES= gssapi
139	GSSAPI_BASE_CONFIGURE_ON= --with-heimdal-krb5=${GSSAPIBASEDIR} ${GSSAPI_CONFIGURE_ARGS}
140	GSSAPI_BASE_PLIST_SUB= AUTH_KERB=""
141
142	GSSAPI_HEIMDAL_USES= gssapi:heimdal	138	GSSAPI_HEIMDAL_USES= gssapi:heimdal
143	GSSAPI_HEIMDAL_CONFIGURE_ON= --with-heimdal-krb5=${GSSAPIBASEDIR} ${GSSAPI_CONFIGURE_ARGS}	139	GSSAPI_HEIMDAL_CONFIGURE_ON= --with-heimdal-krb5=${GSSAPIBASEDIR} ${GSSAPI_CONFIGURE_ARGS}
144	GSSAPI_HEIMDAL_PLIST_SUB= AUTH_KERB=""	140	GSSAPI_HEIMDAL_PLIST_SUB= AUTH_KERB=""