aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorJakub Jirutka <jakub@jirutka.cz>2021-03-17 13:46:39 +0100
committerJakub Jirutka <jakub@jirutka.cz>2021-03-17 13:47:16 +0100
commit13fad181886a646a50b6743b6d5c3c38ab2251c4 (patch)
treece6fdb67bf763e2dcbbd349da4810d81682fe5a8
parent48afd332ec26b1ec2c735135d067795aa7940c65 (diff)
downloadaports-13fad181886a646a50b6743b6d5c3c38ab2251c4.tar.gz
aports-13fad181886a646a50b6743b6d5c3c38ab2251c4.tar.bz2
aports-13fad181886a646a50b6743b6d5c3c38ab2251c4.tar.xz
main/openldap: upgrade to 2.4.58
-rw-r--r--main/openldap/APKBUILD8
-rw-r--r--main/openldap/CVE-2021-27212.patch25
2 files changed, 3 insertions, 30 deletions
diff --git a/main/openldap/APKBUILD b/main/openldap/APKBUILD
index 7949a2b958..0f7ac30503 100644
--- a/main/openldap/APKBUILD
+++ b/main/openldap/APKBUILD
@@ -30,8 +30,8 @@
# - CVE-2017-9287
#
pkgname=openldap
-pkgver=2.4.57
-pkgrel=1
+pkgver=2.4.58
+pkgrel=0
pkgdesc="LDAP Server"
url="https://www.openldap.org/"
arch="all"
@@ -70,7 +70,6 @@ source="https://www.openldap.org/software/download/OpenLDAP/openldap-release/ope
openldap-mqtt-overlay.patch
fix-manpages.patch
cacheflush.patch
- CVE-2021-27212.patch
slapd.initd
slapd.confd
@@ -315,12 +314,11 @@ _submv() {
done
}
-sha512sums="b929bced0f5ba9a90e015a24b8037c8958fbb7282db272bd0cacf43b5f7540ab42159a3c4441148074340228bb5f07f93651c0dbb2affde961be156058f99ce5 openldap-2.4.57.tgz
+sha512sums="2fa2aa36117692eca44e55559f162c8c796f78469e6c2aee91b06d46f2b755d416979c913a3d89bbf9db14cc84881ecffee69af75b48e1d16b7aa9d2e3873baa openldap-2.4.58.tgz
f0014ceb13f0ce6a791be09b613727a12e7d18420c25ab1cad835c2efae436653a667ece3043c355efe790840744b74ca3214142c00b349ffc1cb45016995096 openldap-2.4-ppolicy.patch
44d97efb25d4f39ab10cd5571db43f3bfa7c617a5bb087085ae16c0298aca899b55c8742a502121ba743a73e6d77cd2056bc96cee63d6d0862dabc8fb5574357 openldap-2.4.11-libldap_r.patch
9c7f41279e91ed995c91e9a8c543c797d9294a93cf260afdc03ab5777e45ed045a4d6a4d4d0180b5dc387dc04babca01d818fbfa8168309df44f4500d2a430a4 openldap-mqtt-overlay.patch
d1847aa94e56869adb4575423473f13696401ee0c41dc39c963febb767e2b87de9f5b0eff1a43d170c3b9819d011401e01e159e5150544e1d1079b9e177423b1 fix-manpages.patch
60c1ec62003a33036de68402544e25a71715ed124a3139056a94ed1ba02fb8148ee510ab8f182a308105a2f744b9787e67112bcd8cd0d800cdb6f5409c4f63ff cacheflush.patch
-c207a7d7b07a72fdd89f9d7e80b09c5c9110bf36cef8ad79c1ea3fd25896f6c2242873d17ba7822aea12ba37486272637112a37ad293fbe2ddd6fa50c7824239 CVE-2021-27212.patch
2d286ff7cc56153204f3ab79c464d083801a40cc9bbb0b5cc1fb19de63d6e81c953b1ab0edd256d9ba48144bbda9a0c0d628bfec1342129aa2727344dea5fa9e slapd.initd
64dc4c0aa0abe3d9f7d2aef25fe4c8e23c53df2421067947ac4d096c9e942b26356cb8577ebc41b52d88d0b0a03b2a3e435fe86242671f9b36555a5f82ee0e3a slapd.confd"
diff --git a/main/openldap/CVE-2021-27212.patch b/main/openldap/CVE-2021-27212.patch
deleted file mode 100644
index 59f6d84e16..0000000000
--- a/main/openldap/CVE-2021-27212.patch
+++ /dev/null
@@ -1,25 +0,0 @@
-From 9badb73425a67768c09bcaed1a9c26c684af6c30 Mon Sep 17 00:00:00 2001
-From: Howard Chu <hyc@openldap.org>
-Date: Sat, 6 Feb 2021 20:52:06 +0000
-Subject: [PATCH] ITS#9454 fix issuerAndThisUpdateCheck
-
----
- servers/slapd/schema_init.c | 2 ++
- 1 file changed, 2 insertions(+)
-
-diff --git a/servers/slapd/schema_init.c b/servers/slapd/schema_init.c
-index 31be1154e..8b1e25539 100644
---- a/servers/slapd/schema_init.c
-+++ b/servers/slapd/schema_init.c
-@@ -3900,6 +3900,8 @@ issuerAndThisUpdateCheck(
- break;
- }
- }
-+ if ( tu->bv_len < STRLENOF("YYYYmmddHHmmssZ") ) return LDAP_INVALID_SYNTAX;
-+
- x.bv_val += tu->bv_len + 1;
- x.bv_len -= tu->bv_len + 1;
-
---
-GitLab
-