summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorfan.xin <fan.xin@jp.fujitsu.com>2015-12-11 09:50:39 +0900
committerMartin Jansa <Martin.Jansa@gmail.com>2015-12-18 12:43:22 +0100
commit03d613e570ae262b32322d1fa2eeb47c38518478 (patch)
tree30a8cded0509eb6b66698e50456ba421bd8a09d8
parentfcb7b50851884264dbd9764ba9781ba0b84900e7 (diff)
downloadmeta-openembedded-03d613e570ae262b32322d1fa2eeb47c38518478.tar.gz
openldap: upgrade to 2.4.43
1. Upgrade openldap from 2.4.42 to 2.4.43 2. Delete patch file openldap-fix-CVE-2015-6908.patch because the bug(ITS#8240) has been fixed in OpenLDAP 2.4.43 http://www.openldap.org/software/release/changes.html Signed-off-by: Fan Xin <fan.xin@jp.fujitsu.com> Signed-off-by: Martin Jansa <Martin.Jansa@gmail.com>
-rw-r--r--meta-oe/recipes-support/openldap/openldap/openldap-fix-CVE-2015-6908.patch28
-rw-r--r--meta-oe/recipes-support/openldap/openldap_2.4.43.bb (renamed from meta-oe/recipes-support/openldap/openldap_2.4.42.bb)5
2 files changed, 2 insertions, 31 deletions
diff --git a/meta-oe/recipes-support/openldap/openldap/openldap-fix-CVE-2015-6908.patch b/meta-oe/recipes-support/openldap/openldap/openldap-fix-CVE-2015-6908.patch
deleted file mode 100644
index 34c87cccf..000000000
--- a/meta-oe/recipes-support/openldap/openldap/openldap-fix-CVE-2015-6908.patch
+++ /dev/null
@@ -1,28 +0,0 @@
1Upstream-Status: Backport
2
3Signed-off-by: Kai Kang <kai.kang@windriver.com>
4---
5From 6fe51a9ab04fd28bbc171da3cf12f1c1040d6629 Mon Sep 17 00:00:00 2001
6From: Howard Chu <hyc@openldap.org>
7Date: Thu, 10 Sep 2015 00:37:32 +0100
8Subject: [PATCH 1/1] ITS#8240 remove obsolete assert
9
10---
11 libraries/liblber/io.c | 2 +-
12 1 file changed, 1 insertion(+), 1 deletion(-)
13
14diff --git a/libraries/liblber/io.c b/libraries/liblber/io.c
15index 85c3e23..c05dcf8 100644
16--- a/libraries/liblber/io.c
17+++ b/libraries/liblber/io.c
18@@ -679,7 +679,7 @@ done:
19 return (ber->ber_tag);
20 }
21
22- assert( 0 ); /* ber structure is messed up ?*/
23+ /* invalid input */
24 return LBER_DEFAULT;
25 }
26
27--
281.7.10.4
diff --git a/meta-oe/recipes-support/openldap/openldap_2.4.42.bb b/meta-oe/recipes-support/openldap/openldap_2.4.43.bb
index 49fcb56ba..c4a52b1f9 100644
--- a/meta-oe/recipes-support/openldap/openldap_2.4.42.bb
+++ b/meta-oe/recipes-support/openldap/openldap_2.4.43.bb
@@ -24,11 +24,10 @@ SRC_URI = "ftp://ftp.openldap.org/pub/OpenLDAP/openldap-release/${BP}.tgz \
24 file://initscript \ 24 file://initscript \
25 file://slapd.service \ 25 file://slapd.service \
26 file://thread_stub.patch \ 26 file://thread_stub.patch \
27 file://openldap-fix-CVE-2015-6908.patch \
28" 27"
29 28
30SRC_URI[md5sum] = "47c8e2f283647a6105b8b0325257e922" 29SRC_URI[md5sum] = "49ca65e27891fcf977d78c10f073c705"
31SRC_URI[sha256sum] = "eeb7b0e2c5852bfd2650e83909bb6152835c0b862fab10b63954dc1bcbba8e63" 30SRC_URI[sha256sum] = "34d78e5598a2b0360d26a9050fcdbbe198c65493b013bb607839d5598b6978c8"
32 31
33DEPENDS = "util-linux groff-native" 32DEPENDS = "util-linux groff-native"
34 33