Attachment 249682 Details for Bug 247940 – My attempt

[patch] My attempt

user-gssapi.patch (text/plain), 17.55 KB, created by Michael Osipov on 2024-04-03 16:35:08 UTC

(hide)

Description:

Filename:

MIME Type:

Creator: Michael Osipov

Created: 2024-04-03 16:35:08 UTC

Size: 17.55 KB

patch

obsolete

>diff --git a/Mk/Uses/gssapi.mk b/Mk/Uses/gssapi.mk
>index c1b3d5954c3b..301ea998ea43 100644
>--- a/Mk/Uses/gssapi.mk
>+++ b/Mk/Uses/gssapi.mk
>@@ -2,7 +2,7 @@
> #
> # Feature:	gssapi
> # Usage:	USES=gssapi or USES=gssapi:ARGS
>-# Valid ARGS:	base (default, implicit), heimdal, mit.
>+# Valid ARGS:	base (default, implicit), heimdal, heimdal-devel, mit, mit-devel
> #		"bootstrap" is a special prefix only for krb5 or heimdal ports.
> #		("bootstrap,mit")
> #		flags is a special suffix to define CFLAGS, LDFLAGS, and LDADD.
>@@ -22,6 +22,8 @@
> #  GSSAPILIBDIR
> #  GSSAPILIBS
> #  GSSAPI_CONFIGURE_ARGS
>+#  GSSAPI_VENDOR
>+#  GSSAPI_PROVIDER
> #  KRB5CONFIG
> #
> # Affected variables:
>@@ -36,24 +38,32 @@
> #
> # Usage:
> #
>-#  A typical example:
>+#  A typical example, where the port supports all GSSAPI providers and
>+#  end-users can use DEFAULT_VERSIONS to decide which one they want.
> #
>-#   OPTIONS_SINGLE= GSSAPI
>-#   OPTIONS_SINGLE_GSSAPI= GSSAPI_BASE GSSAPI_HEIMDAL GSSAPI_MIT GSSAPI_NONE
>+#   OPTIONS_DEFINE=		GSSAPI
> #
>-#   GSSAPI_BASE_USES=	gssapi
>-#   GSSAPI_BASE_CONFIGURE_ON= \
>-#	--with-gssapi=${GSSAPIBASEDIR} ${GSSAPI_CONFIGURE_ARGS}
>+#   GSSAPI_USES=		gssapi
>+#   GSSAPI_CONFIGURE_ON=	--with-gssapi=${GSSAPIBASEDIR} ${GSSAPI_CONFIGURE_ARGS}
>+#   GSSAPI_CONFIGURE_OFF=	--without-gssapi
> #
>-#   GSSAPI_HEIMDAL_USES=gssapi:heimdal
>-#   GSSAPI_HEIMDAL_CONFIGURE_ON= \
>-#	--with-gssapi=${GSSAPIBASEDIR} ${GSSAPI_CONFIGURE_ARGS}
>+#  An example of restricting the list of supported gssapi providers.
>+#  The end user cannot use DEFAULT_VERSIONS, but can choose between the various
>+#  port OPTIONS to choose between the supported providers.
>+#  This example port chooses to only support Heimdal based providers from
>+#  the ports collection.
> #
>-#   GSSAPI_MIT_USES=	gssapi:mit
>-#   GSSAPI_MIT_CONFIGURE_ON= \
>-#	--with-gssapi=${GSSAPIBASEDIR} ${GSSAPI_CONFIGURE_ARGS}
>+#   OPTIONS_SINGLE=			GSSAPI
>+#   OPTIONS_SINGLE_GSSAPI=		GSSAPI_NONE GSSAPI_HEIMDAL GSSAPI_HEIMDAL_DEVEL
>+#   OPTIONS_DEFAULT=			GSSAPI_NONE
> #
>-#   GSSAPI_NONE_CONFIGURE_ON= --without-gssapi
>+#   GSSAPI_NONE_CONFIGURE_ON=		--without-gssapi
>+#
>+#   GSSAPI_HEIMDAL_USES=		gssapi:heimdal
>+#   GSSAPI_HEIMDAL_CONFIGURE_ON=	--with-gssapi=${GSSAPIBASEDIR} ${GSSAPI_CONFIGURE_ARGS}
>+#
>+#   GSSAPI_HEIMDAL_DEVEL_USES=		gssapi:heimdal-devel
>+#   GSSAPI_HEIMDAL_DEVEL_CONFIGURE_ON=	--with-gssapi=${GSSAPIBASEDIR} ${GSSAPI_CONFIGURE_ARGS}
> #
> #  If pathname is required for Kerberos implementation, use ${GSSAPIBASEDIR}.
> #
>@@ -73,19 +83,38 @@
> .if !defined(_INCLUDE_USES_GSSAPI_MK)
> _INCLUDE_USES_GSSAPI_MK=	yes
> 
>-_HEIMDAL_DEPENDS=${GSSAPILIBDIR}/libgssapi.so:security/heimdal
>-_MITKRB5_DEPENDS=${GSSAPILIBDIR}/libkrb5support.so:security/krb5
> _HEADERS=	sys/types.h sys/stat.h stdint.h
> 
>-.  if empty(gssapi_ARGS)
>-gssapi_ARGS=	base
>-.  endif
>+GSSAPI_PROVIDER=	${GSSAPI_DEFAULT}
>+
> .  for _A in ${gssapi_ARGS}
>-_local:=	${_A}
>-.    if ${_local} == "base"
>-.      if ${SSL_DEFAULT} != base
>-IGNORE=	You are using OpenSSL from ports and have selected GSSAPI from base, please select another GSSAPI value
>-.      endif
>+.    if ${_A} == "base" || \
>+	${_A} == "heimdal" || \
>+	${_A} == "heimdal-devel" || \
>+	${_A} == "mit" || \
>+	${_A} == "mit-devel"
>+GSSAPI_PROVIDER=	${_A}
>+.    elif ${_A} == "bootstrap"
>+_KRB_BOOTSTRAP=	1
>+.    elif ${_A} == "flags"
>+_KRB_USEFLAGS=	1
>+.    else
>+BROKEN=	USES=gssapi - invalid args: [${_A}] specified
>+.    endif
>+.  endfor
>+
>+.  if ${GSSAPI_PROVIDER} == "base" || ${GSSAPI_PROVIDER:Mheimdal*}
>+GSSAPI_VENDOR=heimdal
>+.  elif ${GSSAPI_PROVIDER:Mmit*}
>+GSSAPI_VENDOR=mit
>+.  else
>+BROKEN=	USES=gssapi - could not determine vendor: invalid GSSAPI provider '${GSSAPI_PROVIDER}'
>+.  endif
>+
>+.  if ${GSSAPI_PROVIDER} == "base"
>+.    if ${SSL_DEFAULT} != "base"
>+BROKEN=	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
>@@ -94,46 +123,41 @@ _HEADERS+=	gssapi/gssapi.h gssapi/gssapi_krb5.h krb5.h
> GSSAPICPPFLAGS=	-I"${GSSAPIINCDIR}"
> GSSAPILIBS=	-lkrb5 -lgssapi -lgssapi_krb5
> GSSAPILDFLAGS=
>-.    elif ${_local} == "heimdal"
>+.  elif ${GSSAPI_PROVIDER:Mheimdal*}
> HEIMDAL_HOME?=	${LOCALBASE}
> GSSAPIBASEDIR=	${HEIMDAL_HOME}
> GSSAPILIBDIR=	${GSSAPIBASEDIR}/lib/heimdal
> GSSAPIINCDIR=	${GSSAPIBASEDIR}/include/heimdal
> _HEADERS+=	gssapi/gssapi.h gssapi/gssapi_krb5.h krb5.h
>-.      if !defined(_KRB_BOOTSTRAP)
>-BUILD_DEPENDS+=	${_HEIMDAL_DEPENDS}
>-RUN_DEPENDS+=	${_HEIMDAL_DEPENDS}
>-.      else
>-PREFIX=		${HEIMDAL_HOME}
>-.      endif
>+.    if !defined(_KRB_BOOTSTRAP)
>+_GSSAPI_DEPENDS=	${GSSAPILIBDIR}/libgssapi.so:security/${GSSAPI_PROVIDER}
>+BUILD_DEPENDS+=		${_GSSAPI_DEPENDS}
>+RUN_DEPENDS+=		${_GSSAPI_DEPENDS}
>+.    else
>+PREFIX=			${HEIMDAL_HOME}
>+.    endif
> GSSAPICPPFLAGS=	-I"${GSSAPIINCDIR}"
> GSSAPILIBS=	-lkrb5 -lgssapi
> GSSAPILDFLAGS=	-L"${GSSAPILIBDIR}"
> _RPATH=		${GSSAPILIBDIR}
>-.    elif ${_local} == "mit"
>+.  elif ${GSSAPI_PROVIDER:Mmit*}
> KRB5_HOME?=	${LOCALBASE}
> GSSAPIBASEDIR=	${KRB5_HOME}
> GSSAPILIBDIR=	${GSSAPIBASEDIR}/lib
> GSSAPIINCDIR=	${GSSAPIBASEDIR}/include
> _HEADERS+=	gssapi/gssapi.h gssapi/gssapi_krb5.h krb5.h
>-.      if !defined(_KRB_BOOTSTRAP)
>-BUILD_DEPENDS+=	${_MITKRB5_DEPENDS}
>-RUN_DEPENDS+=	${_MITKRB5_DEPENDS}
>-.      else
>-PREFIX=		${KRB5_HOME}
>-.      endif
>+.    if !defined(_KRB_BOOTSTRAP)
>+_GSSAPI_DEPENDS=	${GSSAPILIBDIR}/libkrb5support.so:security/krb5${GSSAPI_PROVIDER:S/mit//}
>+BUILD_DEPENDS+=		${_GSSAPI_DEPENDS}
>+RUN_DEPENDS+=		${_GSSAPI_DEPENDS}
>+.    else
>+PREFIX=			${KRB5_HOME}
>+.    endif
> GSSAPILIBS=	-lkrb5 -lgssapi_krb5
> GSSAPICPPFLAGS=	-I"${GSSAPIINCDIR}"
> GSSAPILDFLAGS=	-L"${GSSAPILIBDIR}"
> _RPATH=		${GSSAPILIBDIR}
>-.    elif ${_local} == "bootstrap"
>-_KRB_BOOTSTRAP=	1
>-.    elif ${_local} == "flags"
>-_KRB_USEFLAGS=	1
>-.    else
>-IGNORE=	USES=gssapi - invalid args: [${_local}] specified
>-.    endif
>-.  endfor
>+.  endif
> 
> KRB5CONFIG=${GSSAPIBASEDIR}/bin/krb5-config
> 
>@@ -166,7 +190,7 @@ debug-krb:
> 	    "krb5_init_context(0);" \
> 	    "gsskrb5_register_acceptor_identity(0); return 0;}" \
> 	) > /tmp/${.TARGET}.c
>-	${CC} ${CFLAGS} -o /tmp/${.TARGET}.x ${GSSAPICPPFLAGS} \
>+	${CC} -o /tmp/${.TARGET}.x ${GSSAPICPPFLAGS} \
> 	    ${GSSAPILIBS} ${GSSAPILDFLAGS} ${_DEBUG_KRB_RPATH} \
> 	    /tmp/${.TARGET}.c && \
> 	    ldd /tmp/${.TARGET}.x; \
>@@ -178,6 +202,8 @@ debug-krb:
> 	@echo "GSSAPILIBS: ${GSSAPILIBS}"
> 	@echo "GSSAPICPPFLAGS: ${GSSAPICPPFLAGS}"
> 	@echo "GSSAPILDFLAGS: ${GSSAPILDFLAGS}"
>+	@echo "GSSAPI_VENDOR: ${GSSAPI_VENDOR}"
>+	@echo "GSSAPI_PROVIDER: ${GSSAPI_PROVIDER}"
> 	@echo "GSSAPI_CONFIGURE_ARGS: ${GSSAPI_CONFIGURE_ARGS}"
> 	@echo "KRB5CONFIG: ${KRB5CONFIG}"
> 	@echo "CFLAGS: ${CFLAGS}"
>diff --git a/Mk/bsd.default-versions.mk b/Mk/bsd.default-versions.mk
>index 3be4aff8c05e..48b838c2ef97 100644
>--- a/Mk/bsd.default-versions.mk
>+++ b/Mk/bsd.default-versions.mk
>@@ -65,6 +65,8 @@ GHOSTSCRIPT_DEFAULT?=	10
> GL_DEFAULT?=		mesa-libs
> # Possible values: 1.19, 1.20, 1.21, 1.22, 1.23-devel
> GO_DEFAULT?=		1.21
>+# Possible values: base, heimdal, heimdal-devel, mit, mit-devel
>+GSSAPI_DEFAULT?=	base
> # Possible values: 1.8, 2.2, 3.0
> GUILE_DEFAULT?=		2.2
> # Possible versions: 6, 7
>diff --git a/dns/bind918/Makefile b/dns/bind918/Makefile
>index f9cfbf12a612..2632148a086f 100644
>--- a/dns/bind918/Makefile
>+++ b/dns/bind918/Makefile
>@@ -4,7 +4,7 @@ PORTNAME=	bind
> DISTVERSION=	9.18.24
> .if defined(BIND_TOOLS_SLAVE)
> # dns/bind-tools here
>-PORTREVISION=	0
>+PORTREVISION=	2
> .else
> # dns/bind918 here
> PORTREVISION=	0
>@@ -77,15 +77,12 @@ CONFLICTS=	bind911 bind916 bind9-devel
> 
> MAKE_JOBS_UNSAFE=	yes
> 
>-OPTIONS_DEFAULT=	GSSAPI_NONE IDN JSON LMDB \
>+OPTIONS_DEFAULT=	GSSAPI IDN JSON LMDB \
> 			TCP_FASTOPEN DNSTAP
>-OPTIONS_DEFINE=		DNSTAP DOCS FIXED_RRSET GEOIP IDN JSON LARGE_FILE LMDB \
>+OPTIONS_DEFINE=		GSSAPI DNSTAP DOCS FIXED_RRSET GEOIP IDN JSON LARGE_FILE LMDB \
> 			OVERRIDECACHE QUERYTRACE \
> 			START_LATE TCP_FASTOPEN
> 
>-OPTIONS_SINGLE=		GSSAPI
>-OPTIONS_SINGLE_GSSAPI=	GSSAPI_BASE GSSAPI_HEIMDAL GSSAPI_MIT GSSAPI_NONE
>-
> .if defined(BIND_TOOLS_SLAVE)
> OPTIONS_EXCLUDE=	DNSTAP DOCS GEOIP LMDB \
> 			OVERRIDECACHE QUERYTRACE START_LATE \
>@@ -96,10 +93,7 @@ OPTIONS_SUB=	yes
> 
> DNSTAP_DESC=		Provides fast passive logging of DNS messages
> FIXED_RRSET_DESC=	Enable fixed rrset ordering
>-GSSAPI_BASE_DESC=	Using Heimdal in base (nsupdate is broken)
>-GSSAPI_HEIMDAL_DESC=	Using security/heimdal (nsupdate is broken)
>-GSSAPI_MIT_DESC=	Using security/krb5
>-GSSAPI_NONE_DESC=	Disable
>+GSSAPI_DESC=	GSSAPI support
> LARGE_FILE_DESC=	64-bit file support
> LMDB_DESC=		Use LMDB for zone management
> OVERRIDECACHE_DESC=	Use the override-cache patch
>@@ -122,19 +116,11 @@ GEOIP_CONFIGURE_ENABLE=	geoip
> GEOIP_CONFIGURE_WITH=	maxminddb
> GEOIP_LIB_DEPENDS=	libmaxminddb.so:net/libmaxminddb
> 
>-GSSAPI_BASE_CONFIGURE_ON=	--with-gssapi="${KRB5CONFIG}" \
>-				${GSSAPI_CONFIGURE_ARGS}
>-GSSAPI_BASE_USES=		gssapi
>-
>-GSSAPI_HEIMDAL_CONFIGURE_ON=	--with-gssapi="${KRB5CONFIG}" \
>-				${GSSAPI_CONFIGURE_ARGS}
>-GSSAPI_HEIMDAL_USES=		gssapi:heimdal
>-
>-GSSAPI_MIT_CONFIGURE_ON=	--with-gssapi="${KRB5CONFIG}" \
>+GSSAPI_CONFIGURE_ON=	--with-gssapi="${KRB5CONFIG}" \
> 				${GSSAPI_CONFIGURE_ARGS}
>-GSSAPI_MIT_USES=		gssapi:mit
>+GSSAPI_USES=		gssapi
> 
>-GSSAPI_NONE_CONFIGURE_ON=	--without-gssapi
>+GSSAPI_CONFIGURE_OFF=	--without-gssapi
> 
> IDN_CONFIGURE_OFF=	--without-libidn2
> IDN_CONFIGURE_ON=	${ICONV_CONFIGURE_BASE} \
>diff --git a/ftp/curl/Makefile b/ftp/curl/Makefile
>index 81fcd29670eb..9bccd5bc5ee4 100644
>--- a/ftp/curl/Makefile
>+++ b/ftp/curl/Makefile
>@@ -41,15 +41,14 @@ CPE_VENDOR=	haxx
> 
> SHEBANG_FILES=	*/*.pl
> 
>-OPTIONS_DEFINE=	ALTSVC BROTLI COOKIES CURL_DEBUG DEBUG DOCS EXAMPLES IDN IPV6 NTLM PROXY PSL STATIC TLS_SRP ZSTD
>+OPTIONS_DEFINE=	GSSAPI ALTSVC BROTLI COOKIES CURL_DEBUG DEBUG DOCS EXAMPLES IDN IPV6 NTLM PROXY PSL STATIC TLS_SRP ZSTD
> OPTIONS_GROUP=	PROTOCOL
> OPTIONS_RADIO=	SSL
>-OPTIONS_SINGLE=	GSSAPI RESOLV
>+OPTIONS_SINGLE=	RESOLV
> OPTIONS_GROUP_PROTOCOL=	DICT FTP GOPHER HTTP HTTP2 IMAP LDAP LDAPS LIBSSH LIBSSH2 MQTT POP3 RTMP RTSP SMB SMTP TELNET TFTP WEBSOCKET
> OPTIONS_RADIO_SSL=	GNUTLS OPENSSL WOLFSSL
>-OPTIONS_SINGLE_GSSAPI=	GSSAPI_BASE GSSAPI_HEIMDAL GSSAPI_MIT GSSAPI_NONE
> OPTIONS_SINGLE_RESOLV=	CARES THREADED_RESOLVER
>-OPTIONS_DEFAULT=ALTSVC COOKIES GSSAPI_${${SSL_DEFAULT} == base :?BASE :NONE} DICT FTP GOPHER HTTP HTTP2 IMAP LIBSSH2 NTLM OPENSSL POP3 PROXY PSL RTSP SMTP STATIC TELNET TFTP THREADED_RESOLVER TLS_SRP
>+OPTIONS_DEFAULT=ALTSVC COOKIES GSSAPI DICT FTP GOPHER HTTP HTTP2 IMAP LIBSSH2 NTLM OPENSSL POP3 PROXY PSL RTSP SMTP STATIC TELNET TFTP THREADED_RESOLVER TLS_SRP
> OPTIONS_SUB=	yes
> ALTSVC_DESC=	HTTP Alternative Services support
> COOKIES_DESC=	Cookies support
>@@ -92,22 +91,12 @@ GNUTLS_CONFIGURE_WITH=	gnutls
> 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}
>-GSSAPI_HEIMDAL_LIBS=	${GSSAPILIBS}
>-GSSAPI_HEIMDAL_USES=	gssapi:heimdal
>-GSSAPI_MIT_CONFIGURE_ON=--with-gssapi=${GSSAPIBASEDIR} ${GSSAPI_CONFIGURE_ARGS}
>-GSSAPI_MIT_CPPFLAGS=	${GSSAPICPPFLAGS}
>-GSSAPI_MIT_LDFLAGS=	${GSSAPILDFLAGS}
>-GSSAPI_MIT_LIBS=	${GSSAPILIBS}
>-GSSAPI_MIT_USES=	gssapi:mit
>-GSSAPI_NONE_CONFIGURE_ON=	--without-gssapi
>+GSSAPI_CONFIGURE_ON=	--with-gssapi=${GSSAPIBASEDIR} ${GSSAPI_CONFIGURE_ARGS}
>+GSSAPI_CPPFLAGS=	${GSSAPICPPFLAGS}
>+GSSAPI_LDFLAGS=	${GSSAPILDFLAGS}
>+GSSAPI_LIBS=	${GSSAPILIBS}
>+GSSAPI_USES=	gssapi
>+GSSAPI_CONFIGURE_OFF=	--without-gssapi
> HTTP_CONFIGURE_ENABLE=	http
> HTTP2_CONFIGURE_WITH=	nghttp2
> HTTP2_LIB_DEPENDS=	libnghttp2.so:www/libnghttp2
>diff --git a/mail/dovecot/Makefile b/mail/dovecot/Makefile
>index 7019558281e5..64b4b5de35d2 100644
>--- a/mail/dovecot/Makefile
>+++ b/mail/dovecot/Makefile
>@@ -10,7 +10,7 @@
> 
> PORTNAME=	dovecot
> PORTVERSION=	2.3.21
>-PORTREVISION=	4
>+PORTREVISION=	5
> CATEGORIES=	mail
> MASTER_SITES=	https://dovecot.org/releases/2.3/
> 
>@@ -41,31 +41,25 @@ INSTALL_TARGET=	install-strip
> USERS=		dovecot dovenull
> GROUPS=		${USERS}
> 
>-OPTIONS_DEFINE=	LIBSODIUM LIBUNWIND LIBWRAP LUA LZ4 DOCS EXAMPLES
>-OPTIONS_DEFAULT=GSSAPI_NONE LDAP LIBWRAP
>+OPTIONS_DEFINE=		GSSAPI LIBSODIUM LIBUNWIND LIBWRAP LUA LZ4 DOCS EXAMPLES
>+OPTIONS_DEFAULT=	LDAP LIBWRAP
>+
> OPTIONS_SUB=	yes
> 
> OPTIONS_GROUP=		DB FTS
> OPTIONS_GROUP_DB=	CDB LDAP MYSQL PGSQL SQLITE
> OPTIONS_GROUP_FTS=	ICU LUCENE SOLR TEXTCAT
> 
>-OPTIONS_SINGLE=		GSSAPI
>-OPTIONS_SINGLE_GSSAPI=	GSSAPI_NONE GSSAPI_BASE GSSAPI_HEIMDAL GSSAPI_MIT
>-
> DB_DESC=	Database support
> CDB_DESC=	CDB database support
> 
> FTS_DESC=	Full text search plugins
>+GSSAPI_DESC=	GSSAPI support
> ICU_DESC=	Use libicu for FTS unicode normalization
> LUCENE_DESC=	CLucene FTS support
> SOLR_DESC=	Solr FTS support
> TEXTCAT_DESC=	Libexttextcat 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
>-
> # General options
> LIBSODIUM_DESC=		Support libsodium based crypts (ARGON2I/ARGON2ID)
> LIBSODIUM_LIB_DEPENDS=	libsodium.so:security/libsodium
>@@ -114,12 +108,9 @@ SOLR_LIB_DEPENDS=	libcurl.so:ftp/curl \
> TEXTCAT_CONFIGURE_WITH=	textcat
> TEXTCAT_LIB_DEPENDS=	libexttextcat-2.0.so:textproc/libexttextcat
> 
>-# 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
>+GSSAPI_USES=		gssapi
>+GSSAPI_CONFIGURE_ON=	--with-gssapi ${GSSAPI_CONFIGURE_ARGS}
>+GSSAPI_CONFIGURE_OFF=	--without-gssapi
> 
> DOCS=		AUTHORS COPYING INSTALL NEWS TODO README
> PORTDOCS=	*
>diff --git a/security/cyrus-sasl2-gssapi/Makefile b/security/cyrus-sasl2-gssapi/Makefile
>index 48d2833741ce..bdd725688511 100644
>--- a/security/cyrus-sasl2-gssapi/Makefile
>+++ b/security/cyrus-sasl2-gssapi/Makefile
>@@ -3,19 +3,9 @@ PKGNAMESUFFIX=	-gssapi
> COMMENT=	SASL GSSAPI authentication plugin
> WWW=		https://www.cyrusimap.org/sasl/
> 
>-OPTIONS_SINGLE=			GSSAPI
>-OPTIONS_SINGLE_GSSAPI=		GSSAPI_BASE GSSAPI_HEIMDAL GSSAPI_MIT
>-OPTIONS_DEFAULT=		GSSAPI_BASE
>-GSSAPI_BASE_USES=		gssapi:base
>-GSSAPI_BASE_CONFIGURE_ON=	--enable-gssapi="${GSSAPIBASEDIR}" \
>-				--with-gss_impl=heimdal
>-GSSAPI_HEIMDAL_USES=		gssapi:heimdal,flags
>-GSSAPI_HEIMDAL_CONFIGURE_ON=	--enable-gssapi="${GSSAPIBASEDIR}" \
>-				--with-gss_impl=heimdal
>-GSSAPI_HEIMDAL_PLIST_FILES=	${LIBGS2_PLIST_FILES}
>-GSSAPI_MIT_USES=		gssapi:mit
>-GSSAPI_MIT_CONFIGURE_ON=	--enable-gssapi="${GSSAPIBASEDIR}" \
>-				--with-gss_impl=mit
>+USES+=	gssapi
>+CONFIGURE_ARGS+=	--enable-gssapi="${GSSAPIBASEDIR}" \
>+				--with-gss_impl=${GSSAPI_VENDOR}
> GSSAPI_MIT_PLIST_FILES=		${LIBGS2_PLIST_FILES}
> 
> LIBGS2_PLIST_FILES=		lib/sasl2/libgs2.a \
>diff --git a/security/cyrus-sasl2/Makefile.common b/security/cyrus-sasl2/Makefile.common
>index 620143f4753b..8ec091805136 100644
>--- a/security/cyrus-sasl2/Makefile.common
>+++ b/security/cyrus-sasl2/Makefile.common
>@@ -27,7 +27,6 @@ CONFIGURE_ARGS+=--sysconfdir=${PREFIX}/etc \
> CONFIGURE_ARGS+=--disable-anon \
> 		--disable-cram \
> 		--disable-digest \
>-		--disable-gssapi \
> 		--disable-krb4 \
> 		--disable-login \
> 		--disable-ntlm \
>diff --git a/sysutils/msktutil/Makefile b/sysutils/msktutil/Makefile
>index 0f2c7970bcff..13f660ae5c3a 100644
>--- a/sysutils/msktutil/Makefile
>+++ b/sysutils/msktutil/Makefile
>@@ -13,24 +13,13 @@ LICENSE_FILE=	${WRKSRC}/LICENSE
> 
> RUN_DEPENDS=	cyrus-sasl-gssapi>0:security/cyrus-sasl2-gssapi
> 
>-USES=		autoreconf ldap ssl
>+USES=		autoreconf ldap ssl gssapi
> USE_GITHUB=	yes
> GNU_CONFIGURE=	yes
> GNU_CONFIGURE_MANPREFIX=	${PREFIX}/share
> CONFIGURE_ARGS+=--with-sasldir=${LOCALBASE} --with-ldapdir=${LOCALBASE}
> 
>-OPTIONS_SINGLE=	GSSAPI
>-OPTIONS_SINGLE_GSSAPI=	GSSAPI_BASE GSSAPI_HEIMDAL GSSAPI_MIT
>-
>-OPTIONS_DEFAULT=GSSAPI_BASE
>-
>-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=${GSSAPI_VENDOR}
> CONFIGURE_ARGS+=		--with-krb5-config=${KRB5CONFIG}
> 
> PLIST_FILES=	sbin/msktutil share/man/man1/msktutil.1.gz
>diff --git a/www/serf/Makefile b/www/serf/Makefile
>index d7fba597ccf1..0a4f7ce35b7e 100644
>--- a/www/serf/Makefile
>+++ b/www/serf/Makefile
>@@ -1,5 +1,6 @@
> PORTNAME=	serf
> PORTVERSION=	1.3.10
>+PORTREVISION= 1
> CATEGORIES=	www
> MASTER_SITES=	APACHE/serf
> 
>@@ -19,31 +20,18 @@ USE_LDCONFIG=	yes
> INSTALL_TARGET=	install --install-sandbox=${STAGEDIR}
> TEST_TARGET=	check  # some tests fail
> 
>-OPTIONS_DEFINE=		DOCS
>-OPTIONS_RADIO=		KERBEROS
>-OPTIONS_RADIO_KERBEROS=	GSSAPI_BASE GSSAPI_HEIMDAL GSSAPI_MIT
>+OPTIONS_DEFINE=		DOCS GSSAPI
>+OPTIONS_DEFAULT=	GSSAPI
> 
>-GSSAPI_BASE_DESC=		Heimdal Kerberos (base)
>-GSSAPI_HEIMDAL_DESC=		Heimdal Kerberos (security/heimdal)
>-GSSAPI_MIT_DESC=		MIT Kerberos (security/krb5)
>-
>-GSSAPI_HEIMDAL_LIB_DEPENDS=	libkrb5.so.26:security/heimdal
>-GSSAPI_MIT_LIB_DEPENDS=		libkrb5.so.3:security/krb5
>+GSSAPI_DESC=	GSSAPI support	
>+GSSAPI_USES=	gssapi
> SCONS_ARGS=	APR=${LOCALBASE}/bin/apr-1-config
> SCONS_ARGS+=	APU=${LOCALBASE}/bin/apu-1-config
> SCONS_ARGS+=	OPENSSL=${OPENSSLBASE}
> SCONS_ARGS+=	PREFIX=${PREFIX}
> SCONS_ARGS+=	CC=${CC}
> SCONS_ARGS+=	CFLAGS="${CFLAGS}"
>-
>-.include <bsd.port.options.mk>
>-
>-.if ${PORT_OPTIONS:MGSSAPI_BASE}
>-SCONS_ARGS+=	GSSAPI="/usr"
>-.endif
>-.if ${PORT_OPTIONS:MGSSAPI_MIT} || ${PORT_OPTIONS:MGSSAPI_HEIMDAL}
>-SCONS_ARGS+=	GSSAPI="${LOCALBASE}"
>-.endif
>+SCONS_ARGS+=	GSSAPI="${GSSAPIBASEDIR}"
> 
> post-patch:
> 	@${REINPLACE_CMD} -E \

Actions: View | Diff

Attachments on bug 247940: 247505 | 247558 | 249611 | 249668 | 249682 | 250138