Spring cleanup of OpenLDAP 2.4 port:

- Fix various issues introduced with staging support. - Build MDB backend by default, this will become new preferred backend and BerkeleyDB backend is now deprecated.
svn path=/head/; revision=348654
2025-01-26 09:46:09 +00:00 · 2014-03-19 22:11:10 +00:00 · 2014-03-19 22:11:10 +00:00 · 22c046f17a · 2021-03-31 03:12:20 +00:00
commit 22c046f17a
parent 6167391cda
5 changed files with 84 additions and 50 deletions
--- a/8
+++ b/8
@ -5,6 +5,14 @@ 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.

+20140318:
+  AFFECTS: users of net/openldap24-server
+  AUTHOR: delphij@FreeBSD.org
+
+  Please note that Berkeley DB backend is now deprecated and will be removed
+  in a future version.  Existing users should migrate data to the new MDB
+  backend when possible.
+
 20140317:
  AFFECTS: users of misc/ossp-uuid-perl
  AUTHOR: culot@FreeBSD.org
--- a/net/openldap24-server/Makefile
+++ b/net/openldap24-server/Makefile
@ -49,6 +49,8 @@ USE_AUTOTOOLS=		libtool
 USE_AUTOTOOLS+=		autoconf
 USERS=			ldap
 GROUPS=			ldap
+LDAP_USER?=		ldap
+LDAP_GROUP?=		ldap
 .endif

 WANT_OPENLDAP_VER?=	24
@ -56,29 +58,31 @@ WANT_OPENLDAP_VER?=	24
 BROKEN=			incompatible OpenLDAP version: ${WANT_OPENLDAP_VER}
 .endif

-PORTREVISION_CLIENT=	0
-PORTREVISION_SERVER=	1
+PORTREVISION_CLIENT=	1
+PORTREVISION_SERVER=	2
 OPENLDAP_SHLIB_MAJOR=	8
+OPENLDAP_MAJOR=		${DISTVERSION:R}

 OPTIONS_DEFINE=	FETCH

 FETCH_DESC=	Enable fetch(3) support

 .if !defined(CLIENT_ONLY)
-OPTIONS_DEFINE+=	DYNACL ACI BDB DNSSRV MDB PASSWD PERL RELAY SHELL
+OPTIONS_DEFINE+=	DYNACL ACI BDB MDB DNSSRV PASSWD PERL RELAY SHELL
 OPTIONS_DEFINE+=	SOCK ODBC RLOOKUPS SLP SLAPI TCP_WRAPPERS
 OPTIONS_DEFINE+=	ACCESSLOG AUDITLOG COLLECT CONSTRAINT DDS
 OPTIONS_DEFINE+=	DEREF DYNGROUP DYNLIST MEMBEROF PPOLICY PROXYCACHE
 OPTIONS_DEFINE+=	REFINT RETCODE RWM SEQMOD SSSVLV SYNCPROV TRANSLUCENT
 OPTIONS_DEFINE+=	UNIQUE VALSORT SMBPWD SHA2 DYNAMIC_BACKENDS SASL
+OPTIONS_DEFINE+=	DEBUG

-OPTIONS_DEFAULT=	BDB TCP_WRAPPERS SEQMOD SYNCPROV DYNAMIC_BACKENDS
+OPTIONS_DEFAULT=	BDB MDB SYNCPROV DYNAMIC_BACKENDS

 DYNACL_DESC=		Run-time loadable ACL (experimental)
 ACI_DESC=		Per-object ACI (experimental)
-BDB_DESC=		With BerkeleyDB backend
-DNSSRV_DESC=		With Dnssrv backend
+BDB_DESC=		With BerkeleyDB backend (DEPRECATED)
 MDB_DESC=		With Memory-Mapped DB backend
+DNSSRV_DESC=		With Dnssrv backend
 PASSWD_DESC=		With Passwd backend
 PERL_DESC=		With Perl backend
 RELAY_DESC=		With Relay backend
@ -87,7 +91,7 @@ SOCK_DESC=		With Sock backend
 ODBC_DESC=		With SQL backend
 RLOOKUPS_DESC=		With reverse lookups of client hostnames
 SLP_DESC=		With SLPv2 (RFC 2608) support
-SLAPI_DESC=		With Netscape SLAPI plugin API
+SLAPI_DESC=		With Netscape SLAPI plugin API (experimental)
 TCP_WRAPPERS_DESC=	With tcp wrapper support
 ACCESSLOG_DESC=		With In-Directory Access Logging overlay
 AUDITLOG_DESC=		With Audit Logging overlay
