Attachment #226751 for bug #257374

Lines 10-15 in the release notes and/or placed into UPDATING. Link Here

(-)b/CHANGES (+5 lines)
10		10
11	All ports committers are allowed to commit to this file.	11	All ports committers are allowed to commit to this file.
12		12
		13	2021XXXX:
		14	AUTHOR: delphij@FreeBSD.org
		15	WANT_OPENLDAP_SASL is removed now that OpenLDAP is always built with
		16	SASL support.
		17
13	20210604:	18	20210604:
14	AUTHOR: mat@FreeBSD.org	19	AUTHOR: mat@FreeBSD.org
15		20

Lines 16471-16473 devel/rubygem-grape-entity07\|devel/rubygem-grape-entity\|2021-07-25\|Obsolete, use Link Here

(-)b/MOVED (+1 lines)
16471	net/rubygem-gitlab-fog-google\|net/rubygem-fog-google\|2021-07-25\|Obsolete, use net/rubygem-fog-google	16471	net/rubygem-gitlab-fog-google\|net/rubygem-fog-google\|2021-07-25\|Obsolete, use net/rubygem-fog-google
16472	devel/rubygem-gitlab-rdoc\|devel/rubygem-rdoc\|2021-07-25\|Obsolete, use devel/rubygem-rdoc	16472	devel/rubygem-gitlab-rdoc\|devel/rubygem-rdoc\|2021-07-25\|Obsolete, use devel/rubygem-rdoc
16473	databases/rubygem-redis-namespace17\|databases/rubygem-redis-namespace\|2021-07-25\|Obsolete, use databases/rubygem-redis-namespace	16473	databases/rubygem-redis-namespace17\|databases/rubygem-redis-namespace\|2021-07-25\|Obsolete, use databases/rubygem-redis-namespace
		16474	net/openldap24-sasl-client\|net/openldap24-client\|2021-XX-XX\|SASL is always enabled for OpenLDAP




#				  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.

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)

.		endif
.	endfor
.endif # IGNORE_WITH_OPENLDAP
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

Lines 364-374 FreeBSD_MAINTAINER= portmgr@FreeBSD.org Link Here

(-)b/Mk/bsd.port.mk (-4 / +1 lines)
364	# USE_OPENLDAP - If set, this port uses the OpenLDAP libraries.	364	# USE_OPENLDAP - If set, this port uses the OpenLDAP libraries.
365	# Implies: WANT_OPENLDAP_VER?=24	365	# Implies: WANT_OPENLDAP_VER?=24
366	# WANT_OPENLDAP_VER	366	# WANT_OPENLDAP_VER
367	# - Legal values are: 23, 24	367	# - Legal values are: 24
368	# If set to an unknown value, the port is marked BROKEN.	368	# If set to an unknown value, the port is marked BROKEN.
369	# WANT_OPENLDAP_SASL
370	# - If set, the system should use OpenLDAP libraries
371	# with SASL support.
372	##	369	##
373	# USE_JAVA - If set, this port relies on the Java language.	370	# USE_JAVA - If set, this port relies on the Java language.
374	# Implies inclusion of bsd.java.mk. (Also see	371	# Implies inclusion of bsd.java.mk. (Also see




You should get into the habit of checking this file for changes each time
you update your ports collection, before attempting any port upgrades.

2021XXXX:
  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

20210721:
  AFFECTS: users of x11/rxvt-unicode
  AUTHOR: thierry@FreeBSD.org

Lines 1-7 Link Here

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




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

Lines 1-7 Link Here

(-)b/databases/percona57-client/Makefile (-2 / +2 lines)
1	# Created by: Mark Felder <feld@FreeBSD.org>	1	# Created by: Mark Felder <feld@FreeBSD.org>
2		2
3	PORTNAME= percona	3	PORTNAME= percona
4	PORTREVISION?= 0	4	PORTREVISION?= 1
5	PKGNAMESUFFIX= 57-client	5	PKGNAMESUFFIX= 57-client
6		6
7	COMMENT= Multithreaded SQL database (client)	7	COMMENT= Multithreaded SQL database (client)
Lines 36-42 OPTIONS_GROUP_PLUGINS= SASLCLIENT Link Here
36	SASLCLIENT_DESC= SASL client plugin module	36	SASLCLIENT_DESC= SASL client plugin module
37	SASLCLIENT_CMAKE_BOOL= WITH_AUTHENTICATION_LDAP	37	SASLCLIENT_CMAKE_BOOL= WITH_AUTHENTICATION_LDAP
38	SASLCLIENT_LIB_DEPENDS= libsasl2.so:security/cyrus-sasl2	38	SASLCLIENT_LIB_DEPENDS= libsasl2.so:security/cyrus-sasl2
39	SASLCLIENT_BUILD_DEPENDS= ${LOCALBASE}/include/lber.h:net/openldap24-sasl-client	39	SASLCLIENT_USE= OPENLDAP=yes
40	OPTIONS_DEFAULT+= SASLCLIENT	40	OPTIONS_DEFAULT+= SASLCLIENT
41	OPTIONS_SUB= yes	41	OPTIONS_SUB= yes
42		42

Lines 1-6 Link Here

(-)b/lang/php73/Makefile (-1 / +1 lines)
1	PORTNAME= php73	1	PORTNAME= php73
2	DISTVERSION= 7.3.29	2	DISTVERSION= 7.3.29
3	PORTREVISION?= 0	3	PORTREVISION?= 1
4	CATEGORIES?= lang devel www	4	CATEGORIES?= lang devel www
5	MASTER_SITES= PHP/distributions	5	MASTER_SITES= PHP/distributions
6	DISTNAME= php-${DISTVERSION}	6	DISTNAME= php-${DISTVERSION}




.endif

.if ${PHP_MODNAME} == "ldap"
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"

Lines 1-6 Link Here

(-)b/lang/php74/Makefile (-1 / +1 lines)
1	PORTNAME= php74	1	PORTNAME= php74
2	DISTVERSION= 7.4.21	2	DISTVERSION= 7.4.21
3	PORTREVISION?= 0	3	PORTREVISION?= 1
4	CATEGORIES?= lang devel www	4	CATEGORIES?= lang devel www
5	MASTER_SITES= PHP/distributions	5	MASTER_SITES= PHP/distributions
6	DISTNAME= php-${DISTVERSION}	6	DISTNAME= php-${DISTVERSION}




.endif

.if ${PHP_MODNAME} == "ldap"
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"

Lines 1-6 Link Here

(-)b/lang/php80/Makefile (-1 / +1 lines)
1	PORTNAME= php80	1	PORTNAME= php80
2	DISTVERSION= 8.0.8	2	DISTVERSION= 8.0.8
3	PORTREVISION?= 0	3	PORTREVISION?= 1
4	CATEGORIES?= lang devel www	4	CATEGORIES?= lang devel www
5	MASTER_SITES= PHP/distributions	5	MASTER_SITES= PHP/distributions
6	DISTNAME= php-${DISTVERSION}	6	DISTNAME= php-${DISTVERSION}




.endif

.if ${PHP_MODNAME} == "ldap"
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"





PORTNAME=	opendkim
PORTVERSION=	2.10.3
PORTREVISION=	12
CATEGORIES=	mail security
MASTER_SITES=	SF/${PORTNAME} \
		SF/${PORTNAME}/Previous%20Releases \

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





PORTNAME=	postfix
DISTVERSION=	3.7-20210717
PORTREVISION?=	1
PORTEPOCH=	6
CATEGORIES=	mail
MASTER_SITES=	http://ftp.porcupine.org/mirrors/postfix-release/ \

SCRIPTS_ENV+=	POSTFIX_DEFAULT_MTA="${POSTFIX_DEFAULT_MTA}"

OPTIONS_SUB=	yes
OPTIONS_DEFINE=	BDB BLACKLISTD CDB DOCS EAI INST_BASE LDAP \
		LMDB MYSQL NIS PCRE PGSQL SASL SQLITE TEST TLS

OPTIONS_RADIO=		RG1

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


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}





PORTNAME=	postfix
DISTVERSION=	3.6.2
PORTREVISION?=	1
PORTEPOCH=	1
CATEGORIES=	mail
MASTER_SITES=	http://ftp.porcupine.org/mirrors/postfix-release/ \

SCRIPTS_ENV+=	POSTFIX_DEFAULT_MTA="${POSTFIX_DEFAULT_MTA}"

OPTIONS_SUB=	yes
OPTIONS_DEFINE=	BDB BLACKLISTD CDB DOCS EAI INST_BASE LDAP \
		LMDB MYSQL NIS PCRE PGSQL SASL SQLITE TEST TLS

OPTIONS_RADIO=		RG1

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


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}





PORTNAME=	postfix
DISTVERSION=	3.5.12
PORTREVISION?=	1
PORTEPOCH=	1
CATEGORIES=	mail
MASTER_SITES=	http://ftp.porcupine.org/mirrors/postfix-release/ \

