git: 12fb2c769db1 - main - net/openldap26-server: update to 2.6.3.

The branch main has been updated by delphij:

URL: https://cgit.FreeBSD.org/ports/commit/?id=12fb2c769db1a6e73ef0ebbb5630e81a3c1803f4

commit 12fb2c769db1a6e73ef0ebbb5630e81a3c1803f4
Author:     Xin LI <delphij@FreeBSD.org>
AuthorDate: 2022-07-16 05:54:21 +0000
Commit:     Xin LI <delphij@FreeBSD.org>
CommitDate: 2022-07-16 05:54:52 +0000

    net/openldap26-server: update to 2.6.3.
---
 net/openldap26-server/Makefile                           |  8 +++++++-
 net/openldap26-server/distinfo                           |  6 +++---
 net/openldap26-server/files/patch-servers_slapd_daemon.c | 14 --------------
 net/openldap26-server/pkg-plist                          |  9 +++++++--
 4 files changed, 17 insertions(+), 20 deletions(-)

diff --git a/net/openldap26-server/Makefile b/net/openldap26-server/Makefile
index 27bd1a32dd31..b3f94eacdc46 100644
--- a/net/openldap26-server/Makefile
+++ b/net/openldap26-server/Makefile
@@ -1,7 +1,7 @@
 # Created by: Xin LI <delphij@FreeBSD.org>
 
 PORTNAME=		openldap
-DISTVERSION=		2.6.2
+DISTVERSION=		2.6.3
 PORTREVISION=		${OPENLDAP_PORTREVISION}
 CATEGORIES=		net databases
 MASTER_SITES=		https://www.openldap.org/software/download/OpenLDAP/%SUBDIR%/ \
@@ -80,6 +80,7 @@ OPTIONS_GROUP_OVLYS+=	DENYOP
 OPTIONS_GROUP_OVLYS+=	DEREF
 OPTIONS_GROUP_OVLYS+=	DYNGROUP
 OPTIONS_GROUP_OVLYS+=	DYNLIST
+OPTIONS_GROUP_OVLYS+=	EMPTYDS
 OPTIONS_GROUP_OVLYS+=	HOMEDIR
 OPTIONS_GROUP_OVLYS+=	LASTBIND
 OPTIONS_GROUP_OVLYS+=	LASTMOD
@@ -167,6 +168,7 @@ ALLOP_DESC=		With allop overlay (experimental)
 AUTOGROUP_DESC=		With autogroup overlay (experimental)
 CLOAK_DESC=		With cloak overlay (experimental)
 DENYOP_DESC=		With denyop overlay (experimental)
+EMPTYDS_DESC=		With emptyds overlay (experimental)
 LASTBIND_DESC=		With lastbind overlay
 LASTMOD_DESC=		With lastmod overlay (experimental)
 TRACE_DESC=		With Trace overlay
@@ -342,6 +344,10 @@ CONTRIB_CLEANFILES+=	cloak.a
 CONTRIB_MODULES+=	slapd-modules/denyop
 CONTRIB_CLEANFILES+=	denyop.a
 .endif
+.if ${PORT_OPTIONS:MEMPTYDS}
+CONTRIB_MODULES+=	slapd-modules/emptyds
+CONTRIB_CLEANFILES+=	emptyds.a
+.endif
 .if ${PORT_OPTIONS:MLASTBIND}
 CONTRIB_MODULES+=	slapd-modules/lastbind
 CONTRIB_CLEANFILES+=	lastbind.a
diff --git a/net/openldap26-server/distinfo b/net/openldap26-server/distinfo
index 50ed1fa34ab4..7f835cc9a77c 100644
--- a/net/openldap26-server/distinfo
+++ b/net/openldap26-server/distinfo
@@ -1,3 +1,3 @@
-TIMESTAMP = 1651730071
-SHA256 (openldap-2.6.2.tgz) = 81d09345232eb62486ecf5acacd2c56c0c45b4a6c8c066612e7f421a23a1cf87
-SIZE (openldap-2.6.2.tgz) = 6448362
+TIMESTAMP = 1657946105
+SHA256 (openldap-2.6.3.tgz) = d2a2a1d71df3d77396b1c16ad7502e674df446e06072b0e5a4e941c3d06c0d46
+SIZE (openldap-2.6.3.tgz) = 6474169
diff --git a/net/openldap26-server/files/patch-servers_slapd_daemon.c b/net/openldap26-server/files/patch-servers_slapd_daemon.c
deleted file mode 100644
index 6e6228b2e629..000000000000
--- a/net/openldap26-server/files/patch-servers_slapd_daemon.c
+++ /dev/null
@@ -1,14 +0,0 @@
---- servers/slapd/daemon.c.orig	2021-08-18 17:11:41 UTC
-+++ servers/slapd/daemon.c
-@@ -228,10 +228,9 @@ static slap_daemon_st *slap_daemon;
- } while (0)
- 
- /* a kqueue fd obtained before a fork can't be used in child process.
-- * close it and reacquire it.
-+ * reacquire it.
-  */
- # define SLAP_SOCK_INIT2() do { \
--	close(slap_daemon[0].sd_kq); \
- 	slap_daemon[0].sd_kq = kqueue(); \
- } while (0)
- 
diff --git a/net/openldap26-server/pkg-plist b/net/openldap26-server/pkg-plist
index b2ac7fe3c422..253c85cbc9a6 100644
--- a/net/openldap26-server/pkg-plist
+++ b/net/openldap26-server/pkg-plist
@@ -101,6 +101,11 @@
 %%DYNLIST%%libexec/openldap/dynlist.so.%%SHLIB_MAJOR%%.%%SHLIB_MINOR%%
 %%DYNLIST%%libexec/openldap/dynlist.la
 %%DYNLIST%%libexec/openldap/dynlist.so
+%%EMPTYDS%%libexec/openldap/emptyds.la
+%%EMPTYDS%%libexec/openldap/emptyds.so
+%%EMPTYDS%%libexec/openldap/emptyds.so.0
+%%EMPTYDS%%libexec/openldap/emptyds.so.0.0.0
+%%EMPTYDS%%man/man5/slapo-emptyds.5.gz
 %%HOMEDIR%%libexec/openldap/homedir.so.%%SHLIB_MAJOR%%
 %%HOMEDIR%%libexec/openldap/homedir.so.%%SHLIB_MAJOR%%.%%SHLIB_MINOR%%
 %%HOMEDIR%%libexec/openldap/homedir.la
@@ -138,8 +143,8 @@
 %%PASSWD%%libexec/openldap/back_passwd.so
 %%PBKDF2%%libexec/openldap/pw-pbkdf2.la
 %%PBKDF2%%libexec/openldap/pw-pbkdf2.so
-%%PBKDF2%%libexec/openldap/pw-pbkdf2.so.%%SHLIB_MAJOR%%
-%%PBKDF2%%libexec/openldap/pw-pbkdf2.so.%%SHLIB_MAJOR%%.%%SHLIB_MINOR%%
+%%PBKDF2%%libexec/openldap/pw-pbkdf2.so.0
+%%PBKDF2%%libexec/openldap/pw-pbkdf2.so.0.0.0
 %%PBKDF2%%man/man5/slapd-pw-pbkdf2.5.gz
 %%PERL%%libexec/openldap/back_perl.so.%%SHLIB_MAJOR%%
 %%PERL%%libexec/openldap/back_perl.so.%%SHLIB_MAJOR%%.%%SHLIB_MINOR%%