Update openldap to 2.1.29 (latest stable release).

Changes:

OpenLDAP 2.1.29 Release
        Fixed slapd SASL invalid authcID crash (ITS#2961)
        Fixed slapd sasl-regexp debug crash (ITS#3033)
        Fixed back-bdb empty suffix bug (ITS#2970)
        Fixed back-bdb IDL avl_delete failure bug (ITS#3004)
        Fixed libldap assert failure (ITS#2982)

OpenLDAP 2.1.28 Release
        Fixed back-bdb slapadd crash (ITS#2974)
        Fixed typo in ACL STYLE slap_style_e enum (ITS#3001)
        Added ACL set logging (ITS#2949)
        Fixed '=' escape in DN (ITS#3009)
        Documentation
                Fixed ldapmodify(1) manpage (ITS#3002)
                Fixed ldapmodrdn(1) manpage (ITS#3003)

OpenLDAP 2.1.27 Release
        Fixed slapd replog ordering bug (ITS#2512)
        Fixed slapd uninitialized variable bug
        Fixed libldap SASL client callbacks (ITS#2926)
        Build Environment
                Fixed gai_strerr portability problem (ITS#2643)
                Fixed DNS res_query portability problem

4 files changed, 9 insertions, 45 deletions

diff --git a/databases/openldap/Makefile b/databases/openldap/Makefile
index d96dc8dbc09..4655ecf960c 100644
--- a/databases/openldap/Makefile
+++ b/databases/openldap/Makefile
@@ -1,7 +1,6 @@
-# $NetBSD: Makefile,v 1.74 2004/03/26 02:27:36 wiz Exp $
+# $NetBSD: Makefile,v 1.75 2004/03/31 03:52:46 xtraeme Exp $
 
-DISTNAME=		openldap-2.1.25
-PKGREVISION=		3
+DISTNAME=		openldap-2.1.29
 SVR4_PKGNAME=		oldap
 CATEGORIES=		databases
 MASTER_SITES=		ftp://ftp.openldap.org/pub/OpenLDAP/openldap-release/
diff --git a/databases/openldap/PLIST b/databases/openldap/PLIST
index 965bf01f041..8eb1ed73075 100644
--- a/databases/openldap/PLIST
+++ b/databases/openldap/PLIST
@@ -1,4 +1,4 @@
-@comment $NetBSD: PLIST,v 1.13 2004/02/19 14:42:39 jlam Exp $
+@comment $NetBSD: PLIST,v 1.14 2004/03/31 03:52:47 xtraeme Exp $
 bin/ldapadd
 bin/ldapcompare
 bin/ldapdelete
@@ -20,17 +20,17 @@ lib/liblber.a
 lib/liblber.la
 lib/liblber.so
 lib/liblber.so.2
-lib/liblber.so.2.124
+lib/liblber.so.2.128
 lib/libldap.a
 lib/libldap.la
 lib/libldap.so
 lib/libldap.so.2
-lib/libldap.so.2.124
+lib/libldap.so.2.128
 lib/libldap_r.a
 lib/libldap_r.la
 lib/libldap_r.so
 lib/libldap_r.so.2
-lib/libldap_r.so.2.124
+lib/libldap_r.so.2.128
 libexec/slapd
 ${SLURPD_COMMENT}libexec/slurpd
 man/man1/ldapadd.1
diff --git a/databases/openldap/distinfo b/databases/openldap/distinfo
index 4b55bc92ab3..68244368ec2 100644
--- a/databases/openldap/distinfo
+++ b/databases/openldap/distinfo
@@ -1,11 +1,10 @@
-$NetBSD: distinfo,v 1.24 2004/03/07 12:12:38 markd Exp $
+$NetBSD: distinfo,v 1.25 2004/03/31 03:52:47 xtraeme Exp $
 
-SHA1 (openldap-2.1.25.tgz) = 802ad52c0540bf58fbe797fd64804ff0920159d4
-Size (openldap-2.1.25.tgz) = 2038669 bytes
+SHA1 (openldap-2.1.29.tgz) = 1623df1fb9772a952541422fa9883ba02e587e87
+Size (openldap-2.1.29.tgz) = 2044665 bytes
 SHA1 (patch-aa) = 0f7f0ad7e11a16d084955f5125db12a5e53bafec
 SHA1 (patch-ac) = 56ee06d724a2de895fc373cc57bf3de17058e30b
 SHA1 (patch-ad) = 24734ea7dbfc85c0f1a5ebc7ad9209cfe64ef546
-SHA1 (patch-ae) = 75f5cb64c78c007f3439ad384b21c5a6ea5e9e3d
 SHA1 (patch-af) = 74edff185f7d5222416023801084c069d08ec057
 SHA1 (patch-ag) = 822efbcc01dfd4b6181c25390761f534aaeb4315
 SHA1 (patch-ah) = 4fd10030b2531c7b4a4461053e5896274b24d5dd
diff --git a/databases/openldap/patches/patch-ae b/databases/openldap/patches/patch-ae
deleted file mode 100644
index 870db5d78b5..00000000000
--- a/databases/openldap/patches/patch-ae
+++ /dev/null
@@ -1,34 +0,0 @@
-$NetBSD: patch-ae,v 1.2 2004/02/14 11:31:50 jlam Exp $
-
---- servers/slapd/back-bdb/init.c.orig	Sat Nov 29 04:59:10 2003
-+++ servers/slapd/back-bdb/init.c
-@@ -461,17 +461,19 @@ bdb_db_close( BackendDB *be )
- 	bdb_cache_release_all (&bdb->bi_cache);
- 
- #ifdef SLAP_IDL_CACHE
--	ldap_pvt_thread_mutex_lock ( &bdb->bi_idl_tree_mutex );
--	entry = bdb->bi_idl_lru_head;
--	while ( entry != NULL ) {
--		next_entry = entry->idl_lru_next;
--		avl_delete( &bdb->bi_idl_tree, (caddr_t) entry, bdb_idl_entry_cmp );
--		free( entry->idl );
--		free( entry->kstr.bv_val );
--		free( entry );
--		entry = next_entry;
-+	if ( bdb->bi_idl_cache_max_size ) {
-+		ldap_pvt_thread_mutex_lock ( &bdb->bi_idl_tree_mutex );
-+		entry = bdb->bi_idl_lru_head;
-+		while ( entry != NULL ) {
-+			next_entry = entry->idl_lru_next;
-+			avl_delete( &bdb->bi_idl_tree, (caddr_t) entry, bdb_idl_entry_cmp );
-+			free( entry->idl );
-+			free( entry->kstr.bv_val );
-+			free( entry );
-+			entry = next_entry;
-+		}
-+		ldap_pvt_thread_mutex_unlock ( &bdb->bi_idl_tree_mutex );
- 	}
--	ldap_pvt_thread_mutex_unlock ( &bdb->bi_idl_tree_mutex );
- #endif
- 
- 	return 0;