[Pkg-samba-maint] [samba] 01/03: Merge branch 'master' into wheezy-backports

[Ivo De Decker]

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

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

commit 59426a03d58aec7c61c1e70245a3a71fc44399b2
Merge: 785ef6d 9afd003
Author: Ivo De Decker <ivo.dedecker at ugent.be>
Date:   Sun Aug 11 17:24:10 2013 +0200

    Merge branch 'master' into wheezy-backports
    
    Conflicts:
    	debian/changelog

 WHATSNEW.txt                       |   62 ++++++++++++++++++++++++++++++++----
 debian/changelog                   |   17 ++++++++++
 debian/patches/waf-as-source.patch |    4 ---
 packaging/RHEL-CTDB/samba.spec     |    2 +-
 packaging/RHEL/makerpms.sh         |    2 +-
 packaging/RHEL/samba.spec          |    2 +-
 source3/VERSION                    |    2 +-
 source3/include/version.h          |    4 +--
 source3/smbd/nttrans.c             |   12 +++++++
 9 files changed, 91 insertions(+), 16 deletions(-)

diff --cc debian/changelog
index 24a8508,42ad1af..54d5770
--- a/debian/changelog
+++ b/debian/changelog
@@@ -1,11 -1,20 +1,28 @@@
+ samba (2:3.6.17-1) unstable; urgency=high
+ 
+   * Team upload.
+   * New upstream security release. Closes: #718781
+     Fixes CVE-2013-4124: Denial of service - CPU loop and memory allocation
+ 
+  -- Ivo De Decker <ivo.dedecker at ugent.be>  Mon, 05 Aug 2013 13:46:23 +0200
+ 
+ samba (2:3.6.16-2) unstable; urgency=high
+ 
+   * Team upload.
+   * Make build-dep on libtevent-dev explicit.
+   * Fix waf-as-source.patch to make sure unpacking works in recent build
+     environment. Closes: #716932 
+ 
+  -- Ivo De Decker <ivo.dedecker at ugent.be>  Tue, 16 Jul 2013 22:01:04 +0200
+ 
 +samba (2:3.6.16-1~bpo70+1) wheezy-backports; urgency=low
 +
 +  * Rebuild for wheezy-backports.
 +  * Make build-dep on libtevent-dev explicit.
 +    In sid, this is pulled in by ctdb. 
 +
 + -- Ivo De Decker <ivo.dedecker at ugent.be>  Thu, 11 Jul 2013 20:32:13 +0200
 +
  samba (2:3.6.16-1) unstable; urgency=low
  
    * Team upload.

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