openldap: updated to 2.6.0

OpenLDAP 2.6.0
Initial release for "general use"

7 files changed, 20 insertions, 22 deletions

diff --git a/databases/lmdb/distinfo b/databases/lmdb/distinfo
index b330f08e113..fff51b13503 100644
--- a/databases/lmdb/distinfo
+++ b/databases/lmdb/distinfo
@@ -1,6 +1,6 @@
-$NetBSD: distinfo,v 1.24 2021/10/26 10:09:22 nia Exp $
+$NetBSD: distinfo,v 1.25 2021/12/01 12:13:53 adam Exp $
 
-BLAKE2s (openldap-2.5.8.tgz) = 7d2445e048b63c65c6a8de6a2f8096c55c2b9131985a04ca3219acf6dbbf7993
-SHA512 (openldap-2.5.8.tgz) = ba0c7f64e0447a72feac0014107490cd50d617cdd90d06655fc5c64d65216692c7a93e0380c910ea2292a7594c58bd09ae85fa0adf3eaa474d2e2e4ab66e95c5
-Size (openldap-2.5.8.tgz) = 6437833 bytes
+BLAKE2s (openldap-2.6.0.tgz) = c0c0dafc102d23d38ec094ca5c03ea85f4f990cc9d203d16f05d22be99f64d9c
+SHA512 (openldap-2.6.0.tgz) = c0bb15468cac326acab438939ef902e9fd07a17b1eb81f21ebe5ad121096ddd640040ec696bb8dac4eaa4a73a6916acba57c3558de08cc678157a3ccdead5a67
+Size (openldap-2.6.0.tgz) = 6433764 bytes
 SHA1 (patch-libraries_liblmdb_Makefile) = 4dd8ed43169e5615b416e7e0696dd3b16e784282
diff --git a/databases/openldap-client/PLIST b/databases/openldap-client/PLIST
index cd88473dfcc..b2176734e4a 100644
--- a/databases/openldap-client/PLIST
+++ b/databases/openldap-client/PLIST
@@ -1,4 +1,4 @@
-@comment $NetBSD: PLIST,v 1.14 2021/08/23 09:58:58 adam Exp $
+@comment $NetBSD: PLIST,v 1.15 2021/12/01 12:13:54 adam Exp $
 bin/ldapadd
 bin/ldapcompare
 bin/ldapdelete
@@ -230,7 +230,6 @@ man/man5/slapd-ldif.5
 man/man5/slapd-mdb.5
 man/man5/slapd-meta.5
 man/man5/slapd-monitor.5
-man/man5/slapd-ndb.5
 man/man5/slapd-null.5
 man/man5/slapd-passwd.5
 man/man5/slapd-perl.5
diff --git a/databases/openldap-doc/distinfo b/databases/openldap-doc/distinfo
index 128e913dfdd..b02962510cf 100644
--- a/databases/openldap-doc/distinfo
+++ b/databases/openldap-doc/distinfo
@@ -1,5 +1,5 @@
-$NetBSD: distinfo,v 1.35 2021/10/26 10:09:26 nia Exp $
+$NetBSD: distinfo,v 1.36 2021/12/01 12:13:54 adam Exp $
 
-BLAKE2s (openldap-2.5.8.tgz) = 7d2445e048b63c65c6a8de6a2f8096c55c2b9131985a04ca3219acf6dbbf7993
-SHA512 (openldap-2.5.8.tgz) = ba0c7f64e0447a72feac0014107490cd50d617cdd90d06655fc5c64d65216692c7a93e0380c910ea2292a7594c58bd09ae85fa0adf3eaa474d2e2e4ab66e95c5
-Size (openldap-2.5.8.tgz) = 6437833 bytes
+BLAKE2s (openldap-2.6.0.tgz) = c0c0dafc102d23d38ec094ca5c03ea85f4f990cc9d203d16f05d22be99f64d9c
+SHA512 (openldap-2.6.0.tgz) = c0bb15468cac326acab438939ef902e9fd07a17b1eb81f21ebe5ad121096ddd640040ec696bb8dac4eaa4a73a6916acba57c3558de08cc678157a3ccdead5a67
+Size (openldap-2.6.0.tgz) = 6433764 bytes
diff --git a/databases/openldap-smbk5pwd/Makefile b/databases/openldap-smbk5pwd/Makefile
index ea3bcd50fd6..dfdb3f3ce10 100644
--- a/databases/openldap-smbk5pwd/Makefile
+++ b/databases/openldap-smbk5pwd/Makefile
@@ -1,7 +1,6 @@
-# $NetBSD: Makefile,v 1.27 2021/10/21 07:46:34 wiz Exp $
+# $NetBSD: Makefile,v 1.28 2021/12/01 12:13:54 adam Exp $
 
 PKGNAME=	${DISTNAME:S/-/-smbk5pwd-/}
-PKGREVISION=	1
 COMMENT=	Samba and Kerberos password sync for OpenLDAP
 
 CONFLICTS+=	openldap<2.3.23nb1
