Mon Aug 6 13:33:38 2012 UTC ()
Changes 2.4.32:
	Added slappasswd loadable module support
	Fixed tools to not clobber SASL_NOCANON
	Fixed libldap function declarations
	Fixed libldap double free
	Fixed libldap debug level setting
	Fixed libldap MozNSS PEM/certdb handling
	Fixed libldap MozNSS cipher suite selection
	Fixed libldap MozNSS error handling
	Fixed libldap MozNSS cipher suite being ignored
	Fixed libldap MozNSS infinite loop
	Fixed libldap MozNSS context token for certdb
	Fixed libldap MozNSS store certificate object
	Fixed libldap MozNSS fix init and cleanup
	Fixed libldap MozNSS slot and pin usage
	Fixed libldap MozNSS to avoid infinite loop
	Fixed libldap MozNSS untrusted issuer error
	Fixed libldap gettime() regression
	Fixed libldap sasl handling
	Fixed libldap to correctly free socket with TLS
	Fixed libmdb leaf node handling
	Fixed libmdb mutexes on Apple/Windows
	Fixed slapd config index renumbering
	Fixed slapd duplicate error response
	Fixed slapd parsing of PermissiveModify control
	Fixed slapd-bdb/hdb cache hang under high load
	Fixed slapd-bdb/hdb alias checking
	Fixed slapd-bdb/hdb olcDbConfig changes work immediately
	Fixed slapd-ldap to encode user DN during password change
	Fixed slapd-ldap assertion when proxying to MS AD
	Fixed slapd-ldap monitoring
	Fixed slapd-mdb with tool mode
	Fixed slapd-mdb with approx indexing
	Fixed slapd-mdb dn2id delete
	Fixed slapd-mdb memory leak in online indexer
	Fixed slapd-mdb db corruption when hitting maxsize
	Fixed slapd-mdb aborts with online indexing
	Fixed slapd-perl panic
	Fixed slapo-accesslog memory leaks with sync replication
	Fixed slapo-syncprov memory leaks with sync replication
	Fixed contrib/smbk5pwd to not compile with MozNSS
	Fixed contrib/sha2 portability
	Fixed contrib/sha2 thread safety
	Added contrib/sha2 {SSHA256}, {SSHA384}, {SSHA512} support
	Build Environment
		Fixed test057 timing issues
		Fixed compilation with MS Visual Studio
	Contrib
		Added slapi_[get|free]_client_ip()
	Documentation
		slapo-sssvlv Added note about criticality
		admin24 Fix peername.regex typo
		Fixed slapd-config file include example
		slapd-ldap(5) Reference RFC4526
		slapd-meta(5) Reference RFC4526


(adam)
diff -r1.138 -r1.139 pkgsrc/databases/openldap/Makefile
diff -r1.31 -r1.32 pkgsrc/databases/openldap/Makefile.common
diff -r0 -r1.1 pkgsrc/databases/openldap/Makefile.version
diff -r1.85 -r1.86 pkgsrc/databases/openldap/distinfo
diff -r1.23 -r1.24 pkgsrc/databases/openldap-doc/Makefile
diff -r1.2 -r1.3 pkgsrc/databases/openldap-doc/distinfo
diff -r1.8 -r1.9 pkgsrc/databases/openldap/patches/patch-ah
diff -r1.4 -r1.5 pkgsrc/databases/openldap/patches/patch-an
diff -r1.2 -r1.3 pkgsrc/databases/openldap/patches/patch-de
cvs diff -r1.138 -r1.139 pkgsrc/databases/openldap/Makefile (expand / switch to unified diff)

--- pkgsrc/databases/openldap/Makefile 2012/07/29 10:10:16 1.138
+++ pkgsrc/databases/openldap/Makefile 2012/08/06 13:33:38 1.139
@@ -1,16 +1,18 @@ @@ -1,16 +1,18 @@
1# $NetBSD: Makefile,v 1.138 2012/07/29 10:10:16 adam Exp $ 1# $NetBSD: Makefile,v 1.139 2012/08/06 13:33:38 adam Exp $
2 2
3DISTNAME= openldap-2.4.31 3.include "../../databases/openldap/Makefile.version"
 4
 5DISTNAME= openldap-${OPENLDAP_VERSION}
