From 06cabeb885a79d9a7ac6c0d55345b1dd41c6a815 Mon Sep 17 00:00:00 2001 From: psykose Date: Thu, 9 Feb 2023 12:15:50 +0000 Subject: main/openldap: upgrade to 2.6.4 --- ...on-mips-inconsistent-cacheflush-prototype.patch | 27 ---------------------- main/openldap/APKBUILD | 8 +++---- 2 files changed, 3 insertions(+), 32 deletions(-) delete mode 100644 main/openldap/0006-Fix-build-on-mips-inconsistent-cacheflush-prototype.patch (limited to 'main') diff --git a/main/openldap/0006-Fix-build-on-mips-inconsistent-cacheflush-prototype.patch b/main/openldap/0006-Fix-build-on-mips-inconsistent-cacheflush-prototype.patch deleted file mode 100644 index db908168714..00000000000 --- a/main/openldap/0006-Fix-build-on-mips-inconsistent-cacheflush-prototype.patch +++ /dev/null @@ -1,27 +0,0 @@ -From daea61a39b53badef423af056eddf3f29803e948 Mon Sep 17 00:00:00 2001 -From: Lars Kellogg-Stedman -Date: Fri, 19 Aug 2022 22:42:28 -0400 -Subject: [PATCH 6/8] Fix build on mips* (inconsistent cacheflush() prototype) - -Apply the main/lmdb mips* build fix to the bundled lmdb copy. ---- - libraries/liblmdb/mdb.c | 3 +-- - 1 file changed, 1 insertion(+), 2 deletions(-) - -diff --git a/libraries/liblmdb/mdb.c b/libraries/liblmdb/mdb.c -index 8cecdb2..82cefc3 100644 ---- a/libraries/liblmdb/mdb.c -+++ b/libraries/liblmdb/mdb.c -@@ -77,8 +77,7 @@ - - #if defined(__mips) && defined(__linux) - /* MIPS has cache coherency issues, requires explicit cache control */ --#include --extern int cacheflush(char *addr, int nbytes, int cache); -+#include - #define CACHEFLUSH(addr, bytes, cache) cacheflush(addr, bytes, cache) - #else - #define CACHEFLUSH(addr, bytes, cache) --- -2.37.1 - diff --git a/main/openldap/APKBUILD b/main/openldap/APKBUILD index b7a15f47e89..4c8be2fec6d 100644 --- a/main/openldap/APKBUILD +++ b/main/openldap/APKBUILD @@ -32,8 +32,8 @@ # - CVE-2017-9287 # pkgname=openldap -pkgver=2.6.3 -pkgrel=6 +pkgver=2.6.4 +pkgrel=0 pkgdesc="LDAP Server" url="https://www.openldap.org/" arch="all" @@ -85,7 +85,6 @@ source="https://www.openldap.org/software/download/OpenLDAP/openldap-release/ope 0003-Add-mqtt-overlay.patch 0004-Fix-manpages.patch 0005-Correct-command-line-syntax-in-lloadd-tests.patch - 0006-Fix-build-on-mips-inconsistent-cacheflush-prototype.patch 0007-Use-correct-extension-for-slapd-modules.patch 0008-Remove-pidfile-and-argsfile.patch 0009-Include-more-schemas-in-default-config.patch @@ -381,13 +380,12 @@ _overlay() { } sha512sums=" -56efbbfc68779ad635d2c25228eb9c4f1553b107b96e8a438029b1c5d2f2647cf4d437770554392b436718ea44a4813e17f5195049f67fc09d063a981096cd85 openldap-2.6.3.tgz +4be49c4866e47e96677d0e1f7caa380791917c9df8d6bb343d032aba45031c87db3bd4f6b953e914a1f40044fa68f4886ae96929a410b7188c0ed9bb75073a30 openldap-2.6.4.tgz 8fa57c43c2d51cd2d1d297b4dd4edd9a15b549b6d5beb8038f66f65cb1d7c93b8fda326c33b4f9356ea99e63703c553662deefc87222f23a1e5517fbf2fabdeb 0001-Fix-build-issue-in-clients-tools-common.c.patch 55a6a429fc8486ed8dcf8dc2da7c240be9971d49dd9aea4b746738f92046610711896d914ba8a71a09b405b271125a613074275045cf963a3f058eb85058a00b 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 -12e32308c9a2072adc22a2859d85d7228c9d61cab0088e5b34bbbe98b400768a254eddc7fc420821363ed9139190eb7dd511c409219324e4eb892ba4dbf080fb 0006-Fix-build-on-mips-inconsistent-cacheflush-prototype.patch 30af37e70a53a55c56bb0e74eee770a00abe83d4b0a787845363ccff564b49b8ba20c907bb976442b4dc2278db7b0a039a11c85dd40a547af6de9a7f1591328f 0007-Use-correct-extension-for-slapd-modules.patch eaadec2a58a7f117c67b10673e26fe8c38e40ae4c1ae5fda9004c9bbebca81b6cd51cc482f28d94dacd8154ed800fd1e90f48807970f54652bfc021f8039806e 0008-Remove-pidfile-and-argsfile.patch 1c2a18280ea06f8095f013c110f8b1b0779c3dc89aa19158cdedbe3a7e1019e7ea5a503cba4d3e3ae824423ded22b2ef334665d2281969ac3b0efb96de34e37e 0009-Include-more-schemas-in-default-config.patch -- cgit v1.2.3