Update to OpenLDAP 2.4.21, now the "stable" release.

OpenLDAP 2.4.21 Release (2009/12/20)
	Fixed liblutil for negative microsecond offsets (ITS#6405)
	Fixed slapd global settings to work without restart (ITS#6428)
	Fixed slapd looping with SSL/TLS connections (ITS#6412)
	Fixed slapd syncrepl freeing tasks from queue (ITS#6413)
	Fixed slapd syncrepl parsing of tls defaults (ITS#6419)
	Fixed slapd syncrepl uninitialized variables (ITS#6425)
	Fixed slapd-config Adds with Abstract classes (ITS#6408)
	Fixed slapo-dynlist behavior with simple filters (ITS#6421)
	Fixed slapd-ldif access outside database directory (ITS#6414)
	Fixed slapd-null extraneous assert (ITS#6403)
	Fixed slapo-translucent with back-null (ITS#6403)
	Fixed slapo-unique criteria checking (ITS#6270)
	Build Environment
		Deleted broken LBER_INVALID macro (ITS#6402)
		Fixed test058 kill usage (ITS#6420)
		Fixed meta regression test (ITS#6418)
	Documentation
		slapd-meta(5) Note deprecated functions (ITS#6424)
		admin24 fix set example for group of groups (ITS#6382)
		admin24 fix dynamic group documentation (ITS#6290)

OpenLDAP 2.4.20 Release (2009/11/27)
	Fixed client tools with LDAP options (ITS#6283)
	Fixed liblber embedded NUL values in BerValues (ITS#6353)
	Fixed liblber inverted LBER_USE_DER test (ITS#6348)
	Fixed liblber to return failure on certain failures (ITS#6344)
	Fixed libldap connection initialization (ITS#6386)
	Fixed libldap sasl buffer sizing (ITS#6327,ITS#6334)
	Fixed libldap uninitialized return value (ITS#6355)
	Fixed libldap unlimited timeout (ITS#6388)
	Added slapd handling of hex server IDs (ITS#6297)
	Added slapd syncrepl contextCSN storing in subentry (ITS#6373)
	Fixed slapd asserts in minimal environment (ITS#6361)
	Fixed slapd authid-rewrite parsing (ITS#6392)
	Fixed slapd checks of str2filter (ITS#6391)
	Fixed slapd configArgs initialization (ITS#6363)
	Fixed slapd debug handling of LDAP_DEBUG_ANY (ITS#6324)
	Fixed slapd db_open with connection_fake_init (ITS#6381)
	Fixed slapd with embedded \0 in bervals (ITS#6378,ITS#6379)
	Fixed slapd inclusion of ac/unistd.h (ITS#6342)
	Fixed slapd invalid dn log message (ITS#6309)
	Fixed slapd lockup on shutdown (ITS#6372)
	Fixed slapd onetime leak (ITS#6398)
	Fixed slapd RID range to be decimal only (ITS#6394)
	Fixed slapd sl_free to better reclaim memory (ITS#6380)
	Fixed slapd syncrepl deletes in MirrorMode (ITS#6368)
	Fixed slapd syncrepl to use correct SID (ITS#6367)
	Fixed slapd termination for one level DNs (ITS#6338)
	Fixed slapd tls_accept to retry in certain cases (ITS#6304)
	Fixed slapd-bdb/hdb cache corruption (ITS#6341)
	Fixed slapd-bdb/hdb entry cache (ITS#6360)
	Fixed slapd-ldap leak (ITS#6326)
	Fixed slapd-relay bind segfault (ITS#6337)
	Fixed slapo-accesslog ensure CSNs are normalized (ITS#6400)
	Fixed slapo-memberof operational attr updates (ITS#6329)
	Fixed slapo-pcache entry dupe (ITS#6310)
	Fixed slapo-syncprov checkpoint conversion (ITS#6370)
	Fixed slapo-syncprov deadlock (ITS#6335)
	Fixed slapo-syncprov memory leak (ITS#6376)
	Fixed slapo-syncprov out of order changes (ITS#6346)
	Fixed slapo-syncprov psearch with stale cookie (ITS#6397)
	Build Environment
		Added additional operations for ITS#6332
		Fixed memrchr define (ITS#6351)
		Fixed slapd MAXPATHLEN handling (ITS#6342)
		Added test050 rapid add/mod/del sequence (ITS#6368)
		Fixed test057 handling of memberof/refint (ITS#6343)
		Fixed slapd test error ignoring (ITS#6345)
		Fixed liblutil constant (ITS#5909)
	Documentation
		admin24 fix RFC4511 and other references (ITS#6399)
		ldap_get_dn(3) typos (ITS#5366)
		ldap.conf(5) clarify comment usage (ITS#6384)
		slapd.conf(5) note hex server IDs (ITS#6297)
		slapd-config(5) note hex server IDs (ITS#6297)

8 files changed, 14 insertions, 19 deletions

diff --git a/databases/openldap-cloak/Makefile b/databases/openldap-cloak/Makefile
index 98006683a40..6575f2d9418 100644
--- a/databases/openldap-cloak/Makefile
+++ b/databases/openldap-cloak/Makefile
@@ -1,7 +1,6 @@
-# $NetBSD: Makefile,v 1.5 2010/01/17 12:02:09 wiz Exp $
+# $NetBSD: Makefile,v 1.6 2010/02/19 20:49:29 ghen Exp $
 
 PKGNAME=		${DISTNAME:S/-/-cloak-/}
-PKGREVISION=		1
 COMMENT=		Remove null-ops for OpenLDAP
 
 CONFLICTS+=		openldap<2.3.23nb1
diff --git a/databases/openldap-doc/Makefile b/databases/openldap-doc/Makefile
index a474246e417..ec6ff72ab75 100644
--- a/databases/openldap-doc/Makefile
+++ b/databases/openldap-doc/Makefile
@@ -1,6 +1,6 @@
-# $NetBSD: Makefile,v 1.18 2009/10/29 06:56:11 ghen Exp $
+# $NetBSD: Makefile,v 1.19 2010/02/19 20:49:29 ghen Exp $
 
-DISTNAME=		openldap-2.4.19
+DISTNAME=		openldap-2.4.21
 PKGNAME=		${DISTNAME:S/-/-doc-/}
 CATEGORIES=		databases
 MASTER_SITES=		ftp://ftp.openldap.org/pub/OpenLDAP/openldap-release/
diff --git a/databases/openldap-nops/Makefile b/databases/openldap-nops/Makefile
index 8ae7aa7c65d..47cabb9c4d5 100644
--- a/databases/openldap-nops/Makefile
+++ b/databases/openldap-nops/Makefile
@@ -1,7 +1,6 @@
-# $NetBSD: Makefile,v 1.7 2010/01/17 12:02:10 wiz Exp $
+# $NetBSD: Makefile,v 1.8 2010/02/19 20:49:29 ghen Exp $
 
 PKGNAME=		${DISTNAME:S/-/-nops-/}
-PKGREVISION=		1
 COMMENT=		Remove null-ops for OpenLDAP
 
 CONFLICTS+=		openldap<2.3.23nb1
diff --git a/databases/openldap-server/Makefile b/databases/openldap-server/Makefile
index 29a0e409d24..14c1ff42a91 100644
--- a/databases/openldap-server/Makefile
+++ b/databases/openldap-server/Makefile
@@ -1,7 +1,6 @@
-# $NetBSD: Makefile,v 1.23 2009/12/15 21:33:48 joerg Exp $
+# $NetBSD: Makefile,v 1.24 2010/02/19 20:49:29 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-smbk5pwd/Makefile b/databases/openldap-smbk5pwd/Makefile
index 50210c34cbf..2f1b0bc4f88 100644
--- a/databases/openldap-smbk5pwd/Makefile
+++ b/databases/openldap-smbk5pwd/Makefile
@@ -1,7 +1,6 @@
-# $NetBSD: Makefile,v 1.5 2010/01/17 12:02:10 wiz Exp $
+# $NetBSD: Makefile,v 1.6 2010/02/19 20:49:29 ghen Exp $
 
 PKGNAME=		${DISTNAME:S/-/-smbk5pwd-/}
-PKGREVISION=		1
 COMMENT=		Samba and Kerberos password sync for OpenLDAP
 
 CONFLICTS+=		openldap<2.3.23nb1
diff --git a/databases/openldap/Makefile b/databases/openldap/Makefile
index 56e2a42caca..93d00f7f58f 100644
--- a/databases/openldap/Makefile
+++ b/databases/openldap/Makefile
@@ -1,8 +1,7 @@
-# $NetBSD: Makefile,v 1.133 2010/01/17 12:02:09 wiz Exp $
+# $NetBSD: Makefile,v 1.134 2010/02/19 20:49:29 ghen Exp $
 
 DISTNAME=		openldap-${OPENLDAP_VERSION}
-OPENLDAP_VERSION=	2.4.19
-PKGREVISION=		1
+OPENLDAP_VERSION=	2.4.21
 CATEGORIES=		databases
 MASTER_SITES=		# empty
 DISTFILES=		# empty
diff --git a/databases/openldap/Makefile.common b/databases/openldap/Makefile.common
index 7f3fb8f1dbe..8899cd2d304 100644
--- a/databases/openldap/Makefile.common
+++ b/databases/openldap/Makefile.common
@@ -1,7 +1,7 @@
-# $NetBSD: Makefile.common,v 1.24 2009/10/29 06:56:10 ghen Exp $
+# $NetBSD: Makefile.common,v 1.25 2010/02/19 20:49:29 ghen Exp $
 
 # please stick to the "stable" releases as much as possible!
-DISTNAME=		openldap-2.4.19
+DISTNAME=		openldap-2.4.21
 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 e9beef89b3d..0341a678748 100644
--- a/databases/openldap/distinfo
+++ b/databases/openldap/distinfo
@@ -1,8 +1,8 @@
-$NetBSD: distinfo,v 1.76 2009/10/29 13:51:39 ghen Exp $
+$NetBSD: distinfo,v 1.77 2010/02/19 20:49:29 ghen Exp $
 
-SHA1 (openldap-2.4.19.tgz) = 4a78acae0dd6d51d22ff50eef77912e59b31779a
-RMD160 (openldap-2.4.19.tgz) = 89b6eb1bbf0290178a28a1447fb6240c5e8f79dc
-Size (openldap-2.4.19.tgz) = 5474200 bytes
+SHA1 (openldap-2.4.21.tgz) = cfcfff3df7804bab8eb0d9464d3712a3e32d677b
+RMD160 (openldap-2.4.21.tgz) = 94f662e8fe1b009f5836cb9c19b095f1b159b1bd
+Size (openldap-2.4.21.tgz) = 5477877 bytes
 SHA1 (patch-aa) = 8c5c68ef53decb013114d606698cbd8a1c1b4e49
 SHA1 (patch-ac) = 905b08c4dea8c61e044ccf66d6af22cc685a3ccc
 SHA1 (patch-ad) = 24e7ec27d592dd76bdec1e4805801c5304951daf