[Pkg-samba-maint] [samba] 05/05: Merge branch 'unstable' of https://jelmer.uk/code/samba into unstable

[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 e371bd81301770419243334a02d253679b1418bf
Merge: 6296c2c ecb3f91
Author: Jelmer Vernooij <jelmer at jelmer.uk>
Date:   Wed Mar 9 03:58:24 2016 +0000

    Merge branch 'unstable' of https://jelmer.uk/code/samba into unstable

 debian/changelog         | 16 ++++++++++++++++
 debian/control           |  4 ++--
 debian/samba-common.dhcp |  2 +-
 3 files changed, 19 insertions(+), 3 deletions(-)

diff --cc debian/changelog
index 2a3f9e1,0f0c764..10804fe
--- a/debian/changelog
+++ b/debian/changelog
@@@ -1,12 -1,19 +1,28 @@@
 +samba (2:4.3.6+dfsg-1) unstable; urgency=medium
 +
 +  * New upstream release.
 +   + Fixes:
 +    - CVE-2015-7560: Incorrect ACL get/set allowed on symlink path.
 +    - CVE-2016-0771 (Out-of-bounds read in internal DNS server.
 +
 + -- Jelmer Vernooij <jelmer at debian.org>  Sat, 27 Feb 2016 23:28:53 +0000
 +
+ samba (2:4.3.5+dfsg-3) unstable; urgency=medium
+ 
+   * Fix dhclient hook if samba is not installed. Thanks, Jan Braun.
+     Closes: #801976
+   * Rebuild against current version of ldb in the archive. Closes:
+     #817036
+ 
+  -- Jelmer Vernooij <jelmer at debian.org>  Tue, 08 Mar 2016 00:24:10 +0000
+ 
+ samba (2:4.3.5+dfsg-2) unstable; urgency=medium
+ 
+   * Move strict ldb dependency to samba-dsdb-modules package, which
+     actually contains the modules. Closes: #816210
+ 
+  -- Jelmer Vernooij <jelmer at debian.org>  Sun, 06 Mar 2016 22:51:53 +0000
+ 
  samba (2:4.3.5+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