Changes 2.4.33:

	Added slapd-meta cn=config support
	Fixed libldap MozNSS slot picking
	Fixed libldap MozNSS with tokenname:certnickname format
	Fixed libmdb POSIX semaphore cleanup on environment close
	Fixed libmdb mdb_page_split
	Fixed slapd alock handling on Windows
	Fixed slapd acl handling with zero-length values
	Fixed slapd syncprov to not reference ops inside a lock
	Fixed slapd delta-syncrepl MMR with large attribute values
	Fixed slapd slapd_rw_destroy function
	Fixed slapd-ldap idassert bind handling
	Fixed slapd-mdb slapadd -q -w double free
	Fixed slapd-mdb to close read txn in reindex commit
	Fixed slapo-constraint with multiple modifications
	Build Environment
		Fixed build with Visual Studio
		Fixed libmdb posix semaphore use on BSD system
		Add slapo-constraint test suite
	Contrib
		Updated radius passwd module for NAS-Identifier
	Documentation
		slapo-refint(5) Note that refint is not replicated

4 files changed, 10 insertions, 28 deletions

diff --git a/databases/openldap/Makefile.version b/databases/openldap/Makefile.version
index 8f70eb2d63e..f4e91288d5c 100644
--- a/databases/openldap/Makefile.version
+++ b/databases/openldap/Makefile.version
@@ -1,6 +1,6 @@
-# $NetBSD: Makefile.version,v 1.1 2012/08/06 13:33:38 adam Exp $
+# $NetBSD: Makefile.version,v 1.2 2012/10/13 11:47:19 adam Exp $
 # used by databases/openldap/Makefile
 # used by databases/openldap/Makefile.common
 # used by databases/openldap-docs/Makefile
 
-OPENLDAP_VERSION=	2.4.32
+OPENLDAP_VERSION=	2.4.33
diff --git a/databases/openldap/distinfo b/databases/openldap/distinfo
index 0d3685f6bb7..2476f7331dd 100644
--- a/databases/openldap/distinfo
+++ b/databases/openldap/distinfo
@@ -1,13 +1,13 @@
-$NetBSD: distinfo,v 1.87 2012/09/28 12:28:53 manu Exp $
+$NetBSD: distinfo,v 1.88 2012/10/13 11:47:19 adam Exp $
 
-SHA1 (openldap-2.4.32.tgz) = 294d5e9711bcb6850188ed895eeb986d43b62664
-RMD160 (openldap-2.4.32.tgz) = 5d5cfa9c9bb798a1655c2fc30ac4483f4fb04e95
-Size (openldap-2.4.32.tgz) = 5450134 bytes
+SHA1 (openldap-2.4.33.tgz) = 0cea642ba2dae1eb719da41bfedb9eba72ad504d
+RMD160 (openldap-2.4.33.tgz) = 6ec75c4af25e7afd2b5dbba397710d72791c5a94
+Size (openldap-2.4.33.tgz) = 5463850 bytes
 SHA1 (patch-ac) = 2995c518278b363bf9657e181c2340d3024d5980
 SHA1 (patch-ad) = 24e7ec27d592dd76bdec1e4805801c5304951daf
 SHA1 (patch-af) = 2e00b01bd813e73bdc1fb764a02e98d7755703de
 SHA1 (patch-ag) = ec8581f7145ba47712be65f97051ffd2d7299896
-SHA1 (patch-ah) = d374ec9b369500e7ac9a7f76c8762d14ff061528
+SHA1 (patch-ah) = 7b5a9d042df36f17bcb503372e301a0c6554af68
 SHA1 (patch-aj) = 857bbf14855d7d2a2911457bc6373d8beb69b751
 SHA1 (patch-am) = fb8f3e7699f8b2ef55c066cdc6216522c101c7f3
 SHA1 (patch-an) = 3e904d05a3e69930259329ca821d3bbf7dd54eb2
@@ -16,4 +16,3 @@ SHA1 (patch-contrib_slapd-modules_nops_slapo-nops.5) = f32352f19361b7e9aa5b038ae
 SHA1 (patch-da) = 49c267f09ba7d1a3290bb0b6b273e85296962c0d
 SHA1 (patch-dd) = 9c74118ff0b2232bda729c9917082fceef41dd16
 SHA1 (patch-de) = be3833817205483b62cf3216b27f53a951621198
-SHA1 (patch-libraries_libmdb_mdb.c) = 2ba3d25dfb1aa6b5e81eed77a46ad58aa74733b5
diff --git a/databases/openldap/patches/patch-ah b/databases/openldap/patches/patch-ah
index cbf5ef14e3f..df477b4ea8f 100644
--- a/databases/openldap/patches/patch-ah
+++ b/databases/openldap/patches/patch-ah
@@ -1,11 +1,11 @@
-$NetBSD: patch-ah,v 1.9 2012/08/06 13:33:38 adam Exp $
+$NetBSD: patch-ah,v 1.10 2012/10/13 11:47:19 adam Exp $
 
---- libraries/libldap/init.c.orig	2012-07-31 16:39:26.000000000 +0000
+--- libraries/libldap/init.c.orig	2012-10-10 12:18:49.000000000 +0000
 +++ libraries/libldap/init.c
 @@ -643,7 +643,11 @@ void ldap_int_initialize( struct ldapopt
  #if defined(HAVE_TLS) || defined(HAVE_CYRUS_SASL)
+ 	LDAP_MUTEX_LOCK( &ldap_int_hostname_mutex );
  	{
- 		LDAP_MUTEX_LOCK( &ldap_int_hostname_mutex );
 -		char	*name = ldap_int_hostname;
 +		char	*name;
 +#if defined(LDAP_R_COMPILE)
diff --git a/databases/openldap/patches/patch-libraries_libmdb_mdb.c b/databases/openldap/patches/patch-libraries_libmdb_mdb.c
deleted file mode 100644
index 3a3b70473f3..00000000000
--- a/databases/openldap/patches/patch-libraries_libmdb_mdb.c
+++ /dev/null
@@ -1,17 +0,0 @@
-$NetBSD: patch-libraries_libmdb_mdb.c,v 1.1 2012/03/13 19:57:11 adam Exp $
-
---- libraries/libmdb/mdb.c.orig	2012-03-13 19:49:49.000000000 +0000
-+++ libraries/libmdb/mdb.c
-@@ -2680,10 +2680,12 @@ mdb_env_setup_locks(MDB_env *env, char *
- 		pthread_mutexattr_t mattr;
- 
- 		pthread_mutexattr_init(&mattr);
-+#ifdef _POSIX_THREAD_PROCESS_SHARED
- 		rc = pthread_mutexattr_setpshared(&mattr, PTHREAD_PROCESS_SHARED);
- 		if (rc) {
- 			goto fail;
- 		}
-+#endif
- 		pthread_mutex_init(&env->me_txns->mti_mutex, &mattr);
- 		pthread_mutex_init(&env->me_txns->mti_wmutex, &mattr);
- #endif	/* __APPLE__ */