diff options
author | Li xin <lixin.fnst@cn.fujitsu.com> | 2015-07-27 11:40:44 +0800 |
---|---|---|
committer | Martin Jansa <Martin.Jansa@gmail.com> | 2015-07-30 21:22:24 +0200 |
commit | 125a424fce9c7a4839105def97fa8d169e45455f (patch) | |
tree | 1042b1effbff534b6d05d67f7bf3629e31c3ed69 /meta-oe/recipes-support/openldap | |
parent | 9d2fc54c804136d4344c953dee0731fcf2c965f2 (diff) | |
download | meta-openembedded-125a424fce9c7a4839105def97fa8d169e45455f.tar.gz |
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>
Diffstat (limited to 'meta-oe/recipes-support/openldap')
-rw-r--r-- | meta-oe/recipes-support/openldap/openldap-2.4.40/0001-ITS-8027-require-non-empty-AttributeList.patch | 30 | ||||
-rw-r--r-- | meta-oe/recipes-support/openldap/openldap-2.4.40/0001-ITS-8046-fix-vrFilter_free.patch | 38 | ||||
-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 91c2178c3..000000000 --- a/meta-oe/recipes-support/openldap/openldap-2.4.40/0001-ITS-8027-require-non-empty-AttributeList.patch +++ /dev/null | |||
@@ -1,30 +0,0 @@ | |||
1 | From c32e74763f77675b9e144126e375977ed6dc562c Mon Sep 17 00:00:00 2001 | ||
2 | From: Howard Chu <hyc@openldap.org> | ||
3 | Date: Mon, 19 Jan 2015 22:25:53 +0000 | ||
4 | Subject: [PATCH] ITS#8027 require non-empty AttributeList | ||
5 | |||
6 | Upstream-Status: Backup | ||
7 | |||
8 | Fix the CVE: https://web.nvd.nist.gov/view/vuln/detail?vulnId=CVE-2015-1545 | ||
9 | |||
10 | --- | ||
11 | servers/slapd/overlays/deref.c | 3 ++- | ||
12 | 1 file changed, 2 insertions(+), 1 deletion(-) | ||
13 | |||
14 | diff --git a/servers/slapd/overlays/deref.c b/servers/slapd/overlays/deref.c | ||
15 | index 9420e3e..05aa890 100644 | ||
16 | --- a/servers/slapd/overlays/deref.c | ||
17 | +++ b/servers/slapd/overlays/deref.c | ||
18 | @@ -183,7 +183,8 @@ deref_parseCtrl ( | ||
19 | ber_len_t cnt = sizeof(struct berval); | ||
20 | ber_len_t off = 0; | ||
21 | |||
22 | - if ( ber_scanf( ber, "{m{M}}", &derefAttr, &attributes, &cnt, off ) == LBER_ERROR ) | ||
23 | + if ( ber_scanf( ber, "{m{M}}", &derefAttr, &attributes, &cnt, off ) == LBER_ERROR | ||
24 | + || !cnt ) | ||
25 | { | ||
26 | rs->sr_text = "Dereference control: derefSpec decoding error"; | ||
27 | rs->sr_err = LDAP_PROTOCOL_ERROR; | ||
28 | -- | ||
29 | 1.9.1 | ||
30 | |||
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 8a5c95f7a..000000000 --- a/meta-oe/recipes-support/openldap/openldap-2.4.40/0001-ITS-8046-fix-vrFilter_free.patch +++ /dev/null | |||
@@ -1,38 +0,0 @@ | |||
1 | From 2f1a2dd329b91afe561cd06b872d09630d4edb6a Mon Sep 17 00:00:00 2001 | ||
2 | From: Howard Chu <hyc@openldap.org> | ||
3 | Date: Wed, 4 Feb 2015 02:03:55 +0000 | ||
4 | Subject: [PATCH] ITS#8046 fix vrFilter_free | ||
5 | |||
6 | Upstream-Statue: Backup | ||
7 | |||
8 | Fix CVE: http://web.nvd.nist.gov/view/vuln/detail?vulnId=CVE-2015-1546 | ||
9 | |||
10 | --- | ||
11 | servers/slapd/filter.c | 10 +++------- | ||
12 | 1 file changed, 3 insertions(+), 7 deletions(-) | ||
13 | |||
14 | diff --git a/servers/slapd/filter.c b/servers/slapd/filter.c | ||
15 | index b859f73..22c81c8 100644 | ||
16 | --- a/servers/slapd/filter.c | ||
17 | +++ b/servers/slapd/filter.c | ||
18 | @@ -1158,14 +1158,10 @@ get_vrFilter( Operation *op, BerElement *ber, | ||
19 | void | ||
20 | vrFilter_free( Operation *op, ValuesReturnFilter *vrf ) | ||
21 | { | ||
22 | - ValuesReturnFilter *p, *next; | ||
23 | + ValuesReturnFilter *next; | ||
24 | |||
25 | - if ( vrf == NULL ) { | ||
26 | - return; | ||
27 | - } | ||
28 | - | ||
29 | - for ( p = vrf; p != NULL; p = next ) { | ||
30 | - next = p->vrf_next; | ||
31 | + for ( ; vrf != NULL; vrf = next ) { | ||
32 | + next = vrf->vrf_next; | ||
33 | |||
34 | switch ( vrf->vrf_choice & SLAPD_FILTER_MASK ) { | ||
35 | case LDAP_FILTER_PRESENT: | ||
36 | -- | ||
37 | 1.9.1 | ||
38 | |||
diff --git a/meta-oe/recipes-support/openldap/openldap-2.4.40/initscript b/meta-oe/recipes-support/openldap/openldap/initscript index 08d1067a7..08d1067a7 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 2992b7030..2992b7030 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 dcf541137..dcf541137 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 c7b1552c1..c7b1552c1 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 b669b7254..b669b7254 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 f5f83fdc3..f5f83fdc3 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 540ba4a63..540ba4a63 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 e7b988faf..e7b988faf 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 5afcb6a58..e4a928fef 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" | |||
9 | # basically BSD. opensource.org does not record this license | 9 | # basically BSD. opensource.org does not record this license |
10 | # at present (so it is apparently not OSI certified). | 10 | # at present (so it is apparently not OSI certified). |
11 | LICENSE = "OpenLDAP" | 11 | LICENSE = "OpenLDAP" |
12 | LIC_FILES_CHKSUM = "file://COPYRIGHT;md5=f2bdbaa4f50199a00b6de2ca7ec1db05 \ | 12 | LIC_FILES_CHKSUM = "file://COPYRIGHT;md5=9d845a25aef97da753144f1dacbf680c \ |
13 | file://LICENSE;md5=153d07ef052c4a37a8fac23bc6031972 \ | 13 | file://LICENSE;md5=153d07ef052c4a37a8fac23bc6031972 \ |
14 | " | 14 | " |
15 | SECTION = "libs" | 15 | SECTION = "libs" |
@@ -24,11 +24,9 @@ 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://0001-ITS-8027-require-non-empty-AttributeList.patch \ | ||
28 | file://0001-ITS-8046-fix-vrFilter_free.patch \ | ||
29 | " | 27 | " |
30 | SRC_URI[md5sum] = "423c1f23d2a0cb96b3e9baf7e9d7dda7" | 28 | SRC_URI[md5sum] = "3f1a4cea52827e18feaedfdc1634b5d0" |
31 | SRC_URI[sha256sum] = "d12611a5c25b6499293c2bb7b435dc2b174db73e83f5a8cb7e34f2ce5fa6dadb" | 29 | SRC_URI[sha256sum] = "27856bb4a8b44feca2b326c309000e16a9dadd52362c8ab6eec6c67a43737f6e" |
32 | 30 | ||
33 | DEPENDS = "util-linux groff-native" | 31 | DEPENDS = "util-linux groff-native" |
34 | 32 | ||