CVS commit: pkgsrc/databases

To: pkgsrc-changes%NetBSD.org@localhost
Subject: CVS commit: pkgsrc/databases
From: "Adam Ciarcinski" <adam%netbsd.org@localhost>
Date: Wed, 22 May 2024 08:43:52 +0000

Module Name:    pkgsrc
Committed By:   adam
Date:           Wed May 22 08:43:52 UTC 2024

Modified Files:
        pkgsrc/databases/openldap: Makefile.common Makefile.version distinfo
        pkgsrc/databases/openldap-client: PLIST
        pkgsrc/databases/openldap-doc: distinfo
Added Files:
        pkgsrc/databases/openldap/patches:
            patch-contrib_slapd-modules_autogroup_Makefile

Log Message:
openldap: updated to 2.6.8

OpenLDAP 2.6.8 Release (2024/05/21)
        Fixed libldap exit handling with OpenSSL3 again
        Fixed libldap OpenSSL channel binding digest
        Fixed slapd handling of large uid/gids peercred auth
        Fixed slapd-asyncmeta/meta target structure allocations
        Fixed slapd-meta with dynlist
        Fixed slapd-meta binds when proxying internal op
        Added slapo-nestgroup overlay
        Added slapo-memberof 'addcheck' option
        Fixed slapo-accesslog startup initialization
        Fixed slapo-constraint double free on invalid attr
        Fixed slapo-dynlist with abandoned operations
        Build
                Fixed build with gcc14.x
                Fixed back-perl with clang15
                Fixed to reduce systemd dependencies
        Contrib
                Added slapo-alias contrib module
                Fixed slapo-autogroup to work with slapo-dynlist
                Fixed smbk5pwd implicit function declaration
        Documentation
                Fixed slapo-memberof exattr requirements
                Fixed slapo-memberof is no longer deprecated
        Minor Cleanup


To generate a diff of this commit:
cvs rdiff -u -r1.45 -r1.46 pkgsrc/databases/openldap/Makefile.common
cvs rdiff -u -r1.42 -r1.43 pkgsrc/databases/openldap/Makefile.version
cvs rdiff -u -r1.139 -r1.140 pkgsrc/databases/openldap/distinfo
cvs rdiff -u -r1.15 -r1.16 pkgsrc/databases/openldap-client/PLIST
cvs rdiff -u -r1.43 -r1.44 pkgsrc/databases/openldap-doc/distinfo
cvs rdiff -u -r0 -r1.1 \
    pkgsrc/databases/openldap/patches/patch-contrib_slapd-modules_autogroup_Makefile

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/Makefile.common
diff -u pkgsrc/databases/openldap/Makefile.common:1.45 pkgsrc/databases/openldap/Makefile.common:1.46
--- pkgsrc/databases/openldap/Makefile.common:1.45      Fri Apr 21 00:44:19 2023
+++ pkgsrc/databases/openldap/Makefile.common   Wed May 22 08:43:51 2024
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile.common,v 1.45 2023/04/21 00:44:19 manu Exp $
+# $NetBSD: Makefile.common,v 1.46 2024/05/22 08:43:51 adam Exp $
 #
 # used by databases/openldap-autogroup/Makefile
 # used by databases/openldap-client/Makefile
@@ -40,8 +40,7 @@ PKG_USERS_VARS+=      SLAPD_USER
 # is included by another system header file on Solaris, so subst them.
 SUBST_CLASSES.SunOS+=  conflict
 SUBST_STAGE.conflict=  pre-configure
