[Pkg-samba-maint] [samba] 11/11: Merge in 2:4.1.21-2.

[Jelmer Vernooij]

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

jelmer pushed a commit to branch master
in repository samba.

commit 33f6044f35d6589f73822befd3630824932928ea
Merge: 9da96cf 5e12600
Author: Jelmer Vernooij <jelmer at jelmer.uk>
Date:   Wed Dec 16 01:46:54 2015 +0000

    Merge in 2:4.1.21-2.

 debian/changelog        |  6 ++++++
 debian/patches/git-diff | 45 +++++++++++++++++++++++++++++++++++++++++++++
 2 files changed, 51 insertions(+)

diff --cc debian/changelog
index 1d71e8c,ff4c71a..e65cdd7
--- a/debian/changelog
+++ b/debian/changelog
@@@ -1,21 -1,9 +1,27 @@@
 +samba (2:4.1.22+dfsg-1) unstable; urgency=high
 +
 +  * New upstream release. Fixes:
 +  - CVE-2015-7540 (Remote DoS in Samba (AD) LDAP server)
 +  - CVE-2015-3223 (Denial of service in Samba Active Directory
 +    server)
 +  - CVE-2015-5252 (Insufficient symlink verification in smbd)
 +  - CVE-2015-5299 (Missing access control check in shadow copy
 +    code)
 +  - CVE-2015-5296 (Samba client requesting encryption vulnerable
 +    to downgrade attack)
 +  - CVE-2015-8467 (Denial of service attack against Windows
 +    Active Directory server)
 +  - CVE-2015-5330 (Remote memory read in Samba LDAP server)
 +  * debian/control: Depend on newer system ldb (2:1.1.24).
 +
 + -- Jelmer Vernooij <jelmer at debian.org>  Wed, 16 Dec 2015 00:57:50 +0000
 +
+ samba (2:4.1.21+dfsg-2) unstable; urgency=medium
+ 
+   * Rebuild against newer ldb. Closes: #805304
+ 
+  -- Jelmer Vernooij <jelmer at debian.org>  Mon, 16 Nov 2015 23:14:19 +0000
+ 
  samba (2:4.1.21+dfsg-1) unstable; urgency=medium
  
    * New upstream release.

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