Update to OpenLDAP 2.4.4a.

Approved by:	portmgr (kris, bsd.port.mk part)

6 files changed, 51 insertions, 25 deletions

diff --git a/Mk/bsd.port.mk b/Mk/bsd.port.mk
index 937ea6d143c7..3589648e1a24 100644
--- a/Mk/bsd.port.mk
+++ b/Mk/bsd.port.mk
@@ -1710,7 +1710,7 @@ LIB_DEPENDS+=		ldap-2.2.7:${PORTSDIR}/net/openldap22${_OPENLDAP_FLAVOUR}-client
 .elif ${WANT_OPENLDAP_VER} == 23
 LIB_DEPENDS+=		ldap-2.3.2:${PORTSDIR}/net/openldap23${_OPENLDAP_FLAVOUR}-client
 .elif ${WANT_OPENLDAP_VER} == 24
-LIB_DEPENDS+=		ldap-2.4.1:${PORTSDIR}/net/openldap24${_OPENLDAP_FLAVOUR}-client
+LIB_DEPENDS+=		ldap-2.4.2:${PORTSDIR}/net/openldap24${_OPENLDAP_FLAVOUR}-client
 .else
 IGNORE=				unknown OpenLDAP version: ${WANT_OPENLDAP_VER}
 .endif
diff --git a/net/openldap24-server/Makefile b/net/openldap24-server/Makefile
index 37aebfe4cf29..e51a8b688c27 100644
--- a/net/openldap24-server/Makefile
+++ b/net/openldap24-server/Makefile
@@ -6,7 +6,7 @@
 #
 
 PORTNAME=		openldap
-DISTVERSION=		2.4.3alpha
+DISTVERSION=		2.4.4alpha
 PORTREVISION=		${OPENLDAP_PORTREVISION}
 CATEGORIES=		net databases
 MASTER_SITES=		ftp://ftp.OpenLDAP.org/pub/OpenLDAP/%SUBDIR%/ \
@@ -39,7 +39,7 @@ BROKEN=			incompatible OpenLDAP version: ${WANT_OPENLDAP_VER}
 .endif
 
 PORTREVISION_CLIENT=	0
-PORTREVISION_SERVER=	1
+PORTREVISION_SERVER=	0
 
 .if !defined(CLIENT_ONLY)
 OPTIONS=	SASL "With (Cyrus) SASL2 support" on \
@@ -162,7 +162,7 @@ CONFIGURE_ARGS+=	--disable-slapd \
 SUB_FILES+=		pkg-message.client
 PKGMESSAGE=		${WRKSRC}/pkg-message.client
 
-INSTALLS_SHLIB=		yes
+USE_LDCONFIG=		yes
 
 .else
 # server specific configuration
@@ -380,7 +380,7 @@ PLIST_SUB+=		RLOOKUPS="@comment "
 .if defined(WITH_SLAPI)
 CONFIGURE_ARGS+=	--enable-slapi
 PLIST_SUB+=		SLAPI=""
-INSTALLS_SHLIB=		yes
+USE_LDCONFIG=		yes
 .else
 PLIST_SUB+=		SLAPI="@comment "
 .endif
diff --git a/net/openldap24-server/distinfo b/net/openldap24-server/distinfo
index 4748f22ce0b9..ddbed5afaa65 100644
--- a/net/openldap24-server/distinfo
+++ b/net/openldap24-server/distinfo
@@ -1,3 +1,3 @@
-MD5 (openldap-2.4.3alpha.tgz) = 250785b7d992ad41532bfe76e37897ec
-SHA256 (openldap-2.4.3alpha.tgz) = c033573b58c14e4191775b8fe402df45846d57485f6b5e9cf3dfdc222f879e9f
-SIZE (openldap-2.4.3alpha.tgz) = 3728779
+MD5 (openldap-2.4.4alpha.tgz) = 0d74f2b928e75842be72b9dfaf5f4c79
+SHA256 (openldap-2.4.4alpha.tgz) = 4904826fab5adaf5f9a714fb0205482c0e01754723bc2074d00a5ec2d7f9130a
+SIZE (openldap-2.4.4alpha.tgz) = 3847806
diff --git a/net/openldap24-server/files/manpages b/net/openldap24-server/files/manpages
index 3988e5d8014e..429a4d55ec64 100644
--- a/net/openldap24-server/files/manpages
+++ b/net/openldap24-server/files/manpages
@@ -15,13 +15,16 @@ MLINKS+= \
 MAN3+=	lber-decode.3 \
 	lber-encode.3 \
 	lber-memory.3 \
