CVS commit: pkgsrc/databases

To: pkgsrc-changes%NetBSD.org@localhost
Subject: CVS commit: pkgsrc/databases
From: "Adam Ciarcinski" <adam%netbsd.org@localhost>
Date: Wed, 31 Jan 2024 18:17:22 +0000

Module Name:    pkgsrc
Committed By:   adam
Date:           Wed Jan 31 18:17:22 UTC 2024

Modified Files:
        pkgsrc/databases/lmdb: Makefile distinfo
        pkgsrc/databases/openldap: Makefile Makefile.version distinfo
        pkgsrc/databases/openldap-autogroup: Makefile
        pkgsrc/databases/openldap-client: Makefile
        pkgsrc/databases/openldap-cloak: Makefile
        pkgsrc/databases/openldap-doc: distinfo
        pkgsrc/databases/openldap-nops: Makefile
        pkgsrc/databases/openldap-server: Makefile
        pkgsrc/databases/openldap-smbk5pwd: Makefile
        pkgsrc/databases/openldap/patches:
            patch-contrib_slapd-modules_cloak_Makefile
            patch-contrib_slapd-modules_nops_Makefile
            patch-contrib_slapd-modules_smbk5pwd_Makefile

Log Message:
openldap* lmdb: updated to 2.6.7

OpenLDAP 2.6.7 Release (2024/01/29)
        Added slapo-dynlist option to disable filter support
        Fixed liblber missing newline on long msg
        Fixed libldap exit handling with OpenSSL3
        Fixed libldap with TLS and multiple ldap URIs
        Fixed libldap OpenSSL cipher suite handling
        Fixed libldap OpenSSL 3.0 and Diffie-Hellman param files
        Fixed libldap timestamps on Windows
        Fixed lloadd to work when resolv.conf is missing
        Fixed lloadd handling of closing connection
        Fixed lloadd tiers to be correctly linked on startup
        Fixed slapd to honour disclose in matchedDN handling
        Fixed slapd handling of regex testing in ACLs
        Fixed slapd sync replication with glued database
        Fixed slapd local logging on Windows
        Fixed slapd-asyncmeta when remote suffix is empty
        Fixed slapo-dynlist so it can't be global
        Build
                Fixed lloadd type mismatches
                Fixed builds for Windows
                Fixed build with clang16
        Documentation
                Fixed slapo-homedir(5) attribute name for olcHomedirArchivePath
        Minor Cleanup


To generate a diff of this commit:
cvs rdiff -u -r1.23 -r1.24 pkgsrc/databases/lmdb/Makefile
cvs rdiff -u -r1.31 -r1.32 pkgsrc/databases/lmdb/distinfo
cvs rdiff -u -r1.154 -r1.155 pkgsrc/databases/openldap/Makefile
cvs rdiff -u -r1.41 -r1.42 pkgsrc/databases/openldap/Makefile.version
cvs rdiff -u -r1.138 -r1.139 pkgsrc/databases/openldap/distinfo
cvs rdiff -u -r1.2 -r1.3 pkgsrc/databases/openldap-autogroup/Makefile
cvs rdiff -u -r1.32 -r1.33 pkgsrc/databases/openldap-client/Makefile
cvs rdiff -u -r1.21 -r1.22 pkgsrc/databases/openldap-cloak/Makefile
cvs rdiff -u -r1.42 -r1.43 pkgsrc/databases/openldap-doc/distinfo
cvs rdiff -u -r1.24 -r1.25 pkgsrc/databases/openldap-nops/Makefile
cvs rdiff -u -r1.72 -r1.73 pkgsrc/databases/openldap-server/Makefile
cvs rdiff -u -r1.29 -r1.30 pkgsrc/databases/openldap-smbk5pwd/Makefile
cvs rdiff -u -r1.3 -r1.4 \
    pkgsrc/databases/openldap/patches/patch-contrib_slapd-modules_cloak_Makefile \
    pkgsrc/databases/openldap/patches/patch-contrib_slapd-modules_nops_Makefile
