openldap: updated to 2.5.8

OpenLDAP 2.5.8 Release (2021/10/11)
	Fixed libldap ldap_int_tls_connect: isdigit() requires unsigned char
	Fixed libldap memory leak in ldap_get_option LDAP_OPT_X_TLS_PEERCERT
	Fixed slapd to allow normalized values for namingContexts in cn=monitor
	Fixed slapd to normalize the suffix in rootDSE
	Fixed slapd slapadd to avoid destroying configDB prematurely
	Fixed slapd to not spam logs with lastbind information
	Fixed slapd slaptest migration to correctly set olcTSLVerifyClient
	Fixed slapd-mdb multival delete handling
	Fixed slapd-sql ldap_entry_objectclass table for mariadb/mysql
	Fixed slapd-wt multiple issues
	Fixed slapd-wt to close cache db correctly
	Fixed slapo-ppolicy to restore OpenLDAP 2.4 compatibilty
	Fixed slapo-syncprov to free uuid list when finished replaying sessionlog
	Build
		Fixed libldap result.c compilation on musl systems
		Fixed slapd duplicate definition of peerbv
		Fixed test suite with memberof modular builds
	Contrib
		Added man page for ppm contrib module
		Fix crash when pwdCheckModuleArg is not defined for ppm
	Documentation
		Fixed guide download link for heimdal
		Fixed guide documentation for TLSECName
		Fixed guide documentation missing tags
		Fixed guide loadbalancer typo
		Fixed guide synprov-nopresent redundant text
		Fixed guide various typos and fix config alignment
		Removed ppolicy.schema from servers/slapd/schema/README
		Fixed slapd.conf(5)/slapd-config(5) to document default for database monitoring
		Fixed slapd-meta(5)/slapd-asyncmeta(5) verbiage for try-propagate
		Fixed slapo-syncprov(5) to note entryCSN indexing is highly recommended

7 files changed, 17 insertions, 34 deletions

diff --git a/databases/lmdb/Makefile b/databases/lmdb/Makefile
index 36cf1ecde82..96c7dc3ca07 100644
--- a/databases/lmdb/Makefile
+++ b/databases/lmdb/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.20 2021/06/14 09:04:23 adam Exp $
+# $NetBSD: Makefile,v 1.21 2021/10/12 09:10:06 adam Exp $
 
 .include "../../databases/openldap/Makefile.version"
 
@@ -22,6 +22,7 @@ INSTALLATION_DIRS+=	include
 INSTALLATION_DIRS+=	lib
 INSTALLATION_DIRS+=	${PKGMANDIR}/man1
 
+CHECK_PORTABILITY_SKIP=	configure
 TEST_TARGET=		test
 
 .include "../../mk/bsd.prefs.mk"
diff --git a/databases/lmdb/distinfo b/databases/lmdb/distinfo
index 7dbc0ff449c..bba1846e57c 100644
--- a/databases/lmdb/distinfo
+++ b/databases/lmdb/distinfo
@@ -1,7 +1,6 @@
-$NetBSD: distinfo,v 1.22 2021/10/07 13:35:14 nia Exp $
+$NetBSD: distinfo,v 1.23 2021/10/12 09:10:06 adam Exp $
 
-RMD160 (openldap-2.5.7.tgz) = 06be7fba0ce57c3a8ee260da244d2dc8935ea0f5
-SHA512 (openldap-2.5.7.tgz) = c849b9f9515cf458acbaef0dc21b8a53ab7b27e4288af6f69433f909f2939878c94cd641d24abc88d4351725b80829d342d446933fa5cba52cde4b9f095dcea0
-Size (openldap-2.5.7.tgz) = 6426051 bytes
-SHA1 (patch-configure) = 2f07a1c517c2989c2ff932e251c71a86af5f28be
+RMD160 (openldap-2.5.8.tgz) = 0ec9ef327a090f1140b06e6bd6b3d19b8b3556ee
+SHA512 (openldap-2.5.8.tgz) = ba0c7f64e0447a72feac0014107490cd50d617cdd90d06655fc5c64d65216692c7a93e0380c910ea2292a7594c58bd09ae85fa0adf3eaa474d2e2e4ab66e95c5
+Size (openldap-2.5.8.tgz) = 6437833 bytes
 SHA1 (patch-libraries_liblmdb_Makefile) = 4dd8ed43169e5615b416e7e0696dd3b16e784282