+	lber-sockbuf.3 \
 	lber-types.3 \
 	ldap.3 \
 	ldap_abandon.3 \
 	ldap_add.3 \
 	ldap_bind.3 \
 	ldap_compare.3 \
+	ldap_controls.3 \
 	ldap_delete.3 \
+	ldap_get_option.3 \
 	ldap_error.3 \
 	ldap_extended_operation.3 \
 	ldap_first_attribute.3 \
@@ -30,6 +33,7 @@ MAN3+=	lber-decode.3 \
 	ldap_first_reference.3 \
 	ldap_get_dn.3 \
 	ldap_get_values.3 \
+	ldap_memory.3 \
 	ldap_modify.3 \
 	ldap_modrdn.3 \
 	ldap_open.3 \
@@ -42,6 +46,8 @@ MAN3+=	lber-decode.3 \
 	ldap_schema.3 \
 	ldap_search.3 \
 	ldap_sort.3 \
+	ldap_sync.3 \
+	ldap_tls.3 \
 	ldap_url.3
 MLINKS+= \
 	lber-decode.3 ber_first_element.3 \
@@ -101,6 +107,10 @@ MLINKS+= \
 	ldap_compare.3 ldap_compare_ext.3 \
 	ldap_compare.3 ldap_compare_ext_s.3 \
 	ldap_compare.3 ldap_compare_s.3 \
+	ldap_controls.3 ldap_create_control.3 \
+	ldap_controls.3 ldap_find_control.3 \
+	ldap_controls.3 ldap_control_free.3 \
+	ldap_controls.3 ldap_controls_free.3 \
 	ldap_delete.3 ldap_delete_ext.3 \
 	ldap_delete.3 ldap_delete_ext_s.3 \
 	ldap_delete.3 ldap_delete_s.3 \
@@ -125,11 +135,18 @@ MLINKS+= \
 	ldap_get_dn.3 ldap_explode_dn.3 \
 	ldap_get_dn.3 ldap_explode_rdn.3 \
 	ldap_get_dn.3 ldap_str2dn.3 \
+	ldap_get_option.3 ldap_set_option.3 \
 	ldap_get_values.3 ldap_count_values.3 \
 	ldap_get_values.3 ldap_count_values_len.3 \
 	ldap_get_values.3 ldap_get_values_len.3 \
 	ldap_get_values.3 ldap_value_free.3 \
 	ldap_get_values.3 ldap_value_free_len.3 \
+	ldap_memory.3 ldap_memfree.3 \
+	ldap_memory.3 ldap_memvfree.3 \
+	ldap_memory.3 ldap_memalloc.3 \
+	ldap_memory.3 ldap_memcalloc.3 \
+	ldap_memory.3 ldap_memrealloc.3 \
+	ldap_memory.3 ldap_strdup.3 \
 	ldap_modify.3 ldap_modify_ext.3 \
 	ldap_modify.3 ldap_modify_ext_s.3 \
 	ldap_modify.3 ldap_modify_s.3 \
@@ -169,6 +186,10 @@ MLINKS+= \
 	ldap_sort.3 ldap_sort_entries.3 \
 	ldap_sort.3 ldap_sort_strcasecmp.3 \
 	ldap_sort.3 ldap_sort_values.3 \
+	ldap_tls.3 ldap_start_tls.3 \
+	ldap_tls.3 ldap_start_tls_s.3 \
+	ldap_tls.3 ldap_tls_inplace.3 \
+	ldap_tls.3 ldap_install_tls.3 \
 	ldap_url.3 ldap_free_urldesc.3 \
 	ldap_url.3 ldap_is_ldap_url.3 \
 	ldap_url.3 ldap_url_parse.3
@@ -176,6 +197,7 @@ MLINKS+= \
 MAN5+=	ldap.conf.5 \
 	ldif.5 \
 	slapd-bdb.5 \
+	slapd-config.5 \
 	slapd-dnssrv.5 \
 	slapd-ldap.5 \
 	slapd-ldbm.5 \
@@ -189,7 +211,9 @@ MAN5+=	ldap.conf.5 \
 	slapd-shell.5 \
 	slapd-sql.5 \
 	slapd.access.5 \
+	slapd.backends.5 \
 	slapd.conf.5 \
+	slapd.overlays.5 \
 	slapd.plugin.5 \
 	slapd.replog.5 \
 	slapo-accesslog.5 \
@@ -197,7 +221,6 @@ MAN5+=	ldap.conf.5 \
 	slapo-chain.5 \
 	slapo-dds.5 \
 	slapo-dynlist.5 \
