From 2d1de436b198c4958e75c22942ba43cc06767fb2 Mon Sep 17 00:00:00 2001 From: Kai Kang Date: Thu, 15 Oct 2015 10:21:04 +0800 Subject: 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 Signed-off-by: Martin Jansa --- .../openldap/openldap-fix-CVE-2015-6908.patch | 28 ++++++++++++++++++++++ 1 file changed, 28 insertions(+) create mode 100644 meta-oe/recipes-support/openldap/openldap/openldap-fix-CVE-2015-6908.patch (limited to 'meta-oe/recipes-support/openldap/openldap') 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 @@ +Upstream-Status: Backport + +Signed-off-by: Kai Kang +--- +From 6fe51a9ab04fd28bbc171da3cf12f1c1040d6629 Mon Sep 17 00:00:00 2001 +From: Howard Chu +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 -- cgit v1.2.3-54-g00ecf