SCRIPTS_ENV+=	POSTFIX_DEFAULT_MTA="${POSTFIX_DEFAULT_MTA}"

OPTIONS_SUB=	yes
OPTIONS_DEFINE=	BDB BLACKLISTD CDB DOCS EAI INST_BASE LDAP \
		LMDB MYSQL NIS PCRE PGSQL SASL SQLITE TEST TLS

OPTIONS_RADIO=		RG1

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


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}





PORTNAME=	vpopmail
PORTVERSION=	5.4.33
PORTREVISION=	4
CATEGORIES=	mail
MASTER_SITES=	SF/${PORTNAME}/${PORTNAME}-stable/${PORTVERSION}


		SQL_LOG \
		SQL_LOG_TRIM
OPTIONS_SINGLE=	AUTH
OPTIONS_SINGLE_AUTH=	CDB MYSQL PGSQL LDAP ORACLE SYBASE

OPTIONS_DEFAULT=MD5_PASSWORDS \
		CDB \

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


.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 \

Lines 2-7 Link Here

(-)b/net-mgmt/adcli/Makefile (-1 / +2 lines)
2		2
3	PORTNAME= adcli	3	PORTNAME= adcli
4	PORTVERSION= 0.8.2	4	PORTVERSION= 0.8.2
		5	PORTREVISION= 1
5	CATEGORIES= net-mgmt net security	6	CATEGORIES= net-mgmt net security
6	MASTER_SITES= https://www.freedesktop.org/software/realmd/releases/	7	MASTER_SITES= https://www.freedesktop.org/software/realmd/releases/
7		8
Lines 10-16 COMMENT= Tool for performing actions on an Active Directory domain Link Here
10		11
11	LICENSE= LGPL21	12	LICENSE= LGPL21
12		13
13	LIB_DEPENDS= libldap.so:net/openldap24-sasl-client	14	USE_OPENLDAP= yes
14	BUILD_DEPENDS= xsltproc:textproc/libxslt \	15	BUILD_DEPENDS= xsltproc:textproc/libxslt \
15	docbook-xml>0:textproc/docbook-xml \	16	docbook-xml>0:textproc/docbook-xml \
16	docbook-xsl>0:textproc/docbook-xsl	17	docbook-xsl>0:textproc/docbook-xsl

Lines 544-550 Link Here

(-)b/net/Makefile (-1 lines)
544	SUBDIR += openbgpd	544	SUBDIR += openbgpd
545	SUBDIR += openbgpd6	545	SUBDIR += openbgpd6
546	SUBDIR += openldap24-client	546	SUBDIR += openldap24-client
547	SUBDIR += openldap24-sasl-client
548	SUBDIR += openldap24-server	547	SUBDIR += openldap24-server
549	SUBDIR += openmdns	548	SUBDIR += openmdns
550	SUBDIR += openmpi	549	SUBDIR += openmpi

Lines 2-7 Link Here

(-)b/net/ldapscripts/Makefile (-1 / +1 lines)
2		2
3	PORTNAME= ldapscripts	3	PORTNAME= ldapscripts
4	PORTVERSION= 2.0.8	4	PORTVERSION= 2.0.8
		5	PORTREVISION= 1
5	CATEGORIES= net	6	CATEGORIES= net
6	MASTER_SITES= SF/${PORTNAME}/${PORTNAME}/${PORTNAME}-${PORTVERSION} \	7	MASTER_SITES= SF/${PORTNAME}/${PORTNAME}/${PORTNAME}-${PORTVERSION} \
7	http://contribs.martymac.org/ldapscripts/	8	http://contribs.martymac.org/ldapscripts/
Lines 21-27 RUN_DEPENDS= ldapadd:net/openldap${OPENLDAP_VER}${OPENLDAP_FLAVOUR}-client \ Link Here
21	NO_ARCH= yes	22	NO_ARCH= yes
22		23
23	OPTIONS_DEFINE= SASL DOCS	24	OPTIONS_DEFINE= SASL DOCS
24	SASL_VARS= OPENLDAP_FLAVOUR=-sasl WANT_OPENLDAP_SASL=yes
25		25
26	USES= iconv tar:tgz	26	USES= iconv tar:tgz
27	USE_OPENLDAP= yes	27	USE_OPENLDAP= yes

Lines 2-7 Link Here

(-)b/net/nss-pam-ldapd/Makefile (-1 / +1 lines)
2		2
3	PORTNAME= nss-pam-ldapd	3	PORTNAME= nss-pam-ldapd
4	PORTVERSION= 0.9.11	4	PORTVERSION= 0.9.11
		5	PORTREVISION= 1
5	CATEGORIES= net	6	CATEGORIES= net
6	MASTER_SITES= http://arthurdejong.org/nss-pam-ldapd/ \	7	MASTER_SITES= http://arthurdejong.org/nss-pam-ldapd/ \
7	ZI	8	ZI
Lines 74-80 CONFIGURE_ARGS+= --disable-kerberos Link Here
74	.endif	75	.endif
75		76
76	.if ${PORT_OPTIONS:MSASL}	77	.if ${PORT_OPTIONS:MSASL}
77	WANT_OPENLDAP_SASL= yes
78	CONFIGURE_ARGS+= --enable-sasl	78	CONFIGURE_ARGS+= --enable-sasl
79	.else	79	.else
80	CONFIGURE_ARGS+= --disable-sasl	80	CONFIGURE_ARGS+= --disable-sasl





PORTNAME=	nss_ldap
PORTVERSION=	1.${NSS_LDAP_VERSION}
PORTREVISION=	14
CATEGORIES=	net
MASTER_SITES=	http://www.padl.com/download/ \
		LOCAL/martymac

USE_LDCONFIG=	yes
USE_OPENLDAP=	yes

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


CFLAGS+="-DHAVE_LOGIN_CLASSES"
.endif

.if ${PORT_OPTIONS:MSASL}
WANT_OPENLDAP_SASL=	 yes
.endif

post-extract:
	${CP} ${FILESDIR}/bsdnss.c ${WRKSRC}


Removed Link Here

(-)a/net/openldap24-sasl-client/Makefile (-7 lines)
1	# Created by: Xin LI <delphij@FreeBSD.org>
2
3	CLIENT_ONLY= sasl
4
5	MASTERDIR= ${.CURDIR}/../openldap24-server
6
7	.include "${MASTERDIR}/Makefile"




			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

LICENSE_PERMS=		dist-mirror dist-sell pkg-mirror pkg-sell auto-accept

.if defined(CLIENT_ONLY)
CONFLICTS=		${PKGNAMEPREFIX}${PORTNAME}-client-2.[0-35-9].*
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
.endif

GNU_CONFIGURE=		yes

BROKEN=			incompatible OpenLDAP version: ${WANT_OPENLDAP_VER}
.endif

PORTREVISION_CLIENT=	1
PORTREVISION_SERVER=	1
OPENLDAP_SHLIB_MAJOR=	2
OPENLDAP_SHLIB_MINOR=	11.7
OPENLDAP_MAJOR=		${DISTVERSION:R}

OPTIONS_DEFINE=		DEBUG FETCH GSSAPI

FETCH_DESC=		Enable fetch(3) support
GSSAPI_DESC=		With GSSAPI support

.if defined(CLIENT_ONLY)
OPTIONS_DEFINE+=	DOCS

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
OPTIONS_DEFINE+=	LMPASSWD
OPTIONS_DEFINE+=	PBKDF2
OPTIONS_DEFINE+=	OUTLOOK

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

.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

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}

			--disable-dependency-tracking \
			--enable-dynamic


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

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}




PORTNAME=	ldap
DISTVERSION=	3.3.1
PORTREVISION=	1
CATEGORIES=	net python
MASTER_SITES=	CHEESESHOP
PKGNAMEPREFIX=	${PYTHON_PKGNAMEPREFIX}

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





PORTNAME=	ldap0
PORTVERSION=	1.2.8
PORTREVISION=	1
CATEGORIES=	net python
PKGNAMEPREFIX=	${PYTHON_PKGNAMEPREFIX}



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


GL_PROJECT=	python-ldap0
GL_COMMIT=	1bf10aa9ad4ab7755e02c9f74cfa9ad7b4368d34

WANT_OPENLDAP_SASL=	yes

PYDISTUTILS_BUILD_TARGET=	build_ext
PYDISTUTILS_BUILDARGS+=		--inplace






CYRUS_CONFIGURE_ARGS=	--enable-ldapdb --with-ldap=${LOCALBASE}

OPTIONS_DEFINE=		OPENLDAP_SASL
OPENLDAP_SASL_DESC=	OpenLDAP client with SASL2 support
OPENLDAP_SASL_VARS=	WANT_OPENLDAP_SASL=yes

USE_OPENLDAP=	yes
.if defined(WITH_OPENLDAP_VER)
WANT_OPENLDAP_VER=	${WITH_OPENLDAP_VER}
.endif

.include "${.CURDIR}/../../security/cyrus-sasl2/Makefile.common"




