Update OpenLDAP to 2.4.14.

6 files changed, 32 insertions, 22 deletions

diff --git a/Mk/bsd.ldap.mk b/Mk/bsd.ldap.mk
index 18d24d8cacea..66480f0e893b 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.5
+OPENLDAP24_LIBVER=	2.4.6
 
 .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/UPDATING b/UPDATING
index 4b1defe54ebe..531ff0a73d82 100644
--- a/UPDATING
+++ b/UPDATING
@@ -6,6 +6,16 @@ You should get into the habit of checking this file for changes each
 time you update your ports collection, before attempting any port
 upgrades.
 
+20090216:
+  AFFECTS: users of net/openldap24-{client,server}
+  AUTHOR: delphij@FreeBSD.org
+
+  OpenLDAP has been upgraded to 2.4.14, which requires a shared
+  library version bump.  Therefore, you need to reinstall all
+  ports depending on it.  Run something like:
+
+	# portupgrade -fr net/openldap24-client
+
 20090209:
   AFFECTS: users of multimedia/phonon, x11/kdelibs4, x11/kdebase4*,
   deskutils/kdepimlib4, deskutils/kdepim4, devel/automoc4
diff --git a/net/openldap24-server/Makefile b/net/openldap24-server/Makefile
index bf3ab0f0047b..910b49a75d05 100644
--- a/net/openldap24-server/Makefile
+++ b/net/openldap24-server/Makefile
@@ -6,7 +6,7 @@
 #
 
 PORTNAME=		openldap
-DISTVERSION=		2.4.13
+DISTVERSION=		2.4.14
 PORTREVISION=		${OPENLDAP_PORTREVISION}
 CATEGORIES=		net databases
 MASTER_SITES=		ftp://ftp.OpenLDAP.org/pub/OpenLDAP/%SUBDIR%/ \
diff --git a/net/openldap24-server/distinfo b/net/openldap24-server/distinfo
index 23310eb2296e..d52ca06a16e6 100644
--- a/net/openldap24-server/distinfo
+++ b/net/openldap24-server/distinfo
@@ -1,3 +1,3 @@
-MD5 (openldap-2.4.13.tgz) = 5382bbb4c67172c48c871b6d24b7f8cc
-SHA256 (openldap-2.4.13.tgz) = 2c82cacca946b501ccded103101f88834f438f689d2f24aa48d9f2f2d13680a2
-SIZE (openldap-2.4.13.tgz) = 5040598
+MD5 (openldap-2.4.14.tgz) = fe2089adac9e9bef7172c2fb61cb6ae9
+SHA256 (openldap-2.4.14.tgz) = 6e8e419d5adc5f9bb8c404352838190928dfb486e7a53d2cf2fd6ced1e981ec1
+SIZE (openldap-2.4.14.tgz) = 5087412
diff --git a/net/openldap24-server/pkg-plist b/net/openldap24-server/pkg-plist
index 2dec3e674282..2a0bd0876401 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.5
+%%SLAPI%%lib/libslapi-2.4.so.6
 %%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.5
+%%BACK_BDB%%libexec/openldap/back_bdb-2.4.so.6
 %%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.5
+%%BACK_HDB%%libexec/openldap/back_hdb-2.4.so.6
 %%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.5
+%%BACKEND%%libexec/openldap/back_ldap-2.4.so.6
 %%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.5
+%%BACKEND%%libexec/openldap/back_meta-2.4.so.6
 %%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.5
+%%BACKEND%%libexec/openldap/back_monitor-2.4.so.6
 %%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.5
+%%BACKEND%%libexec/openldap/back_null-2.4.so.6
 %%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.5
+%%BACK_DNSSRV%%libexec/openldap/back_dnssrv-2.4.so.6
 %%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.5
+%%BACK_PASSWD%%libexec/openldap/back_passwd-2.4.so.6
 %%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.5
+%%BACK_PERL%%libexec/openldap/back_perl-2.4.so.6
 %%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.5
+%%BACK_RELAY%%libexec/openldap/back_relay-2.4.so.6
 %%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.5
+%%BACK_SHELL%%libexec/openldap/back_shell-2.4.so.6
 %%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.5
+%%BACK_SOCK%%libexec/openldap/back_sock-2.4.so.6
 %%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.5
+%%BACK_SQL%%libexec/openldap/back_sql-2.4.so.6
 %%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 b1a36ca6010e..1312639e0234 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.5
+lib/liblber-2.4.so.6
 lib/liblber.a
 lib/liblber.la
 lib/liblber.so
 lib/libldap-2.4.so
-lib/libldap-2.4.so.5
+lib/libldap-2.4.so.6
 lib/libldap.a
 lib/libldap.la
 lib/libldap.so
 lib/libldap_r-2.4.so
-lib/libldap_r-2.4.so.5
+lib/libldap_r-2.4.so.6
 lib/libldap_r.a
 lib/libldap_r.la
 lib/libldap_r.so