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

8 files changed, 14 insertions, 75 deletions

diff --git a/net/Makefile b/net/Makefile
index d64d9f411465..8232b0d025bb 100644
--- a/net/Makefile
+++ b/net/Makefile
@@ -544,7 +544,6 @@
     SUBDIR += openbgpd
     SUBDIR += openbgpd6
     SUBDIR += openldap24-client
-    SUBDIR += openldap24-sasl-client
     SUBDIR += openldap24-server
     SUBDIR += openmdns
     SUBDIR += openmpi
diff --git a/net/ldapscripts/Makefile b/net/ldapscripts/Makefile
index c40178a7bc89..9502f0574752 100644
--- a/net/ldapscripts/Makefile
+++ b/net/ldapscripts/Makefile
@@ -2,6 +2,7 @@
 
 PORTNAME=	ldapscripts
 PORTVERSION=	2.0.8
+PORTREVISION=	1
 CATEGORIES=	net
 MASTER_SITES=	SF/${PORTNAME}/${PORTNAME}/${PORTNAME}-${PORTVERSION} \
 		http://contribs.martymac.org/ldapscripts/
@@ -21,7 +22,6 @@ RUN_DEPENDS=	ldapadd:net/openldap${OPENLDAP_VER}${OPENLDAP_FLAVOUR}-client \
 NO_ARCH=	yes
 
 OPTIONS_DEFINE=	SASL DOCS
-SASL_VARS=	OPENLDAP_FLAVOUR=-sasl WANT_OPENLDAP_SASL=yes
 
 USES=		iconv tar:tgz
 USE_OPENLDAP=	yes
diff --git a/net/nss-pam-ldapd/Makefile b/net/nss-pam-ldapd/Makefile
index 996e086db1db..90999086598b 100644
--- a/net/nss-pam-ldapd/Makefile
+++ b/net/nss-pam-ldapd/Makefile
@@ -2,6 +2,7 @@
 
 PORTNAME=		nss-pam-ldapd
 PORTVERSION=		0.9.11
+PORTREVISION=		1
 CATEGORIES=		net
 MASTER_SITES=		http://arthurdejong.org/nss-pam-ldapd/ \
 			ZI
@@ -74,7 +75,6 @@ CONFIGURE_ARGS+=	--disable-kerberos
 .endif
 
 .if ${PORT_OPTIONS:MSASL}
-WANT_OPENLDAP_SASL=	yes
 CONFIGURE_ARGS+=	--enable-sasl
 .else
 CONFIGURE_ARGS+=	--disable-sasl
diff --git a/net/nss_ldap/Makefile b/net/nss_ldap/Makefile
index 17f27f97e8b6..944f0010ce24 100644
--- a/net/nss_ldap/Makefile
+++ b/net/nss_ldap/Makefile
@@ -2,7 +2,7 @@
 
 PORTNAME=	nss_ldap
 PORTVERSION=	1.${NSS_LDAP_VERSION}
-PORTREVISION=	13
+PORTREVISION=	14
 CATEGORIES=	net
 MASTER_SITES=	http://www.padl.com/download/ \
 		LOCAL/martymac
@@ -21,13 +21,11 @@ GNU_CONFIGURE=	yes
 USE_LDCONFIG=	yes
 USE_OPENLDAP=	yes
 
-OPTIONS_DEFINE=	LCLASS KERBEROS SASL
+OPTIONS_DEFINE=	LCLASS KERBEROS
 OPTIONS_DEFAULT=LCLASS KERBEROS
 
 LCLASS_DESC=	Enable login classes via the loginClass attribute
 
-SASL_DESC=	Use the SASL-enabled version of OpenLDAP
-
 CPPFLAGS+=	-I${LOCALBASE}/include
 LDFLAGS+=	-L${LOCALBASE}/lib -Wl,-rpath,${LOCALBASE}/lib
 