4CATEGORIES= databases 6CATEGORIES= databases
5MASTER_SITES= # empty 7MASTER_SITES= # empty
6DISTFILES= # empty 8DISTFILES= # empty
7 9
8MAINTAINER= ghen@NetBSD.org 10MAINTAINER= ghen@NetBSD.org
9HOMEPAGE= http://www.openldap.org/ 11HOMEPAGE= http://www.openldap.org/
10COMMENT= Lightweight Directory Access Protocol meta-package 12COMMENT= Lightweight Directory Access Protocol meta-package
11LICENSE= modified-bsd 13LICENSE= modified-bsd
12 14
13META_PACKAGE= yes 15META_PACKAGE= yes
14 16
15DEPENDS+= openldap-client>=${PKGVERSION_NOREV}:../../databases/openldap-client 17DEPENDS+= openldap-client>=${PKGVERSION_NOREV}:../../databases/openldap-client
16DEPENDS+= openldap-server>=${PKGVERSION_NOREV}:../../databases/openldap-server 18DEPENDS+= openldap-server>=${PKGVERSION_NOREV}:../../databases/openldap-server
cvs diff -r1.31 -r1.32 pkgsrc/databases/openldap/Makefile.common (expand / switch to unified diff)

--- pkgsrc/databases/openldap/Makefile.common 2012/07/29 10:10:16 1.31
+++ pkgsrc/databases/openldap/Makefile.common 2012/08/06 13:33:38 1.32
@@ -1,23 +1,24 @@ @@ -1,23 +1,24 @@
1# $NetBSD: Makefile.common,v 1.31 2012/07/29 10:10:16 adam Exp $ 1# $NetBSD: Makefile.common,v 1.32 2012/08/06 13:33:38 adam Exp $
2# 2#
3# used by databases/openldap-client/Makefile 3# used by databases/openldap-client/Makefile
4# used by databases/openldap-cloak/Makefile 4# used by databases/openldap-cloak/Makefile
5# used by databases/openldap-nops/Makefile 5# used by databases/openldap-nops/Makefile
6# used by databases/openldap-server/Makefile 6# used by databases/openldap-server/Makefile
7# used by databases/openldap-smbk5pwd/Makefile 7# used by databases/openldap-smbk5pwd/Makefile
8 8
9# please stick to the "stable" releases as much as possible! 9.include "../../databases/openldap/Makefile.version"
10DISTNAME= openldap-2.4.31 10
 11DISTNAME= openldap-${OPENLDAP_VERSION}
11CATEGORIES= databases 12CATEGORIES= databases
12MASTER_SITES= ftp://ftp.openldap.org/pub/OpenLDAP/openldap-release/ \ 13MASTER_SITES= ftp://ftp.openldap.org/pub/OpenLDAP/openldap-release/ \
13 http://www.openldap.org/software/download/OpenLDAP/openldap-release/ \ 14 http://www.openldap.org/software/download/OpenLDAP/openldap-release/ \
14 ftp://gd.tuwien.ac.at/infosys/network/OpenLDAP/openldap-release/ \ 15 ftp://gd.tuwien.ac.at/infosys/network/OpenLDAP/openldap-release/ \
15 ftp://ftp.ntua.gr/mirror/OpenLDAP/openldap-release/ \ 16 ftp://ftp.ntua.gr/mirror/OpenLDAP/openldap-release/ \
16 ftp://ftp.dti.ad.jp/pub/net/OpenLDAP/openldap-release/ \ 17 ftp://ftp.dti.ad.jp/pub/net/OpenLDAP/openldap-release/ \
17 ftp://ftp.u-aizu.ac.jp/pub/net/openldap/openldap-release/ \ 18 ftp://ftp.u-aizu.ac.jp/pub/net/openldap/openldap-release/ \
18 ftp://ftp.nl.uu.net/pub/unix/db/openldap/openldap-release/ \ 19 ftp://ftp.nl.uu.net/pub/unix/db/openldap/openldap-release/ \
19 ftp://ftp.linux.pt/pub/mirrors/OpenLDAP/openldap-release/ \ 20 ftp://ftp.linux.pt/pub/mirrors/OpenLDAP/openldap-release/ \
20 ftp://sunsite.cnlab-switch.ch/mirror/OpenLDAP/openldap-release/ 21 ftp://sunsite.cnlab-switch.ch/mirror/OpenLDAP/openldap-release/
21EXTRACT_SUFX= .tgz 22EXTRACT_SUFX= .tgz
22 23
23MAINTAINER= ghen@NetBSD.org 24MAINTAINER= ghen@NetBSD.org
File Added: pkgsrc/databases/openldap/Makefile.version
# $NetBSD: Makefile.version,v 1.1 2012/08/06 13:33:38 adam Exp $
# used by databases/openldap/Makefile
# used by databases/openldap/Makefile.common
# used by databases/openldap-docs/Makefile

