net/openldap24-server: Make SASL permanent for OpenLDAP port.

PR: ports/257374 Reviewed by: obrien Approved by: portmgr (exp-run by antoine) Differential Revision: https://reviews.freebsd.org/D31301
freebsd · Aug 1, 2021 · 974e13b · 974e13b
1 parent f120f8c
commit 974e13b
Show file tree

Hide file tree

Showing 34 changed files with 65 additions and 190 deletions.
diff --git a/CHANGES b/CHANGES
@@ -10,6 +10,11 @@ in the release notes and/or placed into UPDATING.
 
 All ports committers are allowed to commit to this file.
 
+20210801:
+AUTHOR: delphij@FreeBSD.org
+  WANT_OPENLDAP_SASL is removed now that OpenLDAP is always built with
+  SASL support.
+
 20210730:
 AUTHOR: tcberner@FreeBSD.org
 

diff --git a/MOVED b/MOVED
@@ -16474,3 +16474,4 @@ databases/rubygem-redis-namespace17|databases/rubygem-redis-namespace|2021-07-25
 multimedia/mlt|multimedia/mlt6|2021-07-30|Moved to a versioned directory to make place for future versions
 multimedia/mlt-qt5|multimedia/mlt6-qt5|2021-07-30|Moved to a versioned directory to make place for future versions
 multimedia/py-mlt|multimedia/py-mlt6|2021-07-30|Moved to a versioned directory to make place for future versions
+net/openldap24-sasl-client|net/openldap24-client|2021-08-01|SASL is always enabled for OpenLDAP
diff --git a/Mk/bsd.ldap.mk b/Mk/bsd.ldap.mk
@@ -20,9 +20,6 @@ Database_Include_MAINTAINER=		ports@FreeBSD.org
 #				  Default: 24.
 # WANT_OPENLDAP_VER
 #				- Maintainer can set an arbitrary version of OpenLDAP by using it.
-# WANT_OPENLDAP_SASL
-#				- User-defined variable to depend upon SASL-enabled OpenLDAP
-#				  client. Must NOT be set in a port Makefile.
 # IGNORE_OPENLDAP_OPENLDAP
 #				- This variable can be defined if the ports doesn't support
 #				  one or more version of OpenLDAP.
@@ -64,14 +61,6 @@ IGNORE=	cannot install: OpenLDAP versions mismatch: openldap${_OPENLDAP_VER}-cli
 CFLAGS+=	-DLDAP_DEPRECATED
 
 _OPENLDAP_CLIENT_PKG!=	${PKG_INFO} -Ex openldap.\*-client 2>/dev/null; ${ECHO_CMD}
