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

Wed Apr 27 01:57:03 UTC 2016

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

jelmer pushed a commit to branch master
in repository samba.

commit a804652fa83250bc4c4ace00d6a96b1e7fe48fca
Merge: 9b7c700 f05cf99
Author: Jelmer Vernooĳ <jelmer at jelmer.uk>
Date:   Wed Apr 27 01:28:54 2016 +0000

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

 buildtools/wafsamba/wscript          |  1 -
 debian/NEWS                          |  2 +-
 debian/changelog                     | 30 ++++++++++++++++++++++++++++++
 debian/control                       |  2 +-
 debian/patches/no_build_system.patch | 12 ++++++++++++
 debian/patches/series                |  1 +
 debian/watch                         |  2 +-
 7 files changed, 46 insertions(+), 4 deletions(-)

diff --cc debian/NEWS
index 62fbdd7,96b4ff0..401416e

--- a/debian/NEWS
+++ b/debian/NEWS
@@@ -53,7 -53,7 +53,7 @@@ samba (2:4.4.1+dfsg-1) experimental; ur
        into problems as a domain member. The out of the box compatibility
        with Samba 3.x domain controllers requires NETLOGON features only
        available in Samba 3.2 and above.
--    
++
      However, all of these can be worked around by setting smb.conf
      options in Samba, see WHATSNEW.txt the 4.2.0 release notes at
      https://www.samba.org/samba/history/samba-4.2.0.html and the Samba
diff --cc debian/changelog
index 0b96192,ebb7cfc..3fc4eac
--- a/debian/changelog
+++ b/debian/changelog
@@@ -1,35 -1,35 +1,65 @@@
 +samba (2:4.4.2+dfsg-1) unstable; urgency=medium
 +
 +  * New upstream release.
 +  * Bump standards version to 3.9.8 (no changes).
 +  * Drop build dependency on perl-modules; depend on perl instead.
 +  * Upload to unstable.
 +
 + -- Jelmer Vernooĳ <jelmer at debian.org>  Tue, 26 Apr 2016 23:29:54 +0000
 +
 +samba (2:4.4.1+dfsg-1) experimental; urgency=medium
 +
 +  * New upstream release
 +   + Fixes (Patches by Stefan Metzmacher of SerNet and others on the Samba Team):
 +    - CVE-2015-5370 (Multiple errors in DCE-RPC code)
 +    - CVE-2016-2110 (Man in the middle attacks possible with NTLMSSP)
 +    - CVE-2016-2111 (NETLOGON Spoofing Vulnerability)
 +    - CVE-2016-2112 (LDAP client and server don't enforce integrity)
 +    - CVE-2016-2113 (Missing TLS certificate validation)
 +    - CVE-2016-2114 ("server signing = mandatory" not enforced)
 +    - CVE-2016-2115 (SMB IPC traffic is not integrity protected)
 +    - CVE-2016-2118 (SAMR and LSA man in the middle attacks possible)
 +  * Additional regression fix for 'net ads join' to a Windows 2003 domain by metze
 +
 + -- Andrew Bartlett <abartlet+debian at catalyst.net.nz>  Mon, 11 Apr 2016 16:09:59 +1200
 +
 +samba (2:4.4.0+dfsg-1) experimental; urgency=medium
 +  [ Andrew Bartlett ]
 +  * New upstream release.
 +
 + -- Andrew Bartlett <abartlet+debian at catalyst.net.nz>  Wed, 06 Apr 2016 17:08:20 +1200
 +
+ samba (2:4.3.8+dfsg-1) unstable; urgency=low
+ 
+   [ Jelmer Vernooĳ ]
+   * Add patch no_build_system.patch: drop host-specific define that
+     prevents reproducible builds.
+   * New upstream release.
+    + Drop patch
+      security-2016-04-12-prerequisite-v4-3-regression-fixes.metze01.txt,
+      now included upstream.
+   * Bump version in Replaces: samba-libs for samba-vfs-modules to
+     4.3.2+dfsg-1, to fix jessie->stretch upgrades. Closes: #821070
+ 
+  -- Jelmer Vernooĳ <jelmer at debian.org>  Sat, 16 Apr 2016 01:18:36 +0000
+ 
+ samba (2:4.3.7+dfsg-1) unstable; urgency=high
+ 
+   * New upstream release.
+    + Fixes (Patches by Stefan Metzmacher of SerNet and others on the Samba Team):
+     - CVE-2015-5370 (Multiple errors in DCE-RPC code)
+     - CVE-2016-2110 (Man in the middle attacks possible with NTLMSSP)
+     - CVE-2016-2111 (NETLOGON Spoofing Vulnerability)
+     - CVE-2016-2112 (LDAP client and server don't enforce integrity)
+     - CVE-2016-2113 (Missing TLS certificate validation)
+     - CVE-2016-2114 ("server signing = mandatory" not enforced)
+     - CVE-2016-2115 (SMB IPC traffic is not integrity protected)
+     - CVE-2016-2118 (SAMR and LSA man in the middle attacks possible)
+   * Additional regression fix for 'net ads join' to a Windows 2003 domain by metze
+ 
+  -- Andrew Bartlett <abartlet+debian at catalyst.net.nz>  Wed, 13 Apr 2016 10:24:17 +1200
+ 
  samba (2:4.3.6+dfsg-2) unstable; urgency=low
 -
    [ Mathieu Parent ]
    * Fix FTBFS when built with dpkg-buildpackage -A (Closes: #818146). Patch by
      Santiago Vila
diff --cc debian/patches/series
index 6b92d26,1e817b9..1980b23
--- a/debian/patches/series
+++ b/debian/patches/series
@@@ -12,5 -13,8 +12,6 @@@ xsltproc_dont_build_smb.conf.5.patc
  heimdal-rfc3454.txt
  Fix-privacy-breach-on-google.com.patch
  fix-cluster-build.diff
 -disable-socketwrapper.diff
  ctdb-Fix-detection-of-gnukfreebsd.patch
  no_build_options.patch
 -fix-against-talloc-2.1.6.patch
+ no_build_system.patch
diff --cc debian/watch
index 647a2e0,1e65fda..45b67ec
--- a/debian/watch
+++ b/debian/watch
@@@ -1,3 -1,3 +1,3 @@@
  version=3
  opts="uversionmangle=s/tp/~alpha1~tp/;s/alpha/~alpha/;s/beta/~beta/;s/rc/~rc/,dversionmangle=s/\+dfsg\d*$//" \
- 	  https://download.samba.org/pub/samba samba-(4\..*).tar.gz
 -	  https://download.samba.org/pub/samba samba-(4\.3\..*).tar.gz
++	  https://download.samba.org/pub/samba samba-(4\.4\..*).tar.gz

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