PKGNAMESUFFIX=	-saslauthd
PORTREVISION=	2

COMMENT=	SASL authentication server for cyrus-sasl2


CYRUS_CONFIGURE_ARGS=	--with-saslauthd=${SASLAUTHD_RUNPATH}
CONFIGURE_ENV+=		andrew_cv_runpath_switch=none

OPTIONS_DEFINE=		DOCS HTTPFORM OPENLDAP
OPTIONS_RADIO=		GSSAPI SASLDB
OPTIONS_RADIO_SASLDB=	BDB1 BDB GDBM LMDB
OPTIONS_DEFAULT=	BDB1

OPENLDAP_DESC=		Use OpenLDAP
OPENLDAP_USE=		OPENLDAP=yes
OPENLDAP_CONFIGURE_ON=	--with-ldap=${LOCALBASE}
OPENLDAP_SASL_DESC=	OpenLDAP client with SASL2 support
OPENLDAP_SASL_VARS=	WANT_OPENLDAP_SASL=yes

SASLDB_DESC=		Experimental SASLdb authentication module
BDB_USES=		bdb

Lines 1-4 Link Here

(-)b/security/cyrus-sasl2/Makefile (-1 / +1 lines)
1	PORTREVISION= 1	1	PORTREVISION= 2
2		2
3	COMMENT= RFC 2222 SASL (Simple Authentication and Security Layer)	3	COMMENT= RFC 2222 SASL (Simple Authentication and Security Layer)
4		4





PORTNAME=	heimdal
PORTVERSION=	7.7.0
PORTREVISION=	1
CATEGORIES=	security
MASTER_SITES=	https://github.com/heimdal/heimdal/releases/download/${DISTNAME}/



.include <bsd.port.options.mk>

.if ${PORT_OPTIONS:MLDAP}
WANT_OPENLDAP_SASL?=	yes
.endif

post-extract:
	@${MKDIR} ${WRKSRC}/kpasswdd-cracklib
	${INSTALL_DATA} ${FILESDIR}/kpasswdd-cracklib.c \





PORTNAME=	ldapvi
PORTVERSION=	1.7
PORTREVISION=	6
CATEGORIES=	sysutils net
MASTER_SITES=	http://www.lichteblau.com/download/ \
		LOCAL/sbz

		${DOCSDIR_REL}/manual.css ${DOCSDIR_REL}/manual.xml \
		${DOCSDIR_REL}/bg.png ${DOCSDIR_REL}/html.xsl

# XXX should probably be converted to OptionsNG
.if !defined(WANT_OPENLDAP_SASL) || defined(WITHOUT_SASL)
CONFIGURE_ARGS=	--without-sasl
.endif

post-patch:
	@${REINPLACE_CMD} -e 's/-lssl/-lcrypto/' ${WRKSRC}/configure


Lines 2-8 Link Here

(-)b/sysutils/msktutil/Makefile (-3 / +1 lines)
2		2
3	PORTNAME= msktutil	3	PORTNAME= msktutil
4	PORTVERSION= 1.1	4	PORTVERSION= 1.1
5	PORTREVISION= 1	5	PORTREVISION= 2
6	DISTVERSIONPREFIX= v	6	DISTVERSIONPREFIX= v
7	CATEGORIES= sysutils	7	CATEGORIES= sysutils
8		8
Lines 20-26 USE_GITHUB= yes Link Here
20	USE_OPENLDAP= yes	20	USE_OPENLDAP= yes
21	GNU_CONFIGURE= yes	21	GNU_CONFIGURE= yes
22	CONFIGURE_ARGS+=--with-sasldir=${LOCALBASE} --with-ldapdir=${LOCALBASE}	22	CONFIGURE_ARGS+=--with-sasldir=${LOCALBASE} --with-ldapdir=${LOCALBASE}
23	WANT_OPENLDAP_SASL= yes
24		23
25	OPTIONS_SINGLE= GSSAPI	24	OPTIONS_SINGLE= GSSAPI
26	OPTIONS_SINGLE_GSSAPI= GSSAPI_BASE GSSAPI_HEIMDAL GSSAPI_MIT	25	OPTIONS_SINGLE_GSSAPI= GSSAPI_BASE GSSAPI_HEIMDAL GSSAPI_MIT
27	-

Return to bug 257374

Lines 174-186 CONFIGURE_ARGS+=--enable-json Link Here

(-)b/lang/php73/Makefile.ext (-5 / +1 lines)
174	.endif	174	.endif
175		175
176	.if ${PHP_MODNAME} == "ldap"	176	.if ${PHP_MODNAME} == "ldap"
177	CONFIGURE_ARGS+=--with-ldap=${LOCALBASE}	177	CONFIGURE_ARGS+=--with-ldap=${LOCALBASE} --with-ldap-sasl=${LOCALBASE}
178		178
179	USE_OPENLDAP= yes	179	USE_OPENLDAP= yes
180
181	. ifdef(WANT_OPENLDAP_SASL)
182	CONFIGURE_ARGS+=--with-ldap-sasl=${LOCALBASE}
183	. endif
184	.endif	180	.endif
185		181
186	.if ${PHP_MODNAME} == "mbstring"	182	.if ${PHP_MODNAME} == "mbstring"

Lines 172-184 BUILD_DEPENDS= re2c:devel/re2c Link Here

(-)b/lang/php74/Makefile.ext (-5 / +1 lines)
172	.endif	172	.endif
173		173
174	.if ${PHP_MODNAME} == "ldap"	174	.if ${PHP_MODNAME} == "ldap"
175	CONFIGURE_ARGS+=--with-ldap=${LOCALBASE}	175	CONFIGURE_ARGS+=--with-ldap=${LOCALBASE} --with-ldap-sasl=${LOCALBASE}
176		176
177	USE_OPENLDAP= yes	177	USE_OPENLDAP= yes
178
179	. ifdef(WANT_OPENLDAP_SASL)
180	CONFIGURE_ARGS+=--with-ldap-sasl=${LOCALBASE}
181	. endif
182	.endif	178	.endif
183		179
184	.if ${PHP_MODNAME} == "mbstring"	180	.if ${PHP_MODNAME} == "mbstring"

Lines 172-184 BUILD_DEPENDS= re2c:devel/re2c Link Here

(-)b/lang/php80/Makefile.ext (-5 / +1 lines)
172	.endif	172	.endif
173		173
174	.if ${PHP_MODNAME} == "ldap"	174	.if ${PHP_MODNAME} == "ldap"
175	CONFIGURE_ARGS+=--with-ldap=${LOCALBASE}	175	CONFIGURE_ARGS+=--with-ldap=${LOCALBASE} --with-ldap-sasl=${LOCALBASE}
176		176
177	USE_OPENLDAP= yes	177	USE_OPENLDAP= yes
178
179	. ifdef(WANT_OPENLDAP_SASL)
180	CONFIGURE_ARGS+=--with-ldap-sasl=${LOCALBASE}
181	. endif
182	.endif	178	.endif
183		179
184	.if ${PHP_MODNAME} == "mbstring"	180	.if ${PHP_MODNAME} == "mbstring"

Lines 20-28 Database_Include_MAINTAINER= ports@FreeBSD.org Link Here