cvs rdiff -u -r1.1 -r1.2 \
    pkgsrc/databases/openldap/patches/patch-contrib_slapd-modules_smbk5pwd_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/lmdb/Makefile
diff -u pkgsrc/databases/lmdb/Makefile:1.23 pkgsrc/databases/lmdb/Makefile:1.24
--- pkgsrc/databases/lmdb/Makefile:1.23 Tue Jul 11 21:17:15 2023
+++ pkgsrc/databases/lmdb/Makefile      Wed Jan 31 18:17:22 2024
@@ -1,9 +1,9 @@
-# $NetBSD: Makefile,v 1.23 2023/07/11 21:17:15 adam Exp $
+# $NetBSD: Makefile,v 1.24 2024/01/31 18:17:22 adam Exp $
 
 .include "../../databases/openldap/Makefile.version"
 
 # get the version from libraries/liblmdb/lmdb.h
-PKGNAME=       lmdb-0.9.31
+PKGNAME=       lmdb-0.9.32
 CATEGORIES=    databases
 
 MAINTAINER=    pkgsrc-users%NetBSD.org@localhost

Index: pkgsrc/databases/lmdb/distinfo
diff -u pkgsrc/databases/lmdb/distinfo:1.31 pkgsrc/databases/lmdb/distinfo:1.32
--- pkgsrc/databases/lmdb/distinfo:1.31 Wed Aug  2 17:05:40 2023
+++ pkgsrc/databases/lmdb/distinfo      Wed Jan 31 18:17:22 2024
@@ -1,6 +1,6 @@
-$NetBSD: distinfo,v 1.31 2023/08/02 17:05:40 adam Exp $
+$NetBSD: distinfo,v 1.32 2024/01/31 18:17:22 adam Exp $
 
-BLAKE2s (openldap-2.6.6.tgz) = 7260b7a788101cc03ccc6e908fbb27f7566978e9860726fea37863ca598a33c2
-SHA512 (openldap-2.6.6.tgz) = 0e800807b23f090b465dc18c2f0d342585f96768543b3298b85d17c18272d1c5576a66326d30b3520cac493cbd2ea70e309cd923bf19447c973a63d940619fa6
-Size (openldap-2.6.6.tgz) = 6475109 bytes
+BLAKE2s (openldap-2.6.7.tgz) = a7090113159ce6ae7eefba54d04e0f3b68384e76e6f3b7efcc86352bb11bfc81
+SHA512 (openldap-2.6.7.tgz) = ea207b84fdb7bc6cdff2bc1201fcdde6a907f5766f9637589d956ca86ecf61d4e732ab7d80f33b18b691644e1f5fa39b00ff2c7f4084c9b85760ee693a7c451e
+Size (openldap-2.6.7.tgz) = 6484944 bytes
 SHA1 (patch-libraries_liblmdb_Makefile) = 4dd8ed43169e5615b416e7e0696dd3b16e784282

Index: pkgsrc/databases/openldap/Makefile
diff -u pkgsrc/databases/openldap/Makefile:1.154 pkgsrc/databases/openldap/Makefile:1.155
--- pkgsrc/databases/openldap/Makefile:1.154    Tue Oct 24 22:08:30 2023
+++ pkgsrc/databases/openldap/Makefile  Wed Jan 31 18:17:21 2024
@@ -1,6 +1,5 @@
-# $NetBSD: Makefile,v 1.154 2023/10/24 22:08:30 wiz Exp $
+# $NetBSD: Makefile,v 1.155 2024/01/31 18:17:21 adam Exp $
 
-PKGREVISION= 1
 .include "../../databases/openldap/Makefile.version"
 
 CATEGORIES=    databases