diff --git a/databases/openldap/Makefile.version b/databases/openldap/Makefile.version
index 61e79543688..1ac3fe39b0f 100644
--- a/databases/openldap/Makefile.version
+++ b/databases/openldap/Makefile.version
@@ -1,10 +1,10 @@
-# $NetBSD: Makefile.version,v 1.32 2021/10/12 09:10:05 adam Exp $
+# $NetBSD: Makefile.version,v 1.33 2021/12/01 12:13:53 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.8
+OPENLDAP_VERSION=	2.6.0
 
 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 f10c44a3a82..c7154990434 100644
--- a/databases/openldap/distinfo
+++ b/databases/openldap/distinfo
@@ -1,15 +1,15 @@
-$NetBSD: distinfo,v 1.128 2021/10/26 10:09:26 nia Exp $
+$NetBSD: distinfo,v 1.129 2021/12/01 12:13:53 adam Exp $
 
-BLAKE2s (openldap-2.5.8.tgz) = 7d2445e048b63c65c6a8de6a2f8096c55c2b9131985a04ca3219acf6dbbf7993
-SHA512 (openldap-2.5.8.tgz) = ba0c7f64e0447a72feac0014107490cd50d617cdd90d06655fc5c64d65216692c7a93e0380c910ea2292a7594c58bd09ae85fa0adf3eaa474d2e2e4ab66e95c5
-Size (openldap-2.5.8.tgz) = 6437833 bytes
+BLAKE2s (openldap-2.6.0.tgz) = c0c0dafc102d23d38ec094ca5c03ea85f4f990cc9d203d16f05d22be99f64d9c
+SHA512 (openldap-2.6.0.tgz) = c0bb15468cac326acab438939ef902e9fd07a17b1eb81f21ebe5ad121096ddd640040ec696bb8dac4eaa4a73a6916acba57c3558de08cc678157a3ccdead5a67
+Size (openldap-2.6.0.tgz) = 6433764 bytes
 SHA1 (patch-configure) = d17685e195dbde0fd36ddd593da1c3877bf022d9
 SHA1 (patch-contrib_slapd-modules_cloak_Makefile) = f64c16aebd1b5f6ab069fc22b785f066f0b1c143
 SHA1 (patch-contrib_slapd-modules_nops_Makefile) = 96c072cde836ea96710ddf0dc96b7f9fe78d81d8
 SHA1 (patch-contrib_slapd-modules_nops_nops.c) = 72c28de4b09cbac7e793828dfcf04820643dcbec
 SHA1 (patch-contrib_slapd-modules_nops_slapo-nops.5) = f32352f19361b7e9aa5b038ae8578def7c08fa47
 SHA1 (patch-contrib_slapd-modules_smbk5pwd_Makefile) = a57b327bdf680fe60b58c07075a0602afeb556fa
-SHA1 (patch-libraries_libldap_Makefile.in) = 2a259ca83c6f9ce0661e6ba1f91c0ca2db535695
+SHA1 (patch-libraries_libldap_Makefile.in) = 663d65fb8c74f0a4813c30072b5b4f11bdcaf6a4
 SHA1 (patch-libraries_libldap_cyrus.c) = 1e47cdf4b1f1cc4eef36cf40a6beec1bed167f85
 SHA1 (patch-libraries_libldap_init.c) = 884d102d7c02cf85b36635b2ac5d6925ec17420f
 SHA1 (patch-libraries_libldap_ldap-int.h) = 967499db16d31cbf47deff330d97efd0a360ac7f
diff --git a/databases/openldap/patches/patch-libraries_libldap_Makefile.in b/databases/openldap/patches/patch-libraries_libldap_Makefile.in
index 5288a760f68..796b6ee1360 100644
--- a/databases/openldap/patches/patch-libraries_libldap_Makefile.in
+++ b/databases/openldap/patches/patch-libraries_libldap_Makefile.in
@@ -1,9 +1,9 @@
-$NetBSD: patch-libraries_libldap_Makefile.in,v 1.1 2021/08/23 09:58:58 adam Exp $
+$NetBSD: patch-libraries_libldap_Makefile.in,v 1.2 2021/12/01 12:13:53 adam Exp $
 
---- libraries/libldap/Makefile.in.orig	2021-08-13 12:05:43.000000000 +0000
+--- libraries/libldap/Makefile.in.orig	2021-10-25 17:06:00.000000000 +0000
 +++ libraries/libldap/Makefile.in
 @@ -62,6 +62,10 @@ ifneq (,$(OL_VERSIONED_SYMBOLS))
- 	SYMBOL_VERSION_FLAGS=$(OL_VERSIONED_SYMBOLS)$(LDAP_LIBDIR)/libldap/libldap.vers
+ 	SYMBOL_VERSION_FLAGS=$(OL_VERSIONED_SYMBOLS)$(srcdir)/ldap.map
  endif
  
 +AC_CFLAGS += $(PTHREAD_CFLAGS)