Merge 4.1 branch.

diff --cc debian/changelog
index 1233a7595544b07334156add3501bd1e61073d4d,5f64134284e56052880827367ed0752219e80c88..e491bd3ab937fc2d4bd8c02d2dab13e356219991
--- 1/debian/changelog
--- 2/debian/changelog
+++ b/debian/changelog
@@@ -1,15 -1,34 +1,46 @@@
 +samba (2:4.2.0~rc2+dfsg-1) UNRELEASED; urgency=medium
 +
 +  * New upstream release.
 +   + Drop patch do-not-install-smbclient4-and-nmbclient4: applied upstream.
 +   + Drop patch
 +     bug_598313_upstream_7499-nss_wins-dont-clobber-daemons-logs.patch:
 +     present upstream.
 +   + Refresh patch 26_heimdal_compat.26_heimdal_compat.
 +   + Add build-dependency on libarchive-dev.
 +
 + -- Jelmer Vernooij <jelmer@debian.org>  Sun, 07 Dec 2014 15:34:36 +0000
 +
+ samba (2:4.1.17+dfsg-2) unstable; urgency=medium
+ 
+   [ Andreas Beckmann ]
+   * Add samba.preinst to temporarily deactivate the old qtsmbstatusd
+     initscript which has dependencies incompatible with the new samba
+     initscript. This will ensure a clean upgrade path for samba if the
+     qtsmbstatus-server package was installed previously.  (Closes: #779666)
+ 
+  -- Ivo De Decker <ivodd@debian.org>  Sat, 07 Mar 2015 13:09:23 +0100
+ 
+ samba (2:4.1.17+dfsg-1) unstable; urgency=high
+ 
+   * New upstream release. Fixes:
+   - CVE-2014-8143: Elevation of privilege to Active Directory Domain
+                    Controller. Closes: #776993
+   - CVE-2015-0240: Unexpected code execution in smbd. Closes: #779033
+   * Refresh patch add-so-version-to-private-libraries.
+   * Add new smbtorture test rpc.schannel_anon_setpw to detect the conditions
+     leading to CVE-2015-0240.
+   * Add breaks on qtsmbstatus-server (<< 2.2.1-3~). Closes: #775041
+   * Build-depend on reverted ldb version (with increased epoch).
+ 
+  -- Ivo De Decker <ivodd@debian.org>  Mon, 23 Feb 2015 20:20:21 +0100
+ 
+ samba (2:4.1.13+dfsg-4) unstable; urgency=medium
+ 
+   * Revert previous patch, since ldb has an active module version check.
+     Instead, just depend on ldb 1.1.18. Closes: #771991
+ 
+  -- Jelmer Vernooij <jelmer@debian.org>  Wed, 10 Dec 2014 18:13:42 +0000
+ 
  samba (2:4.1.13+dfsg-3) unstable; urgency=medium
  
    * Update debian/rules to allow support for multiple upstream ldb

diff --cc debian/control
Simple merge

diff --cc debian/patches/series
index 7a798cb0fa9bb9fac85ba7994fa44fad38df2d28,42249d991c1252e3b62b65ea54b4cf26be53942c..402496409580cbccc8c024735eb5d6bf1ecfdedc
--- 1/debian/patches/series
--- 2/debian/patches/series
+++ b/debian/patches/series
@@@ -11,4 -12,6 +11,5 @@@ usershare.patc
  VERSION.patch
  waf_smbpasswd_location
  add-so-version-to-private-libraries
 -do-not-install-smbclient4-and-nmbclient4
  xsltproc_dont_build_smb.conf.5.patch
+ samba_bug_11077_torturetest.patch