[Pkg-samba-maint] [samba] 02/05: Merge tag 'debian/2%3.6.6-6+deb7u1' into squeeze-backports

[Ivo De Decker]

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

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

commit 13833c0bc1db75d200912dd99c79ae191da28bd9
Merge: 28b8cb9 49b942d
Author: Ivo De Decker <ivo.dedecker at ugent.be>
Date:   Sun Oct 13 15:09:08 2013 +0200

    Merge tag 'debian/2%3.6.6-6+deb7u1' into squeeze-backports

 debian/changelog                            |    8 ++++++
 debian/patches/security-CVE-2013-4124.patch |   39 +++++++++++++++++++++++++++
 debian/patches/series                       |    1 +
 3 files changed, 48 insertions(+)

diff --cc debian/changelog
index 2108c11,467697c..34c99d4
--- a/debian/changelog
+++ b/debian/changelog
@@@ -1,10 -1,11 +1,18 @@@
+ samba (2:3.6.6-6+deb7u1) wheezy; urgency=low
+ 
+   * Security update
+   * CVE-2013-4124: Denial of service - CPU loop and memory allocation
+     Closes: #718781
+ 
+  -- Ivo De Decker <ivo.dedecker at ugent.be>  Thu, 15 Aug 2013 12:06:17 +0200
+ 
 +samba (2:3.6.6-6~bpo60+1) squeeze-backports; urgency=low
 +
 +  * Backport to squeeze
 +  * No xz compression for deb archive.
 +
 + -- Christian Perrier <bubulle at debian.org>  Sat, 27 Apr 2013 16:44:59 +0200
 +
  samba (2:3.6.6-6) unstable; urgency=low
  
    * Team upload.

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