From cbfb2d981b5c620a70e4ab5428eadf20d466e4dd Mon Sep 17 00:00:00 2001
From: Andy Postnikov <apostnikov@gmail.com>
Date: Tue, 30 Jan 2024 05:51:24 +0100
Subject: [PATCH] main/openldap: upgrade to 2.6.7
---
.../0002-Add-UNIX_LINK_LIBS-to-slapi-Makefile.patch | 7 +++----
main/openldap/APKBUILD | 8 ++++----
2 files changed, 7 insertions(+), 8 deletions(-)
diff --git a/main/openldap/0002-Add-UNIX_LINK_LIBS-to-slapi-Makefile.patch b/main/openldap/0002-Add-UNIX_LINK_LIBS-to-slapi-Makefile.patch
index 9f6ac113167e..953139bbddd0 100644
--- a/main/openldap/0002-Add-UNIX_LINK_LIBS-to-slapi-Makefile.patch
+++ b/main/openldap/0002-Add-UNIX_LINK_LIBS-to-slapi-Makefile.patch
@@ -11,14 +11,13 @@ diff --git a/servers/slapd/slapi/Makefile.in b/servers/slapd/slapi/Makefile.in
index 0e46f78..dd29cca 100644
--- a/servers/slapd/slapi/Makefile.in
+++ b/servers/slapd/slapi/Makefile.in
-@@ -37,6 +37,7 @@ LDAP_LIBDIR= ../../../libraries
- XLIBS = $(LIBRARY)
+@@ -37,6 +37,7 @@
XXLIBS =
- NT_LINK_LIBS = $(AC_LIBS)
+ MOD_LIBS = $(MODULES_LIBS)
+ NT_LINK_LIBS = $(AC_LIBS) -L.. -lslapd $(@BUILD_LIBS_DYNAMIC@_LDAP_LIBS)
+UNIX_LINK_LIBS = ../../../libraries/libldap/libldap.la $(LTHREAD_LIBS)
XINCPATH = -I$(srcdir)/.. -I$(srcdir)
XDEFS = $(MODULES_CPPFLAGS)
--
2.37.1
-
diff --git a/main/openldap/APKBUILD b/main/openldap/APKBUILD
index 8831cfe22bc1..5bc697095b83 100644
--- a/main/openldap/APKBUILD
+++ b/main/openldap/APKBUILD
@@ -32,8 +32,8 @@
# - CVE-2017-9287
#
pkgname=openldap
-pkgver=2.6.6
-pkgrel=1
+pkgver=2.6.7
+pkgrel=0
pkgdesc="LDAP Server"
url="https://www.openldap.org/"
arch="all"
@@ -382,9 +382,9 @@ _overlay() {
}
sha512sums="
-0e800807b23f090b465dc18c2f0d342585f96768543b3298b85d17c18272d1c5576a66326d30b3520cac493cbd2ea70e309cd923bf19447c973a63d940619fa6 openldap-2.6.6.tgz
+ea207b84fdb7bc6cdff2bc1201fcdde6a907f5766f9637589d956ca86ecf61d4e732ab7d80f33b18b691644e1f5fa39b00ff2c7f4084c9b85760ee693a7c451e openldap-2.6.7.tgz
8fa57c43c2d51cd2d1d297b4dd4edd9a15b549b6d5beb8038f66f65cb1d7c93b8fda326c33b4f9356ea99e63703c553662deefc87222f23a1e5517fbf2fabdeb 0001-Fix-build-issue-in-clients-tools-common.c.patch
-55a6a429fc8486ed8dcf8dc2da7c240be9971d49dd9aea4b746738f92046610711896d914ba8a71a09b405b271125a613074275045cf963a3f058eb85058a00b 0002-Add-UNIX_LINK_LIBS-to-slapi-Makefile.patch
+a47f909a2ddc1efa12c369243ba59c5b312bebf67f5106d92b575ce9cb694540a9053a1cf6e9811c1ba1da8a9ea36062c357ff7e94d4bf8b4c2457fc4fdaaaec 0002-Add-UNIX_LINK_LIBS-to-slapi-Makefile.patch
81a9b769bc5b6b599c17381a9f6515f2c479d82f4d728627c83a746403fc3401529dc47146390a4b66a3a4e074cd09c850d3fabe1a097d92066ce16c4443a0fb 0003-Add-mqtt-overlay.patch
0552438d010a3cf225aa90b8c7744a8dbf853885f34a42f6dfc92e08a8b5b86c0082b1548498c6bc55522ca4ac8e3699cfba63be2279d9dcbbffa2690901f632 0004-Fix-manpages.patch
f88de2f92a31f1b906e850daa1b518fc90822e668c9ca99c33934304d260237a1406cb845c2f4985bcc1c1c49355784287cb8e27f724ab6833a8e90912decf73 0005-Correct-command-line-syntax-in-lloadd-tests.patch
--
GitLab