Update to OpenLDAP 2.4.17. Unfortunately a shared library bump is needed.

UPDATING to follow.

6 files changed, 25 insertions, 23 deletions

diff --git a/Mk/bsd.ldap.mk b/Mk/bsd.ldap.mk
index 5fddcc8386c6..8d89bcb1400f 100644
--- a/Mk/bsd.ldap.mk
+++ b/Mk/bsd.ldap.mk
@@ -35,7 +35,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.6
+OPENLDAP24_LIBVER=	2.4.7
 
 .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 f9cb1b56f44d..d188f749a92b 100644
--- a/net/openldap24-server/Makefile
+++ b/net/openldap24-server/Makefile
@@ -6,7 +6,7 @@
 #
 
 PORTNAME=		openldap
-DISTVERSION=		2.4.16
+DISTVERSION=		2.4.17
 PORTREVISION=		${OPENLDAP_PORTREVISION}
 CATEGORIES=		net databases
 MASTER_SITES=		ftp://ftp.OpenLDAP.org/pub/OpenLDAP/%SUBDIR%/ \
@@ -40,7 +40,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" off \
diff --git a/net/openldap24-server/distinfo b/net/openldap24-server/distinfo
index faae9879fa50..eaeaa933e43f 100644
--- a/net/openldap24-server/distinfo
+++ b/net/openldap24-server/distinfo
@@ -1,3 +1,3 @@
-MD5 (openldap-2.4.16.tgz) = ed5b86e9d2b372d10edfe3bb59fee165
-SHA256 (openldap-2.4.16.tgz) = b87505c640007de48a82276c324842a90c6f788eedbef058d0aacdb70f4833c6
-SIZE (openldap-2.4.16.tgz) = 5097314
+MD5 (openldap-2.4.17.tgz) = 5e82103780f8cfc2b2fbd0f77c47c158
+SHA256 (openldap-2.4.17.tgz) = 4a18ce70154f5c0ffc1804698dba609d8f4aab3e74f01bbddf31b28b96403fc3
+SIZE (openldap-2.4.17.tgz) = 5423027
diff --git a/net/openldap24-server/files/manpages b/net/openldap24-server/files/manpages
index 014beae9ac59..3aab435a5255 100644
--- a/net/openldap24-server/files/manpages
+++ b/net/openldap24-server/files/manpages
@@ -245,4 +245,5 @@ MAN8+=	slapacl.8 \
 	slapdn.8 \
 	slapindex.8 \
 	slappasswd.8 \
+	slapschema.8 \
 	slaptest.8
diff --git a/net/openldap24-server/pkg-plist b/net/openldap24-server/pkg-plist
index 2a0bd0876401..d95a2980a45b 100644
--- a/net/openldap24-server/pkg-plist
+++ b/net/openldap24-server/pkg-plist
@@ -16,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.6
+%%SLAPI%%lib/libslapi-2.4.so.7
 %%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.6
+%%BACK_BDB%%libexec/openldap/back_bdb-2.4.so.7
 %%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.6
+%%BACK_HDB%%libexec/openldap/back_hdb-2.4.so.7
 %%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.6
+%%BACKEND%%libexec/openldap/back_ldap-2.4.so.7
 %%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.6
+%%BACKEND%%libexec/openldap/back_meta-2.4.so.7
 %%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.6
+%%BACKEND%%libexec/openldap/back_monitor-2.4.so.7
 %%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.6
+%%BACKEND%%libexec/openldap/back_null-2.4.so.7
 %%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.6
+%%BACK_DNSSRV%%libexec/openldap/back_dnssrv-2.4.so.7
 %%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.6
+%%BACK_PASSWD%%libexec/openldap/back_passwd-2.4.so.7
 %%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.6
+%%BACK_PERL%%libexec/openldap/back_perl-2.4.so.7
 %%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.6
+%%BACK_RELAY%%libexec/openldap/back_relay-2.4.so.7
 %%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.6
+%%BACK_SHELL%%libexec/openldap/back_shell-2.4.so.7
 %%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.6
+%%BACK_SOCK%%libexec/openldap/back_sock-2.4.so.7
 %%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.6
+%%BACK_SQL%%libexec/openldap/back_sql-2.4.so.7
 %%BACK_SQL%%libexec/openldap/back_sql.la
 %%BACK_SQL%%libexec/openldap/back_sql.so
 %%SMBPWD%%libexec/openldap/smbk5pwd.la
@@ -82,6 +82,7 @@ sbin/slapcat
 sbin/slapdn
 sbin/slapindex
 sbin/slappasswd
+sbin/slapschema
 sbin/slaptest
 @cwd /
 @exec mkdir -p %%LDAP_RUN_DIR%%
diff --git a/net/openldap24-server/pkg-plist.client b/net/openldap24-server/pkg-plist.client
index 1312639e0234..b20d5e212747 100644
--- a/net/openldap24-server/pkg-plist.client
+++ b/net/openldap24-server/pkg-plist.client
@@ -22,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.6
+lib/liblber-2.4.so.7
 lib/liblber.a
 lib/liblber.la
 lib/liblber.so
 lib/libldap-2.4.so
-lib/libldap-2.4.so.6
+lib/libldap-2.4.so.7
 lib/libldap.a
 lib/libldap.la
 lib/libldap.so
 lib/libldap_r-2.4.so
-lib/libldap_r-2.4.so.6
+lib/libldap_r-2.4.so.7
 lib/libldap_r.a
 lib/libldap_r.la
 lib/libldap_r.so