diff options
author | Kai Kang <kai.kang@windriver.com> | 2015-10-15 10:21:04 +0800 |
---|---|---|
committer | Martin Jansa <Martin.Jansa@gmail.com> | 2015-10-23 12:53:23 +0200 |
commit | 2d1de436b198c4958e75c22942ba43cc06767fb2 (patch) | |
tree | dc90c083bcbb2c926e6447bfa60609d52902bcc0 /meta-oe/recipes-support/openldap/openldap | |
parent | c56ad520295692ba883f3d079ba835b252b2e144 (diff) | |
download | meta-openembedded-2d1de436b198c4958e75c22942ba43cc06767fb2.tar.gz |
openldap: 2.4.41 -> 2.4.42
Upgrade phpmyadmin from 2.4.41 to 2.4.42. And backport patch from
http://www.openldap.org/devel/gitweb.cgi?p=openldap.git;a=commitdiff;h=6fe51a9
to fix CVE-2015-6908.
Signed-off-by: Kai Kang <kai.kang@windriver.com>
Signed-off-by: Martin Jansa <Martin.Jansa@gmail.com>
Diffstat (limited to 'meta-oe/recipes-support/openldap/openldap')
-rw-r--r-- | meta-oe/recipes-support/openldap/openldap/openldap-fix-CVE-2015-6908.patch | 28 |
1 files changed, 28 insertions, 0 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 000000000..34c87cccf --- /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 | ||