OPENLDAP_VERSION=	2.4.32
cvs diff -r1.85 -r1.86 pkgsrc/databases/openldap/distinfo (expand / switch to unified diff)

--- pkgsrc/databases/openldap/distinfo 2012/07/29 10:10:16 1.85
+++ pkgsrc/databases/openldap/distinfo 2012/08/06 13:33:38 1.86
@@ -1,19 +1,19 @@ @@ -1,19 +1,19 @@
1$NetBSD: distinfo,v 1.85 2012/07/29 10:10:16 adam Exp $ 1$NetBSD: distinfo,v 1.86 2012/08/06 13:33:38 adam Exp $
2 2
3SHA1 (openldap-2.4.31.tgz) = 8315a283fb3724abe6062e38d93bb69298d05765 3SHA1 (openldap-2.4.32.tgz) = 294d5e9711bcb6850188ed895eeb986d43b62664
4RMD160 (openldap-2.4.31.tgz) = 47a50d8f42540f115b8e8b9ec531982b5c3a32d1 4RMD160 (openldap-2.4.32.tgz) = 5d5cfa9c9bb798a1655c2fc30ac4483f4fb04e95
5Size (openldap-2.4.31.tgz) = 5444236 bytes 5Size (openldap-2.4.32.tgz) = 5450134 bytes
6SHA1 (patch-ac) = 2995c518278b363bf9657e181c2340d3024d5980 6SHA1 (patch-ac) = 2995c518278b363bf9657e181c2340d3024d5980
7SHA1 (patch-ad) = 24e7ec27d592dd76bdec1e4805801c5304951daf 7SHA1 (patch-ad) = 24e7ec27d592dd76bdec1e4805801c5304951daf
8SHA1 (patch-af) = 2e00b01bd813e73bdc1fb764a02e98d7755703de 8SHA1 (patch-af) = 2e00b01bd813e73bdc1fb764a02e98d7755703de
9SHA1 (patch-ag) = ec8581f7145ba47712be65f97051ffd2d7299896 9SHA1 (patch-ag) = ec8581f7145ba47712be65f97051ffd2d7299896
10SHA1 (patch-ah) = 5c833010b5e875c12322a112f42fc723ab070a92 10SHA1 (patch-ah) = d374ec9b369500e7ac9a7f76c8762d14ff061528
11SHA1 (patch-aj) = 857bbf14855d7d2a2911457bc6373d8beb69b751 11SHA1 (patch-aj) = 857bbf14855d7d2a2911457bc6373d8beb69b751
12SHA1 (patch-am) = fb8f3e7699f8b2ef55c066cdc6216522c101c7f3 12SHA1 (patch-am) = fb8f3e7699f8b2ef55c066cdc6216522c101c7f3
13SHA1 (patch-an) = a2ef7e96505df948494673f1d1805f1090adad8e 13SHA1 (patch-an) = 3e904d05a3e69930259329ca821d3bbf7dd54eb2
14SHA1 (patch-ao) = 4fcbbfd4d6be792392e3646123022aeaf25923e3 14SHA1 (patch-ao) = 4fcbbfd4d6be792392e3646123022aeaf25923e3
15SHA1 (patch-contrib_slapd-modules_nops_slapo-nops.5) = f32352f19361b7e9aa5b038ae8578def7c08fa47 15SHA1 (patch-contrib_slapd-modules_nops_slapo-nops.5) = f32352f19361b7e9aa5b038ae8578def7c08fa47
16SHA1 (patch-da) = 39f51d21b06d03ffc9d83fd39e88f5b6af1d4f60 16SHA1 (patch-da) = 39f51d21b06d03ffc9d83fd39e88f5b6af1d4f60
17SHA1 (patch-dd) = 9c74118ff0b2232bda729c9917082fceef41dd16 17SHA1 (patch-dd) = 9c74118ff0b2232bda729c9917082fceef41dd16
18SHA1 (patch-de) = c18fd4103d6a6ac7925d59513a9b6bc2196679ba 18SHA1 (patch-de) = be3833817205483b62cf3216b27f53a951621198
19SHA1 (patch-libraries_libmdb_mdb.c) = 2ba3d25dfb1aa6b5e81eed77a46ad58aa74733b5 19SHA1 (patch-libraries_libmdb_mdb.c) = 2ba3d25dfb1aa6b5e81eed77a46ad58aa74733b5
cvs diff -r1.23 -r1.24 pkgsrc/databases/openldap-doc/Makefile (expand / switch to unified diff)

