[Pkg-samba-maint] [samba] 03/06: Merge tag 'debian/2%3.6.6-6+deb7u5' into squeeze-backports

[Ivo De Decker]

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

ivodd pushed a commit to branch squeeze-backports
in repository samba.

commit a4290065da0de46a1c8f41ff7f50b2b1efd0b22a
Merge: 56682b5 f40186e
Author: Ivo De Decker <ivodd at debian.org>
Date:   Sun Feb 22 21:46:36 2015 +0100

    Merge tag 'debian/2%3.6.6-6+deb7u5' into squeeze-backports
    
    samba Debian release 2:3.6.6-6+deb7u5
    
    Conflicts:
    	debian/changelog

 debian/changelog                            |   8 ++
 debian/patches/security-CVE-2015-0240.patch | 155 ++++++++++++++++++++++++++++
 debian/patches/series                       |   1 +
 3 files changed, 164 insertions(+)

diff --cc debian/changelog
index 231a6fa,b8f8f36..a778f3c
--- a/debian/changelog
+++ b/debian/changelog
@@@ -1,11 -1,11 +1,19 @@@
+ samba (2:3.6.6-6+deb7u5) wheezy-security; urgency=high
+ 
+   * Security update
+   * CVE-2015-0240: Unauthenticated code execution attack on smbd file
+     services
+ 
+  -- Ivo De Decker <ivodd at debian.org>  Thu, 19 Feb 2015 23:00:48 +0100
+ 
 +samba (2:3.6.6-6+deb7u4~bpo60+1) squeeze-backports; urgency=medium
 +
 +  * Rebuild for squeeze-backports.
 +  * Refresh patches from security update, to make them apply with patch from
 +    squeeze.
 +
 + -- Ivo De Decker <ivo.dedecker at ugent.be>  Mon, 23 Jun 2014 19:17:20 +0200
 +
  samba (2:3.6.6-6+deb7u4) wheezy-security; urgency=high
  
    * Security update

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