Update to OpenLDAP 2.4.15

From OpenLDAP 2.4 Change Log

OpenLDAP 2.4.15 Release (2009/02/24)
        Fixed libldap alias dereferencing in C API again (ITS#5916)
        Fixed libldap GnuTLS compilation (ITS#5955)
        Fixed slapd bconfig conversion again (ITS#5346)
        Fixed slapd behavior with superior objectClasses again (ITS#5517)
        Fixed slapd RFC4512 behavior with same attr in RDN (ITS#5968)
        Fixed slapd corrupt contextCSN (ITS#5947)
        Fixed slapd syncrepl order to match on add/delete (ITS#5954)
        Fixed slapd adding rdn with other values (ITS#5965)
        Fixed slapd-bdb/hdb behavior with unallocatable shm (ITS#5956)
        Fixed slapd-ldap/meta with entries with invalid attrs (ITS#5959)
        Fixed slapd-relay control initialization (ITS#5724)
        Fixed slapo-pcache caching invalid entries (ITS#5927)
        Fixed slapo-syncprov csn updates (ITS#5969)
        Fixed slapo-rwm objectClass preservation (ITS#5760)
        Fixed slapo-rwm rwm_bva_rewrite handling (ITS#5960)
        Build Environment
                Fixed tester library linking for windows (ITS#5740)
OpenLDAP 2.4.14 Release (2009/02/14)
        Added libldap option to disable SASL host canonicalization (ITS#5812)
        Added libldap TLS_PROTOCOL_MIN (ITS#5655)
        Added libldap GnuTLS support for TLS_CIPHER_SUITE (ITS#5887)
        Added libldap GnuTLS setting random file (ITS#5462)
        Added libldap alias dereferencing in C API (ITS#5916)
        Fixed libldap chasing multiple referrals (ITS#5853)
        Fixed libldap deref handling (ITS#5768)
        Fixed libldap NULL pointer deref (ITS#5934)
        Fixed libldap peer cert memory leak (ITS#5849)
        Fixed libldap interaction with GnuTLS CN IP-based matches (ITS#5789)
        Fixed libldap intermediate response behavior (ITS#5896)
        Fixed libldap IPv6 address handling (ITS#5937)
        Fixed libldap_r deref building (ITS#5768)
        Fixed libldap_r slapd lockup when paused during shutdown (ITS#5841)
        Added slapd syncrepl default retry setting (ITS#5825)
        Added slapd val.regex expansion (ITS#5804)
        Added slapd TLS_PROTOCOL_MIN (ITS#5655)
        Added slapd slapi_pw_find (ITS#2615,ITS#4359)
        Added slapd compatibility with MSAD ranged values (ITS#5927)
        Fixed slapd bconfig to return error codes (ITS#5867)
        Fixed slapd bconfig encoding incorrectly (ITS#5897)
        Fixed slapd bconfig dangling pointers (ITS#5924)
        Fixed slapd behavior with superior objectClasses (ITS#5517)
        Fixed slapd connection assert (ITS#5835)
        Fixed slapd epoll handling (ITS#5886)
        Fixed slapd frontend/backend options handling (ITS#5857)
        Fixed slapd glue with MMR (ITS#5925)
        Fixed slapd logging on Windows (ITS#5392)
        Fixed slapd listener comparison (ITS#5613)
        Fixed slapd manageDSAit with glue entries (ITS#5921)
        Fixed slapd relax behavior with structuralObjectClass (ITS#5792)
        Fixed slapd syncrepl rename handling (ITS#5809)
        Fixed slapd syncrepl MMR when adding new server (ITS#5850)
        Fixed slapd syncrepl MMR with deleted entries (ITS#5843)
        Fixed slapd syncrepl replication with glued DB (ITS#5866)
        Fixed slapd syncrepl replication with moddn (ITS#5901)
        Fixed slapd syncrepl replication with referrals (ITS#5881)
        Fixed slapd syncrepl replication with config tree (ITS#5935)
        Fixed slapd wake_sds close on Windows (ITS#5855)
        Fixed slapd-bdb/hdb dncachesize handling (ITS#5860)
        Fixed slapd-bdb/hdb RFC4528 control support (ITS#5861)
        Fixed slapd-bdb/hdb trickle task usage (ITS#5864)
        Fixed slapd-hdb idlcache with empty suffix (ITS#5859)
        Fixed slapd-ldap idassert-bind validity checking (ITS#5863)
        Fixed slapd-ldap/meta RFC4525 increment support (ITS#5912)
        Fixed slapd-ldap/meta search dereferencing (ITS#5916)
        Fixed slapd-ldap/meta with intermediate response (ITS#5931)
        Fixed slapd-ldif numerous bugs (ITS#5408)
        Fixed slapd-ldif rename on same DN (ITS#5319)
        Fixed slapd-ldif deadlock (ITS#5329)
        Fixed slapd-meta double response sending (ITS#5854)
        Fixed slapd-meta alias deref for retry (ITS#5889)
        Fixed slapd-relay recursion detection (ITS#5943)
        Fixed slapd-sock descriptor leak (ITS#5939)
        Fixed slapo-accesslog on glued dbs (ITS#5907)
        Fixed slapo-dynlist handling of flags (ITS#5898)
        Fixed slapo-memberof multiple instantiation (ITS#5903)
        Fixed slapo-pcache filter sorting (ITS#5756)
        Fixed slapo-ppolicy to not be global (ITS#5858)
        Fixed slapo-rwm double free (ITS#5923)
        Fixed slapo-rwm with back-config (ITS#5906)
        Fixed slapo-rwm olcRwmRewrite modification (ITS#5940)
        Added slapo-rwm newRDN rewriting (ITS#5834)
        Added slapadd progress meter (ITS#5922)
        Updated contrib/addpartial module (ITS#5764)
        Added contrib/cloak module (ITS#5872)
        Added contrib/smbk5pwd gcrypt support (ITS#5410)
        Added contrib/passwd sha2 support (ITS#5660)
        Build Environment
                Fixed test006 appending to log file (ITS#5910)
                Fixed test036,test039 behavior on error (ITS#5893)
                Fixed test048 sed pathname substitution (ITS#5910)
                Fixed test049,test050 to work on windows (ITS#5842)
                Updated test017,test018,test019 to cover more cases (ITS#5883)
                Removed patch for BerkeleyDB 4.7.25 (Official patch available)
                Fixed MSVC 9.0 build issues (ITS#5888)
                Fixed gss detection on Solaris (ITS#5846)
                Fixed uuid_create/uuid_unparse_lower detection (ITS#5905)
                Fixed liblutil tavl_delete to macroize constants (ITS#5909)
        Documentation
                admin24 added limits chapter (ITS#5818)
                admin24 access-control clarify global ACLS (ITS#5851,ITS#5852)
                admin24 search on nested naming contexts (ITS#5788)
                admin24 consistent loglevel documentation (ITS#5904)
                slapd-bdb/hdb expansion on dncachesize behavior (ITS#5721)
                slapo-constraint(5) example fix (ITS#5895)
                slap*(8) man pages should mention slapd-config (ITS#5828)
                slapacl(8c) fix wording (ITS#5918)
                slapd(8) document sid (ITS#5873)
                slapd.access(5) clarify global ACLS (ITS#5851,ITS#5852)
                slapadd/cat/index(8) note -n 0 for slapd-config (ITS#5891)
                Added SEE ALSO slapd-config(5) to relevant man pages (ITS#5914)

5 files changed, 39 insertions, 52 deletions

diff --git a/databases/openldap/Makefile b/databases/openldap/Makefile
index ab22837aede..f778288b379 100644
--- a/databases/openldap/Makefile
+++ b/databases/openldap/Makefile
@@ -1,7 +1,7 @@
-# $NetBSD: Makefile,v 1.129 2009/01/24 22:11:19 manu Exp $
+# $NetBSD: Makefile,v 1.130 2009/03/07 22:26:23 manu Exp $
 
 DISTNAME=		openldap-${OPENLDAP_VERSION}
-OPENLDAP_VERSION=	2.4.13
+OPENLDAP_VERSION=	2.4.15
 CATEGORIES=		databases
 MASTER_SITES=		# empty
 DISTFILES=		# empty
diff --git a/databases/openldap/Makefile.common b/databases/openldap/Makefile.common
index f7671e8119a..c9aa0e1d8bd 100644
--- a/databases/openldap/Makefile.common
+++ b/databases/openldap/Makefile.common
@@ -1,7 +1,7 @@
-# $NetBSD: Makefile.common,v 1.19 2009/01/24 22:11:19 manu Exp $
+# $NetBSD: Makefile.common,v 1.20 2009/03/07 22:26:23 manu Exp $
 
 # please stick to the "stable" releases as much as possible!
-DISTNAME=		openldap-2.4.13
+DISTNAME=		openldap-2.4.15
 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 ba720f2b056..84fa167b563 100644
--- a/databases/openldap/distinfo
+++ b/databases/openldap/distinfo
@@ -1,8 +1,8 @@
-$NetBSD: distinfo,v 1.69 2009/01/31 18:25:57 manu Exp $
+$NetBSD: distinfo,v 1.70 2009/03/07 22:26:23 manu Exp $
 
-SHA1 (openldap-2.4.13.tgz) = bb6fe22808d36425b3bad6ce367e882530ccbf51
-RMD160 (openldap-2.4.13.tgz) = c459bb7912e70187bab298911252b6d14590bfd2
-Size (openldap-2.4.13.tgz) = 5040598 bytes
+SHA1 (openldap-2.4.15.tgz) = bbf78945284b61099e6229bce21a829f88e48034
+RMD160 (openldap-2.4.15.tgz) = 6a247b1ddacda8d4dbcd8a131805ef0d96673072
+Size (openldap-2.4.15.tgz) = 5089559 bytes
 SHA1 (patch-aa) = 8c5c68ef53decb013114d606698cbd8a1c1b4e49
 SHA1 (patch-ac) = 905b08c4dea8c61e044ccf66d6af22cc685a3ccc
 SHA1 (patch-ad) = 24e7ec27d592dd76bdec1e4805801c5304951daf
@@ -10,8 +10,7 @@ SHA1 (patch-af) = 1ae9137e76e885e03d0f44727197a444893ec7c5
 SHA1 (patch-ag) = bde3cb8eb9ece90e1ac13d15f8d156201c3b7026
 SHA1 (patch-ah) = ba33845171cef760a68af1406ee2e1dcae7a5a47
 SHA1 (patch-aj) = 4cedc384f2e81d592d66c0e1688e61cf0e69b05d
-SHA1 (patch-am) = 06c17b10bb8cc091461b82fca2b5d6032b613c78
+SHA1 (patch-am) = cf97dbc86ed1e0dc3cd7f901dd3f0e4c77490a82
 SHA1 (patch-an) = f98c6457474247c092dd0a062e86560cc894ec4e
 SHA1 (patch-ao) = 6276a1226689fc3be3ffacbcd8df2e4f3e51d1a0
 SHA1 (patch-da) = c7ac86fcb4b4283fc61a3e045197bbef617c6ff4
-SHA1 (patch-db) = 2200cd44e8954ddd8c6bfdd5a0bc3c01831ba90e
diff --git a/databases/openldap/patches/patch-am b/databases/openldap/patches/patch-am
index fbd65850a02..c170ed22b3b 100644
--- a/databases/openldap/patches/patch-am
+++ b/databases/openldap/patches/patch-am
@@ -1,8 +1,8 @@
-$NetBSD: patch-am,v 1.5 2006/05/15 19:01:23 ghen Exp $
-
---- libraries/libldap/cyrus.c.orig	2006-05-13 11:47:50.000000000 +0200
-+++ libraries/libldap/cyrus.c
-@@ -884,7 +884,7 @@ ldap_int_sasl_external(
+$NetBSD: patch-am,v 1.6 2009/03/07 22:26:23 manu Exp $
+--- libraries/libldap/cyrus.c.orig	2009-02-08 06:06:04.000000000 +0000
++++ libraries/libldap/cyrus.c	2009-03-07 21:21:47.000000000 +0000
+@@ -712,9 +712,9 @@
+ ldap_int_sasl_external(
  	LDAP *ld,
  	LDAPConn *conn,
  	const char * authid,
@@ -11,7 +11,9 @@ $NetBSD: patch-am,v 1.5 2006/05/15 19:01:23 ghen Exp $
  {
  	int sc;
  	sasl_conn_t *ctx;
-@@ -1026,6 +1026,7 @@ int ldap_pvt_sasl_secprops(
+ #if SASL_VERSION_MAJOR < 2
+@@ -856,8 +856,9 @@
+ 	unsigned i, j, l;
  	char **props;
  	unsigned sflags = 0;
  	int got_sflags = 0;
@@ -19,7 +21,9 @@ $NetBSD: patch-am,v 1.5 2006/05/15 19:01:23 ghen Exp $
  	sasl_ssf_t max_ssf = 0;
  	int got_max_ssf = 0;
  	sasl_ssf_t min_ssf = 0;
-@@ -1056,9 +1057,9 @@ int ldap_pvt_sasl_secprops(
+ 	int got_min_ssf = 0;
+@@ -886,11 +887,11 @@
+ 				v = strtoul( &props[i][sprops[j].key.bv_len], &next, 10 );
  				if ( next == &props[i][sprops[j].key.bv_len] || next[0] != '\0' ) continue;
  				switch( sprops[j].ival ) {
  				case GOT_MINSSF:
@@ -31,7 +35,9 @@ $NetBSD: patch-am,v 1.5 2006/05/15 19:01:23 ghen Exp $
  				case GOT_MAXBUF:
  					maxbufsize = v; got_maxbufsize++; break;
  				}
-@@ -1155,7 +1156,7 @@ ldap_int_sasl_get_option( LDAP *ld, int 
+ 			} else {
+@@ -992,23 +993,23 @@
+ 			if ( sc != SASL_OK ) {
  				return -1;
  			}
  
@@ -40,7 +46,7 @@ $NetBSD: patch-am,v 1.5 2006/05/15 19:01:23 ghen Exp $
  		} break;
  
  		case LDAP_OPT_X_SASL_SSF_EXTERNAL:
-@@ -1163,13 +1164,13 @@ ldap_int_sasl_get_option( LDAP *ld, int 
+ 			/* this option is write only */
  			return -1;
  
  		case LDAP_OPT_X_SASL_SSF_MIN:
@@ -53,11 +59,13 @@ $NetBSD: patch-am,v 1.5 2006/05/15 19:01:23 ghen Exp $
  			break;
  		case LDAP_OPT_X_SASL_MAXBUFSIZE:
 -			*(ber_len_t *)arg = ld->ld_options.ldo_sasl_secprops.maxbufsize;
-+			*(ber_uint_t *)arg = ld->ld_options.ldo_sasl_secprops.maxbufsize;
++			*(sasl_ssf_t *)arg = ld->ld_options.ldo_sasl_secprops.maxbufsize;
  			break;
- 
- 		case LDAP_OPT_X_SASL_SECPROPS:
-@@ -1215,7 +1216,7 @@ ldap_int_sasl_set_option( LDAP *ld, int 
+ 		case LDAP_OPT_X_SASL_NOCANON:
+ 			*(int *)arg = (int) LDAP_BOOL_GET(&ld->ld_options, LDAP_BOOL_SASL_NOCANON );
+ 			break;
+@@ -1061,9 +1062,9 @@
+ 		sc = sasl_setprop( ctx, SASL_SSF_EXTERNAL, &sasl_ssf);
  #else
  		memset(&extprops, 0L, sizeof(extprops));
  
@@ -66,7 +74,9 @@ $NetBSD: patch-am,v 1.5 2006/05/15 19:01:23 ghen Exp $
  
  		sc = sasl_setprop( ctx, SASL_SSF_EXTERNAL,
  			(void *) &extprops );
-@@ -1227,13 +1228,13 @@ ldap_int_sasl_set_option( LDAP *ld, int 
+ #endif
+@@ -1073,15 +1074,15 @@
+ 		}
  		} break;
  
  	case LDAP_OPT_X_SASL_SSF_MIN:
@@ -79,11 +89,13 @@ $NetBSD: patch-am,v 1.5 2006/05/15 19:01:23 ghen Exp $
  		break;
  	case LDAP_OPT_X_SASL_MAXBUFSIZE:
 -		ld->ld_options.ldo_sasl_secprops.maxbufsize = *(ber_len_t *)arg;
-+		ld->ld_options.ldo_sasl_secprops.maxbufsize = *(ber_uint_t *)arg;
++		ld->ld_options.ldo_sasl_secprops.maxbufsize = *(sasl_ssf_t *)arg;
  		break;
- 
- 	case LDAP_OPT_X_SASL_SECPROPS: {
-@@ -1332,7 +1333,7 @@ ldap_int_sasl_external(
+ 	case LDAP_OPT_X_SASL_NOCANON:
+ 		if ( arg == LDAP_OPT_OFF ) {
+ 			LDAP_BOOL_CLR(&ld->ld_options, LDAP_BOOL_SASL_NOCANON );
+@@ -1185,8 +1186,8 @@
+ ldap_int_sasl_external(
  	LDAP *ld,
  	LDAPConn *conn,
  	const char * authid,
diff --git a/databases/openldap/patches/patch-db b/databases/openldap/patches/patch-db
deleted file mode 100644
index c1500afdb8b..00000000000
--- a/databases/openldap/patches/patch-db
+++ /dev/null
@@ -1,24 +0,0 @@
-$NetBSD: patch-db,v 1.1 2009/01/31 18:25:57 manu Exp $
---- contrib/slapd-modules/nops/Makefile.orig	2009-01-31 17:21:12.000000000 +0000
-+++ contrib/slapd-modules/nops/Makefile	2009-01-31 18:10:29.000000000 +0000
-@@ -1,9 +1,15 @@
--CPPFLAGS+=-I../../../include -I../../../servers/slapd
-+CPPFLAGS+=-I../../../include -I../../../servers/slapd 
-+CPPFLAGS+=-DSLAPD_OVER_NOPS=SLAPD_MOD_DYNAMIC
-+LIBS=-lldap_r -llber -lcrypto
- 
--all: nops.so
-+all: nops.la
- 
--nops.so: nops.c
--	$(CC) -shared $(CPPFLAGS) -Wall -o $@ $?
-+nops.lo:    nops.c
-+	$(LIBTOOL) --mode=compile $(CC) $(CPPFLAGS) -c $?
-+
-+nops.la:    nops.lo
-+	$(LIBTOOL) --mode=link $(CC) -version-info 0:0:0 \
-+		   -rpath $(PREFIX)/lib -module -o $@ $? $(LIBS)
- 
- clean:
--	rm nops.so
-+	rm nops.lo nops.la