diff --git a/databases/lmdb/patches/patch-configure b/databases/lmdb/patches/patch-configure
deleted file mode 100644
index fc2837b87bc..00000000000
--- a/databases/lmdb/patches/patch-configure
+++ /dev/null
@@ -1,16 +0,0 @@
-$NetBSD: patch-configure,v 1.1 2021/08/24 20:33:30 mef Exp $
-
-ERROR: [check-portability.awk] => Found test ... == ...:
-ERROR: [check-portability.awk] configure:22850: if test $ol_enable_slapd == no && test $ol_enable_balancer != yes ; then
-
---- openldap-2.5.7/configure.orig	2021-08-19 02:11:41.000000000 +0900
-+++ ../openldap-2.5.7/configure	2021-08-25 05:22:32.598123877 +0900
-@@ -22847,7 +22847,7 @@ fi
- WITH_SYSTEMD=no
- systemdsystemunitdir=
- ol_link_systemd=no
--if test $ol_enable_slapd == no && test $ol_enable_balancer != yes ; then
-+if test $ol_enable_slapd = no && test $ol_enable_balancer != yes ; then
- 	if test $ol_with_systemd != no ; then
- 		{ $as_echo "$as_me:${as_lineno-$LINENO}: WARNING: servers disabled, ignoring --with-systemd=$ol_with_systemd argument" >&5
- $as_echo "$as_me: WARNING: servers disabled, ignoring --with-systemd=$ol_with_systemd argument" >&2;}
diff --git a/databases/openldap-doc/distinfo b/databases/openldap-doc/distinfo
index 44ae12d400d..2aa68ed9d89 100644
--- a/databases/openldap-doc/distinfo
+++ b/databases/openldap-doc/distinfo
@@ -1,5 +1,5 @@
-$NetBSD: distinfo,v 1.33 2021/10/07 13:35:17 nia Exp $
+$NetBSD: distinfo,v 1.34 2021/10/12 09:10:05 adam Exp $
 
-RMD160 (openldap-2.5.7.tgz) = 06be7fba0ce57c3a8ee260da244d2dc8935ea0f5
-SHA512 (openldap-2.5.7.tgz) = c849b9f9515cf458acbaef0dc21b8a53ab7b27e4288af6f69433f909f2939878c94cd641d24abc88d4351725b80829d342d446933fa5cba52cde4b9f095dcea0
-Size (openldap-2.5.7.tgz) = 6426051 bytes
+RMD160 (openldap-2.5.8.tgz) = 0ec9ef327a090f1140b06e6bd6b3d19b8b3556ee
+SHA512 (openldap-2.5.8.tgz) = ba0c7f64e0447a72feac0014107490cd50d617cdd90d06655fc5c64d65216692c7a93e0380c910ea2292a7594c58bd09ae85fa0adf3eaa474d2e2e4ab66e95c5
+Size (openldap-2.5.8.tgz) = 6437833 bytes
diff --git a/databases/openldap-server/Makefile b/databases/openldap-server/Makefile
index cdd8ffdb506..3d72e3d3d0b 100644
--- a/databases/openldap-server/Makefile
+++ b/databases/openldap-server/Makefile
@@ -1,7 +1,6 @@
-# $NetBSD: Makefile,v 1.60 2021/08/30 09:36:31 khorben Exp $
+# $NetBSD: Makefile,v 1.61 2021/10/12 09:10:05 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/Makefile.version b/databases/openldap/Makefile.version
index 58db2711f96..61e79543688 100644
--- a/databases/openldap/Makefile.version
+++ b/databases/openldap/Makefile.version
@@ -1,10 +1,10 @@
-# $NetBSD: Makefile.version,v 1.31 2021/08/23 09:58:58 adam Exp $
+# $NetBSD: Makefile.version,v 1.32 2021/10/12 09:10:05 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.5.7
+OPENLDAP_VERSION=	2.5.8
 
 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 9a89dec566c..8588e01b29e 100644
--- a/databases/openldap/distinfo
+++ b/databases/openldap/distinfo
@@ -1,8 +1,8 @@
-$NetBSD: distinfo,v 1.126 2021/10/07 13:35:17 nia Exp $
+$NetBSD: distinfo,v 1.127 2021/10/12 09:10:05 adam Exp $
 
-RMD160 (openldap-2.5.7.tgz) = 06be7fba0ce57c3a8ee260da244d2dc8935ea0f5
-SHA512 (openldap-2.5.7.tgz) = c849b9f9515cf458acbaef0dc21b8a53ab7b27e4288af6f69433f909f2939878c94cd641d24abc88d4351725b80829d342d446933fa5cba52cde4b9f095dcea0
-Size (openldap-2.5.7.tgz) = 6426051 bytes
+RMD160 (openldap-2.5.8.tgz) = 0ec9ef327a090f1140b06e6bd6b3d19b8b3556ee
+SHA512 (openldap-2.5.8.tgz) = ba0c7f64e0447a72feac0014107490cd50d617cdd90d06655fc5c64d65216692c7a93e0380c910ea2292a7594c58bd09ae85fa0adf3eaa474d2e2e4ab66e95c5
+Size (openldap-2.5.8.tgz) = 6437833 bytes
 SHA1 (patch-configure) = d17685e195dbde0fd36ddd593da1c3877bf022d9
 SHA1 (patch-contrib_slapd-modules_cloak_Makefile) = f64c16aebd1b5f6ab069fc22b785f066f0b1c143
 SHA1 (patch-contrib_slapd-modules_nops_Makefile) = 96c072cde836ea96710ddf0dc96b7f9fe78d81d8