[Pkg-openldap-devel] [openldap] 01/01: Merge branch 'master' 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 230d55be6f1b89e70bbdd08d3c34ec86a38fc069
Merge: 6bb16b7 93fc673
Author: Ryan Tandy <ryan at nardis.ca>
Date:   Mon Feb 9 17:00:23 2015 -0800

    Merge branch 'master' into wheezy-backports
    
    Conflicts:
    	debian/changelog

 debian/changelog                                   | 15 ++++++++++--
 .../ITS8027-deref-reject-empty-attr-list.patch     | 20 ++++++++++++++++
 .../patches/ITS8046-fix-vrFilter_free-crash.patch  | 28 ++++++++++++++++++++++
 debian/patches/series                              |  2 ++
 4 files changed, 63 insertions(+), 2 deletions(-)

diff --cc debian/changelog
index d0beebf,8138511..b3bbffb
--- a/debian/changelog
+++ b/debian/changelog
@@@ -1,11 -1,13 +1,22 @@@
- openldap (2.4.31+really2.4.40-3~bpo70+1) wheezy-backports; urgency=medium
++openldap (2.4.31+really2.4.40-4~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>  Thu, 11 Dec 2014 13:27:22 -0800
++ -- Ryan Tandy <ryan at nardis.ca>  Mon, 09 Feb 2015 16:58:59 -0800
++
+ openldap (2.4.40-4) unstable; urgency=medium
+ 
+   * debian/patches/ITS8027-deref-reject-empty-attr-list.patch: Import upstream 
+     patch to fix a crash when a search includes the Deref control with an 
+     empty attribute list. (ITS#8027) (CVE-2015-1545, Closes: #776988)
+   * debian/patches/ITS8046-fix-vrFilter_free-crash.patch: Import upstream 
+     patch to fix a double free triggered by certain search queries using the 
+     Matched Values control. (ITS#8046) (CVE-2015-1546, Closes: #776991)
+ 
+  -- Ryan Tandy <ryan at nardis.ca>  Sun, 08 Feb 2015 20:19:11 +0000
  
  openldap (2.4.40-3) unstable; urgency=medium
  

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