@@ -49,10 +47,6 @@ CONFIGURE_ARGS+=--enable-configurable-krb5-ccname-gssapi \
 CFLAGS+="-DHAVE_LOGIN_CLASSES"
 .endif
 
-.if ${PORT_OPTIONS:MSASL}
-WANT_OPENLDAP_SASL=	 yes
-.endif
-
 post-extract:
 	${CP} ${FILESDIR}/bsdnss.c ${WRKSRC}
 
diff --git a/net/openldap24-sasl-client/Makefile b/net/openldap24-sasl-client/Makefile
deleted file mode 100644
index eed44e0807f3..000000000000
--- a/net/openldap24-sasl-client/Makefile
+++ /dev/null
@@ -1,7 +0,0 @@
-# Created by: Xin LI <delphij@FreeBSD.org>
-
-CLIENT_ONLY=		sasl
-
-MASTERDIR=		${.CURDIR}/../openldap24-server
-
-.include "${MASTERDIR}/Makefile"
diff --git a/net/openldap24-server/Makefile b/net/openldap24-server/Makefile
index aa3d8dafa451..89c87dfd1348 100644
--- a/net/openldap24-server/Makefile
+++ b/net/openldap24-server/Makefile
@@ -17,22 +17,14 @@ MASTER_SITES=		https://www.openldap.org/software/download/OpenLDAP/%SUBDIR%/ \
 			http://www.openldap.org/software/download/OpenLDAP/%SUBDIR%/
 MASTER_SITE_SUBDIR=	openldap-release
 .if defined(CLIENT_ONLY)
-.if ${CLIENT_ONLY} == sasl
-PKGNAMESUFFIX=		-sasl-client
-.else
 PKGNAMESUFFIX=		-client
-.endif
 .else
 PKGNAMESUFFIX?=		-server
 .endif
 
 MAINTAINER=		delphij@FreeBSD.org
 .if defined(CLIENT_ONLY)
-.if ${CLIENT_ONLY} == sasl
-COMMENT=		Open source LDAP client implementation with SASL2 support
-.else
 COMMENT=		Open source LDAP client implementation
-.endif
 .else
 COMMENT=		Open source LDAP server implementation
 .endif
@@ -43,13 +35,7 @@ LICENSE_FILE=		${WRKSRC}/LICENSE
 LICENSE_PERMS=		dist-mirror dist-sell pkg-mirror pkg-sell auto-accept
 
 .if defined(CLIENT_ONLY)
-.if ${CLIENT_ONLY} == sasl
-CONFLICTS=		${PKGNAMEPREFIX}${PORTNAME}-client-2.* \
-			${PKGNAMEPREFIX}${PORTNAME}-sasl-client-2.[0-3].*
-.else
-CONFLICTS=		${PKGNAMEPREFIX}${PORTNAME}-client-2.[0-3].* \
-			${PKGNAMEPREFIX}${PORTNAME}-sasl-client-2.*
-.endif
+CONFLICTS=		${PKGNAMEPREFIX}${PORTNAME}-client-2.[0-35-9].*
 .endif
 
 GNU_CONFIGURE=		yes
@@ -67,8 +53,8 @@ WANT_OPENLDAP_VER?=	24
 BROKEN=			incompatible OpenLDAP version: ${WANT_OPENLDAP_VER}
 .endif
 
-PORTREVISION_CLIENT=	0
-PORTREVISION_SERVER=	0
+PORTREVISION_CLIENT=	1
+PORTREVISION_SERVER=	1
 OPENLDAP_SHLIB_MAJOR=	2
 OPENLDAP_SHLIB_MINOR=	11.7
 OPENLDAP_MAJOR=		${DISTVERSION:R}
@@ -76,7 +62,7 @@ OPENLDAP_MAJOR=		${DISTVERSION:R}
 OPTIONS_DEFINE=		DEBUG FETCH GSSAPI
 
 FETCH_DESC=		Enable fetch(3) support
