CVS commit: pkgsrc/databases

["Takahiro Kambe" <taca%netbsd.org@localhost>]

Module Name:    pkgsrc
Committed By:   taca
Date:           Wed Jun 22 13:32:49 UTC 2022

Modified Files:
        pkgsrc/databases/openldap-server: Makefile
Added Files:
        pkgsrc/databases/openldap/patches: patch-servers_slapd_daemon.c

Log Message:
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.


To generate a diff of this commit:
cvs rdiff -u -r1.61 -r1.62 pkgsrc/databases/openldap-server/Makefile
cvs rdiff -u -r0 -r1.1 \
    pkgsrc/databases/openldap/patches/patch-servers_slapd_daemon.c

Please note that diffs are not public domain; they are subject to the
copyright notices on the relevant files.

Modified files:

Index: pkgsrc/databases/openldap-server/Makefile
diff -u pkgsrc/databases/openldap-server/Makefile:1.61 pkgsrc/databases/openldap-server/Makefile:1.62
--- pkgsrc/databases/openldap-server/Makefile:1.61      Tue Oct 12 09:10:05 2021
+++ pkgsrc/databases/openldap-server/Makefile   Wed Jun 22 13:32:49 2022
@@ -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

Added files:

Index: pkgsrc/databases/openldap/patches/patch-servers_slapd_daemon.c
diff -u /dev/null pkgsrc/databases/openldap/patches/patch-servers_slapd_daemon.c:1.1
--- /dev/null   Wed Jun 22 13:32:49 2022
+++ pkgsrc/databases/openldap/patches/patch-servers_slapd_daemon.c      Wed Jun 22 13:32:49 2022
@@ -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)
+