Index: pkgsrc/databases/openldap/Makefile.version
diff -u pkgsrc/databases/openldap/Makefile.version:1.41 pkgsrc/databases/openldap/Makefile.version:1.42
--- pkgsrc/databases/openldap/Makefile.version:1.41     Sat Dec 23 21:16:32 2023
+++ pkgsrc/databases/openldap/Makefile.version  Wed Jan 31 18:17:21 2024
@@ -1,10 +1,10 @@
-# $NetBSD: Makefile.version,v 1.41 2023/12/23 21:16:32 zafer Exp $
+# $NetBSD: Makefile.version,v 1.42 2024/01/31 18:17:21 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.6
+OPENLDAP_VERSION=      2.6.7
 
 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.138 pkgsrc/databases/openldap/distinfo:1.139
--- pkgsrc/databases/openldap/distinfo:1.138    Wed Aug  2 17:05:40 2023
+++ pkgsrc/databases/openldap/distinfo  Wed Jan 31 18:17:21 2024
@@ -1,13 +1,13 @@
-$NetBSD: distinfo,v 1.138 2023/08/02 17:05:40 adam Exp $
+$NetBSD: distinfo,v 1.139 2024/01/31 18:17:21 adam Exp $
 
-BLAKE2s (openldap-2.6.6.tgz) = 7260b7a788101cc03ccc6e908fbb27f7566978e9860726fea37863ca598a33c2
-SHA512 (openldap-2.6.6.tgz) = 0e800807b23f090b465dc18c2f0d342585f96768543b3298b85d17c18272d1c5576a66326d30b3520cac493cbd2ea70e309cd923bf19447c973a63d940619fa6
-Size (openldap-2.6.6.tgz) = 6475109 bytes
-SHA1 (patch-contrib_slapd-modules_cloak_Makefile) = f64c16aebd1b5f6ab069fc22b785f066f0b1c143
-SHA1 (patch-contrib_slapd-modules_nops_Makefile) = 96c072cde836ea96710ddf0dc96b7f9fe78d81d8
+BLAKE2s (openldap-2.6.7.tgz) = a7090113159ce6ae7eefba54d04e0f3b68384e76e6f3b7efcc86352bb11bfc81
+SHA512 (openldap-2.6.7.tgz) = ea207b84fdb7bc6cdff2bc1201fcdde6a907f5766f9637589d956ca86ecf61d4e732ab7d80f33b18b691644e1f5fa39b00ff2c7f4084c9b85760ee693a7c451e
+Size (openldap-2.6.7.tgz) = 6484944 bytes
+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
 SHA1 (patch-contrib_slapd-modules_nops_slapo-nops.5) = f32352f19361b7e9aa5b038ae8578def7c08fa47
-SHA1 (patch-contrib_slapd-modules_smbk5pwd_Makefile) = a57b327bdf680fe60b58c07075a0602afeb556fa
+SHA1 (patch-contrib_slapd-modules_smbk5pwd_Makefile) = 3070f42f863ee44856fb1aeff03e3385e714bac0
 SHA1 (patch-contrib_slapd-modules_smbk5pwd_smbk5pwd.c) = 88584e038eab7cd29f4a05c4a6e9884b13d3ee25
 SHA1 (patch-libraries_libldap_cyrus.c) = 1e47cdf4b1f1cc4eef36cf40a6beec1bed167f85
 SHA1 (patch-libraries_libldap_init.c) = 884d102d7c02cf85b36635b2ac5d6925ec17420f

Index: pkgsrc/databases/openldap-autogroup/Makefile
diff -u pkgsrc/databases/openldap-autogroup/Makefile:1.2 pkgsrc/databases/openldap-autogroup/Makefile:1.3
--- pkgsrc/databases/openldap-autogroup/Makefile:1.2    Tue Oct 24 22:08:30 2023
+++ pkgsrc/databases/openldap-autogroup/Makefile        Wed Jan 31 18:17:21 2024
@@ -1,7 +1,6 @@
-# $NetBSD: Makefile,v 1.2 2023/10/24 22:08:30 wiz Exp $
+# $NetBSD: Makefile,v 1.3 2024/01/31 18:17:21 adam Exp $
 
 PKGNAME=       ${DISTNAME:S/-/-autogroup-/}