--- pkgsrc/databases/openldap-doc/Makefile 2012/07/29 10:10:16 1.23
+++ pkgsrc/databases/openldap-doc/Makefile 2012/08/06 13:33:38 1.24
@@ -1,16 +1,18 @@ @@ -1,16 +1,18 @@
1# $NetBSD: Makefile,v 1.23 2012/07/29 10:10:16 adam Exp $ 1# $NetBSD: Makefile,v 1.24 2012/08/06 13:33:38 adam Exp $
2 2
3DISTNAME= openldap-2.4.31 3.include "../../databases/openldap/Makefile.version"
 4
 5DISTNAME= openldap-${OPENLDAP_VERSION}
4PKGNAME= ${DISTNAME:S/-/-doc-/} 6PKGNAME= ${DISTNAME:S/-/-doc-/}
5CATEGORIES= databases 7CATEGORIES= databases
6MASTER_SITES= ftp://ftp.openldap.org/pub/OpenLDAP/openldap-release/ \ 8MASTER_SITES= ftp://ftp.openldap.org/pub/OpenLDAP/openldap-release/ \
7 http://ftp.openldap.org/pub/OpenLDAP/openldap-release/ \ 9 http://ftp.openldap.org/pub/OpenLDAP/openldap-release/ \
8 ftp://gd.tuwien.ac.at/infosys/network/OpenLDAP/openldap-release/ \ 10 ftp://gd.tuwien.ac.at/infosys/network/OpenLDAP/openldap-release/ \
9 ftp://ftp.ntua.gr/mirror/OpenLDAP/openldap-release/ \ 11 ftp://ftp.ntua.gr/mirror/OpenLDAP/openldap-release/ \
10 ftp://ftp.dti.ad.jp/pub/net/OpenLDAP/openldap-release/ \ 12 ftp://ftp.dti.ad.jp/pub/net/OpenLDAP/openldap-release/ \
11 ftp://ftp.u-aizu.ac.jp/pub/net/openldap/openldap-release/ \ 13 ftp://ftp.u-aizu.ac.jp/pub/net/openldap/openldap-release/ \
12 ftp://ftp.nl.uu.net/pub/unix/db/openldap/openldap-release/ \ 14 ftp://ftp.nl.uu.net/pub/unix/db/openldap/openldap-release/ \
13 ftp://ftp.linux.pt/pub/mirrors/OpenLDAP/openldap-release/ \ 15 ftp://ftp.linux.pt/pub/mirrors/OpenLDAP/openldap-release/ \
14 ftp://sunsite.cnlab-switch.ch/mirror/OpenLDAP/openldap-release/ 16 ftp://sunsite.cnlab-switch.ch/mirror/OpenLDAP/openldap-release/
15EXTRACT_SUFX= .tgz 17EXTRACT_SUFX= .tgz
16 18
cvs diff -r1.2 -r1.3 pkgsrc/databases/openldap-doc/distinfo (expand / switch to unified diff)

