diff options
-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.42.bb (renamed from meta-oe/recipes-support/openldap/openldap_2.4.41.bb) | 6 |
2 files changed, 32 insertions, 2 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 new file mode 100644 index 0000000000..34c87cccf8 --- /dev/null +++ b/meta-oe/recipes-support/openldap/openldap/openldap-fix-CVE-2015-6908.patch | |||
@@ -0,0 +1,28 @@ | |||
1 | Upstream-Status: Backport | ||
2 | |||
3 | Signed-off-by: Kai Kang <kai.kang@windriver.com> | ||
4 | --- | ||
5 | From 6fe51a9ab04fd28bbc171da3cf12f1c1040d6629 Mon Sep 17 00:00:00 2001 | ||
6 | From: Howard Chu <hyc@openldap.org> | ||
7 | Date: Thu, 10 Sep 2015 00:37:32 +0100 | ||
8 | Subject: [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 | |||
14 | diff --git a/libraries/liblber/io.c b/libraries/liblber/io.c | ||
15 | index 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 | -- | ||
28 | 1.7.10.4 | ||
diff --git a/meta-oe/recipes-support/openldap/openldap_2.4.41.bb b/meta-oe/recipes-support/openldap/openldap_2.4.42.bb index e4a928fefe..49fcb56bab 100644 --- a/meta-oe/recipes-support/openldap/openldap_2.4.41.bb +++ b/meta-oe/recipes-support/openldap/openldap_2.4.42.bb | |||
@@ -24,9 +24,11 @@ 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 \ | ||
27 | " | 28 | " |
28 | SRC_URI[md5sum] = "3f1a4cea52827e18feaedfdc1634b5d0" | 29 | |
29 | SRC_URI[sha256sum] = "27856bb4a8b44feca2b326c309000e16a9dadd52362c8ab6eec6c67a43737f6e" | 30 | SRC_URI[md5sum] = "47c8e2f283647a6105b8b0325257e922" |
31 | SRC_URI[sha256sum] = "eeb7b0e2c5852bfd2650e83909bb6152835c0b862fab10b63954dc1bcbba8e63" | ||
30 | 32 | ||
31 | DEPENDS = "util-linux groff-native" | 33 | DEPENDS = "util-linux groff-native" |
32 | 34 | ||