@ -162,6 +166,8 @@ LOCALSTATEDIR?=		/var/db
 DATABASEDIR?=		${LOCALSTATEDIR}/openldap-data

 SUB_LIST+=		LDAP_RUN_DIR=${LDAP_RUN_DIR} \
+			LDAP_USER=${LDAP_USER} \
+			LDAP_GROUP=${LDAP_GROUP} \
 			DATABASEDIR=${DATABASEDIR} \
 			PKGNAME=${PKGNAME}

@ -184,6 +190,12 @@ CONFIGURE_ARGS+=	--with-cyrus-sasl
 CONFIGURE_ARGS+=	--without-cyrus-sasl
 .endif

+.if ${PORT_OPTIONS:MDEBUG}
+CONFIGURE_ARGS+=	--enable-debug=yes
+.else
+CONFIGURE_ARGS+=	--enable-debug=no
+.endif
+
 .if defined(CLIENT_ONLY)
 # client specific configuration

@ -469,7 +481,7 @@ LIB_DEPENDS+=		slp.1:${PORTSDIR}/net/openslp
 .endif

 # Include tcp-wrapper support
-.if !defined(WITHOUT_TCP_WRAPPERS) && exists(/usr/include/tcpd.h)
+.if ${PORT_OPTIONS:MTCP_WRAPPERS}
 CONFIGURE_ARGS+=	--enable-wrappers
 .endif

@ -496,6 +508,7 @@ SUB_LIST+=		RC_DIR=${PREFIX} \

 PLIST_SUB+=		${SUB_LIST}
 PLIST_SUB+=		SHLIB_MAJOR=${OPENLDAP_SHLIB_MAJOR}
+PLIST_SUB+=		OPENLDAP_MAJOR=${OPENLDAP_MAJOR}

 post-patch:
 	@${REINPLACE_CMD} -e 's,%LOCALSTATEDIR%/run/,${LDAP_RUN_DIR}/,g' \
@ -539,6 +552,9 @@ pre-su-install:
 .if ${PORT_OPTIONS:MMODULES} || ${PORT_OPTIONS:MDYNAMIC_BACKENDS} || ${PORT_OPTIONS:MSLAPI}
 	@${MKDIR} ${STAGEDIR}${PREFIX}/libexec/openldap
 .endif
+.if !defined(CLIENT_ONLY)
+	@${MKDIR} ${STAGEDIR}${DATABASEDIR}
+.endif

 post-install:
 .if defined(CLIENT_ONLY)
