OpenLDAP 2.4.41 Release (2015/06/21)

	Fixed ldapsearch to explicitly flush its buffer (ITS-8118)
	Fixed libldap async connections (ITS-8090)
	Fixed libldap double free of request during abandon (ITS-7967)
	Fixed libldap error string for LDAP_X_CONNECTING (ITS-8093)
	Fixed libldap segfault in ldap_sync_initialize (ITS-8001)
	Fixed libldap ldif-wrap off by one error (ITS-8003)
	Fixed libldap handling of TLS in async mode (ITS-8022)
	Fixed libldap null pointer dereference (ITS-8028)
	Fixed libldap mutex handling with LDAP_OPT_SESSION_REFCNT (ITS-8050)
	Fixed slapd slapadd config db import of minimal frontend entry (ITS-8150)
	Fixed slapd slapadd onetime leak with -w (ITS-8014)
	Fixed slapd sasl auxprop crash with invalid config (ITS-8092)
	Fixed slapd syncrepl delta-mmr issue with overlays and slapd.conf (ITS-7976)
	Fixed slapd syncrepl mutex for cookie state (ITS-7968)
	Fixed slapd syncrepl memory leaks (ITS-8035)
	Fixed slapd syncrepl to free presentlist at end of refresh mode (ITS-8038)
	Fixed slapd syncrepl to streamline presentlist (ITS-8042)
	Fixed slapd syncrepl concurrency when CHECK_CSN is enabled (ITS-8120)
	Fixed slapd rootdn checks for hidden backends (ITS-8108)
	Fixed slapd segfault when using matched values control (ITS-8046)
	Fixed slapd-ldap reconnection behavior on remote failure (ITS-8142)
	Fixed slapd-mdb minor case typo (ITS-8049)
	Fixed slapd-mdb one-level search (ITS-7975)
	Fixed slapd-mdb heap corruption (ITS-7965)
	Fixed slapd-mdb crash after deleting in-use schema (ITS-7995)
	Fixed slapd-mdb minor code cleanup (ITS-8011)
	Fixed slapd-mdb to return errors when using incorrect env flags (ITS-8016)
	Fixed slapd-mdb to correctly update search candidates (ITS-8036, ITS-7904)
	Fixed slapd-mdb when there were more than 65535 aliases in scope (ITS-8103)
	Fixed slapd-mdb alias deref when objectClass is not indexed (ITS-8146)
	Fixed slapd-meta TLS initialization with ldaps URIs (ITS-8022)
	Fixed slapd-meta to have better error logging (ITS-8131)
	Fixed slapd-perl conversion to cn=config (ITS-8105)
	Fixed slapd-sql autocommit config variable (ITS-8129,ITS-6613)
	Fixed slapo-collect segfault (ITS-7797)
	Fixed slapo-constraint with 0 count constraint (ITS-7780,ITS-7781)
	Fixed slapo-deref with empty attribute list (ITS-8027)
	Fixed slapo-memberof to correctly reject invalid members (ITS-8107)
	Fixed slapo-sock result parser for CONTINUE (ITS-8048)
	Fixed slapo-syncprov synprov_matchops usage of test_filter (ITS-8013)
	Fixed slapo-syncprov segfault on disconnect/abandon (ITS-5452,ITS-8012)
	Fixed slapo-syncprov memory leak (ITS-8039)
	Fixed slapo-syncprov segfault on disconnect/abandon (ITS-8043)
	Fixed slapo-syncprov deadlock when autogroup is in use (ITS-8063)
	Fixed slapo-syncprov potential loss of changes when under load (ITS-8081)
	Fixed slapo-unique enforcement of uniqueness with manageDSAit control (ITS-8057)
	Build Environment
		Fixed libdb detection with gcc 5.x (ITS-8056)
		Fixed ftello reference for Win32 (ITS-8127)
		Enhanced contrib modules build paths (ITS-7782)
		Fixed contrib/autogroup internal operation identity (ITS-8006)
		Fixed contrib/autogroup to skip internal ops with accesslog (ITS-8065)
		Fixed contrib/passwd/sha2 compiler warning (ITS-8000)
		Fixed contrib/noopsrch compiler warning (ITS-7998)
		Fixed contrib/dupent compiler warnings (ITS-7997)
		Test suite: Added vrFilter test (ITS-8046)
	Contrib
		Added pbkdf2 sha256 and sha512 schemes (ITS-7977)
		Fixed autogroup modification callback responses (ITS-6970)
		Fixed nssov compare with usergroup (ITS-8079)
		Fixed nssov password change behavior (ITS-8080)
		Fixed nssov updated to 0.9.4 (ITS-8097)
	Documentation
		Added ldap_get_option(3) LDAP_FEATURE_INFO_VERSION information (ITS-8032)
		Added ldap_get_option(3) LDAP_OPT_API_INFO_VERSION information (ITS-8032)
		Fixed slapd-config(5), slapd.conf(5) tls_cipher_suite option (ITS-8099)
		Fixed slapd-meta(5), slapd-ldap(5) tls_cipher_suite option (ITS-8099)
		Fixed slapd-meta(5) fix minor typo (ITS-7769)