-PKGREVISION=   1
 COMMENT=       Hide specific attributes unless explicitely requested for OpenLDAP
 
 CONFLICTS+=    openldap<2.3.23nb1

Index: pkgsrc/databases/openldap-client/Makefile
diff -u pkgsrc/databases/openldap-client/Makefile:1.32 pkgsrc/databases/openldap-client/Makefile:1.33
--- pkgsrc/databases/openldap-client/Makefile:1.32      Tue Oct 24 22:08:30 2023
+++ pkgsrc/databases/openldap-client/Makefile   Wed Jan 31 18:17:21 2024
@@ -1,7 +1,6 @@
-# $NetBSD: Makefile,v 1.32 2023/10/24 22:08:30 wiz Exp $
+# $NetBSD: Makefile,v 1.33 2024/01/31 18:17:21 adam Exp $
 
 PKGNAME=       ${DISTNAME:S/-/-client-/}
-PKGREVISION=   1
 COMMENT=       Lightweight Directory Access Protocol libraries and client programs
 
 CONFLICTS+=            openldap<2.3.23nb1

Index: pkgsrc/databases/openldap-cloak/Makefile
diff -u pkgsrc/databases/openldap-cloak/Makefile:1.21 pkgsrc/databases/openldap-cloak/Makefile:1.22
--- pkgsrc/databases/openldap-cloak/Makefile:1.21       Tue Oct 24 22:08:30 2023
+++ pkgsrc/databases/openldap-cloak/Makefile    Wed Jan 31 18:17:21 2024
@@ -1,7 +1,6 @@
-# $NetBSD: Makefile,v 1.21 2023/10/24 22:08:30 wiz Exp $
+# $NetBSD: Makefile,v 1.22 2024/01/31 18:17:21 adam Exp $
 
 PKGNAME=       ${DISTNAME:S/-/-cloak-/}
-PKGREVISION=   1
 COMMENT=       Hide specific attributes unless explicitely requested for OpenLDAP
 
 CONFLICTS+=    openldap<2.3.23nb1

Index: pkgsrc/databases/openldap-doc/distinfo
diff -u pkgsrc/databases/openldap-doc/distinfo:1.42 pkgsrc/databases/openldap-doc/distinfo:1.43
--- pkgsrc/databases/openldap-doc/distinfo:1.42 Wed Aug  2 17:05:40 2023
+++ pkgsrc/databases/openldap-doc/distinfo      Wed Jan 31 18:17:21 2024
@@ -1,5 +1,5 @@
-$NetBSD: distinfo,v 1.42 2023/08/02 17:05:40 adam Exp $
+$NetBSD: distinfo,v 1.43 2024/01/31 18:17:21 adam Exp $
 
-BLAKE2s (openldap-2.6.6.tgz) = 7260b7a788101cc03ccc6e908fbb27f7566978e9860726fea37863ca598a33c2
-SHA512 (openldap-2.6.6.tgz) = 0e800807b23f090b465dc18c2f0d342585f96768543b3298b85d17c18272d1c5576a66326d30b3520cac493cbd2ea70e309cd923bf19447c973a63d940619fa6
-Size (openldap-2.6.6.tgz) = 6475109 bytes
+BLAKE2s (openldap-2.6.7.tgz) = a7090113159ce6ae7eefba54d04e0f3b68384e76e6f3b7efcc86352bb11bfc81
+SHA512 (openldap-2.6.7.tgz) = ea207b84fdb7bc6cdff2bc1201fcdde6a907f5766f9637589d956ca86ecf61d4e732ab7d80f33b18b691644e1f5fa39b00ff2c7f4084c9b85760ee693a7c451e
+Size (openldap-2.6.7.tgz) = 6484944 bytes

