Update OpenLDAP packages to 2.4.16, the new stable release.

patch-db (for openldap-cloak module) has been included upstream.

OpenLDAP 2.4.16 Release (2009/04/05)
	Fixed libldap GnuTLS with x509v1 CA certs (ITS#5992)
	Fixed libldap GnuTLS with CA chains (ITS#5991)
	Fixed libldap GnuTLS TLSVerifyCilent try (ITS#5981)
	Fixed libldap segfault in checking cert/DN (ITS#5976)
	Fixed libldap peer cert double free (ITS#5849)
	Fixed libldap referral chasing (ITS#5980)
	Fixed slapd backglue with empty DBs (ITS#5986)
	Fixed slapd ctxcsn race condition (ITS#6001)
	Fixed slapd debug message (ITS#6027)
	Fixed slapd redundant module loading (ITS#6030)
	Fixed slapd schema_init freed value (ITS#6036)
	Fixed slapd syncrepl newCookie sync messages (ITS#5972)
	Fixed slapd syncrepl hang during shutdown (ITS#6011)
	Fixed slapd syncrepl too many MMR messages (ITS#6020)
	Fixed slapd syncrepl skipped entries with MMR (ITS#5988)
	Fixed slapd-bdb/hdb cachesize handling (ITS#5860)
	Fixed slapd-bdb/hdb with slapcat with empty dn (ITS#6006)
	Fixed slapd-bdb/hdb with NULL transactions (ITS#6012)
	Fixed slapd-ldap incorrect referral handling (ITS#6003,ITS#5916)
	Fixed slapd-ldap/meta with broken AD results (ITS#5977)
	Fixed slapd-ldap/meta with invalid attrs again (ITS#5959)
	Fixed slapo-accesslog interaction with ppolicy (ITS#5979)
	Fixed slapo-dynlist conversion to cn=config (ITS#6002)
	Fixed slapo-syncprov newCookie sync messages (ITS#5972)
	Fixed slapd-syncprov too many MMR messages (ITS#6020)
	Fixed slapo-syncprov replica lockout (ITS#5985)
	Fixed slapo-syncprov modtarget tracking (ITS#5999)
	Fixed slapo-syncprov multiple CSN propagation (ITS#5973)
	Fixed slapo-syncprov race condition (ITS#6045)
	Fixed slapo-syncprov sending cookies without CSN (ITS#6024)
	Fixed slapo-syncprov skipped entries with MMR (ITS#5988)
	Fixed tools passphrase free (ITS#6014)
	Build Environment
		Cleaned up alloc/free functions for Windows (ITS#6005)
		Fixed running of autosave files in testsuite (ITS#6026)
	Documentation
		admin24 clarified MMR URI requirements (ITS#5942,ITS#5987)
		Added ldapexop(1) manual page (ITS#5982)
		slapd-ldap/meta(5) added missing TLS options (ITS#5989)

7 files changed, 13 insertions, 30 deletions

diff --git a/databases/openldap-client/PLIST b/databases/openldap-client/PLIST
index 010c25b211b..96f5f72c2d2 100644
--- a/databases/openldap-client/PLIST
+++ b/databases/openldap-client/PLIST
@@ -1,4 +1,4 @@
-@comment $NetBSD: PLIST,v 1.4 2009/01/24 21:10:48 manu Exp $
+@comment $NetBSD: PLIST,v 1.5 2009/04/27 07:15:44 ghen Exp $
 bin/ldapadd
 bin/ldapcompare
 bin/ldapdelete
@@ -23,6 +23,7 @@ lib/libldap_r.la
 man/man1/ldapadd.1
 man/man1/ldapcompare.1
 man/man1/ldapdelete.1
+man/man1/ldapexop.1
 man/man1/ldapmodify.1
 man/man1/ldapmodrdn.1
 man/man1/ldappasswd.1
diff --git a/databases/openldap-doc/Makefile b/databases/openldap-doc/Makefile
index cfc43e04ae6..e931c63ed55 100644
--- a/databases/openldap-doc/Makefile
+++ b/databases/openldap-doc/Makefile
@@ -1,6 +1,6 @@
-# $NetBSD: Makefile,v 1.16 2009/03/07 23:30:29 ghen Exp $
+# $NetBSD: Makefile,v 1.17 2009/04/27 07:15:44 ghen Exp $
 
-DISTNAME=		openldap-2.4.15
+DISTNAME=		openldap-2.4.16
 PKGNAME=		${DISTNAME:S/-/-doc-/}
 CATEGORIES=		databases
 MASTER_SITES=		ftp://ftp.openldap.org/pub/OpenLDAP/openldap-release/
diff --git a/databases/openldap-server/Makefile b/databases/openldap-server/Makefile
index 45f007eb357..5a3442a0a7d 100644
--- a/databases/openldap-server/Makefile
+++ b/databases/openldap-server/Makefile
@@ -1,7 +1,6 @@
-# $NetBSD: Makefile,v 1.19 2009/01/31 15:59:05 manu Exp $
+# $NetBSD: Makefile,v 1.20 2009/04/27 07:15:44 ghen Exp $
 
 PKGNAME=		${DISTNAME:S/-/-server-/}
-PKGREVISION=            1
 COMMENT=		Lightweight Directory Access Protocol server suite
 
 CONFLICTS+=		openldap<2.3.23nb1
diff --git a/databases/openldap/Makefile b/databases/openldap/Makefile
index f778288b379..740ed87ea01 100644
--- a/databases/openldap/Makefile
+++ b/databases/openldap/Makefile
@@ -1,7 +1,7 @@
-# $NetBSD: Makefile,v 1.130 2009/03/07 22:26:23 manu Exp $
+# $NetBSD: Makefile,v 1.131 2009/04/27 07:15:43 ghen Exp $
 
 DISTNAME=		openldap-${OPENLDAP_VERSION}
-OPENLDAP_VERSION=	2.4.15
+OPENLDAP_VERSION=	2.4.16
 CATEGORIES=		databases
 MASTER_SITES=		# empty
 DISTFILES=		# empty
diff --git a/databases/openldap/Makefile.common b/databases/openldap/Makefile.common
index c9aa0e1d8bd..7a0d1666c50 100644
--- a/databases/openldap/Makefile.common
+++ b/databases/openldap/Makefile.common
@@ -1,7 +1,7 @@
-# $NetBSD: Makefile.common,v 1.20 2009/03/07 22:26:23 manu Exp $
+# $NetBSD: Makefile.common,v 1.21 2009/04/27 07:15:43 ghen Exp $
 
 # please stick to the "stable" releases as much as possible!
-DISTNAME=		openldap-2.4.15
+DISTNAME=		openldap-2.4.16
 CATEGORIES=		databases
 MASTER_SITES=		ftp://ftp.openldap.org/pub/OpenLDAP/openldap-release/
 MASTER_SITES+=		http://www.openldap.org/software/download/OpenLDAP/openldap-release/
diff --git a/databases/openldap/distinfo b/databases/openldap/distinfo
index 5f4395599d4..ba0c4f0c250 100644
--- a/databases/openldap/distinfo
+++ b/databases/openldap/distinfo
@@ -1,8 +1,8 @@
-$NetBSD: distinfo,v 1.72 2009/03/16 21:08:44 manu Exp $
+$NetBSD: distinfo,v 1.73 2009/04/27 07:15:43 ghen Exp $
 
-SHA1 (openldap-2.4.15.tgz) = bbf78945284b61099e6229bce21a829f88e48034
-RMD160 (openldap-2.4.15.tgz) = 6a247b1ddacda8d4dbcd8a131805ef0d96673072
-Size (openldap-2.4.15.tgz) = 5089559 bytes
+SHA1 (openldap-2.4.16.tgz) = c84f3281d047804eb977403e66733b7dd0a998b1
+RMD160 (openldap-2.4.16.tgz) = 96d4a46dc95ecb8c64f9bcbcbbb89c6539eb7638
+Size (openldap-2.4.16.tgz) = 5097314 bytes
 SHA1 (patch-aa) = 8c5c68ef53decb013114d606698cbd8a1c1b4e49
 SHA1 (patch-ac) = 905b08c4dea8c61e044ccf66d6af22cc685a3ccc
 SHA1 (patch-ad) = 24e7ec27d592dd76bdec1e4805801c5304951daf
@@ -14,5 +14,4 @@ SHA1 (patch-am) = cf97dbc86ed1e0dc3cd7f901dd3f0e4c77490a82
 SHA1 (patch-an) = f98c6457474247c092dd0a062e86560cc894ec4e
 SHA1 (patch-ao) = 6276a1226689fc3be3ffacbcd8df2e4f3e51d1a0
 SHA1 (patch-da) = c7ac86fcb4b4283fc61a3e045197bbef617c6ff4
-SHA1 (patch-db) = 8cd3ae55446c25ece056c015b57b9df144c01a55
 SHA1 (patch-dd) = 906ece497065a9eef5991718ce1ba1299acc1b63
diff --git a/databases/openldap/patches/patch-db b/databases/openldap/patches/patch-db
deleted file mode 100644
index 6949a588c28..00000000000
--- a/databases/openldap/patches/patch-db
+++ /dev/null
@@ -1,16 +0,0 @@
-$NetBSD: patch-db,v 1.3 2009/03/14 19:40:19 manu Exp $
---- contrib/slapd-modules/cloak/cloak.c.orig	2009-03-14 16:30:13.000000000 +0000
-+++ contrib/slapd-modules/cloak/cloak.c	2009-03-14 16:28:02.000000000 +0000
-@@ -268,10 +268,10 @@
- 		return SLAP_CB_CONTINUE;
- 
- 	sc = op->o_tmpcalloc( 1, sizeof( *sc ), op->o_tmpmemctx );
- 	sc->sc_response = cloak_search_cb;
--	sc->sc_cleanup = NULL;
--	sc->sc_next = NULL;
-+	sc->sc_cleanup = slap_freeself_cb;
-+	sc->sc_next = op->o_callback;
- 	sc->sc_private = ci;
- 	op->o_callback = sc;
- 
- 	return SLAP_CB_CONTINUE;