Attachment 247505 Details for Bug 247940 – [PATCH] USES=gssapi: allow provider choice using DEFAULT_VERSIONS

[patch] [PATCH] USES=gssapi: allow provider choice using DEFAULT_VERSIONS

0001-USES-gssapi-allow-provider-choice-using-DEFAULT_VERS.patch (text/plain), 9.32 KB, created by Siva Mahadevan on 2024-01-07 02:24:02 UTC

(hide)

Description:

Filename:

MIME Type:

Creator: Siva Mahadevan

Created: 2024-01-07 02:24:02 UTC

Size: 9.32 KB

patch

obsolete

>From 251afc17f158365fdcc823aee4f80a92f4ad38d4 Mon Sep 17 00:00:00 2001
>From: Siva Mahadevan <me@svmhdvn.name>
>Date: Sat, 6 Jan 2024 21:17:12 -0500
>Subject: [PATCH] USES=gssapi: allow provider choice using DEFAULT_VERSIONS
>
>---
> Mk/Uses/gssapi.mk          | 91 +++++++++++++++++++++-----------------
> Mk/bsd.default-versions.mk | 34 ++++++++++++++
> mail/dovecot/Makefile      | 22 +++------
> 3 files changed, 90 insertions(+), 57 deletions(-)
>
>diff --git a/Mk/Uses/gssapi.mk b/Mk/Uses/gssapi.mk
>index c1b3d5954c3b..d6b8bc454c6a 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,7 @@
> #  GSSAPILIBDIR
> #  GSSAPILIBS
> #  GSSAPI_CONFIGURE_ARGS
>+#  GSSAPI_VER
> #  KRB5CONFIG
> #
> # Affected variables:
>@@ -36,24 +37,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 +82,18 @@
> .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
>+.  if !empty(gssapi_ARGS)
>+GSSAPI_VER=	${gssapi_ARGS}
>+.  else
>+GSSAPI_VER=	${GSSAPI_DEFAULT}
> .  endif
>-.  for _A in ${gssapi_ARGS}
>-_local:=	${_A}
>-.    if ${_local} == "base"
>-.      if ${SSL_DEFAULT} != base
>+
>+.  if ${GSSAPI_VER} == "base"
>+.    if ${SSL_DEFAULT} != base
> IGNORE=	You are using OpenSSL from ports and have selected GSSAPI from base, please select another GSSAPI value
>-.      endif
>+.    endif
> HEIMDAL_HOME=	/usr
> GSSAPIBASEDIR=	${HEIMDAL_HOME}
> GSSAPILIBDIR=	${GSSAPIBASEDIR}/lib
>@@ -94,46 +102,47 @@ _HEADERS+=	gssapi/gssapi.h gssapi/gssapi_krb5.h krb5.h
> GSSAPICPPFLAGS=	-I"${GSSAPIINCDIR}"
> GSSAPILIBS=	-lkrb5 -lgssapi -lgssapi_krb5
> GSSAPILDFLAGS=
>-.    elif ${_local} == "heimdal"
>+.  elif ${GSSAPI_VER} == "heimdal" || ${GSSAPI_VER} == "heimdal-devel"
> 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
>+.    if !defined(_KRB_BOOTSTRAP)
>+_GSSAPI_DEPENDS=	${GSSAPILIBDIR}/libgssapi.so:security/${GSSAPI_VER}
>+BUILD_DEPENDS+=		${_GSSAPI_DEPENDS}
>+RUN_DEPENDS+=		${_GSSAPI_DEPENDS}
>+.    else
> PREFIX=		${HEIMDAL_HOME}
>-.      endif
>+.    endif
> GSSAPICPPFLAGS=	-I"${GSSAPIINCDIR}"
> GSSAPILIBS=	-lkrb5 -lgssapi
> GSSAPILDFLAGS=	-L"${GSSAPILIBDIR}"
> _RPATH=		${GSSAPILIBDIR}
>-.    elif ${_local} == "mit"
>+.  elif ${GSSAPI_VER} == "mit" || ${GSSAPI_VER} == "mit-devel"
> 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
>+.    if !defined(_KRB_BOOTSTRAP)
>+_GSSAPI_DEPENDS=	${GSSAPILIBDIR}/libkrb5support.so:security/krb5${GSSAPI_VER:S/mit//}
>+BUILD_DEPENDS+=		${_GSSAPI_DEPENDS}
>+RUN_DEPENDS+=		${_GSSAPI_DEPENDS}
>+.    else
> PREFIX=		${KRB5_HOME}
>-.      endif
>+.    endif
> GSSAPILIBS=	-lkrb5 -lgssapi_krb5
> GSSAPICPPFLAGS=	-I"${GSSAPIINCDIR}"
> GSSAPILDFLAGS=	-L"${GSSAPILIBDIR}"
> _RPATH=		${GSSAPILIBDIR}
>-.    elif ${_local} == "bootstrap"
>+.  elif ${GSSAPI_VER} == "bootstrap"
> _KRB_BOOTSTRAP=	1
>-.    elif ${_local} == "flags"
>+.  elif ${GSSAPI_VER} == "flags"
> _KRB_USEFLAGS=	1
>-.    else
>-IGNORE=	USES=gssapi - invalid args: [${_local}] specified
>-.    endif
>-.  endfor
>+.  else
>+IGNORE=	USES=gssapi - invalid args: [${GSSAPI_VER}] specified
>+.  endif
> 
> KRB5CONFIG=${GSSAPIBASEDIR}/bin/krb5-config
> 
>diff --git a/Mk/bsd.default-versions.mk b/Mk/bsd.default-versions.mk
>index 4747af6c8296..b2572a5c57df 100644
>--- a/Mk/bsd.default-versions.mk
>+++ b/Mk/bsd.default-versions.mk
>@@ -65,6 +65,40 @@ GHOSTSCRIPT_DEFAULT?=	10
> GL_DEFAULT?=		mesa-libs
> # Possible values: 1.19, 1.20, 1.21, 1.22-devel
> GO_DEFAULT?=		1.20
>+
>+# Possible values: base, heimdal, heimdal-devel, mit, mit-devel
>+.  if !defined(GSSAPI_DEFAULT)
>+_GSSAPI_PORT_LIB=${LOCALBASE}/lib/libkrb5.so
>+_GSSAPI_BASE_HEADER=${DESTDIR}/usr/include/krb5.h
>+# If no preference was set, check for an installed base version
>+# but give an installed port preference over it.
>+.    if !exists(${DESTDIR}/${_GSSAPI_PORT_LIB}) && exists(${_GSSAPI_BASE_HEADER})
>+GSSAPI_DEFAULT=	base
>+.    elif exists(${DESTDIR}/${_GSSAPI_PORT_LIB})
>+.      if defined(PKG_BIN)
>+# find installed port and use it for dependency
>+.        if defined(DESTDIR)
>+PKGARGS=	-c ${DESTDIR}
>+.        else
>+PKGARGS=
>+.        endif
>+GSSAPI_INSTALLED!=	${PKG_BIN} ${PKGARGS} which -qo ${_GSSAPI_PORT_LIB} || :
>+.      endif
>+.      if defined(GSSAPI_INSTALLED) && !empty(GSSAPI_INSTALLED)
>+GSSAPI_DEFAULT:=	${GSSAPI_INSTALLED:T}
>+WARNING+=	"You have the ${GSSAPI_INSTALLED} port installed but do not have DEFAULT_VERSIONS+=gssapi=${GSSAPI_DEFAULT} set in your make.conf"
>+.      endif
>+.    else
>+check-makevars::
>+	@${ECHO_MSG} "You have a ${_GSSAPI_PORT_LIB} file installed, but the framework is unable"
>+	@${ECHO_MSG} "to determine what port it comes from."
>+	@${ECHO_MSG} "Add DEFAULT_VERSIONS+=gssapi=<gssapi package name> to your /etc/make.conf and try again."
>+	@${FALSE}
>+.    endif
>+# Make sure we have a default in the end
>+GSSAPI_DEFAULT?=	base
>+.  endif
>+
> # Possible values: 1.8, 2.2, 3.0
> GUILE_DEFAULT?=		2.2
> # Possible versions: 6, 7
>diff --git a/mail/dovecot/Makefile b/mail/dovecot/Makefile
>index 3ed68ec5c7bf..d1b5ca896dc5 100644
>--- a/mail/dovecot/Makefile
>+++ b/mail/dovecot/Makefile
>@@ -40,31 +40,24 @@ INSTALL_TARGET=	install-strip
> USERS=		dovecot dovenull
> GROUPS=		${USERS}
> 
>-OPTIONS_DEFINE=	LIBSODIUM LIBUNWIND LIBWRAP LUA LZ4 DOCS EXAMPLES
>-OPTIONS_DEFAULT=GSSAPI_NONE LIBWRAP
>+OPTIONS_DEFINE=	GSSAPI LIBSODIUM LIBUNWIND LIBWRAP LUA LZ4 DOCS EXAMPLES
>+OPTIONS_DEFAULT=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
>@@ -113,12 +106,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=	*
>-- 
>2.42.0
>

Actions: View | Diff

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