[Pkg-samba-maint] [samba] 01/03: Merge tag 'debian/2%4.1.9+dfsg-1' into wheezy-backports
Ivo De Decker
ivodd at moszumanska.debian.org
Mon Jun 23 18:27:44 UTC 2014
This is an automated email from the git hooks/post-receive script.
ivodd pushed a commit to branch wheezy-backports
in repository samba.
commit 19b578b8d6f317fa9afcad830f69d54f50320b17
Merge: 52f21a1 6a218bd
Author: Ivo De Decker <ivo.dedecker at ugent.be>
Date: Mon Jun 23 19:37:29 2014 +0200
Merge tag 'debian/2%4.1.9+dfsg-1' into wheezy-backports
samba Debian release 2:4.1.9+dfsg-1
Conflicts:
debian/changelog
VERSION | 2 +-
WHATSNEW.txt | 178 +++++++++-
buildtools/wafadmin/Tools/config_c.py | 13 +
buildtools/wafadmin/Tools/perl.py | 52 ++-
debian/changelog | 27 ++
debian/patches/series | 1 +
.../patches/xsltproc_dont_build_smb.conf.5.patch | 20 ++
debian/rules | 4 +
debian/samba.init | 8 +-
docs/manpages/dbwrap_tool.1 | 6 +-
docs/manpages/eventlogadm.8 | 21 +-
docs/manpages/findsmb.1 | 6 +-
docs/manpages/idmap_ad.8 | 6 +-
docs/manpages/idmap_autorid.8 | 6 +-
docs/manpages/idmap_hash.8 | 6 +-
docs/manpages/idmap_ldap.8 | 6 +-
docs/manpages/idmap_nss.8 | 6 +-
docs/manpages/idmap_rfc2307.8 | 6 +-
docs/manpages/idmap_rid.8 | 6 +-
docs/manpages/idmap_tdb.8 | 6 +-
docs/manpages/idmap_tdb2.8 | 6 +-
docs/manpages/libsmbclient.7 | 9 +-
docs/manpages/lmhosts.5 | 6 +-
docs/manpages/log2pcap.1 | 6 +-
docs/manpages/net.8 | 11 +-
docs/manpages/nmbd.8 | 7 +-
docs/manpages/nmblookup.1 | 6 +-
docs/manpages/ntlm_auth.1 | 6 +-
docs/manpages/pam_winbind.8 | 6 +-
docs/manpages/pam_winbind.conf.5 | 6 +-
docs/manpages/pdbedit.8 | 8 +-
docs/manpages/profiles.1 | 6 +-
docs/manpages/rpcclient.1 | 6 +-
docs/manpages/samba-regedit.8 | 6 +-
docs/manpages/samba-tool.8 | 6 +-
docs/manpages/samba.7 | 6 +-
docs/manpages/samba.8 | 9 +-
docs/manpages/sharesec.1 | 6 +-
docs/manpages/smb.conf.5 | 46 +--
docs/manpages/smbcacls.1 | 6 +-
docs/manpages/smbclient.1 | 6 +-
docs/manpages/smbcontrol.1 | 6 +-
docs/manpages/smbcquotas.1 | 6 +-
docs/manpages/smbd.8 | 12 +-
docs/manpages/smbget.1 | 6 +-
docs/manpages/smbgetrc.5 | 6 +-
docs/manpages/smbpasswd.5 | 6 +-
docs/manpages/smbpasswd.8 | 6 +-
docs/manpages/smbspool.8 | 6 +-
docs/manpages/smbstatus.1 | 6 +-
docs/manpages/smbta-util.8 | 6 +-
docs/manpages/smbtar.1 | 6 +-
docs/manpages/smbtree.1 | 6 +-
docs/manpages/testparm.1 | 6 +-
docs/manpages/vfs_acl_tdb.8 | 6 +-
docs/manpages/vfs_acl_xattr.8 | 6 +-
docs/manpages/vfs_aio_fork.8 | 6 +-
docs/manpages/vfs_aio_linux.8 | 6 +-
docs/manpages/vfs_aio_pthread.8 | 6 +-
docs/manpages/vfs_audit.8 | 6 +-
docs/manpages/vfs_btrfs.8 | 7 +-
docs/manpages/vfs_cacheprime.8 | 6 +-
docs/manpages/vfs_cap.8 | 6 +-
docs/manpages/vfs_catia.8 | 6 +-
docs/manpages/vfs_commit.8 | 6 +-
docs/manpages/vfs_crossrename.8 | 6 +-
docs/manpages/vfs_default_quota.8 | 6 +-
docs/manpages/vfs_dirsort.8 | 6 +-
docs/manpages/vfs_extd_audit.8 | 6 +-
docs/manpages/vfs_fake_perms.8 | 6 +-
docs/manpages/vfs_fileid.8 | 6 +-
docs/manpages/vfs_full_audit.8 | 6 +-
docs/manpages/vfs_gpfs.8 | 26 +-
docs/manpages/vfs_linux_xfs_sgid.8 | 7 +-
docs/manpages/vfs_media_harmony.8 | 6 +-
docs/manpages/vfs_netatalk.8 | 6 +-
docs/manpages/vfs_notify_fam.8 | 6 +-
docs/manpages/vfs_prealloc.8 | 6 +-
docs/manpages/vfs_preopen.8 | 6 +-
docs/manpages/vfs_readahead.8 | 6 +-
docs/manpages/vfs_readonly.8 | 6 +-
docs/manpages/vfs_recycle.8 | 6 +-
docs/manpages/vfs_scannedonly.8 | 6 +-
docs/manpages/vfs_shadow_copy.8 | 6 +-
docs/manpages/vfs_shadow_copy2.8 | 9 +-
docs/manpages/vfs_smb_traffic_analyzer.8 | 10 +-
docs/manpages/vfs_streams_depot.8 | 8 +-
docs/manpages/vfs_streams_xattr.8 | 6 +-
docs/manpages/vfs_syncops.8 | 6 +-
docs/manpages/vfs_time_audit.8 | 6 +-
docs/manpages/vfs_tsmsm.8 | 6 +-
docs/manpages/vfs_xattr_tdb.8 | 6 +-
docs/manpages/vfs_zfsacl.8 | 6 +-
docs/manpages/vfstest.1 | 6 +-
docs/manpages/wbinfo.1 | 9 +-
docs/manpages/winbind_krb5_locator.7 | 7 +-
docs/manpages/winbindd.8 | 16 +-
lib/util/become_daemon.c | 37 +-
lib/util/byteorder.h | 10 +-
lib/util/samba_util.h | 14 +-
lib/util/util.c | 2 +-
lib/util/wscript_build | 2 +-
libcli/cldap/cldap.c | 90 ++---
libcli/cldap/cldap.h | 2 +
packaging/systemd/nmb.service | 3 +-
packaging/systemd/samba.service | 3 +-
packaging/systemd/smb.service | 3 +-
packaging/systemd/winbind.service | 3 +-
pidl/lib/wscript_build | 4 +-
python/samba/provision/__init__.py | 2 +-
python/samba/tests/dns.py | 29 ++
script/autobuild.py | 4 +-
source3/lib/charcnv.c | 26 +-
source3/lib/interface.c | 4 +-
source3/lib/smbldap.c | 2 +-
source3/lib/system.c | 7 +-
source3/lib/util.c | 33 +-
source3/libsmb/clirap.c | 8 +-
source3/locking/brlock.c | 18 +-
source3/modules/vfs_btrfs.c | 5 +
source3/modules/vfs_default.c | 15 +-
source3/nmbd/nmbd.c | 47 ++-
source3/passdb/secrets.c | 2 +-
source3/printing/printing.c | 23 +-
source3/smbd/aio.c | 10 +
source3/smbd/dosmode.c | 104 +++++-
source3/smbd/files.c | 5 +-
source3/smbd/lanman.c | 4 +-
source3/smbd/open.c | 47 +--
source3/smbd/proto.h | 3 -
source3/smbd/reply.c | 27 +-
source3/smbd/scavenger.c | 3 +
source3/smbd/seal.c | 2 +-
source3/smbd/sec_ctx.c | 4 +-
source3/smbd/server.c | 48 ++-
source3/smbd/smb2_close.c | 127 +++----
source3/smbd/smb2_create.c | 85 ++---
source3/winbindd/idmap_autorid.c | 2 +-
source3/winbindd/winbindd.c | 18 +-
source3/winbindd/winbindd_cache.c | 2 +-
source3/wscript | 2 +-
source4/cldap_server/cldap_server.c | 12 -
source4/cldap_server/cldap_server.h | 15 -
source4/cldap_server/rootdse.c | 5 +
source4/cldap_server/wscript_build | 2 +-
source4/dns_server/dns_server.c | 6 +
.../samdb/ldb_modules}/netlogon.c | 94 ++---
source4/dsdb/samdb/ldb_modules/rootdse.c | 122 +++++--
source4/dsdb/samdb/ldb_modules/samldb.c | 261 +++++++++++++-
source4/dsdb/samdb/ldb_modules/subtree_rename.c | 248 +------------
source4/dsdb/samdb/ldb_modules/util.h | 2 +
source4/dsdb/samdb/ldb_modules/wscript_build | 2 +-
source4/ldap_server/ldap_backend.c | 3 +
source4/libnet/libnet_domain.c | 2 +-
source4/nbt_server/dgram/netlogon.c | 2 +-
source4/nbt_server/wscript_build | 2 +-
source4/rpc_server/netlogon/dcerpc_netlogon.c | 2 +-
source4/rpc_server/wscript_build | 2 +-
source4/smbd/process_thread.c | 4 +-
source4/smbd/server.c | 23 +-
source4/torture/ldap/cldap.c | 331 +----------------
source4/torture/ldap/common.c | 2 +
source4/torture/ldap/{cldap.c => netlogon.c} | 394 +++++++++++++--------
source4/torture/wscript_build | 2 +-
wscript | 27 +-
165 files changed, 1821 insertions(+), 1588 deletions(-)
diff --cc debian/changelog
index 6f07032,a3c6f82..e571961
--- a/debian/changelog
+++ b/debian/changelog
@@@ -1,13 -1,30 +1,40 @@@
+ samba (2:4.1.9+dfsg-1) unstable; urgency=high
+
+ * New upstream security release. Fixes:
+ - CVE-2014-0244: nmbd denial of service
+ - CVE-2014-3493: smbd denial of service: server crash/memory corruption
+
+ -- Ivo De Decker <ivo.dedecker at ugent.be> Mon, 23 Jun 2014 18:33:27 +0200
+
+ samba (2:4.1.8+dfsg-1) unstable; urgency=medium
+
+ [ Jelmer Vernooij ]
+ * Remove smbd and nmbd from required-start and required-stop in
+ samba.init. Closes: #739887
+
+ [ Ivo De Decker ]
+ * Remove workaround for #745233.
+ * New upstream release. Fixes:
+ - CVE-2014-0239: dns: Don't reply to replies. Closes: #749845
+ - CVE-2014-0178: Malformed FSCTL_SRV_ENUMERATE_SNAPSHOTS response.
+ * Use the upstream version of the smb.conf.5 manpage, instead of building
+ it. This is an ugly temporary workaround because xsltproc crashes on some
+ architectures when building this manpage (due to #750593).
+ This fixes the FTBFS, and should make samba installable with the new ldb
+ version. Closes: #750541, 750796
+
+ -- Ivo De Decker <ivo.dedecker at ugent.be> Sun, 08 Jun 2014 23:37:53 +0200
+
+samba (2:4.1.7+dfsg-2~bpo70+1) wheezy-backports; urgency=medium
+
+ * Rebuild for wheezy-backports.
+ * Revert workaround for #745233. It's not relevant for backports, and the
+ newer version of libgmp isn't in wheezy.
+ * Remove build-dep on heimdal-dev, as libcups2-dev depends on libkrb5-dev in
+ wheezy, which conflicts with heimdal-dev.
+
+ -- Ivo De Decker <ivo.dedecker at ugent.be> Fri, 16 May 2014 23:26:56 +0200
+
samba (2:4.1.7+dfsg-2) unstable; urgency=medium
* Build-depend on heimdal-dev instead of libkrb5-dev.
--
Alioth's /usr/local/bin/git-commit-notice on /srv/git.debian.org/git/pkg-samba/samba.git
More information about the Pkg-samba-maint
mailing list