--- pkgsrc/databases/openldap-doc/distinfo 2012/07/29 10:10:16 1.2
+++ pkgsrc/databases/openldap-doc/distinfo 2012/08/06 13:33:38 1.3
@@ -1,5 +1,5 @@ @@ -1,5 +1,5 @@
1$NetBSD: distinfo,v 1.2 2012/07/29 10:10:16 adam Exp $ 1$NetBSD: distinfo,v 1.3 2012/08/06 13:33:38 adam Exp $
2 2
3SHA1 (openldap-2.4.31.tgz) = 8315a283fb3724abe6062e38d93bb69298d05765 3SHA1 (openldap-2.4.32.tgz) = 294d5e9711bcb6850188ed895eeb986d43b62664
4RMD160 (openldap-2.4.31.tgz) = 47a50d8f42540f115b8e8b9ec531982b5c3a32d1 4RMD160 (openldap-2.4.32.tgz) = 5d5cfa9c9bb798a1655c2fc30ac4483f4fb04e95
5Size (openldap-2.4.31.tgz) = 5444236 bytes 5Size (openldap-2.4.32.tgz) = 5450134 bytes
cvs diff -r1.8 -r1.9 pkgsrc/databases/openldap/patches/Attic/patch-ah (expand / switch to unified diff)

