[Pkg-openldap-devel] [openldap] 01/01: Imported Debian patch 2.4.31-2+deb7u1

[Ryan Tandy]

This is an automated email from the git hooks/post-receive script.

rtandy-guest pushed a commit to branch wheezy
in repository openldap.

commit 011571c9253af19da5b335738088a046de72a4d1
Author: Salvatore Bonaccorso <carnil at debian.org>
Date:   Fri Sep 11 13:02:05 2015 +0200

    Imported Debian patch 2.4.31-2+deb7u1
---
 debian/changelog                                    | 13 +++++++------
 debian/patches/ITS8240-remove-obsolete-assert.patch |  2 +-
 2 files changed, 8 insertions(+), 7 deletions(-)

diff --git a/debian/changelog b/debian/changelog
index 8dfe95d..38507e0 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,11 +1,12 @@
-openldap (2.4.31-2+deb7u1) UNRELEASED; urgency=high
+openldap (2.4.31-2+deb7u1) wheezy-security; urgency=high
 
-  * Team upload.
-  * Import upstream patch to remove an unnecessary assert(0) that could be
-    triggered remotely by an unauthenticated user by sending a malformed
-    BER element. (ITS#8240) (CVE-2015-6908) (Closes: #798622)
+  * Non-maintainer upload by the Security Team.
+  * Add ITS8240-remove-obsolete-assert.patch patch.
+    Import upstream patch to remove an unnecessary assert(0) that could be
+    triggered remotely by an unauthenticated user by sending a malformed BER
+    element. (CVE-2015-6908, Closes: #798622)
 
- -- Luca Bruno <lucab at debian.org>  Fri, 11 Sep 2015 10:39:46 +0200
+ -- Salvatore Bonaccorso <carnil at debian.org>  Fri, 11 Sep 2015 13:02:05 +0200
 
 openldap (2.4.31-2) wheezy-security; urgency=high
 
diff --git a/debian/patches/ITS8240-remove-obsolete-assert.patch b/debian/patches/ITS8240-remove-obsolete-assert.patch
index 97bf6d7..6240ce6 100644
--- a/debian/patches/ITS8240-remove-obsolete-assert.patch
+++ b/debian/patches/ITS8240-remove-obsolete-assert.patch
@@ -21,5 +21,5 @@ index 85c3e23..c05dcf8 100644
  }
  
 -- 
-2.1.4
+2.5.1
 

-- 
Alioth's /usr/local/bin/git-commit-notice on /srv/git.debian.org/git/pkg-openldap/openldap.git