openldap: updated to 2.4.49

OpenLDAP 2.4.49:
	Added slapd-monitor database entry count for slapd-mdb
	Fixed client tools to not add controls on cancel/abandon
	Fixed client tools SyncInfo message to be LDIF compliant
	Fixed libldap to correctly free sb
	Fixed libldap descriptor leak if ldaps fails
	Fixed libldap remove unnecessary global mutex for GnuTLS
	Fixed slapd syntax evaluation of preferredDeliveryMethod
	Fixed slapd to relax domainScope control check
	Fixed slapd to have cleaner error handling during connection setup
	Fixed slapd data check when processing cancel exop
	Fixed slapd attribute description processing
	Fixed slapd-ldap to set oldctrls correctly
	Fixed slapd-mdb to honor unchecked limit with alias deref
	Fixed slapd-mdb missing final commit with slapindex
	Fixed slapd-mdb drop attr mappings added in an aborted txn
	Fixed slapd-mdb nosync FLAG configuration handling
	Fixed slapd-monitor global operation counter reporting
	Fixed slapo-ppolicy when used with slapauth
	Fixed slapo-ppolicy to add a missed normalised copy of pwdChangedTime
	Fixed slapo-syncprov fix sessionlog init
	Fixed slapo-unique loop termination
	Build Environment
		Fix mkdep to honor TMPDIR if set
		Remove ICU library detection
		Update config.guess and config.sub to support newer architectures
		Disable ITS8521 regression test as it is no longer valid
	Documentation
		admin24 - Fix inconsistent whitespace in replication section
		slapd-config(5)/slapd.conf(5) - Fix missing bold tag for keyword
		slapd-ldap(5) - Document "tls none" option
		slapo-ppolicy(5) - Correctly document pwdGraceAuthnLimit

9 files changed, 19 insertions, 25 deletions

diff --git a/databases/openldap-client/Makefile b/databases/openldap-client/Makefile
index 4cda409bf28..0138a875f90 100644
--- a/databases/openldap-client/Makefile
+++ b/databases/openldap-client/Makefile
@@ -1,7 +1,6 @@
-# $NetBSD: Makefile,v 1.29 2020/01/18 21:48:00 jperkin Exp $
+# $NetBSD: Makefile,v 1.30 2020/02/10 15:13:06 adam Exp $
 
 PKGNAME=	${DISTNAME:S/-/-client-/}
-PKGREVISION=	1
 COMMENT=	Lightweight Directory Access Protocol libraries and client programs
 
 CONFLICTS+=		openldap<2.3.23nb1
diff --git a/databases/openldap-cloak/Makefile b/databases/openldap-cloak/Makefile
index 992b2b274b1..f026e6a0a9e 100644
--- a/databases/openldap-cloak/Makefile
+++ b/databases/openldap-cloak/Makefile
@@ -1,7 +1,6 @@
-# $NetBSD: Makefile,v 1.18 2020/01/18 21:48:57 jperkin Exp $
+# $NetBSD: Makefile,v 1.19 2020/02/10 15:13:06 adam Exp $
 
 PKGNAME=	${DISTNAME:S/-/-cloak-/}
-PKGREVISION=	1
 COMMENT=	Hide specific attributes unless explicitely requested for OpenLDAP
 
 CONFLICTS+=	openldap<2.3.23nb1
diff --git a/databases/openldap-doc/distinfo b/databases/openldap-doc/distinfo
index aab3cd06612..cc5b313922b 100644
--- a/databases/openldap-doc/distinfo
+++ b/databases/openldap-doc/distinfo
@@ -1,6 +1,6 @@
-$NetBSD: distinfo,v 1.20 2019/08/03 06:46:52 adam Exp $
+$NetBSD: distinfo,v 1.21 2020/02/10 15:13:06 adam Exp $
 
-SHA1 (openldap-2.4.48.tgz) = c1984e80f6db038b317bf931866adb38e5537dcd
-RMD160 (openldap-2.4.48.tgz) = c91aa87634856d84386d2d8498b647ea2b1b7521
-SHA512 (openldap-2.4.48.tgz) = cf694a415be0bd55cc7f606099da2ed461748efd276561944cd29d7f5a8252a9be799d8778fac2d4fa9f382731eb4ca48c6b85630cb58a3b8249843561ae8feb
-Size (openldap-2.4.48.tgz) = 5704883 bytes
+SHA1 (openldap-2.4.49.tgz) = f0caeca122e6f90e6ac5cc8ba36fe9cec13826da
+RMD160 (openldap-2.4.49.tgz) = c09ca490e1f815e2aea799b1edd340e904233ea0
+SHA512 (openldap-2.4.49.tgz) = 99d1943d126b06e62865e31e5825fcff2cb15415f7f85ae4962fa0e7425bc3b58db5b9639150d7b09e3642c80257724c745e47c25ab4fcb1bba0ba771011dd49
+Size (openldap-2.4.49.tgz) = 5704723 bytes
diff --git a/databases/openldap-nops/Makefile b/databases/openldap-nops/Makefile
index 47b7cd0fa69..3219c52e93a 100644
--- a/databases/openldap-nops/Makefile
+++ b/databases/openldap-nops/Makefile
@@ -1,7 +1,6 @@
-# $NetBSD: Makefile,v 1.21 2020/01/18 21:48:57 jperkin Exp $
+# $NetBSD: Makefile,v 1.22 2020/02/10 15:13:06 adam Exp $
 
 PKGNAME=	${DISTNAME:S/-/-nops-/}