-GSSAPI_DESC=		With GSSAPI support (implies SASL support)
+GSSAPI_DESC=		With GSSAPI support
 
 .if defined(CLIENT_ONLY)
 OPTIONS_DEFINE+=	DOCS
@@ -86,7 +72,7 @@ OPTIONS_DEFINE+=	SOCK ODBC RLOOKUPS SLP SLAPI TCP_WRAPPERS
 OPTIONS_DEFINE+=	ACCESSLOG AUDITLOG COLLECT CONSTRAINT DDS
 OPTIONS_DEFINE+=	DEREF DYNGROUP DYNLIST MEMBEROF PPOLICY PCACHE
 OPTIONS_DEFINE+=	REFINT RETCODE RWM SEQMOD SSSVLV SYNCPROV TRANSLUCENT
-OPTIONS_DEFINE+=	UNIQUE VALSORT SMBPWD SHA2 DYNAMIC_BACKENDS SASL
+OPTIONS_DEFINE+=	UNIQUE VALSORT SMBPWD SHA2 DYNAMIC_BACKENDS
 OPTIONS_DEFINE+=	LMPASSWD
 OPTIONS_DEFINE+=	PBKDF2
 OPTIONS_DEFINE+=	OUTLOOK
@@ -132,7 +118,6 @@ PCACHE_DESC=		With Proxy Cache overlay
 REFINT_DESC=		With Referential Integrity overlay
 RETCODE_DESC=		With Return Code testing overlay
 RWM_DESC=		With Rewrite/Remap overlay
-SASL_DESC=		With (Cyrus) SASL2 support
 SEQMOD_DESC=		With Sequential Modify overlay
 SSSVLV_DESC=		With ServerSideSort/VLV overlay
 SYNCPROV_DESC=		With Syncrepl Provider overlay
@@ -165,9 +150,6 @@ CONFIGURE_SED=		-e 's,uuid/uuid.h,xxuuid/uuid.h,g'
 .if defined(CLIENT_ONLY)
 PORTDOCS=		CHANGES drafts rfc
 
-.if ${CLIENT_ONLY} == sasl
-PORT_OPTIONS+=	SASL
-.endif
 .if defined(USE_OPENLDAP)
 BROKEN=			you have USE_OPENLDAP variable defined either in environment or in make(1) arguments; please undefine and try again
 .endif
@@ -176,22 +158,6 @@ USE_OPENLDAP=		yes
 WANT_OPENLDAP_VER=	24
 
 LIB_DEPENDS+=		libicudata.so:devel/icu
-
-.if ${PORT_OPTIONS:MGSSAPI} && empty(PORT_OPTIONS:MSASL)
-PORT_OPTIONS+=	SASL
-.endif
-
-.if ${PORT_OPTIONS:MSASL}
-WANT_OPENLDAP_SASL=	yes
-CONFLICTS=		${PKGNAMEPREFIX}${PORTNAME}-client-2.*
-PKGNAMESUFFIX=		-sasl-server
-.if ${PORT_OPTIONS:MGSSAPI}
-RUN_DEPENDS+=		cyrus-sasl-gssapi>0:security/cyrus-sasl2-gssapi
-.endif
-.else
-CONFLICTS=		${PKGNAMEPREFIX}${PORTNAME}-sasl-client-2.*
-.endif
-
 .endif
 
 DESCR=			${PKGDIR}/pkg-descr${OPENLDAP_PKGFILESUFX}
@@ -218,12 +184,11 @@ CONFIGURE_ARGS=		--with-threads=posix \
 			--disable-dependency-tracking \
 			--enable-dynamic
 
-.if ${PORT_OPTIONS:MSASL}
+
+GSSAPI_RUN_DEPENDS+=	cyrus-sasl-gssapi>0:security/cyrus-sasl2-gssapi
+
 LIB_DEPENDS+=		libsasl2.so:security/cyrus-sasl2
 CONFIGURE_ARGS+=	--with-cyrus-sasl
