[pkgsrc/trunk]: pkgsrc/databases/openldap-server databases/openldap-server: f...

[taca <taca%pkgsrc.org@localhost>]

details:   https://anonhg.NetBSD.org/pkgsrc/rev/931c69783891
branches:  trunk
changeset: 380990:931c69783891
user:      taca <taca%pkgsrc.org@localhost>
date:      Wed Jun 22 13:32:49 2022 +0000

description:
databases/openldap-server: fix runtime problem of slapd

Apply fix for slapd from upstream (gitlab commit):

        ITS#9847 slapd: fix kqueue for FreeBSD/MacOSX/OpenBSD.

Without this fix, slapd dose not reply properly.

Bump PKGREVISION.

diffstat:

 databases/openldap-server/Makefile                      |   3 +-
 databases/openldap/patches/patch-servers_slapd_daemon.c |  21 +++++++++++++++++
 2 files changed, 23 insertions(+), 1 deletions(-)

diffs (37 lines):

diff -r 440606148b8d -r 931c69783891 databases/openldap-server/Makefile
--- a/databases/openldap-server/Makefile        Wed Jun 22 12:23:14 2022 +0000
+++ b/databases/openldap-server/Makefile        Wed Jun 22 13:32:49 2022 +0000
@@ -1,6 +1,7 @@
-# $NetBSD: Makefile,v 1.61 2021/10/12 09:10:05 adam Exp $
+# $NetBSD: Makefile,v 1.62 2022/06/22 13:32:49 taca Exp $
 
 PKGNAME=       ${DISTNAME:S/-/-server-/}
+PKGREVISION=   1
 COMMENT=       Lightweight Directory Access Protocol server suite
 
 CONFLICTS+=    openldap<2.3.23nb1
diff -r 440606148b8d -r 931c69783891 databases/openldap/patches/patch-servers_slapd_daemon.c
--- /dev/null   Thu Jan 01 00:00:00 1970 +0000
+++ b/databases/openldap/patches/patch-servers_slapd_daemon.c   Wed Jun 22 13:32:49 2022 +0000
@@ -0,0 +1,21 @@
+$NetBSD: patch-servers_slapd_daemon.c,v 1.1 2022/06/22 13:32:49 taca Exp $
+
+Apply fix from openldap's gitlab <ced6652e>:
+ITS#9847 slapd: fix kqueue for FreeBSD/MacOSX/OpenBSD
+
+--- servers/slapd/daemon.c.orig        2022-05-04 14:55:23.000000000 +0000
++++ servers/slapd/daemon.c
+@@ -227,11 +227,10 @@ static slap_daemon_st *slap_daemon;
+     slap_daemon[t].sd_kq = kqueue(); \
+ } while (0)
+ 
+-/* a kqueue fd obtained before a fork can't be used in child process.
+- * close it and reacquire it.
++/* a kqueue fd obtained before a fork isn't inherited by child process.
++ * reacquire it.
+  */
+ # define SLAP_SOCK_INIT2() do { \
+-      close(slap_daemon[0].sd_kq); \
+       slap_daemon[0].sd_kq = kqueue(); \
+ } while (0)
+