aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorLi xin <lixin.fnst@cn.fujitsu.com>2015-07-27 11:40:44 +0800
committerMartin Jansa <Martin.Jansa@gmail.com>2015-07-30 21:22:24 +0200
commit125a424fce9c7a4839105def97fa8d169e45455f (patch)
tree1042b1effbff534b6d05d67f7bf3629e31c3ed69
parent9d2fc54c804136d4344c953dee0731fcf2c965f2 (diff)
downloadmeta-openembedded-contrib-125a424fce9c7a4839105def97fa8d169e45455f.tar.gz
meta-openembedded-contrib-125a424fce9c7a4839105def97fa8d169e45455f.tar.bz2
meta-openembedded-contrib-125a424fce9c7a4839105def97fa8d169e45455f.zip
openldap: upgrade 2.4.40 -> 2.4.41
1) Dropped backported patches(commit-id): -0001-ITS-8027-require-non-empty-AttributeList.patch(c32e747) -0001-ITS-8046-fix-vrFilter_free.patch(2f1a2dd) 2) Update the checksum of COPYRIGHT,since the date in it has been changed, but the LICENSE has not been changed. Signed-off-by: Li Xin <lixin.fnst@cn.fujitsu.com> Signed-off-by: Martin Jansa <Martin.Jansa@gmail.com>
-rw-r--r--meta-oe/recipes-support/openldap/openldap-2.4.40/0001-ITS-8027-require-non-empty-AttributeList.patch30
-rw-r--r--meta-oe/recipes-support/openldap/openldap-2.4.40/0001-ITS-8046-fix-vrFilter_free.patch38
-rw-r--r--meta-oe/recipes-support/openldap/openldap/initscript (renamed from meta-oe/recipes-support/openldap/openldap-2.4.40/initscript)0
-rw-r--r--meta-oe/recipes-support/openldap/openldap/install-strip.patch (renamed from meta-oe/recipes-support/openldap/openldap-2.4.40/install-strip.patch)0
-rw-r--r--meta-oe/recipes-support/openldap/openldap/kill-icu.patch (renamed from meta-oe/recipes-support/openldap/openldap-2.4.40/kill-icu.patch)0
-rw-r--r--meta-oe/recipes-support/openldap/openldap/openldap-2.4.28-gnutls-gcrypt.patch (renamed from meta-oe/recipes-support/openldap/openldap-2.4.40/openldap-2.4.28-gnutls-gcrypt.patch)0
-rw-r--r--meta-oe/recipes-support/openldap/openldap/openldap-m4-pthread.patch (renamed from meta-oe/recipes-support/openldap/openldap-2.4.40/openldap-m4-pthread.patch)0
-rw-r--r--meta-oe/recipes-support/openldap/openldap/slapd.service (renamed from meta-oe/recipes-support/openldap/openldap-2.4.40/slapd.service)0
-rw-r--r--meta-oe/recipes-support/openldap/openldap/thread_stub.patch (renamed from meta-oe/recipes-support/openldap/openldap-2.4.40/thread_stub.patch)0
-rw-r--r--meta-oe/recipes-support/openldap/openldap/use-urandom.patch (renamed from meta-oe/recipes-support/openldap/openldap-2.4.40/use-urandom.patch)0
-rw-r--r--meta-oe/recipes-support/openldap/openldap_2.4.41.bb (renamed from meta-oe/recipes-support/openldap/openldap_2.4.40.bb)8
11 files changed, 3 insertions, 73 deletions
diff --git a/meta-oe/recipes-support/openldap/openldap-2.4.40/0001-ITS-8027-require-non-empty-AttributeList.patch b/meta-oe/recipes-support/openldap/openldap-2.4.40/0001-ITS-8027-require-non-empty-AttributeList.patch
deleted file mode 100644
index 91c2178c3f..0000000000
--- a/meta-oe/recipes-support/openldap/openldap-2.4.40/0001-ITS-8027-require-non-empty-AttributeList.patch
+++ /dev/null
@@ -1,30 +0,0 @@
-From c32e74763f77675b9e144126e375977ed6dc562c Mon Sep 17 00:00:00 2001
-From: Howard Chu <hyc@openldap.org>
-Date: Mon, 19 Jan 2015 22:25:53 +0000
-Subject: [PATCH] ITS#8027 require non-empty AttributeList
-
-Upstream-Status: Backup
-
-Fix the CVE: https://web.nvd.nist.gov/view/vuln/detail?vulnId=CVE-2015-1545
-
----
- servers/slapd/overlays/deref.c | 3 ++-
- 1 file changed, 2 insertions(+), 1 deletion(-)
-
-diff --git a/servers/slapd/overlays/deref.c b/servers/slapd/overlays/deref.c
-index 9420e3e..05aa890 100644
---- a/servers/slapd/overlays/deref.c
-+++ b/servers/slapd/overlays/deref.c
-@@ -183,7 +183,8 @@ deref_parseCtrl (
- ber_len_t cnt = sizeof(struct berval);
- ber_len_t off = 0;
-
-- if ( ber_scanf( ber, "{m{M}}", &derefAttr, &attributes, &cnt, off ) == LBER_ERROR )
-+ if ( ber_scanf( ber, "{m{M}}", &derefAttr, &attributes, &cnt, off ) == LBER_ERROR
-+ || !cnt )
- {
- rs->sr_text = "Dereference control: derefSpec decoding error";
- rs->sr_err = LDAP_PROTOCOL_ERROR;
---
-1.9.1
-
diff --git a/meta-oe/recipes-support/openldap/openldap-2.4.40/0001-ITS-8046-fix-vrFilter_free.patch b/meta-oe/recipes-support/openldap/openldap-2.4.40/0001-ITS-8046-fix-vrFilter_free.patch
deleted file mode 100644
index 8a5c95f7a8..0000000000
--- a/meta-oe/recipes-support/openldap/openldap-2.4.40/0001-ITS-8046-fix-vrFilter_free.patch
+++ /dev/null
@@ -1,38 +0,0 @@
-From 2f1a2dd329b91afe561cd06b872d09630d4edb6a Mon Sep 17 00:00:00 2001
-From: Howard Chu <hyc@openldap.org>
-Date: Wed, 4 Feb 2015 02:03:55 +0000
-Subject: [PATCH] ITS#8046 fix vrFilter_free
-
-Upstream-Statue: Backup
-
-Fix CVE: http://web.nvd.nist.gov/view/vuln/detail?vulnId=CVE-2015-1546
-
----
- servers/slapd/filter.c | 10 +++-------
- 1 file changed, 3 insertions(+), 7 deletions(-)
-
-diff --git a/servers/slapd/filter.c b/servers/slapd/filter.c
-index b859f73..22c81c8 100644
---- a/servers/slapd/filter.c
-+++ b/servers/slapd/filter.c
-@@ -1158,14 +1158,10 @@ get_vrFilter( Operation *op, BerElement *ber,
- void
- vrFilter_free( Operation *op, ValuesReturnFilter *vrf )
- {
-- ValuesReturnFilter *p, *next;
-+ ValuesReturnFilter *next;
-
-- if ( vrf == NULL ) {
-- return;
-- }
--
-- for ( p = vrf; p != NULL; p = next ) {
-- next = p->vrf_next;
-+ for ( ; vrf != NULL; vrf = next ) {
-+ next = vrf->vrf_next;
-
- switch ( vrf->vrf_choice & SLAPD_FILTER_MASK ) {
- case LDAP_FILTER_PRESENT:
---
-1.9.1
-
diff --git a/meta-oe/recipes-support/openldap/openldap-2.4.40/initscript b/meta-oe/recipes-support/openldap/openldap/initscript
index 08d1067a7e..08d1067a7e 100644
--- a/meta-oe/recipes-support/openldap/openldap-2.4.40/initscript
+++ b/meta-oe/recipes-support/openldap/openldap/initscript
diff --git a/meta-oe/recipes-support/openldap/openldap-2.4.40/install-strip.patch b/meta-oe/recipes-support/openldap/openldap/install-strip.patch
index 2992b7030d..2992b7030d 100644
--- a/meta-oe/recipes-support/openldap/openldap-2.4.40/install-strip.patch
+++ b/meta-oe/recipes-support/openldap/openldap/install-strip.patch
diff --git a/meta-oe/recipes-support/openldap/openldap-2.4.40/kill-icu.patch b/meta-oe/recipes-support/openldap/openldap/kill-icu.patch
index dcf5411372..dcf5411372 100644
--- a/meta-oe/recipes-support/openldap/openldap-2.4.40/kill-icu.patch
+++ b/meta-oe/recipes-support/openldap/openldap/kill-icu.patch
diff --git a/meta-oe/recipes-support/openldap/openldap-2.4.40/openldap-2.4.28-gnutls-gcrypt.patch b/meta-oe/recipes-support/openldap/openldap/openldap-2.4.28-gnutls-gcrypt.patch
index c7b1552c1c..c7b1552c1c 100644
--- a/meta-oe/recipes-support/openldap/openldap-2.4.40/openldap-2.4.28-gnutls-gcrypt.patch
+++ b/meta-oe/recipes-support/openldap/openldap/openldap-2.4.28-gnutls-gcrypt.patch
diff --git a/meta-oe/recipes-support/openldap/openldap-2.4.40/openldap-m4-pthread.patch b/meta-oe/recipes-support/openldap/openldap/openldap-m4-pthread.patch
index b669b7254d..b669b7254d 100644
--- a/meta-oe/recipes-support/openldap/openldap-2.4.40/openldap-m4-pthread.patch
+++ b/meta-oe/recipes-support/openldap/openldap/openldap-m4-pthread.patch
diff --git a/meta-oe/recipes-support/openldap/openldap-2.4.40/slapd.service b/meta-oe/recipes-support/openldap/openldap/slapd.service
index f5f83fdc37..f5f83fdc37 100644
--- a/meta-oe/recipes-support/openldap/openldap-2.4.40/slapd.service
+++ b/meta-oe/recipes-support/openldap/openldap/slapd.service
diff --git a/meta-oe/recipes-support/openldap/openldap-2.4.40/thread_stub.patch b/meta-oe/recipes-support/openldap/openldap/thread_stub.patch
index 540ba4a635..540ba4a635 100644
--- a/meta-oe/recipes-support/openldap/openldap-2.4.40/thread_stub.patch
+++ b/meta-oe/recipes-support/openldap/openldap/thread_stub.patch
diff --git a/meta-oe/recipes-support/openldap/openldap-2.4.40/use-urandom.patch b/meta-oe/recipes-support/openldap/openldap/use-urandom.patch
index e7b988fafd..e7b988fafd 100644
--- a/meta-oe/recipes-support/openldap/openldap-2.4.40/use-urandom.patch
+++ b/meta-oe/recipes-support/openldap/openldap/use-urandom.patch
diff --git a/meta-oe/recipes-support/openldap/openldap_2.4.40.bb b/meta-oe/recipes-support/openldap/openldap_2.4.41.bb
index 5afcb6a588..e4a928fefe 100644
--- a/meta-oe/recipes-support/openldap/openldap_2.4.40.bb
+++ b/meta-oe/recipes-support/openldap/openldap_2.4.41.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=f2bdbaa4f50199a00b6de2ca7ec1db05 \
+LIC_FILES_CHKSUM = "file://COPYRIGHT;md5=9d845a25aef97da753144f1dacbf680c \
file://LICENSE;md5=153d07ef052c4a37a8fac23bc6031972 \
"
SECTION = "libs"
@@ -24,11 +24,9 @@ SRC_URI = "ftp://ftp.openldap.org/pub/OpenLDAP/openldap-release/${BP}.tgz \
file://initscript \
file://slapd.service \
file://thread_stub.patch \
- file://0001-ITS-8027-require-non-empty-AttributeList.patch \
- file://0001-ITS-8046-fix-vrFilter_free.patch \
"
-SRC_URI[md5sum] = "423c1f23d2a0cb96b3e9baf7e9d7dda7"
-SRC_URI[sha256sum] = "d12611a5c25b6499293c2bb7b435dc2b174db73e83f5a8cb7e34f2ce5fa6dadb"
+SRC_URI[md5sum] = "3f1a4cea52827e18feaedfdc1634b5d0"
+SRC_URI[sha256sum] = "27856bb4a8b44feca2b326c309000e16a9dadd52362c8ab6eec6c67a43737f6e"
DEPENDS = "util-linux groff-native"