5 files changed, 18 insertions, 18 deletions

diff --git a/databases/openldap/Makefile.version b/databases/openldap/Makefile.version
index 5b17b0e7ce9..47912ad6df9 100644
--- a/databases/openldap/Makefile.version
+++ b/databases/openldap/Makefile.version
@@ -1,6 +1,6 @@
-# $NetBSD: Makefile.version,v 1.9 2014/10/01 08:32:31 adam Exp $
+# $NetBSD: Makefile.version,v 1.10 2015/07/17 14:49:05 adam Exp $
 # used by databases/openldap/Makefile
 # used by databases/openldap/Makefile.common
 # used by databases/openldap-docs/Makefile
 
-OPENLDAP_VERSION=	2.4.40
+OPENLDAP_VERSION=	2.4.41
diff --git a/databases/openldap/distinfo b/databases/openldap/distinfo
index 83a299f0626..377a9232f35 100644
--- a/databases/openldap/distinfo
+++ b/databases/openldap/distinfo
@@ -1,8 +1,8 @@
-$NetBSD: distinfo,v 1.98 2015/07/15 16:33:57 manu Exp $
+$NetBSD: distinfo,v 1.99 2015/07/17 14:49:05 adam Exp $
 
-SHA1 (openldap-2.4.40.tgz) = 0cfac3b024b99de2e2456cc7254481b6644e0b96
-RMD160 (openldap-2.4.40.tgz) = 38a914d785040730e9e595fe007ea4a0d0635344
-Size (openldap-2.4.40.tgz) = 5641865 bytes
+SHA1 (openldap-2.4.41.tgz) = c6880df9fec928a5f010b78a4285b497e8a12d6b
+RMD160 (openldap-2.4.41.tgz) = b07662d9b93e67eb7f1bb8374ee5b25bc76e7a47
+Size (openldap-2.4.41.tgz) = 5644124 bytes
 SHA1 (patch-ac) = 2995c518278b363bf9657e181c2340d3024d5980
 SHA1 (patch-ad) = 24e7ec27d592dd76bdec1e4805801c5304951daf
 SHA1 (patch-af) = 2e00b01bd813e73bdc1fb764a02e98d7755703de
@@ -12,10 +12,10 @@ SHA1 (patch-aj) = 857bbf14855d7d2a2911457bc6373d8beb69b751
 SHA1 (patch-am) = fb8f3e7699f8b2ef55c066cdc6216522c101c7f3
 SHA1 (patch-an) = 3e904d05a3e69930259329ca821d3bbf7dd54eb2
 SHA1 (patch-ao) = 4fcbbfd4d6be792392e3646123022aeaf25923e3
-SHA1 (patch-contrib_slapd-modules_cloak_Makefile) = 36c416f21982235270ca9f0e4b54f677c4deb1ea
-SHA1 (patch-contrib_slapd-modules_nops_Makefile) = 22a39eda3e9375e35cec4be57d92a8eafca130a5
+SHA1 (patch-contrib_slapd-modules_cloak_Makefile) = 47c81def0c013a360acb549ed69e9042f0bc1be3
+SHA1 (patch-contrib_slapd-modules_nops_Makefile) = c51bccf34c3f3112232a134038622d31b6315628
 SHA1 (patch-contrib_slapd-modules_nops_slapo-nops.5) = f32352f19361b7e9aa5b038ae8578def7c08fa47
-SHA1 (patch-da) = 880b25a9266ee057f7269c5be46ef3c3fecf16b4
+SHA1 (patch-da) = 75e26bd08c6e66b69192ebfbb36db974d391ec3e
 SHA1 (patch-dd) = 9c74118ff0b2232bda729c9917082fceef41dd16
 SHA1 (patch-de) = f371fc2bd2534832bf57c363095eecacb5cb1fe3
 SHA1 (patch-its7506) = a50f9428d6d7dd28f71d21e11ae3f8b0f1372f75