Index: pkgsrc/databases/openldap-nops/Makefile
diff -u pkgsrc/databases/openldap-nops/Makefile:1.24 pkgsrc/databases/openldap-nops/Makefile:1.25
--- pkgsrc/databases/openldap-nops/Makefile:1.24        Tue Oct 24 22:08:30 2023
+++ pkgsrc/databases/openldap-nops/Makefile     Wed Jan 31 18:17:21 2024
@@ -1,7 +1,6 @@
-# $NetBSD: Makefile,v 1.24 2023/10/24 22:08:30 wiz Exp $
+# $NetBSD: Makefile,v 1.25 2024/01/31 18:17:21 adam Exp $
 
 PKGNAME=       ${DISTNAME:S/-/-nops-/}
-PKGREVISION=   1
 COMMENT=       Remove null-ops for OpenLDAP
 
 CONFLICTS+=    openldap<2.3.23nb1

Index: pkgsrc/databases/openldap-server/Makefile
diff -u pkgsrc/databases/openldap-server/Makefile:1.72 pkgsrc/databases/openldap-server/Makefile:1.73
--- pkgsrc/databases/openldap-server/Makefile:1.72      Tue Oct 24 22:08:31 2023
+++ pkgsrc/databases/openldap-server/Makefile   Wed Jan 31 18:17:22 2024
@@ -1,7 +1,6 @@
-# $NetBSD: Makefile,v 1.72 2023/10/24 22:08:31 wiz Exp $
+# $NetBSD: Makefile,v 1.73 2024/01/31 18:17:22 adam Exp $
 
 PKGNAME=       ${DISTNAME:S/-/-server-/}
-PKGREVISION=   1
 COMMENT=       Lightweight Directory Access Protocol server suite
 
 CONFLICTS+=    openldap<2.3.23nb1

Index: pkgsrc/databases/openldap-smbk5pwd/Makefile
diff -u pkgsrc/databases/openldap-smbk5pwd/Makefile:1.29 pkgsrc/databases/openldap-smbk5pwd/Makefile:1.30
--- pkgsrc/databases/openldap-smbk5pwd/Makefile:1.29    Tue Oct 24 22:08:31 2023
+++ pkgsrc/databases/openldap-smbk5pwd/Makefile Wed Jan 31 18:17:22 2024
@@ -1,7 +1,6 @@
-# $NetBSD: Makefile,v 1.29 2023/10/24 22:08:31 wiz Exp $
+# $NetBSD: Makefile,v 1.30 2024/01/31 18:17:22 adam Exp $
 
 PKGNAME=       ${DISTNAME:S/-/-smbk5pwd-/}
-PKGREVISION=   1
 COMMENT=       Samba and Kerberos password sync for OpenLDAP
 
 CONFLICTS+=    openldap<2.3.23nb1

Index: pkgsrc/databases/openldap/patches/patch-contrib_slapd-modules_cloak_Makefile
diff -u pkgsrc/databases/openldap/patches/patch-contrib_slapd-modules_cloak_Makefile:1.3 pkgsrc/databases/openldap/patches/patch-contrib_slapd-modules_cloak_Makefile:1.4
--- pkgsrc/databases/openldap/patches/patch-contrib_slapd-modules_cloak_Makefile:1.3    Mon Aug 23 09:58:58 2021
+++ pkgsrc/databases/openldap/patches/patch-contrib_slapd-modules_cloak_Makefile        Wed Jan 31 18:17:21 2024
@@ -1,10 +1,10 @@
-$NetBSD: patch-contrib_slapd-modules_cloak_Makefile,v 1.3 2021/08/23 09:58:58 adam Exp $
+$NetBSD: patch-contrib_slapd-modules_cloak_Makefile,v 1.4 2024/01/31 18:17:21 adam Exp $
 
 Link against external libraries.
 