-_OPENLDAP_FLAVOUR=	${_OPENLDAP_CLIENT_PKG:C/openldap//:C/-client-.*//}
-
-.if defined(WANT_OPENLDAP_SASL)
-.if !empty(_OPENLDAP_CLIENT_PKG) && empty(_OPENLDAP_FLAVOUR)
-IGNORE= cannot install: SASL support requested and ${_OPENLDAP_CLIENT_PKG} is installed
-.endif
-_OPENLDAP_FLAVOUR=	-sasl
-.endif
 
 # And now we are checking if we can use it
 .if defined(OPENLDAP${OPENLDAP_VER}_LIB)
@@ -86,7 +75,7 @@ IGNORE=		cannot install: doesn't work with OpenLDAP version: ${OPENLDAP_VER} (Do
 .		endif
 .	endfor
 .endif # IGNORE_WITH_OPENLDAP
-LIB_DEPENDS+=	${OPENLDAP${OPENLDAP_VER}_LIB}:net/openldap${OPENLDAP_VER}${_OPENLDAP_FLAVOUR}-client
+LIB_DEPENDS+=	${OPENLDAP${OPENLDAP_VER}_LIB}:net/openldap${OPENLDAP_VER}-client
 .else
 IGNORE=		cannot install: unknown OpenLDAP version: ${OPENLDAP_VER}
 .endif # Check for correct libs

diff --git a/Mk/bsd.port.mk b/Mk/bsd.port.mk
@@ -364,11 +364,8 @@ FreeBSD_MAINTAINER=	portmgr@FreeBSD.org
 # USE_OPENLDAP	- If set, this port uses the OpenLDAP libraries.
 #				  Implies: WANT_OPENLDAP_VER?=24
 # WANT_OPENLDAP_VER
-#				- Legal values are: 23, 24
+#				- Legal values are: 24
 #				  If set to an unknown value, the port is marked BROKEN.
-# WANT_OPENLDAP_SASL
-#				- If set, the system should use OpenLDAP libraries
-#				  with SASL support.
 ##
 # USE_JAVA		- If set, this port relies on the Java language.
 #				  Implies inclusion of bsd.java.mk.  (Also see

diff --git a/UPDATING b/UPDATING
@@ -5,6 +5,19 @@ they are unavoidable.
 You should get into the habit of checking this file for changes each time
 you update your ports collection, before attempting any port upgrades.
 
+20210801:
+  AFFECTS: users of OpenLDAP
+  AUTHOR: delphij@FreeBSD.org
+
+  SASL is now always enabled for OpenLDAP.
+
+  If you use portmaster:
+        portmaster -o net/openldap24-client openldap24-sasl-client
+  If you use portupgrade:
+	portupgrade -fo net/openldap24-client openldap24-sasl-client
+  If you use pkg with binary packages:
+        pkg set -o net/openldap24-sasl-client:net/openldap24-client
+
 20210730:
   AFFECTS: users of multimedia/mlt, multimedia/mlt-qt and multimedia/py-mlt
   AUTHOR:  kde@FreeBSD.org

diff --git a/databases/mysql57-client/Makefile b/databases/mysql57-client/Makefile
@@ -1,7 +1,7 @@
 # Created by: "Mahdi Mokhtari <mokhi64@gmail.com>"
 
 PORTNAME=	mysql
-PORTREVISION=	0
+PORTREVISION=	1
 PKGNAMESUFFIX=	57-client
 
 COMMENT=	Multithreaded SQL database (client)
@@ -36,7 +36,7 @@ OPTIONS_GROUP_PLUGINS=	SASLCLIENT
 SASLCLIENT_DESC=	SASL client plugin module
 SASLCLIENT_CMAKE_BOOL=	WITH_AUTHENTICATION_LDAP
 SASLCLIENT_LIB_DEPENDS=		libsasl2.so:security/cyrus-sasl2
-SASLCLIENT_BUILD_DEPENDS=	${LOCALBASE}/include/lber.h:net/openldap24-sasl-client
+SASLCLIENT_USE=		OPENLDAP=yes
 OPTIONS_DEFAULT+=	SASLCLIENT
 
 # issue 166367: adding symlinks for back-compatibility with ${lib}_r

diff --git a/databases/mysql57-server/Makefile b/databases/mysql57-server/Makefile
@@ -164,17 +164,6 @@ CMAKE_ARGS+=		-DWITH_SSL=${OPENSSLBASE}
 CXXFLAGS+=	-fpermissive
 .endif
 
-# mysql57-server fails to compile with llvm11, which was imported to current in r364284
-# without a version increase (1300109 = r364274).
-# Until a proper fix is provided, simply use llvm from ports, which probably could be
-# a backport of amongst other tings:
-# https://github.com/mysql/mysql-server/commit/08f46b3c00ee70e7ed7825daeb91df2289f80f50
-.if ${CHOSEN_COMPILER_TYPE} == clang && ${OPSYS} == FreeBSD && ${OSVERSION} >= 1300109
-BUILD_DEPENDS+=	clang${LLVM_DEFAULT}:devel/llvm${LLVM_DEFAULT}
-CC=		${LOCALBASE}/bin/clang${LLVM_DEFAULT}
-CXX=		${LOCALBASE}/bin/clang++${LLVM_DEFAULT}
-.endif
-
 .if ${ARCH} == powerpc
 LLD_UNSAFE=	yes
 .endif

diff --git a/databases/percona57-client/Makefile b/databases/percona57-client/Makefile
@@ -1,7 +1,7 @@
 # Created by: Mark Felder <feld@FreeBSD.org>
 
 PORTNAME=	percona
-PORTREVISION?=	0
+PORTREVISION?=	1
 PKGNAMESUFFIX=	57-client
 
 COMMENT=	Multithreaded SQL database (client)
@@ -36,7 +36,7 @@ OPTIONS_GROUP_PLUGINS=	SASLCLIENT
 SASLCLIENT_DESC=	SASL client plugin module
 SASLCLIENT_CMAKE_BOOL=	WITH_AUTHENTICATION_LDAP
 SASLCLIENT_LIB_DEPENDS=	libsasl2.so:security/cyrus-sasl2
-SASLCLIENT_BUILD_DEPENDS=	${LOCALBASE}/include/lber.h:net/openldap24-sasl-client
+SASLCLIENT_USE=		OPENLDAP=yes
 OPTIONS_DEFAULT+=	SASLCLIENT
 OPTIONS_SUB=	yes
 

diff --git a/lang/php73/Makefile b/lang/php73/Makefile
@@ -1,6 +1,6 @@
 PORTNAME=	php73
 DISTVERSION=	7.3.29
-PORTREVISION?=	0
+PORTREVISION?=	1
 CATEGORIES?=	lang devel www
 MASTER_SITES=	PHP/distributions
 DISTNAME=	php-${DISTVERSION}

diff --git a/lang/php73/Makefile.ext b/lang/php73/Makefile.ext
@@ -174,13 +174,9 @@ CONFIGURE_ARGS+=--enable-json
 .endif
 
 .if ${PHP_MODNAME} == "ldap"
-CONFIGURE_ARGS+=--with-ldap=${LOCALBASE}
+CONFIGURE_ARGS+=--with-ldap=${LOCALBASE} --with-ldap-sasl=${LOCALBASE}
 
 USE_OPENLDAP=	yes
-
-. ifdef(WANT_OPENLDAP_SASL)
-CONFIGURE_ARGS+=--with-ldap-sasl=${LOCALBASE}
-. endif
 .endif
 
 .if ${PHP_MODNAME} == "mbstring"

diff --git a/lang/php74/Makefile b/lang/php74/Makefile
@@ -1,6 +1,6 @@
 PORTNAME=	php74
 DISTVERSION=	7.4.22
-PORTREVISION?=	0
+PORTREVISION?=	1
 CATEGORIES?=	lang devel www
 MASTER_SITES=   PHP/distributions
 DISTNAME=	php-${DISTVERSION}

diff --git a/lang/php74/Makefile.ext b/lang/php74/Makefile.ext
@@ -172,13 +172,9 @@ BUILD_DEPENDS=  re2c:devel/re2c
 .endif
 
 .if ${PHP_MODNAME} == "ldap"
-CONFIGURE_ARGS+=--with-ldap=${LOCALBASE}
+CONFIGURE_ARGS+=--with-ldap=${LOCALBASE} --with-ldap-sasl=${LOCALBASE}
 
 USE_OPENLDAP=	yes
-
-. ifdef(WANT_OPENLDAP_SASL)
-CONFIGURE_ARGS+=--with-ldap-sasl=${LOCALBASE}
-. endif
 .endif
 
 .if ${PHP_MODNAME} == "mbstring"

diff --git a/lang/php80/Makefile b/lang/php80/Makefile
@@ -1,6 +1,6 @@
 PORTNAME=	php80
 DISTVERSION=	8.0.9
-PORTREVISION?=	0
+PORTREVISION?=	1
 CATEGORIES?=	lang devel www
 MASTER_SITES=	PHP/distributions
 DISTNAME=	php-${DISTVERSION}

diff --git a/lang/php80/Makefile.ext b/lang/php80/Makefile.ext
@@ -172,13 +172,9 @@ BUILD_DEPENDS=  re2c:devel/re2c
 .endif
 
 .if ${PHP_MODNAME} == "ldap"
-CONFIGURE_ARGS+=--with-ldap=${LOCALBASE}
+CONFIGURE_ARGS+=--with-ldap=${LOCALBASE} --with-ldap-sasl=${LOCALBASE}
 
 USE_OPENLDAP=	yes
-
-. ifdef(WANT_OPENLDAP_SASL)
-CONFIGURE_ARGS+=--with-ldap-sasl=${LOCALBASE}
-. endif
 .endif
 
 .if ${PHP_MODNAME} == "mbstring"

diff --git a/mail/opendkim/Makefile b/mail/opendkim/Makefile
@@ -2,7 +2,7 @@
 
 PORTNAME=	opendkim
 PORTVERSION=	2.10.3
-PORTREVISION=	11
+PORTREVISION=	12
 CATEGORIES=	mail security
 MASTER_SITES=	SF/${PORTNAME} \
 		SF/${PORTNAME}/Previous%20Releases \
@@ -107,10 +107,6 @@ MAKE_ENV=	INSTALL_STRIP_FLAG=${STRIP}
 WITH_DEBUG=	yes
 .endif
 
-.if ${PORT_OPTIONS:MSASL} && ${PORT_OPTIONS:MOPENLDAP}
-WANT_OPENLDAP_SASL=	yes
-.endif
-
 .if ${PORT_OPTIONS:MFILTER}
 SUB_FILES=		pkg-message
 WITHOUT_MILTER_CFLAGS=	yes

diff --git a/mail/postfix-current/Makefile b/mail/postfix-current/Makefile
@@ -2,7 +2,7 @@
 
 PORTNAME=	postfix
 DISTVERSION=	3.7-20210717
-PORTREVISION?=	0
+PORTREVISION?=	1
 PORTEPOCH=	6
 CATEGORIES=	mail
 MASTER_SITES=	http://ftp.porcupine.org/mirrors/postfix-release/ \
@@ -38,7 +38,7 @@ USE_SUBMAKE=	yes
 SCRIPTS_ENV+=	POSTFIX_DEFAULT_MTA="${POSTFIX_DEFAULT_MTA}"
 
 OPTIONS_SUB=	yes
-OPTIONS_DEFINE=	BDB BLACKLISTD CDB DOCS EAI INST_BASE LDAP LDAP_SASL \
+OPTIONS_DEFINE=	BDB BLACKLISTD CDB DOCS EAI INST_BASE LDAP \
 		LMDB MYSQL NIS PCRE PGSQL SASL SQLITE TEST TLS
 
 OPTIONS_RADIO=		RG1
@@ -63,7 +63,6 @@ CDB_DESC=	CDB maps lookups
 EAI_DESC=	Email Address Internationalization (SMTPUTF8) support
 INST_BASE_DESC=	Install into /usr and /etc/postfix
 LDAP_DESC=	LDAP maps (uses WITH_OPENLDAP_VER)
-LDAP_SASL_DESC=	LDAP client-to-server SASL auth
 LMDB_DESC=	LMDB maps
 TEST_DESC=	SMTP/LMTP test server and generator
 
@@ -234,15 +233,9 @@ DYN_EXT+=		ldap
 WANT_OPENLDAP_VER=	${WITH_OPENLDAP_VER}
 . endif
 POSTFIX_CCARGS+=	-DHAS_LDAP -I${LOCALBASE}/include
+POSTFIX_CCARGS+=	-I${LOCALBASE}/include/sasl -DUSE_LDAP_SASL
 POSTFIX_DYN_AUXLIBS+=	"AUXLIBS_LDAP=-L${LOCALBASE}/lib -lldap -L${LOCALBASE}/lib -llber"
 _REQUIRE+=		slapd
-. if ${PORT_OPTIONS:MLDAP_SASL}
-.  if ! ${PORT_OPTIONS:MSASL}
-LIB_DEPENDS+=		libsasl2.so:security/cyrus-sasl2
-.  endif
-WANT_OPENLDAP_SASL=	yes
-POSTFIX_CCARGS+=	-I${LOCALBASE}/include/sasl -DUSE_LDAP_SASL
-. endif
 .endif
 
 .if ${PORT_OPTIONS:MCDB}

diff --git a/mail/postfix/Makefile b/mail/postfix/Makefile
@@ -2,7 +2,7 @@
 
 PORTNAME=	postfix
 DISTVERSION=	3.6.2
-PORTREVISION?=	0
+PORTREVISION?=	1
 PORTEPOCH=	1
 CATEGORIES=	mail
 MASTER_SITES=	http://ftp.porcupine.org/mirrors/postfix-release/ \
@@ -38,7 +38,7 @@ USE_SUBMAKE=	yes
 SCRIPTS_ENV+=	POSTFIX_DEFAULT_MTA="${POSTFIX_DEFAULT_MTA}"
 
 OPTIONS_SUB=	yes
-OPTIONS_DEFINE=	BDB BLACKLISTD CDB DOCS EAI INST_BASE LDAP LDAP_SASL \
+OPTIONS_DEFINE=	BDB BLACKLISTD CDB DOCS EAI INST_BASE LDAP \
 		LMDB MYSQL NIS PCRE PGSQL SASL SQLITE TEST TLS
 
 OPTIONS_RADIO=		RG1
@@ -63,7 +63,6 @@ CDB_DESC=	CDB maps lookups
 EAI_DESC=	Email Address Internationalization (SMTPUTF8) support
 INST_BASE_DESC=	Install into /usr and /etc/postfix
 LDAP_DESC=	LDAP maps (uses WITH_OPENLDAP_VER)
-LDAP_SASL_DESC=	LDAP client-to-server SASL auth
 LMDB_DESC=	LMDB maps
 TEST_DESC=	SMTP/LMTP test server and generator
 
@@ -234,15 +233,9 @@ DYN_EXT+=		ldap
 WANT_OPENLDAP_VER=	${WITH_OPENLDAP_VER}
 . endif
 POSTFIX_CCARGS+=	-DHAS_LDAP -I${LOCALBASE}/include
+POSTFIX_CCARGS+=	-I${LOCALBASE}/include/sasl -DUSE_LDAP_SASL
 POSTFIX_DYN_AUXLIBS+=	"AUXLIBS_LDAP=-L${LOCALBASE}/lib -lldap -L${LOCALBASE}/lib -llber"
 _REQUIRE+=		slapd
-. if ${PORT_OPTIONS:MLDAP_SASL}
-.  if ! ${PORT_OPTIONS:MSASL}
-LIB_DEPENDS+=		libsasl2.so:security/cyrus-sasl2
-.  endif
-WANT_OPENLDAP_SASL=	yes
-POSTFIX_CCARGS+=	-I${LOCALBASE}/include/sasl -DUSE_LDAP_SASL
-. endif
 .endif
 
 .if ${PORT_OPTIONS:MCDB}

diff --git a/mail/postfix35/Makefile b/mail/postfix35/Makefile
@@ -2,7 +2,7 @@
 
 PORTNAME=	postfix
 DISTVERSION=	3.5.12
-PORTREVISION?=	0
+PORTREVISION?=	1
 PORTEPOCH=	1
 CATEGORIES=	mail
 MASTER_SITES=	http://ftp.porcupine.org/mirrors/postfix-release/ \
@@ -41,7 +41,7 @@ USE_SUBMAKE=	yes
 SCRIPTS_ENV+=	POSTFIX_DEFAULT_MTA="${POSTFIX_DEFAULT_MTA}"
 
 OPTIONS_SUB=	yes
-OPTIONS_DEFINE=	BDB BLACKLISTD CDB DOCS EAI INST_BASE LDAP LDAP_SASL \
+OPTIONS_DEFINE=	BDB BLACKLISTD CDB DOCS EAI INST_BASE LDAP \
 		LMDB MYSQL NIS PCRE PGSQL SASL SQLITE TEST TLS
 
 OPTIONS_RADIO=		RG1
@@ -67,7 +67,6 @@ CDB_DESC=	CDB maps lookups
 EAI_DESC=	Email Address Internationalization (SMTPUTF8) support
 INST_BASE_DESC=	Install into /usr and /etc/postfix
 LDAP_DESC=	LDAP maps (uses WITH_OPENLDAP_VER)
-LDAP_SASL_DESC=	LDAP client-to-server SASL auth
 LMDB_DESC=	LMDB maps
 TEST_DESC=	SMTP/LMTP test server and generator
 
@@ -230,15 +229,9 @@ DYN_EXT+=		ldap
 WANT_OPENLDAP_VER=	${WITH_OPENLDAP_VER}
 . endif
 POSTFIX_CCARGS+=	-DHAS_LDAP -I${LOCALBASE}/include
+POSTFIX_CCARGS+=	-I${LOCALBASE}/include/sasl -DUSE_LDAP_SASL
 POSTFIX_DYN_AUXLIBS+=	"AUXLIBS_LDAP=-L${LOCALBASE}/lib -lldap -L${LOCALBASE}/lib -llber"
 _REQUIRE+=		slapd
-. if ${PORT_OPTIONS:MLDAP_SASL}
-.  if ! ${PORT_OPTIONS:MSASL}
-LIB_DEPENDS+=		libsasl2.so:security/cyrus-sasl2
-.  endif
-WANT_OPENLDAP_SASL=	yes
-POSTFIX_CCARGS+=	-I${LOCALBASE}/include/sasl -DUSE_LDAP_SASL
-. endif
 .endif
 
 .if ${PORT_OPTIONS:MCDB}

diff --git a/mail/vpopmail/Makefile b/mail/vpopmail/Makefile
@@ -2,7 +2,7 @@
 
 PORTNAME=	vpopmail
 PORTVERSION=	5.4.33
-PORTREVISION=	3
+PORTREVISION=	4
 CATEGORIES=	mail
 MASTER_SITES=	SF/${PORTNAME}/${PORTNAME}-stable/${PORTVERSION}
 
@@ -68,7 +68,7 @@ OPTIONS_DEFINE=	DOCS \
 		SQL_LOG \
 		SQL_LOG_TRIM
 OPTIONS_SINGLE=	AUTH
-OPTIONS_SINGLE_AUTH=	CDB MYSQL PGSQL LDAP LDAP_SASL ORACLE SYBASE
+OPTIONS_SINGLE_AUTH=	CDB MYSQL PGSQL LDAP ORACLE SYBASE
 
 OPTIONS_DEFAULT=MD5_PASSWORDS \
 		CDB \
@@ -90,7 +90,6 @@ MYSQL_REPLICATION_DESC=		MySQL database replication support
 MYSQL_LIMITS_DESC=		MySQL mailbox limitations support
 ORACLE_DESC=			Auth via Oracle
 LDAP_DESC=			Auth via LDAP
-LDAP_SASL_DESC=			Auth via LDAP SASL
 VALIAS_DESC=			Store aliases in DB instead of .qmail files
 ROAMING_DESC=			roaming users support
 IP_ALIAS_DESC=			IP alias support
@@ -255,9 +254,6 @@ VPOPMAIL_DIR?=			${PREFIX}/vpopmail
 
 .if ${PORT_OPTIONS:MLDAP}
 USE_OPENLDAP=	yes
-.if ${PORT_OPTIONS:MLDAP_SASL}
-WANT_OPENLDAP_SASL=	yes
-.endif
 LDAP_FILES=		${WRKSRC}/doc/README.ldap \
 			${WRKSRC}/ldap/nsswitch.conf \
 			${WRKSRC}/ldap/pam_ldap.conf \