openldap: updated to 2.4.47

OpenLDAP 2.4.47:
Added slapd-sock DN qualifier for subtrees to be processed
Added slapd-sock ability to send extended operations to external listeners
Fixed liblber to avoid incremental access to user-supplied bv in dupbv
Fixed libldap dn to domain parsing with bad input
Fixed slapd slapcat to correctly honor -g option
Fixed slapd to correctly handle NO_SUCH_OBJECT with dynamic groups
Fixed slapd to check status of rdnNormalize
Fixed slapd cn=config when modifying slapo-syncprov config
Fixed slapd sasl authz-policy "all" behavior
Fixed slapd sasl minor typo
Fixed slapd to correctly hide hidden DBs in the rootDSE
Fixed slapd domainScope control to match Microsoft specification
Fixed slapd-bdb/hdb/mdb to not convert certain IDLs to ranges
Fixed slapo-accesslog deadlock during cleanup
Fixed slapo-memberof cn=config modifications
Fixed slapo-ppolicy with multimaster replication
Fixed slapo-syncprov with NULL modlist
Build Environment
	Added slapd reproducible build support
	Fixed missing includes with OpenSSL 1.0.2
Contrib
	Fixed slapo-pbkdf2 hash generation
Documentation
	admin24 fixed minor typo

8 files changed, 36 insertions, 47 deletions

diff --git a/databases/openldap-client/builtin.mk b/databases/openldap-client/builtin.mk
index 3b53cb6ac7b..92f8c8c1a94 100644
--- a/databases/openldap-client/builtin.mk
+++ b/databases/openldap-client/builtin.mk
@@ -1,11 +1,11 @@
-# $NetBSD: builtin.mk,v 1.1 2008/10/12 20:49:19 ahoka Exp $
+# $NetBSD: builtin.mk,v 1.2 2018/12/20 17:54:09 adam Exp $
 
 BUILTIN_PKG:=	openldap-client
 
 PKGCONFIG_FILE.openldap-client=	/usr/include/ldap_features.h
 PKGCONFIG_BASE.openldap-client=	/usr
 
-BUILTIN_VERSION_SCRIPT.openldap-client= ${AWK} \
+BUILTIN_VERSION_SCRIPT.openldap-client=	${AWK} \
 	'/\#define[ \t]*_?LDAP_VENDOR_VERSION_MAJOR[ \t]/ { major = $$3; } \
 	/\#define[ \t]*_?LDAP_VENDOR_VERSION_MINOR[ \t]/ { minor = $$3; } \
 	/\#define[ \t]*_?LDAP_VENDOR_VERSION_PATCH[ \t]/ { patch = $$3; } \
diff --git a/databases/openldap-doc/Makefile b/databases/openldap-doc/Makefile
index d3e40c95fe7..55fc7b7ceeb 100644
--- a/databases/openldap-doc/Makefile
+++ b/databases/openldap-doc/Makefile
@@ -1,24 +1,12 @@
-# $NetBSD: Makefile,v 1.28 2018/04/21 13:38:04 wiz Exp $
+# $NetBSD: Makefile,v 1.29 2018/12/20 17:54:09 adam Exp $
 
 .include "../../databases/openldap/Makefile.version"
 
-DISTNAME=	openldap-${OPENLDAP_VERSION}
 PKGNAME=	${DISTNAME:S/-/-doc-/}
 CATEGORIES=	databases
-MASTER_SITES=	ftp://ftp.openldap.org/pub/OpenLDAP/openldap-release/
-MASTER_SITES+=	http://ftp.openldap.org/pub/OpenLDAP/openldap-release/
-MASTER_SITES+=	ftp://ftp.ntua.gr/mirror/OpenLDAP/openldap-release/
-MASTER_SITES+=	ftp://ftp.dti.ad.jp/pub/net/OpenLDAP/openldap-release/
-MASTER_SITES+=	ftp://ftp.u-aizu.ac.jp/pub/net/openldap/openldap-release/
-MASTER_SITES+=	ftp://ftp.nl.uu.net/pub/unix/db/openldap/openldap-release/
-MASTER_SITES+=	ftp://ftp.linux.pt/pub/mirrors/OpenLDAP/openldap-release/
-MASTER_SITES+=	ftp://sunsite.cnlab-switch.ch/mirror/OpenLDAP/openldap-release/
-EXTRACT_SUFX=	.tgz
 
 MAINTAINER=	adam@NetBSD.org
-HOMEPAGE=	http://www.openldap.org/
 COMMENT=	Lightweight Directory Access Protocol documentation
-LICENSE=	modified-bsd
 
 NO_CONFIGURE=		yes
 NO_BUILD=		yes