---- contrib/slapd-modules/cloak/Makefile.orig  2021-07-27 17:44:47.000000000 +0000
+--- contrib/slapd-modules/cloak/Makefile.orig  2024-01-29 18:52:23.000000000 +0000
 +++ contrib/slapd-modules/cloak/Makefile
-@@ -3,13 +3,11 @@
+@@ -3,8 +3,7 @@
  LDAP_SRC = ../../..
  LDAP_BUILD = $(LDAP_SRC)
  LDAP_INC = -I$(LDAP_BUILD)/include -I$(LDAP_SRC)/include -I$(LDAP_SRC)/servers/slapd
@@ -12,6 +12,10 @@ Link against external libraries.
 -      $(LDAP_BUILD)/libraries/liblber/liblber.la
 +LDAP_LIB = -lldap -llber
  
+ PLAT = UNIX
+ NT_LIB = -L$(LDAP_BUILD)/servers/slapd -lslapd
+@@ -13,8 +12,7 @@ UNIX_LDFLAGS = -version-info $(LTVER)
+ 
  LIBTOOL = $(LDAP_BUILD)/libtool
  INSTALL = /usr/bin/install
 -CC = gcc
@@ -19,4 +23,4 @@ Link against external libraries.
 +OPT = ${CFLAGS} ${CPPFLAGS}
  DEFS = -DSLAPD_OVER_CLOAK=SLAPD_MOD_DYNAMIC
  INCS = $(LDAP_INC)
- LIBS = $(LDAP_LIB)
+ LIBS = $($(PLAT)_LIB) $(LDAP_LIB)
Index: pkgsrc/databases/openldap/patches/patch-contrib_slapd-modules_nops_Makefile
diff -u pkgsrc/databases/openldap/patches/patch-contrib_slapd-modules_nops_Makefile:1.3 pkgsrc/databases/openldap/patches/patch-contrib_slapd-modules_nops_Makefile:1.4
--- pkgsrc/databases/openldap/patches/patch-contrib_slapd-modules_nops_Makefile:1.3     Mon Aug 23 09:58:58 2021
+++ pkgsrc/databases/openldap/patches/patch-contrib_slapd-modules_nops_Makefile Wed Jan 31 18:17:21 2024
@@ -1,10 +1,10 @@
-$NetBSD: patch-contrib_slapd-modules_nops_Makefile,v 1.3 2021/08/23 09:58:58 adam Exp $
+$NetBSD: patch-contrib_slapd-modules_nops_Makefile,v 1.4 2024/01/31 18:17:21 adam Exp $
 
 Link against external libraries.
 
---- contrib/slapd-modules/nops/Makefile.orig   2021-07-27 17:44:47.000000000 +0000
+--- contrib/slapd-modules/nops/Makefile.orig   2024-01-29 18:52:23.000000000 +0000
 +++ contrib/slapd-modules/nops/Makefile
-@@ -3,13 +3,11 @@
+@@ -3,8 +3,7 @@
  LDAP_SRC = ../../..
  LDAP_BUILD = $(LDAP_SRC)
  LDAP_INC = -I$(LDAP_BUILD)/include -I$(LDAP_SRC)/include -I$(LDAP_SRC)/servers/slapd
@@ -12,6 +12,10 @@ Link against external libraries.
 -      $(LDAP_BUILD)/libraries/liblber/liblber.la
 +LDAP_LIB = -lldap -llber
  
+ PLAT = UNIX
+ NT_LIB = -L$(LDAP_BUILD)/servers/slapd -lslapd
+@@ -13,8 +12,7 @@ UNIX_LDFLAGS = -version-info $(LTVER)
+ 
  LIBTOOL = $(LDAP_BUILD)/libtool
  INSTALL = /usr/bin/install
 -CC = gcc
