summaryrefslogtreecommitdiff
path: root/user/openldap
diff options
context:
space:
mode:
Diffstat (limited to 'user/openldap')
-rw-r--r--user/openldap/APKBUILD14
-rw-r--r--user/openldap/fix-manpages.patch8
-rw-r--r--user/openldap/test063.patch2
-rw-r--r--user/openldap/test079.patch160
-rw-r--r--user/openldap/time64.patch12
5 files changed, 17 insertions, 179 deletions
diff --git a/user/openldap/APKBUILD b/user/openldap/APKBUILD
index 0aef3baa7..fd39451bc 100644
--- a/user/openldap/APKBUILD
+++ b/user/openldap/APKBUILD
@@ -13,8 +13,8 @@
# - CVE-2017-9287
#
pkgname=openldap
-pkgver=2.6.3
-pkgrel=2
+pkgver=2.6.10
+pkgrel=0
pkgdesc="LDAP Server"
url="https://www.openldap.org/"
arch="all"
@@ -33,7 +33,6 @@ source="https://www.$pkgname.org/software/download/OpenLDAP/$pkgname-release/$pk
fix-manpages.patch
configs.patch
test063.patch
- test079.patch
time64.patch
slapd.initd
@@ -186,11 +185,10 @@ _submv() {
done
}
-sha512sums="56efbbfc68779ad635d2c25228eb9c4f1553b107b96e8a438029b1c5d2f2647cf4d437770554392b436718ea44a4813e17f5195049f67fc09d063a981096cd85 openldap-2.6.3.tgz
-0c026a5c8790ebb7d6784514363f1403c693d61defbeaacae574267c3b7833f198919d31604da1f49db3000c9a561cb6d36d95e021f7906761e45d1434cef15b fix-manpages.patch
+sha512sums="18129ad9a385457941e3203de5f130fe2571701abf24592c5beffb01361aae3182c196b2cd48ffeecb792b9b0e5f82c8d92445a7ec63819084757bdedba63b20 openldap-2.6.10.tgz
+5de64a172da10a5d02d4f2d91dfd0d959a12db0ed2d14133e3186a2b4d3d9e4e3bbe8eb800821dfcfb79fb808a69d44253a4cae1e37b6d2477bc11062734d41e fix-manpages.patch
1a1f669db968061eb8c9fb5e42768d0f12075d4eb4d8ae7085533276775027c56760c2f7413494deebec4d78b053f674661236e6e1506ecffadf510985c393c0 configs.patch
-26fbe3fa2182d80ee98e6885972f803d03ac45a72cb8478c31e76a6f07f45565e6fdcdbf528fcf61e77fd4f9e2068e4f82d9c9c178df7da103d4e9b714bf204e test063.patch
-c7f2b32f2643d6b7ea5dbee6c1baad7cae53ea9d511cfae6c976edb8f8f85ae14351f612f02e560d15c6b577676804fd7b0a6f45f79cc1cdbe11f117e61ad088 test079.patch
-a3d2ce7cbfd8a24605efef47550833e0a2e0f7aa426a46342e5f7bf2ef082b1640c31cd33eb246c225cc4cdc011ed4a640763158111e62f9e76e3530c3fa786e time64.patch
+30e59a3ff14cf612ef299f7b9f8ffcee172b4693f8a77548eab64def3d0d7e374da1bffd546f36e076e8f3431134ce7b8a9ccb3a173c728b37b6ec8148c31463 test063.patch
+fd45360ae9631a8e0481809dfc809bccb0f933e01d724a9c4c541faed966f046e142589719ef558a80bedba63eefa8225852d71127139bc105d48415a31fa17a time64.patch
0c3606e4dad1b32f1c4b62f2bc1990a4c9f7ccd10c7b50e623309ba9df98064e68fc42a7242450f32fb6e5fa2203609d3d069871b5ae994cd4b227a078c93532 slapd.initd
64dc4c0aa0abe3d9f7d2aef25fe4c8e23c53df2421067947ac4d096c9e942b26356cb8577ebc41b52d88d0b0a03b2a3e435fe86242671f9b36555a5f82ee0e3a slapd.confd"
diff --git a/user/openldap/fix-manpages.patch b/user/openldap/fix-manpages.patch
index 03c925537..62e1e74bf 100644
--- a/user/openldap/fix-manpages.patch
+++ b/user/openldap/fix-manpages.patch
@@ -8,7 +8,7 @@ diff --git a/doc/man/man1/ldapmodify.1 b/doc/man/man1/ldapmodify.1
index 3def6da..466c772 100644
--- a/doc/man/man1/ldapmodify.1
+++ b/doc/man/man1/ldapmodify.1
-@@ -382,8 +382,7 @@ exit status and a diagnostic message being written to standard error.
+@@ -391,8 +391,7 @@ exit status and a diagnostic message being written to standard error.
.BR ldap_add_ext (3),
.BR ldap_delete_ext (3),
.BR ldap_modify_ext (3),
@@ -31,7 +31,7 @@ index b739f4d..e2a1a00 100644
[\c
.BR \-V [ V [ V ]]
[\c
-@@ -332,7 +332,7 @@ the LDAP databases defined in the default config file, just type:
+@@ -333,7 +333,7 @@ the LDAP databases defined in the default config file, just type:
.LP
.nf
.ft tt
@@ -40,7 +40,7 @@ index b739f4d..e2a1a00 100644
.ft
.fi
.LP
-@@ -343,7 +343,7 @@ on voluminous debugging which will be printed on standard error, type:
+@@ -344,7 +344,7 @@ on voluminous debugging which will be printed on standard error, type:
.LP
.nf
.ft tt
@@ -49,7 +49,7 @@ index b739f4d..e2a1a00 100644
.ft
.fi
.LP
-@@ -351,7 +351,7 @@ To test whether the configuration file is correct or not, type:
+@@ -352,7 +352,7 @@ To test whether the configuration file is correct or not, type:
.LP
.nf
.ft tt
diff --git a/user/openldap/test063.patch b/user/openldap/test063.patch
index 972feba6f..a6de434c8 100644
--- a/user/openldap/test063.patch
+++ b/user/openldap/test063.patch
@@ -5,7 +5,7 @@ thanks to Ryan Tandy for root cause analysis and suggested fix.
--- openldap-2.6.2/tests/scripts/test063-delta-multiprovider 2022-05-04 09:55:23.000000000 -0500
+++ openldap-2.6.2/tests/scripts/test063-delta-multiprovider 2022-06-01 02:14:47.230724205 -0500
-@@ -318,6 +318,9 @@
+@@ -324,6 +324,9 @@
exit $RC
fi
diff --git a/user/openldap/test079.patch b/user/openldap/test079.patch
deleted file mode 100644
index a902ba878..000000000
--- a/user/openldap/test079.patch
+++ /dev/null
@@ -1,160 +0,0 @@
-From 0031b8ed342386960ab9d0cd1566196ba0e6ae42 Mon Sep 17 00:00:00 2001
-From: "A. Wilcox" <AWilcox@Wilcox-Tech.com>
-Date: Wed, 1 Jun 2022 04:36:24 -0500
-Subject: [PATCH] Tests: Use ldapsearch(1) correctly in test079
-
-Before this change, ldapsearch(1) was not being called with the correct
-parameter syntax. This caused the test to fail on musl libc environments
-where getopt(3) is more strict, with messages like:
-
-Error: LDAP connection to remote LDAP server is not found (1)
-
-The test.out file simply stated:
-
-ldap_sasl_bind(SIMPLE): Can't contact LDAP server (-1)
-
-Indeed, strace showed that the `-H` param was missed and we were trying
-to connect to port 389:
-
-connect(3, {sa_family=AF_INET6, sin6_port=htons(389), sin6_flowinfo=htonl(0), inet_pton(AF_INET6, "::1", &sin6_addr), sin6_scope_id=0}, 28) = -1 ECONNREFUSED (Connection refused)
----
- tests/scripts/test079-proxy-timeout | 40 ++++++++++++++---------------
- 1 file changed, 20 insertions(+), 20 deletions(-)
-
-diff --git a/tests/scripts/test079-proxy-timeout b/tests/scripts/test079-proxy-timeout
-index 6a8e0c7a8..9ece4c1a1 100755
---- a/tests/scripts/test079-proxy-timeout
-+++ b/tests/scripts/test079-proxy-timeout
-@@ -139,10 +139,10 @@ fi
-
- echo "Checking that proxy has created connections towards backend (time_t now=`date +%s`)"
-
--$LDAPSEARCH -b "cn=Connections,cn=database 2,cn=databases,cn=monitor" -s one -LLL olmDbConnURI \
-+$LDAPSEARCH -b "cn=Connections,cn=database 2,cn=databases,cn=monitor" -s one -LLL \
- -D "cn=Manager,dc=local,dc=com" \
- -H $URI2 \
-- -w $PASSWD 2>&1 | tee -a $TESTOUT | grep ldap://${LOCALHOST}:$PORT1 >/dev/null
-+ -w $PASSWD olmDbConnURI 2>&1 | tee -a $TESTOUT | grep ldap://${LOCALHOST}:$PORT1 >/dev/null
- RC=$?
- if test $RC != 0 ; then
- echo "Error: LDAP connection to remote LDAP server is not found ($RC)"
-@@ -150,10 +150,10 @@ if test $RC != 0 ; then
- exit $RC
- fi
-
--$LDAPSEARCH -b "cn=Connections,cn=database 3,cn=databases,cn=monitor" -s one -LLL olmDbConnURI \
-+$LDAPSEARCH -b "cn=Connections,cn=database 3,cn=databases,cn=monitor" -s one -LLL \
- -D "cn=Manager,dc=local,dc=com" \
- -H $URI2 \
-- -w $PASSWD 2>&1 | tee -a $TESTOUT | grep ldap://${LOCALHOST}:$PORT1 >/dev/null
-+ -w $PASSWD olmDbConnURI 2>&1 | tee -a $TESTOUT | grep ldap://${LOCALHOST}:$PORT1 >/dev/null
- RC=$?
- if test $RC != 0 ; then
- echo "Error: LDAP connection to remote LDAP server is not found ($RC)"
-@@ -171,10 +171,10 @@ sleep `expr $CONN_EXPIRES - $NOW + 2`
-
- echo "Checking that proxy has closed expired connections towards the remote LDAP server (time_t now=`date +%s`)"
-
--$LDAPSEARCH -b "cn=Connections,cn=database 2,cn=databases,cn=monitor" -s one -LLL olmDbConnURI \
-+$LDAPSEARCH -b "cn=Connections,cn=database 2,cn=databases,cn=monitor" -s one -LLL \
- -D "cn=Manager,dc=local,dc=com" \
- -H $URI2 \
-- -w $PASSWD 2>&1 | tee -a $TESTOUT | grep ldap://${LOCALHOST}:$PORT1 >/dev/null
-+ -w $PASSWD olmDbConnURI 2>&1 | tee -a $TESTOUT | grep ldap://${LOCALHOST}:$PORT1 >/dev/null
- RC=$?
- if test $RC != 1 ; then
- echo "Error: LDAP connection to remote LDAP server was not closed"
-@@ -182,10 +182,10 @@ if test $RC != 1 ; then
- exit $RC
- fi
-
--$LDAPSEARCH -b "cn=Connections,cn=database 3,cn=databases,cn=monitor" -s one -LLL olmDbConnURI \
-+$LDAPSEARCH -b "cn=Connections,cn=database 3,cn=databases,cn=monitor" -s one -LLL \
- -D "cn=Manager,dc=local,dc=com" \
- -H $URI2 \
-- -w $PASSWD 2>&1 | tee -a $TESTOUT | grep ldap://${LOCALHOST}:$PORT1 >/dev/null
-+ -w $PASSWD olmDbConnURI 2>&1 | tee -a $TESTOUT | grep ldap://${LOCALHOST}:$PORT1 >/dev/null
- RC=$?
- if test $RC != 1 ; then
- echo "Error: LDAP connection to remote LDAP server was not closed"
-@@ -235,10 +235,10 @@ sleep 2
-
- echo "Checking that proxy has created connections towards backend (time_t now=`date +%s`)"
-
--$LDAPSEARCH -b "cn=Connections,cn=database 2,cn=databases,cn=monitor" -s one -LLL olmDbConnURI \
-+$LDAPSEARCH -b "cn=Connections,cn=database 2,cn=databases,cn=monitor" -s one -LLL \
- -D "cn=Manager,dc=local,dc=com" \
- -H $URI2 \
-- -w $PASSWD 2>&1 | tee -a $TESTOUT | grep ldap://${LOCALHOST}:$PORT1 >/dev/null
-+ -w $PASSWD olmDbConnURI 2>&1 | tee -a $TESTOUT | grep ldap://${LOCALHOST}:$PORT1 >/dev/null
- RC=$?
- if test $RC != 0 ; then
- echo "Error: LDAP connection to remote LDAP server is not found ($RC)"
-@@ -246,10 +246,10 @@ if test $RC != 0 ; then
- exit $RC
- fi
-
--$LDAPSEARCH -b "cn=Connections,cn=database 3,cn=databases,cn=monitor" -s one -LLL olmDbConnURI \
-+$LDAPSEARCH -b "cn=Connections,cn=database 3,cn=databases,cn=monitor" -s one -LLL \
- -D "cn=Manager,dc=local,dc=com" \
- -H $URI2 \
-- -w $PASSWD 2>&1 | tee -a $TESTOUT | grep ldap://${LOCALHOST}:$PORT1 >/dev/null
-+ -w $PASSWD olmDbConnURI 2>&1 | tee -a $TESTOUT | grep ldap://${LOCALHOST}:$PORT1 >/dev/null
- RC=$?
- if test $RC != 0 ; then
- echo "Error: LDAP connection to remote LDAP server is not found ($RC)"
-@@ -267,10 +267,10 @@ sleep `expr $CONN_EXPIRES - $NOW + 2`
-
- echo "Checking that proxy has closed expired connections towards the remote LDAP server (time_t now=`date +%s`)"
-
--$LDAPSEARCH -b "cn=Connections,cn=database 2,cn=databases,cn=monitor" -s one -LLL olmDbConnURI \
-+$LDAPSEARCH -b "cn=Connections,cn=database 2,cn=databases,cn=monitor" -s one -LLL \
- -D "cn=Manager,dc=local,dc=com" \
- -H $URI2 \
-- -w $PASSWD 2>&1 | tee -a $TESTOUT | grep ldap://${LOCALHOST}:$PORT1 >/dev/null
-+ -w $PASSWD olmDbConnURI 2>&1 | tee -a $TESTOUT | grep ldap://${LOCALHOST}:$PORT1 >/dev/null
- RC=$?
- if test $RC != 1 ; then
- echo "Error: LDAP connection to remote LDAP server was not closed"
-@@ -278,10 +278,10 @@ if test $RC != 1 ; then
- exit $RC
- fi
-
--$LDAPSEARCH -b "cn=Connections,cn=database 3,cn=databases,cn=monitor" -s one -LLL olmDbConnURI \
-+$LDAPSEARCH -b "cn=Connections,cn=database 3,cn=databases,cn=monitor" -s one -LLL \
- -D "cn=Manager,dc=local,dc=com" \
- -H $URI2 \
-- -w $PASSWD 2>&1 | tee -a $TESTOUT | grep ldap://${LOCALHOST}:$PORT1 >/dev/null
-+ -w $PASSWD olmDbConnURI 2>&1 | tee -a $TESTOUT | grep ldap://${LOCALHOST}:$PORT1 >/dev/null
- RC=$?
- if test $RC != 1 ; then
- echo "Error: LDAP connection to remote LDAP server was not closed"
-@@ -339,10 +339,10 @@ fi
- NOW=`date +%s`
- sleep `expr $CONN_EXPIRES - $NOW - 2`
- echo "Check that connection is still alive due to idle-timeout reset (time_t now=`date +%s`)"
--$LDAPSEARCH -b "cn=Connections,cn=database 2,cn=databases,cn=monitor" -s one -LLL olmDbConnURI \
-+$LDAPSEARCH -b "cn=Connections,cn=database 2,cn=databases,cn=monitor" -s one -LLL \
- -D "cn=Manager,dc=local,dc=com" \
- -H $URI2 \
-- -w $PASSWD 2>&1 | tee -a $TESTOUT | grep ldap://${LOCALHOST}:$PORT1 >/dev/null
-+ -w $PASSWD olmDbConnURI 2>&1 | tee -a $TESTOUT | grep ldap://${LOCALHOST}:$PORT1 >/dev/null
- RC=$?
- if test $RC != 0 ; then
- echo "Error: LDAP connection to remote LDAP server is not found ($RC)"
-@@ -354,10 +354,10 @@ fi
- NOW=`date +%s`
- sleep `expr $CONN_EXPIRES - $NOW + 2`
- echo "Check that connection is closed after extended idle-timeout has passed (time_t now=`date +%s`)"
--$LDAPSEARCH -b "cn=Connections,cn=database 2,cn=databases,cn=monitor" -s one -LLL olmDbConnURI \
-+$LDAPSEARCH -b "cn=Connections,cn=database 2,cn=databases,cn=monitor" -s one -LLL \
- -D "cn=Manager,dc=local,dc=com" \
- -H $URI2 \
-- -w $PASSWD 2>&1 | tee -a $TESTOUT | grep ldap://${LOCALHOST}:$PORT1 >/dev/null
-+ -w $PASSWD olmDbConnURI 2>&1 | tee -a $TESTOUT | grep ldap://${LOCALHOST}:$PORT1 >/dev/null
- RC=$?
- if test $RC != 1 ; then
- echo "Error: LDAP connection to remote LDAP server was not closed"
---
-2.32.0 (Apple Git-132)
-
diff --git a/user/openldap/time64.patch b/user/openldap/time64.patch
index 780d67069..ecca4a143 100644
--- a/user/openldap/time64.patch
+++ b/user/openldap/time64.patch
@@ -34,7 +34,7 @@ diff -ur a/libraries/libldap/os-local.c b/libraries/libldap/os-local.c
diff -ur a/libraries/libldap/result.c b/libraries/libldap/result.c
--- a/libraries/libldap/result.c 2022-12-12 23:12:56.618567894 -0600
+++ b/libraries/libldap/result.c 2022-12-12 23:34:24.977768222 -0600
-@@ -264,8 +264,8 @@
+@@ -288,8 +288,8 @@
Debug2( LDAP_DEBUG_TRACE, "wait4msg ld %p msgid %d (infinite timeout)\n",
(void *)ld, msgid );
} else {
@@ -149,7 +149,7 @@ diff -ur a/servers/slapd/overlays/pcache.c b/servers/slapd/overlays/pcache.c
else
refresh_len = 0;
-@@ -1601,8 +1601,8 @@
+@@ -1607,8 +1607,8 @@
new_cached_query->lru_up = NULL;
new_cached_query->lru_down = NULL;
@@ -160,7 +160,7 @@ diff -ur a/servers/slapd/overlays/pcache.c b/servers/slapd/overlays/pcache.c
pc_caching_reason_str[ why ] );
new_cached_query->scope = query->scope;
-@@ -2729,7 +2729,7 @@
+@@ -2735,7 +2735,7 @@
pbi->bi_flags |= BI_HASHED;
} else {
Debug( pcache_debug, "pc_bind_search: cache is stale, "
@@ -169,7 +169,7 @@ diff -ur a/servers/slapd/overlays/pcache.c b/servers/slapd/overlays/pcache.c
pbi->bi_cq->bindref_time, op->o_time );
}
} else if ( pbi->bi_si ) {
-@@ -3865,7 +3865,7 @@
+@@ -3872,7 +3872,7 @@
struct berval bv;
switch( c->type ) {
case PC_MAIN:
@@ -178,7 +178,7 @@ diff -ur a/servers/slapd/overlays/pcache.c b/servers/slapd/overlays/pcache.c
cm->db.bd_info->bi_type, cm->max_entries, cm->numattrsets,
cm->num_entries_limit, cm->cc_period );
bv.bv_val = c->cr_msg;
-@@ -3909,7 +3909,7 @@
+@@ -3916,7 +3916,7 @@
/* HEADS-UP: always print all;
* if optional == 0, ignore */
bv.bv_len = snprintf( c->cr_msg, sizeof( c->cr_msg ),
@@ -187,7 +187,7 @@ diff -ur a/servers/slapd/overlays/pcache.c b/servers/slapd/overlays/pcache.c
temp->attr_set_index,
temp->ttl,
temp->negttl,
-@@ -3931,7 +3931,7 @@
+@@ -3938,7 +3938,7 @@
for (temp=qm->templates; temp; temp=temp->qmnext) {
if ( !temp->bindttr ) continue;
bv.bv_len = snprintf( c->cr_msg, sizeof( c->cr_msg ),
generated by cgit v1.2.3-70-g09d2 (git 2.46.0) at 2025-08-07 20:31:57 +0000