commit a6d69793466dd28fae4f1d1fd25af19bb441060b
Author: Jakub Bogusz <[email protected]>
Date: Sun Jul 5 09:07:23 2015 +0200
- updated to 2.4.41
- removed obsolete CVE-2015-1545-CVE-2015-1546 patch
CVE-2015-1545-CVE-2015-1546.patch | 26 --------------------------
openldap.spec | 8 +++-----
2 files changed, 3 insertions(+), 31 deletions(-)
---
diff --git a/openldap.spec b/openldap.spec
index e0f467a..d672d38 100644
--- a/openldap.spec
+++ b/openldap.spec
@@ -25,12 +25,12 @@ Summary(pt_BR.UTF-8): Clientes e servidor para LDAP
Summary(ru.UTF-8): Образцы клиентов LDAP
Summary(uk.UTF-8): Зразки клієнтів LDAP
Name: openldap
-Version: 2.4.40
-Release: 4
+Version: 2.4.41
+Release: 1
License: OpenLDAP Public License
Group: Networking/Daemons
Source0:
ftp://ftp.openldap.org/pub/OpenLDAP/openldap-release/%{name}-%{version}.tgz
-# Source0-md5: 423c1f23d2a0cb96b3e9baf7e9d7dda7
+# Source0-md5: 3f1a4cea52827e18feaedfdc1634b5d0
Source1: http://download.oracle.com/berkeley-db/db-%{db_version}.tar.gz
# Source1-md5: 718082e7e35fc48478a2334b0bc4cd11
Source2: ldap.init
@@ -63,7 +63,6 @@ Patch19: %{name}-gcc47.patch
Patch20: enable-mdb.patch
Patch22: %{name}-am.patch
Patch23: %{name}-db.patch
-Patch24: CVE-2015-1545-CVE-2015-1546.patch
# Patch for the evolution library
Patch100: %{name}-ntlm.diff
URL: http://www.openldap.org/
@@ -1245,7 +1244,6 @@ cd %{name}-%{version}
%patch20 -p1
%patch22 -p1
%patch23 -p1
-%patch24 -p1
%if %{with krb5}
%patch17 -p1
%endif
diff --git a/CVE-2015-1545-CVE-2015-1546.patch
b/CVE-2015-1545-CVE-2015-1546.patch
deleted file mode 100644
index a642bed..0000000
--- a/CVE-2015-1545-CVE-2015-1546.patch
+++ /dev/null
@@ -1,26 +0,0 @@
-From c32e74763f77675b9e144126e375977ed6dc562c Mon Sep 17 00:00:00 2001
-From: Howard Chu <[email protected]>
-Date: Mon, 19 Jan 2015 22:25:53 +0000
-Subject: [PATCH] ITS#8027 require non-empty AttributeList
-
----
- 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.7.10.4
-
================================================================
---- gitweb:
http://git.pld-linux.org/gitweb.cgi/packages/openldap.git/commitdiff/a6d69793466dd28fae4f1d1fd25af19bb441060b
_______________________________________________
pld-cvs-commit mailing list
[email protected]
http://lists.pld-linux.org/mailman/listinfo/pld-cvs-commit
