[Pkg-samba-maint] [samba] 13/13: Merge branch 'master' of git+ssh://git.debian.org/git/pkg-samba/samba

[Ivo De Decker]

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

idd-guest pushed a commit to branch master
in repository samba.

commit 912254cc9d89d1014bb7a4e3c6c3546ecdff1c6d
Merge: 699784e f417b20
Author: Ivo De Decker <ivo.dedecker at ugent.be>
Date:   Sat Nov 23 08:02:25 2013 +0100

    Merge branch 'master' of git+ssh://git.debian.org/git/pkg-samba/samba
    
    Conflicts:
    	debian/changelog

 debian/changelog                 |  4 ++++
 debian/patches/26_heimdal_compat | 46 ++++++++++++++++++++++++++++++++++++++++
 debian/patches/series            |  1 +
 3 files changed, 51 insertions(+)

diff --cc debian/changelog
index ef50238,3ca54ba..53c7d48
--- a/debian/changelog
+++ b/debian/changelog
@@@ -7,21 -7,11 +7,25 @@@ samba (2:4.0.12+dfsg-1) UNRELEASED; urg
    * Thai (Theppitak Karoonboonyanan).  Closes: #728525
    * Norwegian Bokmål (Bjørn Steensrud).  Closes: #729070
  
+   [ Jelmer Vernooij ]
+   * Add 26_heimdal_compat: Fix compatibility with newer versions of
+     Heimdal.
+ 
 - -- Ivo De Decker <ivo.dedecker at ugent.be>  Sat, 02 Nov 2013 11:51:28 +0100
 + -- Ivo De Decker <ivo.dedecker at ugent.be>  Tue, 19 Nov 2013 23:19:03 +0100
 +
 +samba (2:4.0.11+dfsg-1) unstable; urgency=high
 +
 +  * New upstream security release. Fixes:
 +    - CVE-2013-4475: ACLs are not checked on opening an alternate data stream
 +                     on a file or directory
 +    - CVE-2013-4476: Private key in key.pem world readable
 +  * Move world-readable private key file on upgrade to allow
 +    auto-regeneration.
 +  * Add check in samba-ad-dc init script for wrong permission on private key
 +    file that would prevent samba to start.
 +  * Update samba-libs.lintian-overrides for moved libtorture0.
 +
 + -- Ivo De Decker <ivo.dedecker at ugent.be>  Mon, 11 Nov 2013 15:42:40 +0100
  
  samba (2:4.0.10+dfsg-4) unstable; urgency=low
  

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