(-)b/Mk/bsd.ldap.mk (-12 / +1 lines)
20	# Default: 24.	20	# Default: 24.
21	# WANT_OPENLDAP_VER	21	# WANT_OPENLDAP_VER
22	# - Maintainer can set an arbitrary version of OpenLDAP by using it.	22	# - Maintainer can set an arbitrary version of OpenLDAP by using it.
23	# WANT_OPENLDAP_SASL
24	# - User-defined variable to depend upon SASL-enabled OpenLDAP
25	# client. Must NOT be set in a port Makefile.
26	# IGNORE_OPENLDAP_OPENLDAP	23	# IGNORE_OPENLDAP_OPENLDAP
27	# - This variable can be defined if the ports doesn't support	24	# - This variable can be defined if the ports doesn't support
28	# one or more version of OpenLDAP.	25	# one or more version of OpenLDAP.
Lines 64-77 IGNORE= cannot install: OpenLDAP versions mismatch: openldap${_OPENLDAP_VER}-cli Link Here
64	CFLAGS+= -DLDAP_DEPRECATED	61	CFLAGS+= -DLDAP_DEPRECATED
65		62
66	_OPENLDAP_CLIENT_PKG!= ${PKG_INFO} -Ex openldap.\*-client 2>/dev/null; ${ECHO_CMD}	63	_OPENLDAP_CLIENT_PKG!= ${PKG_INFO} -Ex openldap.\*-client 2>/dev/null; ${ECHO_CMD}
67	_OPENLDAP_FLAVOUR= ${_OPENLDAP_CLIENT_PKG:C/openldap//:C/-client-.*//}
68
69	.if defined(WANT_OPENLDAP_SASL)
70	.if !empty(_OPENLDAP_CLIENT_PKG) && empty(_OPENLDAP_FLAVOUR)
71	IGNORE= cannot install: SASL support requested and ${_OPENLDAP_CLIENT_PKG} is installed
72	.endif
73	_OPENLDAP_FLAVOUR= -sasl
74	.endif
75		64
76	# And now we are checking if we can use it	65	# And now we are checking if we can use it
77	.if defined(OPENLDAP${OPENLDAP_VER}_LIB)	66	.if defined(OPENLDAP${OPENLDAP_VER}_LIB)
Lines 86-92 IGNORE= cannot install: doesn't work with OpenLDAP version: ${OPENLDAP_VER} (Do Link Here
86	. endif	75	. endif
87	. endfor	76	. endfor
88	.endif # IGNORE_WITH_OPENLDAP	77	.endif # IGNORE_WITH_OPENLDAP
89	LIB_DEPENDS+= ${OPENLDAP${OPENLDAP_VER}_LIB}:net/openldap${OPENLDAP_VER}${_OPENLDAP_FLAVOUR}-client	78	LIB_DEPENDS+= ${OPENLDAP${OPENLDAP_VER}_LIB}:net/openldap${OPENLDAP_VER}-client
90	.else	79	.else
91	IGNORE= cannot install: unknown OpenLDAP version: ${OPENLDAP_VER}	80	IGNORE= cannot install: unknown OpenLDAP version: ${OPENLDAP_VER}
92	.endif # Check for correct libs	81	.endif # Check for correct libs

Lines 5-10 they are unavoidable. Link Here

(-)b/UPDATING (+13 lines)
5	You should get into the habit of checking this file for changes each time	5	You should get into the habit of checking this file for changes each time
6	you update your ports collection, before attempting any port upgrades.	6	you update your ports collection, before attempting any port upgrades.
7		7
		8	2021XXXX:
		9	AFFECTS: users of OpenLDAP
		10	AUTHOR: delphij@FreeBSD.org
		11
		12	SASL is now always enabled for OpenLDAP.
		13
		14	If you use portmaster:
		15	portmaster -o net/openldap24-client openldap24-sasl-client
		16	If you use portupgrade:
		17	portupgrade -fo net/openldap24-client openldap24-sasl-client
		18	If you use pkg with binary packages:
		19	pkg set -o net/openldap24-sasl-client:net/openldap24-client
		20
8	20210721:	21	20210721:
9	AFFECTS: users of x11/rxvt-unicode	22	AFFECTS: users of x11/rxvt-unicode
10	AUTHOR: thierry@FreeBSD.org	23	AUTHOR: thierry@FreeBSD.org

Lines 164-180 CMAKE_ARGS+= -DWITH_SSL=${OPENSSLBASE} Link Here

(-)b/databases/mysql57-server/Makefile (-11 lines)
164	CXXFLAGS+= -fpermissive	164	CXXFLAGS+= -fpermissive
165	.endif	165	.endif
166		166
167	# mysql57-server fails to compile with llvm11, which was imported to current in r364284
168	# without a version increase (1300109 = r364274).
169	# Until a proper fix is provided, simply use llvm from ports, which probably could be
170	# a backport of amongst other tings:
171	# https://github.com/mysql/mysql-server/commit/08f46b3c00ee70e7ed7825daeb91df2289f80f50
172	.if ${CHOSEN_COMPILER_TYPE} == clang && ${OPSYS} == FreeBSD && ${OSVERSION} >= 1300109
173	BUILD_DEPENDS+= clang${LLVM_DEFAULT}:devel/llvm${LLVM_DEFAULT}
174	CC= ${LOCALBASE}/bin/clang${LLVM_DEFAULT}
175	CXX= ${LOCALBASE}/bin/clang++${LLVM_DEFAULT}
176	.endif
177
178	.if ${ARCH} == powerpc	167	.if ${ARCH} == powerpc
179	LLD_UNSAFE= yes	168	LLD_UNSAFE= yes
180	.endif	169	.endif

Lines 2-8 Link Here

(-)b/mail/opendkim/Makefile (-5 / +1 lines)
2		2
3	PORTNAME= opendkim	3	PORTNAME= opendkim
4	PORTVERSION= 2.10.3	4	PORTVERSION= 2.10.3
5	PORTREVISION= 11	5	PORTREVISION= 12
6	CATEGORIES= mail security	6	CATEGORIES= mail security
7	MASTER_SITES= SF/${PORTNAME} \	7	MASTER_SITES= SF/${PORTNAME} \
8	SF/${PORTNAME}/Previous%20Releases \	8	SF/${PORTNAME}/Previous%20Releases \
Lines 107-116 MAKE_ENV= INSTALL_STRIP_FLAG=${STRIP} Link Here
107	WITH_DEBUG= yes	107	WITH_DEBUG= yes
108	.endif	108	.endif
109		109
110	.if ${PORT_OPTIONS:MSASL} && ${PORT_OPTIONS:MOPENLDAP}
111	WANT_OPENLDAP_SASL= yes
112	.endif
113
114	.if ${PORT_OPTIONS:MFILTER}	110	.if ${PORT_OPTIONS:MFILTER}
115	SUB_FILES= pkg-message	111	SUB_FILES= pkg-message
116	WITHOUT_MILTER_CFLAGS= yes	112	WITHOUT_MILTER_CFLAGS= yes

Lines 2-8 Link Here

(-)b/mail/postfix-current/Makefile (-10 / +3 lines)
2		2
3	PORTNAME= postfix	3	PORTNAME= postfix
4	DISTVERSION= 3.7-20210717	4	DISTVERSION= 3.7-20210717
5	PORTREVISION?= 0	5	PORTREVISION?= 1
6	PORTEPOCH= 6	6	PORTEPOCH= 6
7	CATEGORIES= mail	7	CATEGORIES= mail
8	MASTER_SITES= http://ftp.porcupine.org/mirrors/postfix-release/ \	8	MASTER_SITES= http://ftp.porcupine.org/mirrors/postfix-release/ \
Lines 38-44 USE_SUBMAKE= yes Link Here
38	SCRIPTS_ENV+= POSTFIX_DEFAULT_MTA="${POSTFIX_DEFAULT_MTA}"	38	SCRIPTS_ENV+= POSTFIX_DEFAULT_MTA="${POSTFIX_DEFAULT_MTA}"
39		39
40	OPTIONS_SUB= yes	40	OPTIONS_SUB= yes
41	OPTIONS_DEFINE= BDB BLACKLISTD CDB DOCS EAI INST_BASE LDAP LDAP_SASL \	41	OPTIONS_DEFINE= BDB BLACKLISTD CDB DOCS EAI INST_BASE LDAP \
42	LMDB MYSQL NIS PCRE PGSQL SASL SQLITE TEST TLS	42	LMDB MYSQL NIS PCRE PGSQL SASL SQLITE TEST TLS
43		43
44	OPTIONS_RADIO= RG1	44	OPTIONS_RADIO= RG1
Lines 63-69 CDB_DESC= CDB maps lookups Link Here
63	EAI_DESC= Email Address Internationalization (SMTPUTF8) support	63	EAI_DESC= Email Address Internationalization (SMTPUTF8) support
64	INST_BASE_DESC= Install into /usr and /etc/postfix	64	INST_BASE_DESC= Install into /usr and /etc/postfix
65	LDAP_DESC= LDAP maps (uses WITH_OPENLDAP_VER)	65	LDAP_DESC= LDAP maps (uses WITH_OPENLDAP_VER)
66	LDAP_SASL_DESC= LDAP client-to-server SASL auth
67	LMDB_DESC= LMDB maps	66	LMDB_DESC= LMDB maps
68	TEST_DESC= SMTP/LMTP test server and generator	67	TEST_DESC= SMTP/LMTP test server and generator
69		68
Lines 234-248 DYN_EXT+= ldap Link Here
234	WANT_OPENLDAP_VER= ${WITH_OPENLDAP_VER}	233	WANT_OPENLDAP_VER= ${WITH_OPENLDAP_VER}
235	. endif	234	. endif
236	POSTFIX_CCARGS+= -DHAS_LDAP -I${LOCALBASE}/include	235	POSTFIX_CCARGS+= -DHAS_LDAP -I${LOCALBASE}/include
		236	POSTFIX_CCARGS+= -I${LOCALBASE}/include/sasl -DUSE_LDAP_SASL
237	POSTFIX_DYN_AUXLIBS+= "AUXLIBS_LDAP=-L${LOCALBASE}/lib -lldap -L${LOCALBASE}/lib -llber"	237	POSTFIX_DYN_AUXLIBS+= "AUXLIBS_LDAP=-L${LOCALBASE}/lib -lldap -L${LOCALBASE}/lib -llber"
238	_REQUIRE+= slapd	238	_REQUIRE+= slapd
239	. if ${PORT_OPTIONS:MLDAP_SASL}
240	. if ! ${PORT_OPTIONS:MSASL}
241	LIB_DEPENDS+= libsasl2.so:security/cyrus-sasl2
242	. endif
243	WANT_OPENLDAP_SASL= yes
244	POSTFIX_CCARGS+= -I${LOCALBASE}/include/sasl -DUSE_LDAP_SASL
245	. endif
246	.endif	239	.endif
247		240
248	.if ${PORT_OPTIONS:MCDB}	241	.if ${PORT_OPTIONS:MCDB}

Lines 2-8 Link Here

(-)b/mail/postfix/Makefile (-10 / +3 lines)
2		2
3	PORTNAME= postfix	3	PORTNAME= postfix
4	DISTVERSION= 3.6.2	4	DISTVERSION= 3.6.2
5	PORTREVISION?= 0	5	PORTREVISION?= 1
6	PORTEPOCH= 1	6	PORTEPOCH= 1
7	CATEGORIES= mail	7	CATEGORIES= mail
8	MASTER_SITES= http://ftp.porcupine.org/mirrors/postfix-release/ \	8	MASTER_SITES= http://ftp.porcupine.org/mirrors/postfix-release/ \
Lines 38-44 USE_SUBMAKE= yes Link Here
38	SCRIPTS_ENV+= POSTFIX_DEFAULT_MTA="${POSTFIX_DEFAULT_MTA}"	38	SCRIPTS_ENV+= POSTFIX_DEFAULT_MTA="${POSTFIX_DEFAULT_MTA}"
39		39
40	OPTIONS_SUB= yes	40	OPTIONS_SUB= yes
41	OPTIONS_DEFINE= BDB BLACKLISTD CDB DOCS EAI INST_BASE LDAP LDAP_SASL \	41	OPTIONS_DEFINE= BDB BLACKLISTD CDB DOCS EAI INST_BASE LDAP \
42	LMDB MYSQL NIS PCRE PGSQL SASL SQLITE TEST TLS	42	LMDB MYSQL NIS PCRE PGSQL SASL SQLITE TEST TLS
43		43
44	OPTIONS_RADIO= RG1	44	OPTIONS_RADIO= RG1
Lines 63-69 CDB_DESC= CDB maps lookups Link Here
63	EAI_DESC= Email Address Internationalization (SMTPUTF8) support	63	EAI_DESC= Email Address Internationalization (SMTPUTF8) support
64	INST_BASE_DESC= Install into /usr and /etc/postfix	64	INST_BASE_DESC= Install into /usr and /etc/postfix
65	LDAP_DESC= LDAP maps (uses WITH_OPENLDAP_VER)	65	LDAP_DESC= LDAP maps (uses WITH_OPENLDAP_VER)
66	LDAP_SASL_DESC= LDAP client-to-server SASL auth
67	LMDB_DESC= LMDB maps	66	LMDB_DESC= LMDB maps
68	TEST_DESC= SMTP/LMTP test server and generator	67	TEST_DESC= SMTP/LMTP test server and generator
69		68
Lines 234-248 DYN_EXT+= ldap Link Here
234	WANT_OPENLDAP_VER= ${WITH_OPENLDAP_VER}	233	WANT_OPENLDAP_VER= ${WITH_OPENLDAP_VER}
235	. endif	234	. endif
236	POSTFIX_CCARGS+= -DHAS_LDAP -I${LOCALBASE}/include	235	POSTFIX_CCARGS+= -DHAS_LDAP -I${LOCALBASE}/include
		236	POSTFIX_CCARGS+= -I${LOCALBASE}/include/sasl -DUSE_LDAP_SASL
237	POSTFIX_DYN_AUXLIBS+= "AUXLIBS_LDAP=-L${LOCALBASE}/lib -lldap -L${LOCALBASE}/lib -llber"	237	POSTFIX_DYN_AUXLIBS+= "AUXLIBS_LDAP=-L${LOCALBASE}/lib -lldap -L${LOCALBASE}/lib -llber"
238	_REQUIRE+= slapd	238	_REQUIRE+= slapd
239	. if ${PORT_OPTIONS:MLDAP_SASL}
240	. if ! ${PORT_OPTIONS:MSASL}
241	LIB_DEPENDS+= libsasl2.so:security/cyrus-sasl2
242	. endif
243	WANT_OPENLDAP_SASL= yes
244	POSTFIX_CCARGS+= -I${LOCALBASE}/include/sasl -DUSE_LDAP_SASL
245	. endif
246	.endif	239	.endif
247		240
248	.if ${PORT_OPTIONS:MCDB}	241	.if ${PORT_OPTIONS:MCDB}

Lines 2-8 Link Here

(-)b/mail/postfix35/Makefile (-10 / +3 lines)
2		2
3	PORTNAME= postfix	3	PORTNAME= postfix
4	DISTVERSION= 3.5.12	4	DISTVERSION= 3.5.12
5	PORTREVISION?= 0	5	PORTREVISION?= 1
6	PORTEPOCH= 1	6	PORTEPOCH= 1
7	CATEGORIES= mail	7	CATEGORIES= mail
8	MASTER_SITES= http://ftp.porcupine.org/mirrors/postfix-release/ \	8	MASTER_SITES= http://ftp.porcupine.org/mirrors/postfix-release/ \
Lines 41-47 USE_SUBMAKE= yes Link Here
41	SCRIPTS_ENV+= POSTFIX_DEFAULT_MTA="${POSTFIX_DEFAULT_MTA}"	41	SCRIPTS_ENV+= POSTFIX_DEFAULT_MTA="${POSTFIX_DEFAULT_MTA}"
42		42
43	OPTIONS_SUB= yes	43	OPTIONS_SUB= yes
44	OPTIONS_DEFINE= BDB BLACKLISTD CDB DOCS EAI INST_BASE LDAP LDAP_SASL \	44	OPTIONS_DEFINE= BDB BLACKLISTD CDB DOCS EAI INST_BASE LDAP \
45	LMDB MYSQL NIS PCRE PGSQL SASL SQLITE TEST TLS	45	LMDB MYSQL NIS PCRE PGSQL SASL SQLITE TEST TLS
46		46
47	OPTIONS_RADIO= RG1	47	OPTIONS_RADIO= RG1
Lines 67-73 CDB_DESC= CDB maps lookups Link Here
67	EAI_DESC= Email Address Internationalization (SMTPUTF8) support	67	EAI_DESC= Email Address Internationalization (SMTPUTF8) support
68	INST_BASE_DESC= Install into /usr and /etc/postfix	68	INST_BASE_DESC= Install into /usr and /etc/postfix
69	LDAP_DESC= LDAP maps (uses WITH_OPENLDAP_VER)	69	LDAP_DESC= LDAP maps (uses WITH_OPENLDAP_VER)
70	LDAP_SASL_DESC= LDAP client-to-server SASL auth
71	LMDB_DESC= LMDB maps	70	LMDB_DESC= LMDB maps
72	TEST_DESC= SMTP/LMTP test server and generator	71	TEST_DESC= SMTP/LMTP test server and generator
73		72
Lines 230-244 DYN_EXT+= ldap Link Here
230	WANT_OPENLDAP_VER= ${WITH_OPENLDAP_VER}	229	WANT_OPENLDAP_VER= ${WITH_OPENLDAP_VER}
231	. endif	230	. endif
232	POSTFIX_CCARGS+= -DHAS_LDAP -I${LOCALBASE}/include	231	POSTFIX_CCARGS+= -DHAS_LDAP -I${LOCALBASE}/include
		232	POSTFIX_CCARGS+= -I${LOCALBASE}/include/sasl -DUSE_LDAP_SASL
233	POSTFIX_DYN_AUXLIBS+= "AUXLIBS_LDAP=-L${LOCALBASE}/lib -lldap -L${LOCALBASE}/lib -llber"	233	POSTFIX_DYN_AUXLIBS+= "AUXLIBS_LDAP=-L${LOCALBASE}/lib -lldap -L${LOCALBASE}/lib -llber"
234	_REQUIRE+= slapd	234	_REQUIRE+= slapd
235	. if ${PORT_OPTIONS:MLDAP_SASL}
236	. if ! ${PORT_OPTIONS:MSASL}
237	LIB_DEPENDS+= libsasl2.so:security/cyrus-sasl2
238	. endif
239	WANT_OPENLDAP_SASL= yes
240	POSTFIX_CCARGS+= -I${LOCALBASE}/include/sasl -DUSE_LDAP_SASL
241	. endif
242	.endif	235	.endif
243		236
244	.if ${PORT_OPTIONS:MCDB}	237	.if ${PORT_OPTIONS:MCDB}

Lines 2-8 Link Here

(-)b/mail/vpopmail/Makefile (-6 / +2 lines)
2		2
3	PORTNAME= vpopmail	3	PORTNAME= vpopmail
4	PORTVERSION= 5.4.33	4	PORTVERSION= 5.4.33
5	PORTREVISION= 3	5	PORTREVISION= 4
6	CATEGORIES= mail	6	CATEGORIES= mail
7	MASTER_SITES= SF/${PORTNAME}/${PORTNAME}-stable/${PORTVERSION}	7	MASTER_SITES= SF/${PORTNAME}/${PORTNAME}-stable/${PORTVERSION}
8		8
Lines 68-74 OPTIONS_DEFINE= DOCS \ Link Here
68	SQL_LOG \	68	SQL_LOG \
69	SQL_LOG_TRIM	69	SQL_LOG_TRIM
70	OPTIONS_SINGLE= AUTH	70	OPTIONS_SINGLE= AUTH
71	OPTIONS_SINGLE_AUTH= CDB MYSQL PGSQL LDAP LDAP_SASL ORACLE SYBASE	71	OPTIONS_SINGLE_AUTH= CDB MYSQL PGSQL LDAP ORACLE SYBASE
72		72
73	OPTIONS_DEFAULT=MD5_PASSWORDS \	73	OPTIONS_DEFAULT=MD5_PASSWORDS \
74	CDB \	74	CDB \
Lines 90-96 MYSQL_REPLICATION_DESC= MySQL database replication support Link Here
90	MYSQL_LIMITS_DESC= MySQL mailbox limitations support	90	MYSQL_LIMITS_DESC= MySQL mailbox limitations support
91	ORACLE_DESC= Auth via Oracle	91	ORACLE_DESC= Auth via Oracle
92	LDAP_DESC= Auth via LDAP	92	LDAP_DESC= Auth via LDAP
93	LDAP_SASL_DESC= Auth via LDAP SASL
94	VALIAS_DESC= Store aliases in DB instead of .qmail files	93	VALIAS_DESC= Store aliases in DB instead of .qmail files
95	ROAMING_DESC= roaming users support	94	ROAMING_DESC= roaming users support
96	IP_ALIAS_DESC= IP alias support	95	IP_ALIAS_DESC= IP alias support
Lines 255-263 VPOPMAIL_DIR?= ${PREFIX}/vpopmail Link Here
255		254
256	.if ${PORT_OPTIONS:MLDAP}	255	.if ${PORT_OPTIONS:MLDAP}
257	USE_OPENLDAP= yes	256	USE_OPENLDAP= yes
258	.if ${PORT_OPTIONS:MLDAP_SASL}
259	WANT_OPENLDAP_SASL= yes
260	.endif
261	LDAP_FILES= ${WRKSRC}/doc/README.ldap \	257	LDAP_FILES= ${WRKSRC}/doc/README.ldap \
262	${WRKSRC}/ldap/nsswitch.conf \	258	${WRKSRC}/ldap/nsswitch.conf \
263	${WRKSRC}/ldap/pam_ldap.conf \	259	${WRKSRC}/ldap/pam_ldap.conf \

Lines 2-8 Link Here

(-)b/net/nss_ldap/Makefile (-8 / +2 lines)
2		2
3	PORTNAME= nss_ldap	3	PORTNAME= nss_ldap
4	PORTVERSION= 1.${NSS_LDAP_VERSION}	4	PORTVERSION= 1.${NSS_LDAP_VERSION}
5	PORTREVISION= 13	5	PORTREVISION= 14
6	CATEGORIES= net	6	CATEGORIES= net
7	MASTER_SITES= http://www.padl.com/download/ \	7	MASTER_SITES= http://www.padl.com/download/ \
8	LOCAL/martymac	8	LOCAL/martymac
Lines 21-33 GNU_CONFIGURE= yes Link Here
21	USE_LDCONFIG= yes	21	USE_LDCONFIG= yes
22	USE_OPENLDAP= yes	22	USE_OPENLDAP= yes
23		23
24	OPTIONS_DEFINE= LCLASS KERBEROS SASL	24	OPTIONS_DEFINE= LCLASS KERBEROS
25	OPTIONS_DEFAULT=LCLASS KERBEROS	25	OPTIONS_DEFAULT=LCLASS KERBEROS
26		26
27	LCLASS_DESC= Enable login classes via the loginClass attribute	27	LCLASS_DESC= Enable login classes via the loginClass attribute
28		28
29	SASL_DESC= Use the SASL-enabled version of OpenLDAP
30
31	CPPFLAGS+= -I${LOCALBASE}/include	29	CPPFLAGS+= -I${LOCALBASE}/include
32	LDFLAGS+= -L${LOCALBASE}/lib -Wl,-rpath,${LOCALBASE}/lib	30	LDFLAGS+= -L${LOCALBASE}/lib -Wl,-rpath,${LOCALBASE}/lib
33		31
Lines 49-58 CONFIGURE_ARGS+=--enable-configurable-krb5-ccname-gssapi \ Link Here
49	CFLAGS+="-DHAVE_LOGIN_CLASSES"	47	CFLAGS+="-DHAVE_LOGIN_CLASSES"
50	.endif	48	.endif
51		49
52	.if ${PORT_OPTIONS:MSASL}
53	WANT_OPENLDAP_SASL= yes
54	.endif
55
56	post-extract:	50	post-extract:
57	${CP} ${FILESDIR}/bsdnss.c ${WRKSRC}	51	${CP} ${FILESDIR}/bsdnss.c ${WRKSRC}
58		52

Lines 17-38 MASTER_SITES= https://www.openldap.org/software/download/OpenLDAP/%SUBDIR%/ \ Link Here

(-)b/net/openldap24-server/Makefile (-45 / +8 lines)
17	http://www.openldap.org/software/download/OpenLDAP/%SUBDIR%/	17	http://www.openldap.org/software/download/OpenLDAP/%SUBDIR%/
18	MASTER_SITE_SUBDIR= openldap-release	18	MASTER_SITE_SUBDIR= openldap-release
19	.if defined(CLIENT_ONLY)	19	.if defined(CLIENT_ONLY)
20	.if ${CLIENT_ONLY} == sasl
21	PKGNAMESUFFIX= -sasl-client
22	.else
23	PKGNAMESUFFIX= -client	20	PKGNAMESUFFIX= -client
24	.endif
25	.else	21	.else
26	PKGNAMESUFFIX?= -server	22	PKGNAMESUFFIX?= -server
27	.endif	23	.endif
28		24
29	MAINTAINER= delphij@FreeBSD.org	25	MAINTAINER= delphij@FreeBSD.org
30	.if defined(CLIENT_ONLY)	26	.if defined(CLIENT_ONLY)
31	.if ${CLIENT_ONLY} == sasl
32	COMMENT= Open source LDAP client implementation with SASL2 support
33	.else
34	COMMENT= Open source LDAP client implementation	27	COMMENT= Open source LDAP client implementation
35	.endif
36	.else	28	.else
37	COMMENT= Open source LDAP server implementation	29	COMMENT= Open source LDAP server implementation
38	.endif	30	.endif
Lines 43-55 LICENSE_FILE= ${WRKSRC}/LICENSE Link Here
43	LICENSE_PERMS= dist-mirror dist-sell pkg-mirror pkg-sell auto-accept	35	LICENSE_PERMS= dist-mirror dist-sell pkg-mirror pkg-sell auto-accept
44		36
45	.if defined(CLIENT_ONLY)	37	.if defined(CLIENT_ONLY)
46	.if ${CLIENT_ONLY} == sasl	38	CONFLICTS= ${PKGNAMEPREFIX}${PORTNAME}-client-2.[0-35-9].*
47	CONFLICTS= ${PKGNAMEPREFIX}${PORTNAME}-client-2.* \
48	${PKGNAMEPREFIX}${PORTNAME}-sasl-client-2.[0-3].*
49	.else
50	CONFLICTS= ${PKGNAMEPREFIX}${PORTNAME}-client-2.[0-3].* \
51	${PKGNAMEPREFIX}${PORTNAME}-sasl-client-2.*
52	.endif
53	.endif	39	.endif
54		40
55	GNU_CONFIGURE= yes	41	GNU_CONFIGURE= yes
Lines 67-74 WANT_OPENLDAP_VER?= 24 Link Here
67	BROKEN= incompatible OpenLDAP version: ${WANT_OPENLDAP_VER}	53	BROKEN= incompatible OpenLDAP version: ${WANT_OPENLDAP_VER}
68	.endif	54	.endif
69		55
70	PORTREVISION_CLIENT= 0	56	PORTREVISION_CLIENT= 1
71	PORTREVISION_SERVER= 0	57	PORTREVISION_SERVER= 1
72	OPENLDAP_SHLIB_MAJOR= 2	58	OPENLDAP_SHLIB_MAJOR= 2
73	OPENLDAP_SHLIB_MINOR= 11.7	59	OPENLDAP_SHLIB_MINOR= 11.7
74	OPENLDAP_MAJOR= ${DISTVERSION:R}	60	OPENLDAP_MAJOR= ${DISTVERSION:R}
Lines 76-82 OPENLDAP_MAJOR= ${DISTVERSION:R} Link Here
76	OPTIONS_DEFINE= DEBUG FETCH GSSAPI	62	OPTIONS_DEFINE= DEBUG FETCH GSSAPI
77		63
78	FETCH_DESC= Enable fetch(3) support	64	FETCH_DESC= Enable fetch(3) support
79	GSSAPI_DESC= With GSSAPI support (implies SASL support)	65	GSSAPI_DESC= With GSSAPI support
80		66
81	.if defined(CLIENT_ONLY)	67	.if defined(CLIENT_ONLY)
82	OPTIONS_DEFINE+= DOCS	68	OPTIONS_DEFINE+= DOCS
Lines 86-92 OPTIONS_DEFINE+= SOCK ODBC RLOOKUPS SLP SLAPI TCP_WRAPPERS Link Here
86	OPTIONS_DEFINE+= ACCESSLOG AUDITLOG COLLECT CONSTRAINT DDS	72	OPTIONS_DEFINE+= ACCESSLOG AUDITLOG COLLECT CONSTRAINT DDS
87	OPTIONS_DEFINE+= DEREF DYNGROUP DYNLIST MEMBEROF PPOLICY PCACHE	73	OPTIONS_DEFINE+= DEREF DYNGROUP DYNLIST MEMBEROF PPOLICY PCACHE
88	OPTIONS_DEFINE+= REFINT RETCODE RWM SEQMOD SSSVLV SYNCPROV TRANSLUCENT	74	OPTIONS_DEFINE+= REFINT RETCODE RWM SEQMOD SSSVLV SYNCPROV TRANSLUCENT
89	OPTIONS_DEFINE+= UNIQUE VALSORT SMBPWD SHA2 DYNAMIC_BACKENDS SASL	75	OPTIONS_DEFINE+= UNIQUE VALSORT SMBPWD SHA2 DYNAMIC_BACKENDS
90	OPTIONS_DEFINE+= LMPASSWD	76	OPTIONS_DEFINE+= LMPASSWD
91	OPTIONS_DEFINE+= PBKDF2	77	OPTIONS_DEFINE+= PBKDF2
92	OPTIONS_DEFINE+= OUTLOOK	78	OPTIONS_DEFINE+= OUTLOOK
Lines 132-138 PCACHE_DESC= With Proxy Cache overlay Link Here
132	REFINT_DESC= With Referential Integrity overlay	118	REFINT_DESC= With Referential Integrity overlay
133	RETCODE_DESC= With Return Code testing overlay	119	RETCODE_DESC= With Return Code testing overlay
134	RWM_DESC= With Rewrite/Remap overlay	120	RWM_DESC= With Rewrite/Remap overlay
135	SASL_DESC= With (Cyrus) SASL2 support
136	SEQMOD_DESC= With Sequential Modify overlay	121	SEQMOD_DESC= With Sequential Modify overlay
137	SSSVLV_DESC= With ServerSideSort/VLV overlay	122	SSSVLV_DESC= With ServerSideSort/VLV overlay
138	SYNCPROV_DESC= With Syncrepl Provider overlay	123	SYNCPROV_DESC= With Syncrepl Provider overlay
Lines 165-173 CONFIGURE_SED= -e 's,uuid/uuid.h,xxuuid/uuid.h,g' Link Here
165	.if defined(CLIENT_ONLY)	150	.if defined(CLIENT_ONLY)
166	PORTDOCS= CHANGES drafts rfc	151	PORTDOCS= CHANGES drafts rfc
167		152
168	.if ${CLIENT_ONLY} == sasl
169	PORT_OPTIONS+= SASL
170	.endif
171	.if defined(USE_OPENLDAP)	153	.if defined(USE_OPENLDAP)
172	BROKEN= you have USE_OPENLDAP variable defined either in environment or in make(1) arguments; please undefine and try again	154	BROKEN= you have USE_OPENLDAP variable defined either in environment or in make(1) arguments; please undefine and try again
173	.endif	155	.endif
Lines 176-197 USE_OPENLDAP= yes Link Here
176	WANT_OPENLDAP_VER= 24	158	WANT_OPENLDAP_VER= 24
177		159
178	LIB_DEPENDS+= libicudata.so:devel/icu	160	LIB_DEPENDS+= libicudata.so:devel/icu
179
180	.if ${PORT_OPTIONS:MGSSAPI} && empty(PORT_OPTIONS:MSASL)
181	PORT_OPTIONS+= SASL
182	.endif
183
184	.if ${PORT_OPTIONS:MSASL}
185	WANT_OPENLDAP_SASL= yes
186	CONFLICTS= ${PKGNAMEPREFIX}${PORTNAME}-client-2.*
187	PKGNAMESUFFIX= -sasl-server
188	.if ${PORT_OPTIONS:MGSSAPI}
189	RUN_DEPENDS+= cyrus-sasl-gssapi>0:security/cyrus-sasl2-gssapi
190	.endif
191	.else
192	CONFLICTS= ${PKGNAMEPREFIX}${PORTNAME}-sasl-client-2.*
193	.endif
194
195	.endif	161	.endif
196		162
197	DESCR= ${PKGDIR}/pkg-descr${OPENLDAP_PKGFILESUFX}	163	DESCR= ${PKGDIR}/pkg-descr${OPENLDAP_PKGFILESUFX}
Lines 218-229 CONFIGURE_ARGS= --with-threads=posix \ Link Here
218	--disable-dependency-tracking \	184	--disable-dependency-tracking \
219	--enable-dynamic	185	--enable-dynamic
220		186
221	.if ${PORT_OPTIONS:MSASL}	187
		188	GSSAPI_RUN_DEPENDS+= cyrus-sasl-gssapi>0:security/cyrus-sasl2-gssapi
		189
222	LIB_DEPENDS+= libsasl2.so:security/cyrus-sasl2	190	LIB_DEPENDS+= libsasl2.so:security/cyrus-sasl2
223	CONFIGURE_ARGS+= --with-cyrus-sasl	191	CONFIGURE_ARGS+= --with-cyrus-sasl
224	.else
225	CONFIGURE_ARGS+= --without-cyrus-sasl
226	.endif
227		192
228	.if defined(CLIENT_ONLY)	193	.if defined(CLIENT_ONLY)
229	# client specific configuration	194	# client specific configuration
Lines 523-531 PLIST_SUB+= BACK_PERL=${BACKEND_PLIST} Link Here
523	PLIST_SUB+= BACK_PERL="@comment "	488	PLIST_SUB+= BACK_PERL="@comment "
524	.endif	489	.endif
525		490
526	.if ${PORT_OPTIONS:MSASL}
527	CONFIGURE_ARGS+= --enable-spasswd	491	CONFIGURE_ARGS+= --enable-spasswd
528	.endif
529		492
530	.if ${PORT_OPTIONS:MODBC}	493	.if ${PORT_OPTIONS:MODBC}
531	CONFIGURE_ARGS+= --enable-sql=${BACKEND_ENABLE}	494	CONFIGURE_ARGS+= --enable-sql=${BACKEND_ENABLE}

Lines 1-5 Link Here

(-)b/net/py-ldap/Makefile (-9 / +1 lines)
1	PORTNAME= ldap	1	PORTNAME= ldap
2	DISTVERSION= 3.3.1	2	DISTVERSION= 3.3.1
		3	PORTREVISION= 1
3	CATEGORIES= net python	4	CATEGORIES= net python
4	MASTER_SITES= CHEESESHOP	5	MASTER_SITES= CHEESESHOP
5	PKGNAMEPREFIX= ${PYTHON_PKGNAMEPREFIX}	6	PKGNAMEPREFIX= ${PYTHON_PKGNAMEPREFIX}
Lines 19-36 USE_PYTHON= autoplist distutils Link Here
19	USE_OPENLDAP= yes	20	USE_OPENLDAP= yes
20	WANT_OPENLDAP_VER= 24	21	WANT_OPENLDAP_VER= 24
21		22
22	OPTIONS_DEFINE= SASL
23
24	SASL_VARS= WANT_OPENLDAP_SASL=yes
25	SASL_CONFLICTS= openldap24-client-2.*
26
27	post-patch:	23	post-patch:
28	@${REINPLACE_CMD} -e 's\|%%LOCALBASE%%\|${LOCALBASE}\|g' ${WRKSRC}/setup.py	24	@${REINPLACE_CMD} -e 's\|%%LOCALBASE%%\|${LOCALBASE}\|g' ${WRKSRC}/setup.py
29		25
30	do-configure-SASL-off:
31	@cd ${WRKSRC} && ${PYTHON_CMD} setup.py -q setopt -c _ldap -s HAVE_TLS -o defines
32	@cd ${WRKSRC} && ${PYTHON_CMD} setup.py -q saveopts
33
34	post-install:	26	post-install:
35	${STRIP_CMD} ${STAGEDIR}${PYTHONPREFIX_SITELIBDIR}/_ldap*.so	27	${STRIP_CMD} ${STAGEDIR}${PYTHONPREFIX_SITELIBDIR}/_ldap*.so
36		28

Lines 1-5 Link Here

(-)b/net/py-ldap0/Makefile (-3 / +1 lines)
1	PORTNAME= ldap0	1	PORTNAME= ldap0
2	PORTVERSION= 1.2.8	2	PORTVERSION= 1.2.8
		3	PORTREVISION= 1
3	CATEGORIES= net python	4	CATEGORIES= net python
4	PKGNAMEPREFIX= ${PYTHON_PKGNAMEPREFIX}	5	PKGNAMEPREFIX= ${PYTHON_PKGNAMEPREFIX}
5		6
Lines 10-16 LICENSE= PSFL Link Here
10		11
11	RUN_DEPENDS= ${PYTHON_PKGNAMEPREFIX}pyasn1>=0.4.5:devel/py-pyasn1@${PY_FLAVOR} \	12	RUN_DEPENDS= ${PYTHON_PKGNAMEPREFIX}pyasn1>=0.4.5:devel/py-pyasn1@${PY_FLAVOR} \
12	${PYTHON_PKGNAMEPREFIX}pyasn1-modules>=0.2.5:devel/py-pyasn1-modules@${PY_FLAVOR}	13	${PYTHON_PKGNAMEPREFIX}pyasn1-modules>=0.2.5:devel/py-pyasn1-modules@${PY_FLAVOR}
13	# OpenLDAP needs SASL option enabled
14	# Cyrus needs PLAIN / CRAM-MD5 / DIGEST-MD5 enabled	14	# Cyrus needs PLAIN / CRAM-MD5 / DIGEST-MD5 enabled
15	TEST_DEPENDS= ${LOCALBASE}/libexec/slapd:net/openldap24-server	15	TEST_DEPENDS= ${LOCALBASE}/libexec/slapd:net/openldap24-server
16		16
Lines 24-31 GL_ACCOUNT= ae-dir Link Here
24	GL_PROJECT= python-ldap0	24	GL_PROJECT= python-ldap0
25	GL_COMMIT= 1bf10aa9ad4ab7755e02c9f74cfa9ad7b4368d34	25	GL_COMMIT= 1bf10aa9ad4ab7755e02c9f74cfa9ad7b4368d34
26		26
27	WANT_OPENLDAP_SASL= yes
28
29	PYDISTUTILS_BUILD_TARGET= build_ext	27	PYDISTUTILS_BUILD_TARGET= build_ext
30	PYDISTUTILS_BUILDARGS+= --inplace	28	PYDISTUTILS_BUILDARGS+= --inplace
31		29

Lines 4-16 COMMENT= SASL LDAPDB auxprop plugin Link Here

(-)b/security/cyrus-sasl2-ldapdb/Makefile (-7 lines)
4		4
5	CYRUS_CONFIGURE_ARGS= --enable-ldapdb --with-ldap=${LOCALBASE}	5	CYRUS_CONFIGURE_ARGS= --enable-ldapdb --with-ldap=${LOCALBASE}
6		6
7	OPTIONS_DEFINE= OPENLDAP_SASL
8	OPENLDAP_SASL_DESC= OpenLDAP client with SASL2 support
9	OPENLDAP_SASL_VARS= WANT_OPENLDAP_SASL=yes
10
11	USE_OPENLDAP= yes	7	USE_OPENLDAP= yes
12	.if defined(WITH_OPENLDAP_VER)
13	WANT_OPENLDAP_VER= ${WITH_OPENLDAP_VER}
14	.endif
15		8
16	.include "${.CURDIR}/../../security/cyrus-sasl2/Makefile.common"	9	.include "${.CURDIR}/../../security/cyrus-sasl2/Makefile.common"

Lines 1-5 Link Here

(-)b/security/cyrus-sasl2-saslauthd/Makefile (-4 / +2 lines)
1	PKGNAMESUFFIX= -saslauthd	1	PKGNAMESUFFIX= -saslauthd
2	PORTREVISION= 1	2	PORTREVISION= 2
3		3
4	COMMENT= SASL authentication server for cyrus-sasl2	4	COMMENT= SASL authentication server for cyrus-sasl2
5		5
Lines 12-18 USE_RC_SUBR= saslauthd Link Here
12	CYRUS_CONFIGURE_ARGS= --with-saslauthd=${SASLAUTHD_RUNPATH}	12	CYRUS_CONFIGURE_ARGS= --with-saslauthd=${SASLAUTHD_RUNPATH}
13	CONFIGURE_ENV+= andrew_cv_runpath_switch=none	13	CONFIGURE_ENV+= andrew_cv_runpath_switch=none
14		14
15	OPTIONS_DEFINE= DOCS HTTPFORM OPENLDAP OPENLDAP_SASL	15	OPTIONS_DEFINE= DOCS HTTPFORM OPENLDAP
16	OPTIONS_RADIO= GSSAPI SASLDB	16	OPTIONS_RADIO= GSSAPI SASLDB
17	OPTIONS_RADIO_SASLDB= BDB1 BDB GDBM LMDB	17	OPTIONS_RADIO_SASLDB= BDB1 BDB GDBM LMDB
18	OPTIONS_DEFAULT= BDB1	18	OPTIONS_DEFAULT= BDB1
Lines 22-29 HTTPFORM_CONFIGURE_ENABLE=httpform Link Here
22	OPENLDAP_DESC= Use OpenLDAP	22	OPENLDAP_DESC= Use OpenLDAP
23	OPENLDAP_USE= OPENLDAP=yes	23	OPENLDAP_USE= OPENLDAP=yes
24	OPENLDAP_CONFIGURE_ON= --with-ldap=${LOCALBASE}	24	OPENLDAP_CONFIGURE_ON= --with-ldap=${LOCALBASE}
25	OPENLDAP_SASL_DESC= OpenLDAP client with SASL2 support
26	OPENLDAP_SASL_VARS= WANT_OPENLDAP_SASL=yes
27		25
28	SASLDB_DESC= Experimental SASLdb authentication module	26	SASLDB_DESC= Experimental SASLdb authentication module
29	BDB_USES= bdb	27	BDB_USES= bdb

Lines 2-7 Link Here

(-)b/security/heimdal/Makefile (-4 / +1 lines)
2		2
3	PORTNAME= heimdal	3	PORTNAME= heimdal
4	PORTVERSION= 7.7.0	4	PORTVERSION= 7.7.0
		5	PORTREVISION= 1
5	CATEGORIES= security	6	CATEGORIES= security
6	MASTER_SITES= https://github.com/heimdal/heimdal/releases/download/${DISTNAME}/	7	MASTER_SITES= https://github.com/heimdal/heimdal/releases/download/${DISTNAME}/
7		8
Lines 98-107 CRACKLIB_LIB_DEPENDS= libcrack.so:security/cracklib Link Here
98		99
99	.include <bsd.port.options.mk>	100	.include <bsd.port.options.mk>
100		101
101	.if ${PORT_OPTIONS:MLDAP}
102	WANT_OPENLDAP_SASL?= yes
103	.endif
104
105	post-extract:	102	post-extract:
106	@${MKDIR} ${WRKSRC}/kpasswdd-cracklib	103	@${MKDIR} ${WRKSRC}/kpasswdd-cracklib
107	${INSTALL_DATA} ${FILESDIR}/kpasswdd-cracklib.c \	104	${INSTALL_DATA} ${FILESDIR}/kpasswdd-cracklib.c \

Lines 2-8 Link Here

(-)b/sysutils/ldapvi/Makefile (-6 / +1 lines)
2		2
3	PORTNAME= ldapvi	3	PORTNAME= ldapvi
4	PORTVERSION= 1.7	4	PORTVERSION= 1.7
5	PORTREVISION= 5	5	PORTREVISION= 6
6	CATEGORIES= sysutils net	6	CATEGORIES= sysutils net
7	MASTER_SITES= http://www.lichteblau.com/download/ \	7	MASTER_SITES= http://www.lichteblau.com/download/ \
8	LOCAL/sbz	8	LOCAL/sbz
Lines 29-39 PLIST_FILES= bin/${PORTNAME} man/man1/${PORTNAME}.1.gz \ Link Here
29	${DOCSDIR_REL}/manual.css ${DOCSDIR_REL}/manual.xml \	29	${DOCSDIR_REL}/manual.css ${DOCSDIR_REL}/manual.xml \
30	${DOCSDIR_REL}/bg.png ${DOCSDIR_REL}/html.xsl	30	${DOCSDIR_REL}/bg.png ${DOCSDIR_REL}/html.xsl
31		31
32	# XXX should probably be converted to OptionsNG
33	.if !defined(WANT_OPENLDAP_SASL) \|\| defined(WITHOUT_SASL)
34	CONFIGURE_ARGS= --without-sasl
35	.endif
36
37	post-patch:	32	post-patch:
38	@${REINPLACE_CMD} -e 's/-lssl/-lcrypto/' ${WRKSRC}/configure	33	@${REINPLACE_CMD} -e 's/-lssl/-lcrypto/' ${WRKSRC}/configure
39		34