[Pkg-openldap-devel] [openldap] 02/03: Merge branch 'jessie' into wheezy-backports

[Ryan Tandy]

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

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

commit 33af219b30a6b82a9d5be734db3e0288d2bb7abd
Merge: 50de3da b008176
Author: Ryan Tandy <ryan at nardis.ca>
Date:   Sun Sep 13 14:35:36 2015 -0700

    Merge branch 'jessie' into wheezy-backports

 debian/changelog                                   | 10 +++++++++
 .../patches/ITS8240-remove-obsolete-assert.patch   | 25 ++++++++++++++++++++++
 debian/patches/series                              |  1 +
 3 files changed, 36 insertions(+)

diff --cc debian/changelog
index 3eb9445,eb2fcca..d4dd797
--- a/debian/changelog
+++ b/debian/changelog
@@@ -1,12 -1,13 +1,22 @@@
+ openldap (2.4.40+dfsg-1+deb8u1) jessie-security; urgency=high
+ 
+   * 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)
+ 
+  -- Salvatore Bonaccorso <carnil at debian.org>  Fri, 11 Sep 2015 10:30:43 +0200
+ 
 +openldap (2.4.31+really2.4.40+dfsg-1~bpo70+1) wheezy-backports; urgency=medium
 +
 +  * Backport to wheezy.
 +    - Use a +really version lower than 2.4.39-1 to ensure a database upgrade 
 +      is still performed when upgrading to jessie later.
 +    - Build against db5.1 instead of db5.3.
 +
 + -- Ryan Tandy <ryan at nardis.ca>  Sat, 18 Apr 2015 09:49:14 -0700
 +
  openldap (2.4.40+dfsg-1) unstable; urgency=medium
  
    * Remove inetorgperson.schema from the upstream source. Replace it with a

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