aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorHuang Qiyu <huangqy.fnst@cn.fujitsu.com>2017-07-25 16:33:49 +0800
committerMartin Jansa <Martin.Jansa@gmail.com>2017-08-13 13:19:02 +0200
commitb0ccd810d717bf8d448ac9b620318de95e571095 (patch)
tree985ca7ad16f9d5beb83b6de065bcc1f0f7f3e667
parent79b38aee7e36a033069ccdb9b0ccbe8c4f12a9b7 (diff)
downloadmeta-openembedded-contrib-b0ccd810d717bf8d448ac9b620318de95e571095.tar.gz
meta-openembedded-contrib-b0ccd810d717bf8d448ac9b620318de95e571095.tar.bz2
meta-openembedded-contrib-b0ccd810d717bf8d448ac9b620318de95e571095.zip
openldap: 2.4.44 -> 2.4.45
1) Upgrade openldap from 2.4.44 to 2.4.45 2) Delete openldap-CVE-2017-9287.patch, since it is integrated upstream. 3) License checksum changed, since the copyright years were updated. Signed-off-by: Huang Qiyu <huangqy.fnst@cn.fujitsu.com> Signed-off-by: Martin Jansa <Martin.Jansa@gmail.com>
-rw-r--r--meta-oe/recipes-support/openldap/openldap/openldap-CVE-2017-9287.patch30
-rw-r--r--meta-oe/recipes-support/openldap/openldap_2.4.45.bb (renamed from meta-oe/recipes-support/openldap/openldap_2.4.44.bb)7
2 files changed, 3 insertions, 34 deletions
diff --git a/meta-oe/recipes-support/openldap/openldap/openldap-CVE-2017-9287.patch b/meta-oe/recipes-support/openldap/openldap/openldap-CVE-2017-9287.patch
deleted file mode 100644
index 93e9243eed..0000000000
--- a/meta-oe/recipes-support/openldap/openldap/openldap-CVE-2017-9287.patch
+++ /dev/null
@@ -1,30 +0,0 @@
-From e0e65f309dc0eb5582387acf1b2c2b5b3955f6b6 Mon Sep 17 00:00:00 2001
-From: Ryan Tandy <ryan@nardis.ca>
-Date: Wed, 17 May 2017 20:07:39 -0700
-Subject: [PATCH] Fix double free of search base with page size 0
-
-CVE: CVE-2017-9287
-Upstream-Status: Submitted
-
-Signed-off-by: Fan Xin <fan.xin@jp.fujitsu.com>
----
- servers/slapd/back-mdb/search.c | 3 ++-
- 1 file changed, 2 insertions(+), 1 deletion(-)
-
-diff --git a/servers/slapd/back-mdb/search.c b/servers/slapd/back-mdb/search.c
-index 009939d..d0db918 100644
---- a/servers/slapd/back-mdb/search.c
-+++ b/servers/slapd/back-mdb/search.c
-@@ -1066,7 +1066,8 @@ notfound:
- /* check size limit */
- if ( get_pagedresults(op) > SLAP_CONTROL_IGNORED ) {
- if ( rs->sr_nentries >= ((PagedResultsState *)op->o_pagedresults_state)->ps_size ) {
-- mdb_entry_return( op, e );
-+ if (e != base)
-+ mdb_entry_return( op, e );
- e = NULL;
- send_paged_response( op, rs, &lastid, tentries );
- goto done;
---
-2.1.4
-
diff --git a/meta-oe/recipes-support/openldap/openldap_2.4.44.bb b/meta-oe/recipes-support/openldap/openldap_2.4.45.bb
index 2d3cfc0d03..adbf8ce289 100644
--- a/meta-oe/recipes-support/openldap/openldap_2.4.44.bb
+++ b/meta-oe/recipes-support/openldap/openldap_2.4.45.bb
@@ -9,7 +9,7 @@ HOMEPAGE = "http://www.OpenLDAP.org/license.html"
# basically BSD. opensource.org does not record this license
# at present (so it is apparently not OSI certified).
LICENSE = "OpenLDAP"
-LIC_FILES_CHKSUM = "file://COPYRIGHT;md5=c933fba6d89fda89f58df1e086e3f2e7 \
+LIC_FILES_CHKSUM = "file://COPYRIGHT;md5=25fd3721960f39128cd15a749fd21139 \
file://LICENSE;md5=153d07ef052c4a37a8fac23bc6031972 \
"
SECTION = "libs"
@@ -25,11 +25,10 @@ SRC_URI = "ftp://ftp.openldap.org/pub/OpenLDAP/openldap-release/${BP}.tgz \
file://slapd.service \
file://thread_stub.patch \
file://openldap-CVE-2015-3276.patch \
- file://openldap-CVE-2017-9287.patch \
"
-SRC_URI[md5sum] = "693ac26de86231f8dcae2b4e9d768e51"
-SRC_URI[sha256sum] = "d7de6bf3c67009c95525dde3a0212cc110d0a70b92af2af8e3ee800e81b88400"
+SRC_URI[md5sum] = "00ff8301277cdfd0af728a6927042a13"
+SRC_URI[sha256sum] = "cdd6cffdebcd95161a73305ec13fc7a78e9707b46ca9f84fb897cd5626df3824"
DEPENDS = "util-linux groff-native"