diff --git a/databases/openldap/patches/patch-contrib_slapd-modules_cloak_Makefile b/databases/openldap/patches/patch-contrib_slapd-modules_cloak_Makefile
index 2c58e7f3157..59ac503e1fa 100644
--- a/databases/openldap/patches/patch-contrib_slapd-modules_cloak_Makefile
+++ b/databases/openldap/patches/patch-contrib_slapd-modules_cloak_Makefile
@@ -1,10 +1,10 @@
-$NetBSD: patch-contrib_slapd-modules_cloak_Makefile,v 1.1 2013/03/16 12:49:54 adam Exp $
+$NetBSD: patch-contrib_slapd-modules_cloak_Makefile,v 1.2 2015/07/17 14:49:05 adam Exp $
 
---- contrib/slapd-modules/cloak/Makefile.orig	2013-03-16 12:37:06.000000000 +0000
+--- contrib/slapd-modules/cloak/Makefile.orig	2015-06-21 00:19:58.000000000 +0000
 +++ contrib/slapd-modules/cloak/Makefile
 @@ -3,12 +3,10 @@
  LDAP_SRC = ../../..
- LDAP_BUILD = ../../..
+ LDAP_BUILD = $(LDAP_SRC)
  LDAP_INC = -I$(LDAP_BUILD)/include -I$(LDAP_SRC)/include -I$(LDAP_SRC)/servers/slapd
 -LDAP_LIB = $(LDAP_BUILD)/libraries/libldap_r/libldap_r.la \
 -	$(LDAP_BUILD)/libraries/liblber/liblber.la
diff --git a/databases/openldap/patches/patch-contrib_slapd-modules_nops_Makefile b/databases/openldap/patches/patch-contrib_slapd-modules_nops_Makefile
index e1b2e98384c..695ddcbfe43 100644
--- a/databases/openldap/patches/patch-contrib_slapd-modules_nops_Makefile
+++ b/databases/openldap/patches/patch-contrib_slapd-modules_nops_Makefile
@@ -1,10 +1,10 @@
-$NetBSD: patch-contrib_slapd-modules_nops_Makefile,v 1.1 2013/03/16 12:49:54 adam Exp $
+$NetBSD: patch-contrib_slapd-modules_nops_Makefile,v 1.2 2015/07/17 14:49:05 adam Exp $
 
---- contrib/slapd-modules/nops/Makefile.orig	2013-03-16 12:40:41.000000000 +0000
+--- contrib/slapd-modules/nops/Makefile.orig	2015-06-21 00:19:58.000000000 +0000
 +++ contrib/slapd-modules/nops/Makefile
 @@ -3,12 +3,10 @@
  LDAP_SRC = ../../..
- LDAP_BUILD = ../../..
+ LDAP_BUILD = $(LDAP_SRC)
  LDAP_INC = -I$(LDAP_BUILD)/include -I$(LDAP_SRC)/include -I$(LDAP_SRC)/servers/slapd
 -LDAP_LIB = $(LDAP_BUILD)/libraries/libldap_r/libldap_r.la \
 -	$(LDAP_BUILD)/libraries/liblber/liblber.la
diff --git a/databases/openldap/patches/patch-da b/databases/openldap/patches/patch-da
index 8b8711ba180..300a66be1ce 100644
--- a/databases/openldap/patches/patch-da
+++ b/databases/openldap/patches/patch-da
@@ -1,10 +1,10 @@
-$NetBSD: patch-da,v 1.7 2013/03/16 12:49:54 adam Exp $
+$NetBSD: patch-da,v 1.8 2015/07/17 14:49:05 adam Exp $
 
---- contrib/slapd-modules/smbk5pwd/Makefile.orig	2013-03-03 21:17:30.000000000 +0000
+--- contrib/slapd-modules/smbk5pwd/Makefile.orig	2015-06-21 00:19:58.000000000 +0000
 +++ contrib/slapd-modules/smbk5pwd/Makefile
 @@ -15,8 +15,7 @@
  LDAP_SRC = ../../..
- LDAP_BUILD = ../../..
+ LDAP_BUILD = $(LDAP_SRC)
  LDAP_INC = -I$(LDAP_BUILD)/include -I$(LDAP_SRC)/include -I$(LDAP_SRC)/servers/slapd
 -LDAP_LIB = $(LDAP_BUILD)/libraries/libldap_r/libldap_r.la \
 -	$(LDAP_BUILD)/libraries/liblber/liblber.la