diff --git a/databases/openldap-doc/distinfo b/databases/openldap-doc/distinfo
index 9a3d9f20835..43ccca0a794 100644
--- a/databases/openldap-doc/distinfo
+++ b/databases/openldap-doc/distinfo
@@ -1,6 +1,6 @@
-$NetBSD: distinfo,v 1.18 2018/04/02 13:40:45 adam Exp $
+$NetBSD: distinfo,v 1.19 2018/12/20 17:54:09 adam Exp $
 
-SHA1 (openldap-2.4.46.tgz) = a9ae2273eb9bdd70090dafe0d018a3132606bef6
-RMD160 (openldap-2.4.46.tgz) = d7038355b1c13a0b2d5104a0c75735b63e9c4148
-SHA512 (openldap-2.4.46.tgz) = eef39d43f04aa09c657a1422cefef060fe00368559ae40d0d97536c08ebeaaa1ab06207b3f121ba6afcde54abdc550027c3505e5217e5fd47ae6f8c001260186
-Size (openldap-2.4.46.tgz) = 5700204 bytes
+SHA1 (openldap-2.4.47.tgz) = c59d52dd75f7d1c7b02f83725da36c322d439674
+RMD160 (openldap-2.4.47.tgz) = c228e5d55019c90aaeceeda32980e52cd7a0a4a6
+SHA512 (openldap-2.4.47.tgz) = d424079e34207e3d24383a2bea70a07ded40714982a6767174d2b2cb208cd94feab5ef12157accae915b8e404e5773a7547aaef65f06b44dc3cc09c6a64d5a11
+Size (openldap-2.4.47.tgz) = 5699678 bytes
diff --git a/databases/openldap-server/options.mk b/databases/openldap-server/options.mk
index 7178c4ec229..74d45340937 100644
--- a/databases/openldap-server/options.mk
+++ b/databases/openldap-server/options.mk
@@ -1,4 +1,4 @@
-# $NetBSD: options.mk,v 1.19 2015/09/07 12:02:06 jperkin Exp $
+# $NetBSD: options.mk,v 1.20 2018/12/20 17:54:09 adam Exp $
 
 PKG_OPTIONS_VAR=	PKG_OPTIONS.openldap-server
 PKG_SUPPORTED_OPTIONS=	bdb dso inet6 sasl slapi slp smbk5pwd
@@ -94,10 +94,10 @@ CONFIGURE_ARGS+=	--enable-modules
 ###
 ### Enable SLAPI support
 ###
-.if empty(PKG_OPTIONS:Mslapi)
-CONFIGURE_ARGS+=	--disable-slapi
-.else
+.if !empty(PKG_OPTIONS:Mslapi)
 CONFIGURE_ARGS+=	--enable-slapi
 PLIST.slapi=		yes
 .include "../../devel/libltdl/buildlink3.mk"
+.else
+CONFIGURE_ARGS+=	--disable-slapi
 .endif
diff --git a/databases/openldap/Makefile b/databases/openldap/Makefile
index 8f8915900a9..a71d81b4fe5 100644
--- a/databases/openldap/Makefile
+++ b/databases/openldap/Makefile
@@ -1,11 +1,9 @@
-# $NetBSD: Makefile,v 1.148 2018/04/02 13:40:44 adam Exp $
+# $NetBSD: Makefile,v 1.149 2018/12/20 17:54:09 adam Exp $
 
 .include "../../databases/openldap/Makefile.version"
 
 DISTNAME=	openldap-${OPENLDAP_VERSION}
 CATEGORIES=	databases
-MASTER_SITES=	# empty
-DISTFILES=	# empty
 
 MAINTAINER=	adam@NetBSD.org
 HOMEPAGE=	http://www.openldap.org/
diff --git a/databases/openldap/Makefile.common b/databases/openldap/Makefile.common
index 8d5f61ae67c..2248ba0c306 100644
--- a/databases/openldap/Makefile.common
+++ b/databases/openldap/Makefile.common
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile.common,v 1.41 2018/07/04 13:40:12 jperkin Exp $
+# $NetBSD: Makefile.common,v 1.42 2018/12/20 17:54:09 adam Exp $
 #
 # used by databases/openldap-client/Makefile
 # used by databases/openldap-cloak/Makefile
@@ -8,21 +8,9 @@
 
 .include "../../databases/openldap/Makefile.version"
 
-DISTNAME=	openldap-${OPENLDAP_VERSION}
 CATEGORIES=	databases