--- pkgsrc/databases/openldap/patches/Attic/patch-ah 2012/03/13 19:57:11 1.8
+++ pkgsrc/databases/openldap/patches/Attic/patch-ah 2012/08/06 13:33:38 1.9
@@ -1,17 +1,17 @@ @@ -1,17 +1,17 @@
1$NetBSD: patch-ah,v 1.8 2012/03/13 19:57:11 adam Exp $ 1$NetBSD: patch-ah,v 1.9 2012/08/06 13:33:38 adam Exp $
2 2
3--- libraries/libldap/init.c.orig 2007-09-01 01:13:55.000000000 +0200 3--- libraries/libldap/init.c.orig 2012-07-31 16:39:26.000000000 +0000
4+++ libraries/libldap/init.c 4+++ libraries/libldap/init.c
5@@ -636,7 +636,11 @@ void ldap_int_initialize( struct ldapopt 5@@ -643,7 +643,11 @@ void ldap_int_initialize( struct ldapopt
6  
7 #if defined(HAVE_TLS) || defined(HAVE_CYRUS_SASL) 6 #if defined(HAVE_TLS) || defined(HAVE_CYRUS_SASL)
8 { 7 {
 8 LDAP_MUTEX_LOCK( &ldap_int_hostname_mutex );
9- char *name = ldap_int_hostname; 9- char *name = ldap_int_hostname;
10+ char *name; 10+ char *name;
11+#if defined(LDAP_R_COMPILE) 11+#if defined(LDAP_R_COMPILE)
12+ ldap_pvt_thread_initialize(); 12+ ldap_pvt_thread_initialize();
13+#endif 13+#endif
14+ name = ldap_int_hostname; 14+ name = ldap_int_hostname;
15  15
16 ldap_int_hostname = ldap_pvt_get_fqdn( name ); 16 ldap_int_hostname = ldap_pvt_get_fqdn( name );
17  17
cvs diff -r1.4 -r1.5 pkgsrc/databases/openldap/patches/Attic/patch-an (expand / switch to unified diff)

--- pkgsrc/databases/openldap/patches/Attic/patch-an 2012/03/13 19:57:11 1.4
+++ pkgsrc/databases/openldap/patches/Attic/patch-an 2012/08/06 13:33:38 1.5
@@ -1,13 +1,13 @@ @@ -1,13 +1,13 @@
1$NetBSD: patch-an,v 1.4 2012/03/13 19:57:11 adam Exp $ 1$NetBSD: patch-an,v 1.5 2012/08/06 13:33:38 adam Exp $
2 2
3--- libraries/libldap/ldap-int.h.orig 2005-10-11 21:10:47.000000000 -0400 3--- libraries/libldap/ldap-int.h.orig 2005-10-11 21:10:47.000000000 -0400
4+++ libraries/libldap/ldap-int.h 4+++ libraries/libldap/ldap-int.h
5@@ -733,7 +733,7 @@ LDAP_F (int) ldap_int_sasl_close LDAP_P( 5@@ -743,7 +743,7 @@ LDAP_F (int) ldap_int_sasl_close LDAP_P(
6  6
7 LDAP_F (int) ldap_int_sasl_external LDAP_P(( 7 LDAP_F (int) ldap_int_sasl_external LDAP_P((
8 LDAP *ld, LDAPConn *conn, 8 LDAP *ld, LDAPConn *conn,
9- const char* authid, ber_len_t ssf )); 9- const char* authid, ber_len_t ssf ));
10+ const char* authid, ber_uint_t ssf )); 10+ const char* authid, ber_uint_t ssf ));
11  11
12 LDAP_F (int) ldap_int_sasl_get_option LDAP_P(( LDAP *ld, 12 LDAP_F (int) ldap_int_sasl_get_option LDAP_P(( LDAP *ld,
13 int option, void *arg )); 13 int option, void *arg ));
cvs diff -r1.2 -r1.3 pkgsrc/databases/openldap/patches/Attic/patch-de (expand / switch to unified diff)

--- pkgsrc/databases/openldap/patches/Attic/patch-de 2012/03/13 19:57:11 1.2
+++ pkgsrc/databases/openldap/patches/Attic/patch-de 2012/08/06 13:33:38 1.3
@@ -1,20 +1,20 @@ @@ -1,20 +1,20 @@
1$NetBSD: patch-de,v 1.2 2012/03/13 19:57:11 adam Exp $ 1$NetBSD: patch-de,v 1.3 2012/08/06 13:33:38 adam Exp $
2 2
3--- contrib/slapd-modules/smbk5pwd/smbk5pwd.c.orig 2009-08-04 17:38:01.000000000 +0200 3--- contrib/slapd-modules/smbk5pwd/smbk5pwd.c.orig 2012-07-31 16:39:26.000000000 +0000
4+++ contrib/slapd-modules/smbk5pwd/smbk5pwd.c 2009-08-04 22:56:06.000000000 +0200 4+++ contrib/slapd-modules/smbk5pwd/smbk5pwd.c
5@@ -68,9 +68,15 @@ 5@@ -69,8 +69,15 @@ static ObjectClass *oc_krb5KDCEntry;
6 #ifdef HAVE_GNUTLS 
7 #include <gcrypt.h> 6 #include <gcrypt.h>
8 typedef unsigned char DES_cblock[8]; 7 typedef unsigned char DES_cblock[8];
9 #else 8 #elif HAVE_OPENSSL
10+#ifdef __NetBSD__ 9+#ifdef __NetBSD__
11+#include <des.h> 10+#include <des.h>
 11+#include <md4.h>
12+typedef des_key_schedule DES_key_schedule; 12+typedef des_key_schedule DES_key_schedule;
13+typedef des_cblock DES_cblock; 13+typedef des_cblock DES_cblock;
14+#else 14+#else
15 #include <openssl/des.h> 15 #include <openssl/des.h>
16+#endif 
17 #include <openssl/md4.h> 16 #include <openssl/md4.h>
 17+#endif
 18 #else
 19 #error Unsupported crypto backend.
18 #endif 20 #endif
19 #include "ldap_utf8.h" 
20