-SUBST_FILES.conflict=  ${WRKSRC}/*/*.h
-SUBST_FILES.conflict+= ${WRKSRC}/*/*/*.c ${WRKSRC}/*/*/*/*.c
+SUBST_FILES.conflict=  */*.h */*/*.c */*/*/*.c
 SUBST_SED.conflict+=   -e 's,avl_free,openldap_avl_free,g'
 SUBST_SED.conflict+=   -e 's,avl_insert,openldap_avl_insert,g'
 SUBST_SED.conflict+=   -e 's,avl_delete,openldap_avl_delete,g'
@@ -57,7 +56,7 @@ CONFIGURE_ARGS+=      --localstatedir=${OPENL
 CONFIGURE_ARGS+=       --enable-dynamic
 CONFIGURE_ARGS+=       --with-tls=openssl
 
-.if !empty(USE_CROSS_COMPILE:M[yY][eE][sS]) && ${OPSYS} == "NetBSD"
+.if ${USE_CROSS_COMPILE:U:tl} == yes && ${OPSYS} == "NetBSD"
 # Probably true for more than just NetBSD.
 CONFIGURE_ARGS+=       --with-yielding_select=yes
 CONFIGURE_ENV+=                ac_cv_func_memcmp_working=yes
@@ -102,7 +101,7 @@ CPPFLAGS+=  -DOPENLDAP_FD_SETSIZE=${PTH_F
 .endif
 
 # OpenLDAP hardcodes this to 4096, disregarding the OS default.
-.if !empty(MACHINE_PLATFORM:MSunOS-*-x86_64)
+.if ${MACHINE_PLATFORM:MSunOS-*-x86_64}
 CPPFLAGS+=     -DOPENLDAP_FD_SETSIZE=65536
 .endif
 

Index: pkgsrc/databases/openldap/Makefile.version
diff -u pkgsrc/databases/openldap/Makefile.version:1.42 pkgsrc/databases/openldap/Makefile.version:1.43
--- pkgsrc/databases/openldap/Makefile.version:1.42     Wed Jan 31 18:17:21 2024
+++ pkgsrc/databases/openldap/Makefile.version  Wed May 22 08:43:51 2024
@@ -1,10 +1,10 @@
-# $NetBSD: Makefile.version,v 1.42 2024/01/31 18:17:21 adam Exp $
+# $NetBSD: Makefile.version,v 1.43 2024/05/22 08:43:51 adam Exp $
 # used by databases/lmdb/Makefile
 # used by databases/openldap/Makefile
 # used by databases/openldap/Makefile.common
 # used by databases/openldap-doc/Makefile
 
-OPENLDAP_VERSION=      2.6.7
+OPENLDAP_VERSION=      2.6.8
 
 DISTNAME=      openldap-${OPENLDAP_VERSION}
 MASTER_SITES+= https://www.openldap.org/software/download/OpenLDAP/openldap-release/

Index: pkgsrc/databases/openldap/distinfo
diff -u pkgsrc/databases/openldap/distinfo:1.139 pkgsrc/databases/openldap/distinfo:1.140
--- pkgsrc/databases/openldap/distinfo:1.139    Wed Jan 31 18:17:21 2024
+++ pkgsrc/databases/openldap/distinfo  Wed May 22 08:43:51 2024
@@ -1,8 +1,9 @@
-$NetBSD: distinfo,v 1.139 2024/01/31 18:17:21 adam Exp $
+$NetBSD: distinfo,v 1.140 2024/05/22 08:43:51 adam Exp $
 
-BLAKE2s (openldap-2.6.7.tgz) = a7090113159ce6ae7eefba54d04e0f3b68384e76e6f3b7efcc86352bb11bfc81
-SHA512 (openldap-2.6.7.tgz) = ea207b84fdb7bc6cdff2bc1201fcdde6a907f5766f9637589d956ca86ecf61d4e732ab7d80f33b18b691644e1f5fa39b00ff2c7f4084c9b85760ee693a7c451e
-Size (openldap-2.6.7.tgz) = 6484944 bytes
+BLAKE2s (openldap-2.6.8.tgz) = 425497e774657c6dc0549c759157b4f17ae141bf7b099652104e1458dd4bfda3
+SHA512 (openldap-2.6.8.tgz) = c86bda8a0af2645e586d56a1494a5bd486ec5dd55c47859dbabcc2bb6ddc0a8307e23c6b58228d49ee3c8bc5e4d6ead305863442efdcee3dc2ab9953097b5a77
+Size (openldap-2.6.8.tgz) = 6512544 bytes
+SHA1 (patch-contrib_slapd-modules_autogroup_Makefile) = ff07bf3b53abcadd9486736543862e6089ddc592
 SHA1 (patch-contrib_slapd-modules_cloak_Makefile) = 6670b53a04988a021f1eb79faf7a051d0a364b87
 SHA1 (patch-contrib_slapd-modules_nops_Makefile) = 0868e789ad3551594c16d2425676300ff0d53416
 SHA1 (patch-contrib_slapd-modules_nops_nops.c) = 72c28de4b09cbac7e793828dfcf04820643dcbec

Index: pkgsrc/databases/openldap-client/PLIST
diff -u pkgsrc/databases/openldap-client/PLIST:1.15 pkgsrc/databases/openldap-client/PLIST:1.16
--- pkgsrc/databases/openldap-client/PLIST:1.15 Wed Dec  1 12:13:54 2021
+++ pkgsrc/databases/openldap-client/PLIST      Wed May 22 08:43:52 2024
@@ -1,4 +1,4 @@
-@comment $NetBSD: PLIST,v 1.15 2021/12/01 12:13:54 adam Exp $
+@comment $NetBSD: PLIST,v 1.16 2024/05/22 08:43:52 adam Exp $
 bin/ldapadd
 bin/ldapcompare
 bin/ldapdelete
@@ -254,6 +254,7 @@ man/man5/slapo-dyngroup.5
 man/man5/slapo-dynlist.5
 man/man5/slapo-homedir.5
 man/man5/slapo-memberof.5
+man/man5/slapo-nestgroup.5
 man/man5/slapo-otp.5
 man/man5/slapo-pbind.5
 man/man5/slapo-pcache.5

Index: pkgsrc/databases/openldap-doc/distinfo
diff -u pkgsrc/databases/openldap-doc/distinfo:1.43 pkgsrc/databases/openldap-doc/distinfo:1.44
--- pkgsrc/databases/openldap-doc/distinfo:1.43 Wed Jan 31 18:17:21 2024
+++ pkgsrc/databases/openldap-doc/distinfo      Wed May 22 08:43:52 2024
@@ -1,5 +1,5 @@
-$NetBSD: distinfo,v 1.43 2024/01/31 18:17:21 adam Exp $
+$NetBSD: distinfo,v 1.44 2024/05/22 08:43:52 adam Exp $
 
-BLAKE2s (openldap-2.6.7.tgz) = a7090113159ce6ae7eefba54d04e0f3b68384e76e6f3b7efcc86352bb11bfc81
-SHA512 (openldap-2.6.7.tgz) = ea207b84fdb7bc6cdff2bc1201fcdde6a907f5766f9637589d956ca86ecf61d4e732ab7d80f33b18b691644e1f5fa39b00ff2c7f4084c9b85760ee693a7c451e
-Size (openldap-2.6.7.tgz) = 6484944 bytes
+BLAKE2s (openldap-2.6.8.tgz) = 425497e774657c6dc0549c759157b4f17ae141bf7b099652104e1458dd4bfda3
+SHA512 (openldap-2.6.8.tgz) = c86bda8a0af2645e586d56a1494a5bd486ec5dd55c47859dbabcc2bb6ddc0a8307e23c6b58228d49ee3c8bc5e4d6ead305863442efdcee3dc2ab9953097b5a77
+Size (openldap-2.6.8.tgz) = 6512544 bytes

Added files:

Index: pkgsrc/databases/openldap/patches/patch-contrib_slapd-modules_autogroup_Makefile
diff -u /dev/null pkgsrc/databases/openldap/patches/patch-contrib_slapd-modules_autogroup_Makefile:1.1
--- /dev/null   Wed May 22 08:43:52 2024
+++ pkgsrc/databases/openldap/patches/patch-contrib_slapd-modules_autogroup_Makefile    Wed May 22 08:43:52 2024
@@ -0,0 +1,26 @@
+$NetBSD: patch-contrib_slapd-modules_autogroup_Makefile,v 1.1 2024/05/22 08:43:52 adam Exp $
+
+Link against external libraries.
+
+--- contrib/slapd-modules/autogroup/Makefile.orig      2024-05-22 08:01:54.031108527 +0000
++++ contrib/slapd-modules/autogroup/Makefile
+@@ -13,8 +13,7 @@
+ LDAP_SRC = ../../..
+ LDAP_BUILD = $(LDAP_SRC)
+ LDAP_INC = -I$(LDAP_BUILD)/include -I$(LDAP_SRC)/include -I$(LDAP_SRC)/servers/slapd
+-LDAP_LIB = $(LDAP_BUILD)/libraries/libldap/libldap.la \
+-      $(LDAP_BUILD)/libraries/liblber/liblber.la
++LDAP_LIB = -lldap -llber
+ 
+ PLAT = UNIX
+ NT_LIB = -L$(LDAP_BUILD)/servers/slapd -lslapd
+@@ -23,8 +22,7 @@ UNIX_LDFLAGS = -version-info $(LTVER)
+ 
+ LIBTOOL = $(LDAP_BUILD)/libtool
+ INSTALL = /usr/bin/install
+-CC = gcc
+-OPT = -g -O2
++OPT = ${CFLAGS} ${CPPFLAGS}
+ DEFS = 
+ INCS = $(LDAP_INC)
+ LIBS = $($(PLAT)_LIB) $(LDAP_LIB)

Prev by Date: CVS commit: pkgsrc/doc
Next by Date: CVS commit: pkgsrc/databases/lmdb
Previous by Thread: CVS commit: pkgsrc/doc
Next by Thread: CVS commit: pkgsrc/databases/lmdb
Indexes:

Home | Main Index | Thread Index | Old Index