-MASTER_SITES=	ftp://ftp.openldap.org/pub/OpenLDAP/openldap-release/
-MASTER_SITES+=	http://www.openldap.org/software/download/OpenLDAP/openldap-release/
-MASTER_SITES+=	ftp://ftp.ntua.gr/mirror/OpenLDAP/openldap-release/
-MASTER_SITES+=	ftp://ftp.dti.ad.jp/pub/net/OpenLDAP/openldap-release/
-MASTER_SITES+=	ftp://ftp.u-aizu.ac.jp/pub/net/openldap/openldap-release/
-MASTER_SITES+=	ftp://ftp.nl.uu.net/pub/unix/db/openldap/openldap-release/
-MASTER_SITES+=	ftp://ftp.linux.pt/pub/mirrors/OpenLDAP/openldap-release/
-MASTER_SITES+=	ftp://sunsite.cnlab-switch.ch/mirror/OpenLDAP/openldap-release/
-EXTRACT_SUFX=	.tgz
 
 MAINTAINER=	adam@NetBSD.org
-HOMEPAGE=	http://www.openldap.org/
-LICENSE=	modified-bsd
 
 CONFLICTS+=		ldapsdk-[0-9]*
 
diff --git a/databases/openldap/Makefile.version b/databases/openldap/Makefile.version
index dedb9497d9f..4d88de925ed 100644
--- a/databases/openldap/Makefile.version
+++ b/databases/openldap/Makefile.version
@@ -1,6 +1,21 @@
-# $NetBSD: Makefile.version,v 1.15 2018/04/02 13:40:44 adam Exp $
+# $NetBSD: Makefile.version,v 1.16 2018/12/20 17:54:09 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.46
+OPENLDAP_VERSION=	2.4.47
+
+DISTNAME=	openldap-${OPENLDAP_VERSION}
+MASTER_SITES=	ftp://ftp.openldap.org/pub/OpenLDAP/openldap-release/
+MASTER_SITES+=	http://www.openldap.org/software/download/OpenLDAP/openldap-release/
+MASTER_SITES+=	ftp://ftp.ntua.gr/mirror/OpenLDAP/openldap-release/
+MASTER_SITES+=	ftp://ftp.dti.ad.jp/pub/net/OpenLDAP/openldap-release/
+MASTER_SITES+=	ftp://ftp.u-aizu.ac.jp/pub/net/openldap/openldap-release/
+MASTER_SITES+=	ftp://ftp.nl.uu.net/pub/unix/db/openldap/openldap-release/
+MASTER_SITES+=	ftp://ftp.linux.pt/pub/mirrors/OpenLDAP/openldap-release/
+MASTER_SITES+=	ftp://sunsite.cnlab-switch.ch/mirror/OpenLDAP/openldap-release/
+EXTRACT_SUFX=	.tgz
+
+HOMEPAGE=	http://www.openldap.org/
+LICENSE=	modified-bsd
diff --git a/databases/openldap/distinfo b/databases/openldap/distinfo
index e0f31d29126..b5745fecbd5 100644
--- a/databases/openldap/distinfo
+++ b/databases/openldap/distinfo
@@ -1,9 +1,9 @@
-$NetBSD: distinfo,v 1.111 2018/07/31 12:39:52 manu Exp $
+$NetBSD: distinfo,v 1.112 2018/12/20 17:54:09 adam Exp $
 
-SHA1 (openldap-2.4.46.tgz) = a9ae2273eb9bdd70090dafe0d018a3132606bef6
-RMD160 (openldap-2.4.46.tgz) = d7038355b1c13a0b2d5104a0c75735b63e9c4148
-SHA512 (openldap-2.4.46.tgz) = eef39d43f04aa09c657a1422cefef060fe00368559ae40d0d97536c08ebeaaa1ab06207b3f121ba6afcde54abdc550027c3505e5217e5fd47ae6f8c001260186
-Size (openldap-2.4.46.tgz) = 5700204 bytes
+SHA1 (openldap-2.4.47.tgz) = c59d52dd75f7d1c7b02f83725da36c322d439674
+RMD160 (openldap-2.4.47.tgz) = c228e5d55019c90aaeceeda32980e52cd7a0a4a6
+SHA512 (openldap-2.4.47.tgz) = d424079e34207e3d24383a2bea70a07ded40714982a6767174d2b2cb208cd94feab5ef12157accae915b8e404e5773a7547aaef65f06b44dc3cc09c6a64d5a11
+Size (openldap-2.4.47.tgz) = 5699678 bytes
 SHA1 (patch-ac) = 2995c518278b363bf9657e181c2340d3024d5980
 SHA1 (patch-ad) = 24e7ec27d592dd76bdec1e4805801c5304951daf
 SHA1 (patch-af) = 2e00b01bd813e73bdc1fb764a02e98d7755703de