@ -548,11 +564,13 @@ post-install:
 		${MKDIR} ${STAGEDIR}${DOCSDIR}/$${dir}; \
 		${INSTALL_DATA} ${WRKSRC}/doc/$${dir}/* ${STAGEDIR}${DOCSDIR}/$${dir}; \
 	done
-
+	@for library in lber ldap ldap_r; do \
+		${STRIP_CMD} ${STAGEDIR}${PREFIX}/lib/lib$${library}-${OPENLDAP_MAJOR}.so.${OPENLDAP_SHLIB_MAJOR}; \
+	done
 .else
 	@${MKDIR} ${STAGEDIR}${LDAP_RUN_DIR}
 	@for schema in ${SCHEMATA}; do \
-		${ECHO_CMD} "@unexec if cmp -s %D/etc/openldap/schema/$${schema}.schema" \
+		${ECHO_CMD} "@unexec if cmp -s %D/etc/openldap/schema/$${schema}.schema " \
 			"%D/etc/openldap/schema/$${schema}.schema.default; then" \
 			"rm -f %D/etc/openldap/schema/$${schema}.schema; fi"; \
 		${ECHO_CMD} "etc/openldap/schema/$${schema}.schema.default"; \
@ -560,6 +578,9 @@ post-install:
 	done >>${TMPPLIST}
 	@${ECHO_CMD} "@unexec ${RMDIR} %D/etc/openldap/schema 2>/dev/null || true" >>${TMPPLIST}
 	@${ECHO_CMD} "@unexec ${RMDIR} %D/etc/openldap 2>/dev/null || true" >>${TMPPLIST}
+.if ${PORT_OPTIONS:MDYNAMIC_BACKENDS}
+	@${STRIP_CMD} ${STAGEDIR}${PREFIX}/libexec/openldap/*.so.${OPENLDAP_SHLIB_MAJOR}
+.endif
 .if ${PORT_OPTIONS:MSMBPWD}
 	@${INSTALL_DATA} ${WRKSRC}/contrib/slapd-modules/smbk5pwd/smbk5pwd.la \
 		${STAGEDIR}${PREFIX}/libexec/openldap/
--- a/net/openldap24-server/files/slapd.in
+++ b/net/openldap24-server/files/slapd.in
@ -47,7 +47,7 @@ if [ -n "${slapd_args+set}" ]; then
  warn "slapd_args is deprecated, use slapd_flags"
  : ${slapd_flags="$slapd_args"}
 fi
-: ${slapd_owner="ldap:ldap"}
+: ${slapd_owner="%%LDAP_USER%%:%%LDAP_GROUP%%"}
 : ${slapd_sockets_mode="666"}
 : ${slapd_cn_config="NO"}

@ -83,7 +83,7 @@ start_precmd()
    for DBDIR in ${DATABASEDIR}; do
       if [ ! -d "${DBDIR}" ]; then
          mkdir -p "${DBDIR}"
-          cp "%%PREFIX%%/etc/openldap/DB_CONFIG.example" "${DBDIR}/DB_CONFIG"
+          [ -f "%%PREFIX%%/etc/openldap/DB_CONFIG.example" ] && cp "%%PREFIX%%/etc/openldap/DB_CONFIG.example" "${DBDIR}/DB_CONFIG"
       fi
       chown -RL "$slapd_owner" "${DBDIR}"
       chmod 700 "${DBDIR}"
--- a/net/openldap24-server/pkg-plist
+++ b/net/openldap24-server/pkg-plist
@ -18,67 +18,67 @@ etc/openldap/schema/core.ldif
 etc/openldap/schema/corba.ldif
 etc/openldap/schema/collective.ldif
 etc/openldap/schema/README
-etc/openldap/DB_CONFIG.example
+%%BACK_BDB%%etc/openldap/DB_CONFIG.example
 %%SLAPI%%lib/libslapi.a
 %%SLAPI%%lib/libslapi.la
 %%SLAPI%%lib/libslapi.so
-%%SLAPI%%lib/libslapi-2.4.so
-%%SLAPI%%lib/libslapi-2.4.so.%%SHLIB_MAJOR%%
+%%SLAPI%%lib/libslapi-%%OPENLDAP_MAJOR%%.so
+%%SLAPI%%lib/libslapi-%%OPENLDAP_MAJOR%%.so.%%SHLIB_MAJOR%%
 %%MODULES%%@exec mkdir -p %D/libexec/openldap
-%%BACK_BDB%%libexec/openldap/back_bdb-2.4.so
-%%BACK_BDB%%libexec/openldap/back_bdb-2.4.so.%%SHLIB_MAJOR%%
+%%BACK_BDB%%libexec/openldap/back_bdb-%%OPENLDAP_MAJOR%%.so
+%%BACK_BDB%%libexec/openldap/back_bdb-%%OPENLDAP_MAJOR%%.so.%%SHLIB_MAJOR%%
 %%BACK_BDB%%libexec/openldap/back_bdb.la
 %%BACK_BDB%%libexec/openldap/back_bdb.so
-%%BACK_HDB%%libexec/openldap/back_hdb-2.4.so
-%%BACK_HDB%%libexec/openldap/back_hdb-2.4.so.%%SHLIB_MAJOR%%
+%%BACK_HDB%%libexec/openldap/back_hdb-%%OPENLDAP_MAJOR%%.so
+%%BACK_HDB%%libexec/openldap/back_hdb-%%OPENLDAP_MAJOR%%.so.%%SHLIB_MAJOR%%
 %%BACK_HDB%%libexec/openldap/back_hdb.la
 %%BACK_HDB%%libexec/openldap/back_hdb.so
-%%BACKEND%%libexec/openldap/back_ldap-2.4.so
-%%BACKEND%%libexec/openldap/back_ldap-2.4.so.%%SHLIB_MAJOR%%
+%%BACKEND%%libexec/openldap/back_ldap-%%OPENLDAP_MAJOR%%.so
+%%BACKEND%%libexec/openldap/back_ldap-%%OPENLDAP_MAJOR%%.so.%%SHLIB_MAJOR%%
 %%BACKEND%%libexec/openldap/back_ldap.la
 %%BACKEND%%libexec/openldap/back_ldap.so
-%%BACKEND%%libexec/openldap/back_meta-2.4.so
-%%BACKEND%%libexec/openldap/back_meta-2.4.so.%%SHLIB_MAJOR%%
+%%BACKEND%%libexec/openldap/back_meta-%%OPENLDAP_MAJOR%%.so
+%%BACKEND%%libexec/openldap/back_meta-%%OPENLDAP_MAJOR%%.so.%%SHLIB_MAJOR%%
 %%BACKEND%%libexec/openldap/back_meta.la
 %%BACKEND%%libexec/openldap/back_meta.so
-%%BACKEND%%libexec/openldap/back_monitor-2.4.so
-%%BACKEND%%libexec/openldap/back_monitor-2.4.so.%%SHLIB_MAJOR%%
+%%BACKEND%%libexec/openldap/back_monitor-%%OPENLDAP_MAJOR%%.so
+%%BACKEND%%libexec/openldap/back_monitor-%%OPENLDAP_MAJOR%%.so.%%SHLIB_MAJOR%%
 %%BACKEND%%libexec/openldap/back_monitor.la
 %%BACKEND%%libexec/openldap/back_monitor.so
-%%BACKEND%%libexec/openldap/back_null-2.4.so
-%%BACKEND%%libexec/openldap/back_null-2.4.so.%%SHLIB_MAJOR%%
+%%BACKEND%%libexec/openldap/back_null-%%OPENLDAP_MAJOR%%.so
+%%BACKEND%%libexec/openldap/back_null-%%OPENLDAP_MAJOR%%.so.%%SHLIB_MAJOR%%
 %%BACKEND%%libexec/openldap/back_null.la
 %%BACKEND%%libexec/openldap/back_null.so
-%%BACK_DNSSRV%%libexec/openldap/back_dnssrv-2.4.so
-%%BACK_DNSSRV%%libexec/openldap/back_dnssrv-2.4.so.%%SHLIB_MAJOR%%
+%%BACK_DNSSRV%%libexec/openldap/back_dnssrv-%%OPENLDAP_MAJOR%%.so
+%%BACK_DNSSRV%%libexec/openldap/back_dnssrv-%%OPENLDAP_MAJOR%%.so.%%SHLIB_MAJOR%%
 %%BACK_DNSSRV%%libexec/openldap/back_dnssrv.la
 %%BACK_DNSSRV%%libexec/openldap/back_dnssrv.so
-%%BACK_MDB%%libexec/openldap/back_mdb-2.4.so
-%%BACK_MDB%%libexec/openldap/back_mdb-2.4.so.%%SHLIB_MAJOR%%
+%%BACK_MDB%%libexec/openldap/back_mdb-%%OPENLDAP_MAJOR%%.so
+%%BACK_MDB%%libexec/openldap/back_mdb-%%OPENLDAP_MAJOR%%.so.%%SHLIB_MAJOR%%
 %%BACK_MDB%%libexec/openldap/back_mdb.la
 %%BACK_MDB%%libexec/openldap/back_mdb.so
-%%BACK_PASSWD%%libexec/openldap/back_passwd-2.4.so
-%%BACK_PASSWD%%libexec/openldap/back_passwd-2.4.so.%%SHLIB_MAJOR%%
+%%BACK_PASSWD%%libexec/openldap/back_passwd-%%OPENLDAP_MAJOR%%.so
+%%BACK_PASSWD%%libexec/openldap/back_passwd-%%OPENLDAP_MAJOR%%.so.%%SHLIB_MAJOR%%
 %%BACK_PASSWD%%libexec/openldap/back_passwd.la
 %%BACK_PASSWD%%libexec/openldap/back_passwd.so
-%%BACK_PERL%%libexec/openldap/back_perl-2.4.so
-%%BACK_PERL%%libexec/openldap/back_perl-2.4.so.%%SHLIB_MAJOR%%
+%%BACK_PERL%%libexec/openldap/back_perl-%%OPENLDAP_MAJOR%%.so
+%%BACK_PERL%%libexec/openldap/back_perl-%%OPENLDAP_MAJOR%%.so.%%SHLIB_MAJOR%%
 %%BACK_PERL%%libexec/openldap/back_perl.la
 %%BACK_PERL%%libexec/openldap/back_perl.so
-%%BACK_RELAY%%libexec/openldap/back_relay-2.4.so
-%%BACK_RELAY%%libexec/openldap/back_relay-2.4.so.%%SHLIB_MAJOR%%
+%%BACK_RELAY%%libexec/openldap/back_relay-%%OPENLDAP_MAJOR%%.so
+%%BACK_RELAY%%libexec/openldap/back_relay-%%OPENLDAP_MAJOR%%.so.%%SHLIB_MAJOR%%
 %%BACK_RELAY%%libexec/openldap/back_relay.la
 %%BACK_RELAY%%libexec/openldap/back_relay.so
-%%BACK_SHELL%%libexec/openldap/back_shell-2.4.so
-%%BACK_SHELL%%libexec/openldap/back_shell-2.4.so.%%SHLIB_MAJOR%%
+%%BACK_SHELL%%libexec/openldap/back_shell-%%OPENLDAP_MAJOR%%.so
+%%BACK_SHELL%%libexec/openldap/back_shell-%%OPENLDAP_MAJOR%%.so.%%SHLIB_MAJOR%%
 %%BACK_SHELL%%libexec/openldap/back_shell.la
 %%BACK_SHELL%%libexec/openldap/back_shell.so
-%%BACK_SOCK%%libexec/openldap/back_sock-2.4.so
-%%BACK_SOCK%%libexec/openldap/back_sock-2.4.so.%%SHLIB_MAJOR%%
+%%BACK_SOCK%%libexec/openldap/back_sock-%%OPENLDAP_MAJOR%%.so
+%%BACK_SOCK%%libexec/openldap/back_sock-%%OPENLDAP_MAJOR%%.so.%%SHLIB_MAJOR%%
 %%BACK_SOCK%%libexec/openldap/back_sock.la
 %%BACK_SOCK%%libexec/openldap/back_sock.so
-%%BACK_SQL%%libexec/openldap/back_sql-2.4.so
-%%BACK_SQL%%libexec/openldap/back_sql-2.4.so.%%SHLIB_MAJOR%%
+%%BACK_SQL%%libexec/openldap/back_sql-%%OPENLDAP_MAJOR%%.so
+%%BACK_SQL%%libexec/openldap/back_sql-%%OPENLDAP_MAJOR%%.so.%%SHLIB_MAJOR%%
 %%BACK_SQL%%libexec/openldap/back_sql.la
 %%BACK_SQL%%libexec/openldap/back_sql.so
 %%SHA2%%libexec/openldap/pw-sha2.la
@ -153,7 +153,12 @@ man/man8/slappasswd.8.gz
 man/man8/slapschema.8.gz
 man/man8/slaptest.8.gz
@cwd /
-@exec mkdir -p %%LDAP_RUN_DIR%%
+@owner %%LDAP_USER%%
+@group %%LDAP_USER%%
+@exec install -d -o %%LDAP_USER%% -g %%LDAP_GROUP%% %%LDAP_RUN_DIR%%
@dirrmtry %%LDAP_RUN_DIR%%
+@exec install -d -o %%LDAP_USER%% -g %%LDAP_GROUP%% %%DATABASEDIR%%
@dirrmtry %%DATABASEDIR%%
+@owner root
+@group wheel
@cwd %%PREFIX%%
--- a/net/openldap24-server/pkg-plist.client
+++ b/net/openldap24-server/pkg-plist.client
@ -21,18 +21,18 @@ include/ldap_schema.h
 include/ldap_utf8.h
 include/ldif.h
 include/slapi-plugin.h
-lib/liblber-2.4.so
-lib/liblber-2.4.so.%%SHLIB_MAJOR%%
+lib/liblber-%%OPENLDAP_MAJOR%%.so
+lib/liblber-%%OPENLDAP_MAJOR%%.so.%%SHLIB_MAJOR%%
 lib/liblber.a
 lib/liblber.la
 lib/liblber.so
-lib/libldap-2.4.so
-lib/libldap-2.4.so.%%SHLIB_MAJOR%%
+lib/libldap-%%OPENLDAP_MAJOR%%.so
+lib/libldap-%%OPENLDAP_MAJOR%%.so.%%SHLIB_MAJOR%%
 lib/libldap.a
 lib/libldap.la
 lib/libldap.so
-lib/libldap_r-2.4.so
-lib/libldap_r-2.4.so.%%SHLIB_MAJOR%%
+lib/libldap_r-%%OPENLDAP_MAJOR%%.so
+lib/libldap_r-%%OPENLDAP_MAJOR%%.so.%%SHLIB_MAJOR%%
 lib/libldap_r.a
 lib/libldap_r.la
 lib/libldap_r.so