@@ -19,4 +23,4 @@ Link against external libraries.
 +OPT = ${CFLAGS} ${CPPFLAGS}
  DEFS = -DSLAPD_OVER_NOPS=SLAPD_MOD_DYNAMIC
  INCS = $(LDAP_INC)
- LIBS = $(LDAP_LIB)
+ LIBS = $($(PLAT)_LIB) $(LDAP_LIB)

Index: pkgsrc/databases/openldap/patches/patch-contrib_slapd-modules_smbk5pwd_Makefile
diff -u pkgsrc/databases/openldap/patches/patch-contrib_slapd-modules_smbk5pwd_Makefile:1.1 pkgsrc/databases/openldap/patches/patch-contrib_slapd-modules_smbk5pwd_Makefile:1.2
--- pkgsrc/databases/openldap/patches/patch-contrib_slapd-modules_smbk5pwd_Makefile:1.1 Mon Aug 23 09:58:58 2021
+++ pkgsrc/databases/openldap/patches/patch-contrib_slapd-modules_smbk5pwd_Makefile     Wed Jan 31 18:17:21 2024
@@ -1,9 +1,9 @@
-$NetBSD: patch-contrib_slapd-modules_smbk5pwd_Makefile,v 1.1 2021/08/23 09:58:58 adam Exp $
+$NetBSD: patch-contrib_slapd-modules_smbk5pwd_Makefile,v 1.2 2024/01/31 18:17:21 adam Exp $
 
 Link against external libraries.
 Take build options from PkgSrc.
 
---- contrib/slapd-modules/smbk5pwd/Makefile.orig       2021-08-18 17:11:41.000000000 +0000
+--- contrib/slapd-modules/smbk5pwd/Makefile.orig       2024-01-29 18:52:23.000000000 +0000
 +++ contrib/slapd-modules/smbk5pwd/Makefile
 @@ -15,8 +15,7 @@
  LDAP_SRC = ../../..
@@ -15,7 +15,7 @@ Take build options from PkgSrc.
  
  SSL_INC = 
  SSL_LIB = -lcrypto
-@@ -26,12 +25,11 @@ HEIMDAL_LIB = -L/usr/heimdal/lib -lkrb5 
+@@ -31,12 +30,11 @@ UNIX_LDFLAGS = -version-info $(LTVER)
  
  LIBTOOL = $(LDAP_BUILD)/libtool
  INSTALL = /usr/bin/install
@@ -25,10 +25,10 @@ Take build options from PkgSrc.
  # Omit DO_KRB5, DO_SAMBA or DO_SHADOW if you don't want to support it.
 -DEFS = -DDO_KRB5 -DDO_SAMBA -DDO_SHADOW
 -INCS = $(LDAP_INC) $(HEIMDAL_INC) $(SSL_INC)
--LIBS = $(LDAP_LIB) $(HEIMDAL_LIB) $(SSL_LIB)
+-LIBS = $($(PLAT)_LIB) $(LDAP_LIB) $(HEIMDAL_LIB) $(SSL_LIB)
 +DEFS = -DDO_SAMBA
 +INCS = $(LDAP_INC) $(SSL_INC)
-+LIBS = $(LDAP_LIB) $(SSL_LIB) ${EXTRA_LIBS}
++LIBS = $($(PLAT)_LIB) $(LDAP_LIB) $(SSL_LIB) ${EXTRA_LIBS}
+ LD_FLAGS = $(LDFLAGS) $($(PLAT)_LDFLAGS) -rpath $(moduledir) -module
  
  PROGRAMS = smbk5pwd.la
- MANPAGES = slapo-smbk5pwd.5

Prev by Date: CVS commit: pkgsrc/net/haproxy
Next by Date: CVS commit: pkgsrc/doc
Previous by Thread: CVS commit: pkgsrc/net/haproxy
Next by Thread: CVS commit: pkgsrc/doc
Indexes:

Home | Main Index | Thread Index | Old Index