diff options
| author |   fan.xin <fan.xin@jp.fujitsu.com> | 2015-12-11 09:50:39 +0900 |
|---|---|---|
| committer |   Martin Jansa <Martin.Jansa@gmail.com> | 2015-12-18 12:43:22 +0100 |
| commit | 03d613e570ae262b32322d1fa2eeb47c38518478 (patch) | |
| tree | 30a8cded0509eb6b66698e50456ba421bd8a09d8 | |
| parent | fcb7b50851884264dbd9764ba9781ba0b84900e7 (diff) | |
| download | meta-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.patch | 28 | ||||
| -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 34c87cccf8..0000000000 --- a/meta-oe/recipes-support/openldap/openldap/openldap-fix-CVE-2015-6908.patch +++ /dev/null @@ -1,28 +0,0 @@ -Upstream-Status: Backport - -Signed-off-by: Kai Kang <kai.kang@windriver.com> ---- -From 6fe51a9ab04fd28bbc171da3cf12f1c1040d6629 Mon Sep 17 00:00:00 2001 -From: Howard Chu <hyc@openldap.org> -Date: Thu, 10 Sep 2015 00:37:32 +0100 -Subject: [PATCH 1/1] ITS#8240 remove obsolete assert - ---- - libraries/liblber/io.c | 2 +- - 1 file changed, 1 insertion(+), 1 deletion(-) - -diff --git a/libraries/liblber/io.c b/libraries/liblber/io.c -index 85c3e23..c05dcf8 100644 ---- a/libraries/liblber/io.c -+++ b/libraries/liblber/io.c -@@ -679,7 +679,7 @@ done: - return (ber->ber_tag); - } - -- assert( 0 ); /* ber structure is messed up ?*/ -+ /* invalid input */ - return LBER_DEFAULT; - } - --- -1.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 49fcb56bab..c4a52b1f9d 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 \ file://initscript \ file://slapd.service \ file://thread_stub.patch \ - file://openldap-fix-CVE-2015-6908.patch \ " -SRC_URI[md5sum] = "47c8e2f283647a6105b8b0325257e922" -SRC_URI[sha256sum] = "eeb7b0e2c5852bfd2650e83909bb6152835c0b862fab10b63954dc1bcbba8e63" +SRC_URI[md5sum] = "49ca65e27891fcf977d78c10f073c705" +SRC_URI[sha256sum] = "34d78e5598a2b0360d26a9050fcdbbe198c65493b013bb607839d5598b6978c8" DEPENDS = "util-linux groff-native" |