-.else
-CONFIGURE_ARGS+=	--without-cyrus-sasl
-.endif
 
 .if defined(CLIENT_ONLY)
 # client specific configuration
@@ -523,9 +488,7 @@ PLIST_SUB+=		BACK_PERL=${BACKEND_PLIST}
 PLIST_SUB+=		BACK_PERL="@comment "
 .endif
 
-.if ${PORT_OPTIONS:MSASL}
 CONFIGURE_ARGS+=	--enable-spasswd
-.endif
 
 .if ${PORT_OPTIONS:MODBC}
 CONFIGURE_ARGS+=	--enable-sql=${BACKEND_ENABLE}
diff --git a/net/py-ldap/Makefile b/net/py-ldap/Makefile
index 6ee65c7aab47..45a8c076a985 100644
--- a/net/py-ldap/Makefile
+++ b/net/py-ldap/Makefile
@@ -1,5 +1,6 @@
 PORTNAME=	ldap
 DISTVERSION=	3.3.1
+PORTREVISION=	1
 CATEGORIES=	net python
 MASTER_SITES=	CHEESESHOP
 PKGNAMEPREFIX=	${PYTHON_PKGNAMEPREFIX}
@@ -19,18 +20,9 @@ USE_PYTHON=	autoplist distutils
 USE_OPENLDAP=	yes
 WANT_OPENLDAP_VER=	24
 
-OPTIONS_DEFINE=	SASL
-
-SASL_VARS=	WANT_OPENLDAP_SASL=yes
-SASL_CONFLICTS=	openldap24-client-2.*
-
 post-patch:
 	@${REINPLACE_CMD} -e 's|%%LOCALBASE%%|${LOCALBASE}|g' ${WRKSRC}/setup.py
 
-do-configure-SASL-off:
-	@cd ${WRKSRC} && ${PYTHON_CMD} setup.py -q setopt -c _ldap -s HAVE_TLS -o defines
-	@cd ${WRKSRC} && ${PYTHON_CMD} setup.py -q saveopts
-
 post-install:
 	${STRIP_CMD} ${STAGEDIR}${PYTHONPREFIX_SITELIBDIR}/_ldap*.so
 
diff --git a/net/py-ldap0/Makefile b/net/py-ldap0/Makefile
index 7bc6b26b7c19..c003e7606a03 100644
--- a/net/py-ldap0/Makefile
+++ b/net/py-ldap0/Makefile
@@ -1,5 +1,6 @@
 PORTNAME=	ldap0
 PORTVERSION=	1.2.8
+PORTREVISION=	1
 CATEGORIES=	net python
 PKGNAMEPREFIX=	${PYTHON_PKGNAMEPREFIX}
 
@@ -10,7 +11,6 @@ LICENSE=	PSFL
 
 RUN_DEPENDS=	${PYTHON_PKGNAMEPREFIX}pyasn1>=0.4.5:devel/py-pyasn1@${PY_FLAVOR} \
 		${PYTHON_PKGNAMEPREFIX}pyasn1-modules>=0.2.5:devel/py-pyasn1-modules@${PY_FLAVOR}
-# OpenLDAP needs SASL option enabled
 # Cyrus needs PLAIN / CRAM-MD5 / DIGEST-MD5 enabled
 TEST_DEPENDS=	${LOCALBASE}/libexec/slapd:net/openldap24-server
 
@@ -24,8 +24,6 @@ GL_ACCOUNT=	ae-dir
 GL_PROJECT=	python-ldap0
 GL_COMMIT=	1bf10aa9ad4ab7755e02c9f74cfa9ad7b4368d34
 
-WANT_OPENLDAP_SASL=	yes
-
 PYDISTUTILS_BUILD_TARGET=	build_ext
 PYDISTUTILS_BUILDARGS+=		--inplace