-PKGREVISION=	1
 COMMENT=	Remove null-ops for OpenLDAP
 
 CONFLICTS+=	openldap<2.3.23nb1
diff --git a/databases/openldap-server/Makefile b/databases/openldap-server/Makefile
index 4ac3f503722..269a1f6121c 100644
--- a/databases/openldap-server/Makefile
+++ b/databases/openldap-server/Makefile
@@ -1,7 +1,6 @@
-# $NetBSD: Makefile,v 1.55 2020/01/18 21:48:57 jperkin Exp $
+# $NetBSD: Makefile,v 1.56 2020/02/10 15:13:06 adam Exp $
 
 PKGNAME=	${DISTNAME:S/-/-server-/}
-PKGREVISION=	1
 COMMENT=	Lightweight Directory Access Protocol server suite
 
 CONFLICTS+=	openldap<2.3.23nb1
diff --git a/databases/openldap-smbk5pwd/Makefile b/databases/openldap-smbk5pwd/Makefile
index 00285052069..c6fdb0a1e79 100644
--- a/databases/openldap-smbk5pwd/Makefile
+++ b/databases/openldap-smbk5pwd/Makefile
@@ -1,13 +1,12 @@
-# $NetBSD: Makefile,v 1.24 2020/01/18 21:48:58 jperkin Exp $
+# $NetBSD: Makefile,v 1.25 2020/02/10 15:13:06 adam Exp $
 
 PKGNAME=	${DISTNAME:S/-/-smbk5pwd-/}
-PKGREVISION=	1
 COMMENT=	Samba and Kerberos password sync for OpenLDAP
 
 CONFLICTS+=	openldap<2.3.23nb1
 DEPENDS+=	openldap-server>=2.4.13nb1:../../databases/openldap-server
 
-USE_LIBTOOL=		yes
+USE_LIBTOOL=	yes
 
 BUILD_DIRS=		include contrib/slapd-modules/smbk5pwd
 INSTALLATION_DIRS+=	lib/openldap
diff --git a/databases/openldap/Makefile b/databases/openldap/Makefile
index 07537a8784d..b9d7ee19746 100644
--- a/databases/openldap/Makefile
+++ b/databases/openldap/Makefile
@@ -1,6 +1,5 @@
-# $NetBSD: Makefile,v 1.151 2020/01/26 17:30:53 rillig Exp $
+# $NetBSD: Makefile,v 1.152 2020/02/10 15:13:06 adam Exp $
 
-PKGREVISION= 1
 .include "../../databases/openldap/Makefile.version"
 
 DISTNAME=	openldap-${OPENLDAP_VERSION}
diff --git a/databases/openldap/Makefile.version b/databases/openldap/Makefile.version
index e831bca661e..1087e950ada 100644
--- a/databases/openldap/Makefile.version
+++ b/databases/openldap/Makefile.version
@@ -1,10 +1,10 @@
-# $NetBSD: Makefile.version,v 1.18 2020/01/26 17:30:53 rillig Exp $
+# $NetBSD: Makefile.version,v 1.19 2020/02/10 15:13:06 adam Exp $
 # used by databases/lmdb/Makefile
 # used by databases/openldap/Makefile
 # used by databases/openldap/Makefile.common
 # used by databases/openldap-docs/Makefile
 
-OPENLDAP_VERSION=	2.4.48
+OPENLDAP_VERSION=	2.4.49
 
 DISTNAME=	openldap-${OPENLDAP_VERSION}
 MASTER_SITES=	ftp://ftp.openldap.org/pub/OpenLDAP/openldap-release/
diff --git a/databases/openldap/distinfo b/databases/openldap/distinfo
index bca7285ab13..e123a9522cb 100644
--- a/databases/openldap/distinfo
+++ b/databases/openldap/distinfo
@@ -1,9 +1,9 @@
-$NetBSD: distinfo,v 1.113 2019/08/03 06:46:52 adam Exp $
+$NetBSD: distinfo,v 1.114 2020/02/10 15:13:06 adam Exp $
 
-SHA1 (openldap-2.4.48.tgz) = c1984e80f6db038b317bf931866adb38e5537dcd
-RMD160 (openldap-2.4.48.tgz) = c91aa87634856d84386d2d8498b647ea2b1b7521
-SHA512 (openldap-2.4.48.tgz) = cf694a415be0bd55cc7f606099da2ed461748efd276561944cd29d7f5a8252a9be799d8778fac2d4fa9f382731eb4ca48c6b85630cb58a3b8249843561ae8feb
-Size (openldap-2.4.48.tgz) = 5704883 bytes
+SHA1 (openldap-2.4.49.tgz) = f0caeca122e6f90e6ac5cc8ba36fe9cec13826da
+RMD160 (openldap-2.4.49.tgz) = c09ca490e1f815e2aea799b1edd340e904233ea0
+SHA512 (openldap-2.4.49.tgz) = 99d1943d126b06e62865e31e5825fcff2cb15415f7f85ae4962fa0e7425bc3b58db5b9639150d7b09e3642c80257724c745e47c25ab4fcb1bba0ba771011dd49
+Size (openldap-2.4.49.tgz) = 5704723 bytes
 SHA1 (patch-ac) = 2995c518278b363bf9657e181c2340d3024d5980
 SHA1 (patch-ad) = 24e7ec27d592dd76bdec1e4805801c5304951daf
 SHA1 (patch-af) = 2e00b01bd813e73bdc1fb764a02e98d7755703de