Update openldap packages to 2.3.31 (new stable release).

OpenLDAP 2.3.31 Release
	Fixed libldap unchased referral leak (ITS#4545)
	Fixed libldap tls callback (ITS#4723)
	Fixed liblutil ldif file: URL parsing
	Fixed slapd syncrepl logging (ITS#4755)
	Fixed slapd group ACL caching when proxyAuthz'ing (ITS#4760)
	Fixed slapd "group" authz default member parsing (ITS#4761)
	Fixed slapd uninitialized sd_actives array (ITS#4765)
	Fixed slapd DN parsing in bindconf_parse (ITS#4766)
	Fixed slapd conditional in macro argument (ITS#4769)
	Fixed slapd send_search_reference should propagate errors
	Fixed slapd memleak on failed bind (ITS#4771)
	Fixed slapd schema preparation case to match RFCs (ITS#4764)
	Fixed slapd kbind buffer overflow condition (ITS#4775)
	Fixed slapd connections_shutdown assert
	Fixed slapd glue parent/sub db overlay nesting (ITS#4615)
	Fixed slapd-bdb/hdb/ldbm slap_add_opattrs error checking
	Fixed slapd-bdb/hdb setting up tool threads when no indices specified
	Fixed slapd-perl interpreter context (ITS#4751)
	Fixed slapo-syncprov to complain if defined outside of a database
	Fixed test021 modify ops to be syntactically correct
	Fixed contrib smbk5pwd, check kadm5 init result
	Documentation
		Fixed typo in slapo-retcode(5) man page (ITS#4753)
		Fixed syncrepl searchbase note (ITS#4540)
		Added syncrepl starttls in the admin guide (ITS#4510)
		Fixed reference to deprecated function in ldap_parse_result(3)

OpenLDAP 2.3.30 Release
	Fixed slapd authzTo/authzFrom URL matching (ITS#4744)
	Fixed slapd syncrepl consumer memory leaks (ITS#4746)
	Fixed slapd-hdb livelock (ITS#4738)
	Fixed slapo-ppolicy external quality check (ITS#4741)
	Documentation
		Fixed ldapsearch(1) man page acknowledgement (ITS#4743)

OpenLDAP 2.3.29 Release
	Fixed liblber/libldap error codes on Windows (ITS#4606)
	Fixed libldap string length assert (ITS#4740)
	Fixed liblunicode case mapping (ITS#4724)
	Fixed slapd ldapi:// socket permissions (ITS#4709)
	Fixed slapd c_writewaiters assert (ITS#4696,4736)
	Fixed slapo-accesslog purge contextCSN bug (ITS#4704)
	Fixed slapo-accesslog modify/replace bug (ITS#4728)
	Fixed slapo-dynlist leaks (ITS#4664)
	Fixed slapo-ppolicy leaks (ITS#4665)
	Fixed slapo-syncprov deadlock (ITS#4720)
	Build environment
		Added selection of ODBC (ITS#4735)
	Documentation
		Fixed slapd-ldap/meta(5) rebind-as-user usage (ITS#4715)
		Fixed slapd-ldap/meta(5) missing network-timeout (ITS#4718)

OpenLDAP 2.3.28 Release
	Fixed libldap ldap.conf max line length (ITS#4669)
	Fixed libldap use keepalive for syncrepl (ITS#4708)
	Fixed liblutil LDIF CR/LF parsing bug (ITS#4635)
	Fixed librewrite LDAP map parsing bug
	Fixed librewrite map double free bug
	Added ldapsearch bad filter pattern check (ITS#4647)
	Fixed slapd global access controls initialization (ITS#4654)
	Fixed slapd setting c_sasl_bindop only on SASL binds
	Fixed slapd max line length issue (ITS#4651)
	Fixed slapd return code not being propagated (ITS#4565)
	Fixed slapd integerBitAndMatch (ITS#4672)
	Fixed slapd syncrepl modrdn new superior (ITS#4695)
	Fixed slapd-ldap retry with idassert (ITS#4686)
	Fixed slapd-meta DN massage error code handling (ITS#4711)
	Fixed slapd-monitor locking with scope "subordinate" (ITS#4668)
	Fixed slapd-perl deletes (ITS#2612)
	Fixed slapd-perl backend initialization (ITS#4358)
	Fixed slapd-perl finding interpreter inside a thread (ITS#4358)
	Fixed slapo-ppolicy pwdChangedTime behavior (ITS#4692)
	Fixed slapo-translucent ldapmodify crash (ITS#4673)
	Documentation
		Updated ldapsearch(1) options (ITS#4371,4526,4647)
		Fixed slapd.access(5) non-optional dn= error (ITS#4522)

4 files changed, 8 insertions, 43 deletions

diff --git a/databases/openldap/Makefile b/databases/openldap/Makefile
index 2255a1593ea..412f8e8e718 100644
--- a/databases/openldap/Makefile
+++ b/databases/openldap/Makefile
@@ -1,7 +1,7 @@
-# $NetBSD: Makefile,v 1.117 2006/08/25 07:02:28 ghen Exp $
+# $NetBSD: Makefile,v 1.118 2007/01/02 11:29:15 ghen Exp $
 
 DISTNAME=		openldap-${OPENLDAP_VERSION}
-OPENLDAP_VERSION=	2.3.27
+OPENLDAP_VERSION=	2.3.31
 CATEGORIES=		databases
 MASTER_SITES=		# empty
 DISTFILES=		# empty
diff --git a/databases/openldap/Makefile.common b/databases/openldap/Makefile.common
index 7a02143e24b..9f6b7923093 100644
--- a/databases/openldap/Makefile.common
+++ b/databases/openldap/Makefile.common
@@ -1,7 +1,7 @@
-# $NetBSD: Makefile.common,v 1.6 2006/11/27 17:24:11 ghen Exp $
+# $NetBSD: Makefile.common,v 1.7 2007/01/02 11:29:15 ghen Exp $
 
 # please stick to the "stable" releases as much as possible!
-DISTNAME=		openldap-2.3.27
+DISTNAME=		openldap-2.3.31
 CATEGORIES=		databases
 MASTER_SITES=		ftp://ftp.openldap.org/pub/OpenLDAP/openldap-release/
 MASTER_SITES+=		http://ftp.openldap.org/pub/OpenLDAP/openldap-release/
diff --git a/databases/openldap/distinfo b/databases/openldap/distinfo
index 122f9e621ac..84c8e67c43f 100644
--- a/databases/openldap/distinfo
+++ b/databases/openldap/distinfo
@@ -1,8 +1,8 @@
-$NetBSD: distinfo,v 1.51 2006/11/27 12:44:36 ghen Exp $
+$NetBSD: distinfo,v 1.52 2007/01/02 11:29:15 ghen Exp $
 
-SHA1 (openldap-2.3.27.tgz) = c2b6ac3ec89d0f58d079592946d045dba45edafe
-RMD160 (openldap-2.3.27.tgz) = 8c25c39689daa515f14e88611490ae6d8df0911c
-Size (openldap-2.3.27.tgz) = 3757519 bytes
+SHA1 (openldap-2.3.31.tgz) = 4ee3cefdb82aaabb42fe25f791e8a0f48b046a16
+RMD160 (openldap-2.3.31.tgz) = 3a5bc3622d64c7af27901046144bc9e2952abf57
+Size (openldap-2.3.31.tgz) = 3766559 bytes
 SHA1 (patch-ac) = 905b08c4dea8c61e044ccf66d6af22cc685a3ccc
 SHA1 (patch-ad) = 24e7ec27d592dd76bdec1e4805801c5304951daf
 SHA1 (patch-af) = 1ae9137e76e885e03d0f44727197a444893ec7c5
@@ -13,4 +13,3 @@ SHA1 (patch-ak) = 80685a7b46ded94722ea91c2842db424572d6513
 SHA1 (patch-am) = 06c17b10bb8cc091461b82fca2b5d6032b613c78
 SHA1 (patch-an) = f98c6457474247c092dd0a062e86560cc894ec4e
 SHA1 (patch-ao) = 6276a1226689fc3be3ffacbcd8df2e4f3e51d1a0
-SHA1 (patch-ap) = 65173e053006d452eb9b60f51829f45bffe442ae
diff --git a/databases/openldap/patches/patch-ap b/databases/openldap/patches/patch-ap
deleted file mode 100644
index d7c3310814a..00000000000
--- a/databases/openldap/patches/patch-ap
+++ /dev/null
@@ -1,34 +0,0 @@
-$NetBSD: patch-ap,v 1.1 2006/11/27 12:44:36 ghen Exp $
-
-Fix for CVE-2006-5779, from OpenLDAP CVS.  Versions >= 2.3.29 will have it.
-
---- libraries/libldap/getdn.c.orig	2006-01-16 20:06:12.000000000 +0100
-+++ libraries/libldap/getdn.c
-@@ -2025,7 +2025,7 @@ static int
- strval2strlen( struct berval *val, unsigned flags, ber_len_t *len )
- {
- 	ber_len_t	l, cl = 1;
--	char		*p;
-+	char		*p, *end;
- 	int		escaped_byte_len = LDAP_DN_IS_PRETTY( flags ) ? 1 : 3;
- #ifdef PRETTY_ESCAPE
- 	int		escaped_ascii_len = LDAP_DN_IS_PRETTY( flags ) ? 2 : 3;
-@@ -2039,7 +2039,8 @@ strval2strlen( struct berval *val, unsig
- 		return( 0 );
- 	}
- 
--	for ( l = 0, p = val->bv_val; p < val->bv_val + val->bv_len; p += cl ) {
-+	end = val->bv_val + val->bv_len - 1;
-+	for ( l = 0, p = val->bv_val; p <= end; p += cl ) {
- 
- 		/* 
- 		 * escape '%x00' 
-@@ -2068,7 +2069,7 @@ strval2strlen( struct berval *val, unsig
- 		} else if ( LDAP_DN_NEEDESCAPE( p[ 0 ] )
- 				|| LDAP_DN_SHOULDESCAPE( p[ 0 ] )
- 				|| ( p == val->bv_val && LDAP_DN_NEEDESCAPE_LEAD( p[ 0 ] ) )
--				|| ( !p[ 1 ] && LDAP_DN_NEEDESCAPE_TRAIL( p[ 0 ] ) ) ) {
-+				|| ( p == end && LDAP_DN_NEEDESCAPE_TRAIL( p[ 0 ] ) ) ) {
- #ifdef PRETTY_ESCAPE
- #if 0
- 			if ( LDAP_DN_WILLESCAPE_HEX( flags, p[ 0 ] ) ) {