mirror of
https://github.com/openembedded/meta-openembedded.git
synced 2026-06-03 02:10:04 +00:00
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>
This commit is contained in:
-30
@@ -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
|
||||
|
||||
-38
@@ -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
|
||||
|
||||
+3
-5
@@ -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"
|
||||
|
||||
Reference in New Issue
Block a user