4 files changed, 16 insertions, 19 deletions

diff --git a/net/openldap25-server/Makefile b/net/openldap25-server/Makefile
index 6246c23b5ce5..4b30986aa500 100644
--- a/net/openldap25-server/Makefile
+++ b/net/openldap25-server/Makefile
@@ -1,7 +1,7 @@
 # Created by: Xin LI <delphij@FreeBSD.org>
 
 PORTNAME=		openldap
-DISTVERSION=		2.5.12
+DISTVERSION=		2.5.13
 PORTREVISION=		${OPENLDAP_PORTREVISION}
 CATEGORIES=		net databases
 MASTER_SITES=		https://www.openldap.org/software/download/OpenLDAP/%SUBDIR%/ \
@@ -48,7 +48,7 @@ GNU_CONFIGURE=		yes
 PORTREVISION_CLIENT=	0
 PORTREVISION_SERVER=	0
 OPENLDAP_SHLIB_MAJOR=	0
-OPENLDAP_SHLIB_MINOR=	1.7
+OPENLDAP_SHLIB_MINOR=	1.8
 OPENLDAP_MAJOR=		${DISTVERSION:R}
 
 OPTIONS_DEFINE=		DEBUG
@@ -81,6 +81,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
@@ -168,6 +169,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
@@ -344,6 +346,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/openldap25-server/distinfo b/net/openldap25-server/distinfo
index 4b82506a2c6b..d43b19f5f659 100644
--- a/net/openldap25-server/distinfo
+++ b/net/openldap25-server/distinfo
@@ -1,3 +1,3 @@
-TIMESTAMP = 1651730006
-SHA256 (openldap-2.5.12.tgz) = d5086cbfc49597fa7d0670a429a9054552d441b16ee8b2435412797ab0e37b96
-SIZE (openldap-2.5.12.tgz) = 6444482
+TIMESTAMP = 1657946132
+SHA256 (openldap-2.5.13.tgz) = ee3c430c4ef7b87c57b622108c7339376d6c27fbbf2767770be3de1df63d008c
+SIZE (openldap-2.5.13.tgz) = 6454072
diff --git a/net/openldap25-server/files/patch-servers_slapd_daemon.c b/net/openldap25-server/files/patch-servers_slapd_daemon.c
deleted file mode 100644
index 6e6228b2e629..000000000000
--- a/net/openldap25-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/openldap25-server/pkg-plist b/net/openldap25-server/pkg-plist
index 4bdf2cce7dc1..b7250829d674 100644
--- a/net/openldap25-server/pkg-plist
+++ b/net/openldap25-server/pkg-plist
@@ -101,6 +101,11 @@
 %%DYNLIST%%libexec/openldap/dynlist-%%OPENLDAP_MAJOR%%.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-%%OPENLDAP_MAJOR%%.so.0
 %%HOMEDIR%%libexec/openldap/homedir-%%OPENLDAP_MAJOR%%.so.0.%%SHLIB_MINOR%%
 %%HOMEDIR%%libexec/openldap/homedir.la