-	slapo-lastmod.5 \
 	slapo-pcache.5 \
 	slapo-ppolicy.5 \
 	slapo-refint.5 \
diff --git a/net/openldap24-server/pkg-plist b/net/openldap24-server/pkg-plist
index 247cd7aa489d..425635275c0e 100644
--- a/net/openldap24-server/pkg-plist
+++ b/net/openldap24-server/pkg-plist
@@ -3,6 +3,9 @@
 %%SLURPD%%@unexec %%RC_DIR%%/etc/rc.d/slurpd%%RC_SUFX%% stop 2>&1 >/dev/null || true
 etc/openldap/schema/README
 etc/openldap/schema/core.ldif
+etc/openldap/schema/cosine.ldif
+etc/openldap/schema/inetorgperson.ldif
+etc/openldap/schema/nis.ldif
 etc/openldap/schema/openldap.ldif
 @unexec if cmp -s %D/etc/openldap/slapd.conf %D/etc/openldap/slapd.conf.default; then rm -f %D/etc/openldap/slapd.conf; fi
 etc/openldap/slapd.conf.default
@@ -12,54 +15,54 @@ etc/openldap/DB_CONFIG.example
 %%SLAPI%%lib/libslapi.la
 %%SLAPI%%lib/libslapi.so
 %%SLAPI%%lib/libslapi-2.4.so
-%%SLAPI%%lib/libslapi-2.4.so.1
+%%SLAPI%%lib/libslapi-2.4.so.2
 %%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.1
+%%BACK_BDB%%libexec/openldap/back_bdb-2.4.so.2
 %%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.1
+%%BACK_HDB%%libexec/openldap/back_hdb-2.4.so.2
 %%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.1
+%%BACKEND%%libexec/openldap/back_ldap-2.4.so.2
 %%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.1
+%%BACKEND%%libexec/openldap/back_meta-2.4.so.2
 %%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.1
+%%BACKEND%%libexec/openldap/back_monitor-2.4.so.2
 %%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.1
+%%BACKEND%%libexec/openldap/back_null-2.4.so.2
 %%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.1
+%%BACK_DNSSRV%%libexec/openldap/back_dnssrv-2.4.so.2
 %%BACK_DNSSRV%%libexec/openldap/back_dnssrv.la
 %%BACK_DNSSRV%%libexec/openldap/back_dnssrv.so
 %%BACK_PASSWD%%libexec/openldap/back_passwd-2.4.so
-%%BACK_PASSWD%%libexec/openldap/back_passwd-2.4.so.1
+%%BACK_PASSWD%%libexec/openldap/back_passwd-2.4.so.2
 %%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.1
+%%BACK_PERL%%libexec/openldap/back_perl-2.4.so.2
 %%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.1
+%%BACK_RELAY%%libexec/openldap/back_relay-2.4.so.2
 %%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.1
+%%BACK_SHELL%%libexec/openldap/back_shell-2.4.so.2
 %%BACK_SHELL%%libexec/openldap/back_shell.la
 %%BACK_SHELL%%libexec/openldap/back_shell.so
 %%BACK_SQL%%libexec/openldap/back_sql-2.4.so
-%%BACK_SQL%%libexec/openldap/back_sql-2.4.so.1
+%%BACK_SQL%%libexec/openldap/back_sql-2.4.so.2
 %%BACK_SQL%%libexec/openldap/back_sql.la
 %%BACK_SQL%%libexec/openldap/back_sql.so
 libexec/slapd
diff --git a/net/openldap24-server/pkg-plist.client b/net/openldap24-server/pkg-plist.client
index 21436f5dee50..f764aa17cc46 100644
--- a/net/openldap24-server/pkg-plist.client
+++ b/net/openldap24-server/pkg-plist.client
@@ -21,17 +21,17 @@ include/ldap_schema.h
 include/ldap_utf8.h
 include/slapi-plugin.h
 lib/liblber-2.4.so
-lib/liblber-2.4.so.1
+lib/liblber-2.4.so.2
 lib/liblber.a
 lib/liblber.la
 lib/liblber.so
 lib/libldap-2.4.so
-lib/libldap-2.4.so.1
+lib/libldap-2.4.so.2
 lib/libldap.a
 lib/libldap.la
 lib/libldap.so
 lib/libldap_r-2.4.so
-lib/libldap_r-2.4.so.1
+lib/libldap_r-2.4.so.2
 lib/libldap_r.a
 lib/libldap_r.la
 lib/libldap_r.so