Update to 2.4.13. Note that this requires a full rebuild of all

packages that depends on openldap24-client due to a shared library
version bump.

6 files changed, 29 insertions, 23 deletions

diff --git a/Mk/bsd.ldap.mk b/Mk/bsd.ldap.mk
index d748e3f6f4ea..18d24d8cacea 100644
--- a/Mk/bsd.ldap.mk
+++ b/Mk/bsd.ldap.mk
@@ -37,7 +37,7 @@ Database_Include_MAINTAINER=	ports@FreeBSD.org
 DEFAULT_OPENLDAP_VER?=	24
 # OpenLDAP client versions currently supported
 OPENLDAP23_LIBVER=	2.3.2
-OPENLDAP24_LIBVER=	2.4.3
+OPENLDAP24_LIBVER=	2.4.5
 
 .if exists(${LOCALBASE}/bin/ldapwhoami)
 _OPENLDAP_VER!=	${LOCALBASE}/bin/ldapwhoami -VV 2>&1 | ${GREP} ldapwhoami | ${SED} -E 's/.*OpenLDAP: ldapwhoami (2)\.(3|4).*/\1\2/'
diff --git a/net/openldap24-server/Makefile b/net/openldap24-server/Makefile
index 7749da8361d3..bf3ab0f0047b 100644
--- a/net/openldap24-server/Makefile
+++ b/net/openldap24-server/Makefile
@@ -6,7 +6,7 @@
 #
 
 PORTNAME=		openldap
-DISTVERSION=		2.4.11
+DISTVERSION=		2.4.13
 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=	2
+PORTREVISION_SERVER=	0
 
 .if !defined(CLIENT_ONLY)
 OPTIONS=	SASL "With (Cyrus) SASL2 support" off \
diff --git a/net/openldap24-server/distinfo b/net/openldap24-server/distinfo
index c729e385897b..23310eb2296e 100644
--- a/net/openldap24-server/distinfo
+++ b/net/openldap24-server/distinfo
@@ -1,3 +1,3 @@
-MD5 (openldap-2.4.11.tgz) = 920fedbbb5bc61c2ca52c56edeef770a
-SHA256 (openldap-2.4.11.tgz) = 76e57147a2373015f306f2e72128330e51d5c0f1056b4713283234dfd16c1c9c
-SIZE (openldap-2.4.11.tgz) = 4941654
+MD5 (openldap-2.4.13.tgz) = 5382bbb4c67172c48c871b6d24b7f8cc
+SHA256 (openldap-2.4.13.tgz) = 2c82cacca946b501ccded103101f88834f438f689d2f24aa48d9f2f2d13680a2
+SIZE (openldap-2.4.13.tgz) = 5040598
diff --git a/net/openldap24-server/files/manpages b/net/openldap24-server/files/manpages
index 83d1fd38876e..93b0de9290ec 100644
--- a/net/openldap24-server/files/manpages
+++ b/net/openldap24-server/files/manpages
@@ -8,6 +8,7 @@ MAN1+=	ldapcompare.1 \
 	ldapmodrdn.1 \
 	ldappasswd.1 \
 	ldapsearch.1 \
+	ldapurl.1 \
 	ldapwhoami.1
 MLINKS+= \
 	ldapmodify.1 ldapadd.1
@@ -201,6 +202,7 @@ MAN5+=	ldap.conf.5 \
 	slapd-ldif.5 \
 	slapd-meta.5 \
 	slapd-monitor.5 \
+	slapd-ndb.5 \
 	slapd-null.5 \
 	slapd-passwd.5 \
 	slapd-perl.5 \
@@ -216,6 +218,7 @@ MAN5+=	ldap.conf.5 \
 	slapo-accesslog.5 \
 	slapo-auditlog.5 \
 	slapo-chain.5 \
+	slapo-collect.5 \
 	slapo-constraint.5 \
 	slapo-dds.5 \
 	slapo-dyngroup.5 \
diff --git a/net/openldap24-server/pkg-plist b/net/openldap24-server/pkg-plist
index a0625c6ed45e..2dec3e674282 100644
--- a/net/openldap24-server/pkg-plist
+++ b/net/openldap24-server/pkg-plist
@@ -6,6 +6,8 @@ etc/openldap/schema/cosine.ldif
 etc/openldap/schema/inetorgperson.ldif
 etc/openldap/schema/nis.ldif
 etc/openldap/schema/openldap.ldif
+etc/openldap/schema/pmi.schema
+etc/openldap/schema/pmi.schema.default
 @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
 @exec [ -f %B/slapd.conf ] || cp %B/%f %B/slapd.conf
@@ -14,58 +16,58 @@ 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.3
+%%SLAPI%%lib/libslapi-2.4.so.5
 %%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.3
+%%BACK_BDB%%libexec/openldap/back_bdb-2.4.so.5
 %%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.3
+%%BACK_HDB%%libexec/openldap/back_hdb-2.4.so.5
 %%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.3
+%%BACKEND%%libexec/openldap/back_ldap-2.4.so.5
 %%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.3
+%%BACKEND%%libexec/openldap/back_meta-2.4.so.5
 %%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.3
+%%BACKEND%%libexec/openldap/back_monitor-2.4.so.5
 %%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.3
+%%BACKEND%%libexec/openldap/back_null-2.4.so.5
 %%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.3
+%%BACK_DNSSRV%%libexec/openldap/back_dnssrv-2.4.so.5
 %%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.3
+%%BACK_PASSWD%%libexec/openldap/back_passwd-2.4.so.5
 %%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.3
+%%BACK_PERL%%libexec/openldap/back_perl-2.4.so.5
 %%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.3
+%%BACK_RELAY%%libexec/openldap/back_relay-2.4.so.5
 %%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.3
+%%BACK_SHELL%%libexec/openldap/back_shell-2.4.so.5
 %%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.3
+%%BACK_SOCK%%libexec/openldap/back_sock-2.4.so.5
 %%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.3
+%%BACK_SQL%%libexec/openldap/back_sql-2.4.so.5
 %%BACK_SQL%%libexec/openldap/back_sql.la
 %%BACK_SQL%%libexec/openldap/back_sql.so
 %%SMBPWD%%libexec/openldap/smbk5pwd.la
diff --git a/net/openldap24-server/pkg-plist.client b/net/openldap24-server/pkg-plist.client
index 38fa40e17b25..b1a36ca6010e 100644
--- a/net/openldap24-server/pkg-plist.client
+++ b/net/openldap24-server/pkg-plist.client
@@ -7,6 +7,7 @@ bin/ldapmodify
 bin/ldapmodrdn
 bin/ldappasswd
 bin/ldapsearch
+bin/ldapurl
 bin/ldapwhoami
 @unexec if cmp -s %D/etc/openldap/ldap.conf %D/etc/openldap/ldap.conf.default; then rm -f %D/etc/openldap/ldap.conf; fi
 etc/openldap/ldap.conf.default
@@ -21,17 +22,17 @@ include/ldap_schema.h
 include/ldap_utf8.h
 include/slapi-plugin.h
 lib/liblber-2.4.so
-lib/liblber-2.4.so.3
+lib/liblber-2.4.so.5
 lib/liblber.a
 lib/liblber.la
 lib/liblber.so
 lib/libldap-2.4.so
-lib/libldap-2.4.so.3
+lib/libldap-2.4.so.5
 lib/libldap.a
 lib/libldap.la
 lib/libldap.so
 lib/libldap_r-2.4.so
-lib/libldap_r-2.4.so.3
+lib/libldap_r-2.4.so.5
 lib/libldap_r.a
 lib/libldap_r.la
 lib/libldap_r.so