[Pkg-samba-maint] [samba] 01/03: Merge tag 'debian/2%4.1.17+dfsg-1' into wheezy-backports
Ivo De Decker
ivodd at moszumanska.debian.org
Mon Feb 23 20:24:55 UTC 2015
This is an automated email from the git hooks/post-receive script.
ivodd pushed a commit to branch wheezy-backports
in repository samba.
commit 482e548ec6b58c8c8727dd35f743cb1fbe14b07b
Merge: 780159c e244bab
Author: Ivo De Decker <ivodd at debian.org>
Date: Mon Feb 23 21:02:55 2015 +0100
Merge tag 'debian/2%4.1.17+dfsg-1' into wheezy-backports
samba Debian release 2:4.1.17+dfsg-1
Conflicts:
debian/changelog
debian/control
VERSION | 2 +-
WHATSNEW.txt | 498 +++++++++++-
buildtools/wafadmin/Tools/perl.py | 51 +-
buildtools/wafsamba/samba_patterns.py | 4 +-
buildtools/wafsamba/samba_perl.py | 62 ++
buildtools/wafsamba/wafsamba.py | 83 +-
debian/changelog | 56 ++
debian/control | 11 +-
debian/copyright | 4 +
debian/dfsg-clean.sh | 21 -
debian/gbp.conf | 8 +-
debian/patches/add-so-version-to-private-libraries | 12 +-
debian/patches/samba_bug_11077_torturetest.patch | 259 ++++++
debian/patches/series | 1 +
debian/po/it.po | 164 +---
debian/po/nl.po | 121 +--
debian/rules | 3 +-
debian/samba-libs.install | 7 +-
debian/samba.links | 2 +
debian/samba.postinst | 6 +
debian/watch | 2 +-
docs-xml/manpages/net.8.xml | 15 +-
docs-xml/manpages/vfs_streams_xattr.8.xml | 4 +
docs-xml/smbdotconf/security/inheritowner.xml | 6 +-
.../smbdotconf/winbind/winbindrequesttimeout.xml | 16 +
docs-xml/wscript_build | 30 +-
docs/manpages/dbwrap_tool.1 | 4 +-
docs/manpages/eventlogadm.8 | 4 +-
docs/manpages/findsmb.1 | 4 +-
docs/manpages/idmap_ad.8 | 4 +-
docs/manpages/idmap_autorid.8 | 4 +-
docs/manpages/idmap_hash.8 | 4 +-
docs/manpages/idmap_ldap.8 | 4 +-
docs/manpages/idmap_nss.8 | 4 +-
docs/manpages/idmap_rfc2307.8 | 4 +-
docs/manpages/idmap_rid.8 | 4 +-
docs/manpages/idmap_tdb.8 | 4 +-
docs/manpages/idmap_tdb2.8 | 4 +-
docs/manpages/libsmbclient.7 | 4 +-
docs/manpages/lmhosts.5 | 4 +-
docs/manpages/log2pcap.1 | 4 +-
docs/manpages/net.8 | 12 +-
docs/manpages/nmbd.8 | 4 +-
docs/manpages/nmblookup.1 | 4 +-
docs/manpages/ntlm_auth.1 | 4 +-
docs/manpages/pam_winbind.8 | 4 +-
docs/manpages/pam_winbind.conf.5 | 4 +-
docs/manpages/pdbedit.8 | 4 +-
docs/manpages/profiles.1 | 4 +-
docs/manpages/rpcclient.1 | 4 +-
docs/manpages/samba-regedit.8 | 4 +-
docs/manpages/samba-tool.8 | 4 +-
docs/manpages/samba.7 | 4 +-
docs/manpages/samba.8 | 4 +-
docs/manpages/sharesec.1 | 4 +-
docs/manpages/smb.conf.5 | 18 +-
docs/manpages/smbcacls.1 | 4 +-
docs/manpages/smbclient.1 | 4 +-
docs/manpages/smbcontrol.1 | 4 +-
docs/manpages/smbcquotas.1 | 4 +-
docs/manpages/smbd.8 | 4 +-
docs/manpages/smbget.1 | 4 +-
docs/manpages/smbgetrc.5 | 4 +-
docs/manpages/smbpasswd.5 | 4 +-
docs/manpages/smbpasswd.8 | 4 +-
docs/manpages/smbspool.8 | 4 +-
docs/manpages/smbstatus.1 | 4 +-
docs/manpages/smbta-util.8 | 4 +-
docs/manpages/smbtar.1 | 4 +-
docs/manpages/smbtree.1 | 4 +-
docs/manpages/testparm.1 | 4 +-
docs/manpages/vfs_acl_tdb.8 | 4 +-
docs/manpages/vfs_acl_xattr.8 | 4 +-
docs/manpages/vfs_aio_fork.8 | 4 +-
docs/manpages/vfs_aio_linux.8 | 4 +-
docs/manpages/vfs_aio_pthread.8 | 4 +-
docs/manpages/vfs_audit.8 | 4 +-
docs/manpages/vfs_btrfs.8 | 4 +-
docs/manpages/vfs_cacheprime.8 | 4 +-
docs/manpages/vfs_cap.8 | 4 +-
docs/manpages/vfs_catia.8 | 4 +-
docs/manpages/vfs_commit.8 | 4 +-
docs/manpages/vfs_crossrename.8 | 4 +-
docs/manpages/vfs_default_quota.8 | 4 +-
docs/manpages/vfs_dirsort.8 | 4 +-
docs/manpages/vfs_extd_audit.8 | 4 +-
docs/manpages/vfs_fake_perms.8 | 4 +-
docs/manpages/vfs_fileid.8 | 4 +-
docs/manpages/vfs_full_audit.8 | 4 +-
docs/manpages/vfs_gpfs.8 | 4 +-
docs/manpages/vfs_linux_xfs_sgid.8 | 4 +-
docs/manpages/vfs_media_harmony.8 | 4 +-
docs/manpages/vfs_netatalk.8 | 4 +-
docs/manpages/vfs_notify_fam.8 | 4 +-
docs/manpages/vfs_prealloc.8 | 4 +-
docs/manpages/vfs_preopen.8 | 4 +-
docs/manpages/vfs_readahead.8 | 4 +-
docs/manpages/vfs_readonly.8 | 4 +-
docs/manpages/vfs_recycle.8 | 4 +-
docs/manpages/vfs_scannedonly.8 | 4 +-
docs/manpages/vfs_shadow_copy.8 | 4 +-
docs/manpages/vfs_shadow_copy2.8 | 4 +-
docs/manpages/vfs_smb_traffic_analyzer.8 | 4 +-
docs/manpages/vfs_streams_depot.8 | 4 +-
docs/manpages/vfs_streams_xattr.8 | 6 +-
docs/manpages/vfs_syncops.8 | 4 +-
docs/manpages/vfs_time_audit.8 | 4 +-
docs/manpages/vfs_tsmsm.8 | 4 +-
docs/manpages/vfs_xattr_tdb.8 | 4 +-
docs/manpages/vfs_zfsacl.8 | 4 +-
docs/manpages/vfstest.1 | 4 +-
docs/manpages/wbinfo.1 | 4 +-
docs/manpages/winbind_krb5_locator.7 | 4 +-
docs/manpages/winbindd.8 | 4 +-
dynconfig/wscript | 55 +-
lib/ldb/wscript | 3 +-
lib/param/param_functions.c | 1 +
lib/param/param_table.c | 9 +
lib/replace/replace.h | 5 +
lib/replace/wscript | 25 +
lib/tevent/tevent_signal.c | 6 +
lib/util/become_daemon.c | 11 +
lib/util/charset/tests/charset.c | 12 +
lib/util/charset/util_str.c | 37 +-
{source3/lib => lib/util}/memcache.c | 22 +-
{source3/include => lib/util}/memcache.h | 2 -
lib/util/samba_util.h | 12 +-
lib/util/select.c | 14 +-
lib/util/signal.c | 8 +-
lib/util/string_wrappers.h | 5 -
lib/util/util_strlist.c | 2 +-
lib/util/wscript_build | 2 +-
lib/zlib/contrib/dotzlib/DotZLib.chm | Bin 72728 -> 0 bytes
libcli/auth/credentials.c | 2 +
libcli/auth/proto.h | 1 +
libcli/dns/dns_hosts_file.c | 35 +-
libcli/ldap/ldap_message.h | 2 +-
libcli/security/secdesc.c | 36 +-
libcli/smb/smb1cli_echo.c | 1 -
libcli/smb/smb2cli_query_info.c | 2 +-
libcli/smb/smbXcli_base.c | 18 +-
libgpo/gpext/gpext.c | 2 +-
librpc/idl/drsuapi.idl | 104 ++-
librpc/idl/security.idl | 31 +-
librpc/ndr/ndr_drsuapi.c | 190 +++++
nsswitch/pam_winbind.c | 5 +-
nsswitch/winbind_nss_freebsd.c | 74 +-
nsswitch/winbind_nss_linux.c | 5 +
nsswitch/wscript_build | 24 +-
pidl/pidl | 1 -
pidl/wscript | 7 +-
python/samba/join.py | 4 +-
python/samba/netcmd/dns.py | 15 +-
python/samba/provision/sambadns.py | 1 +
python/samba/tests/dcerpc/dnsserver.py | 41 +-
python/samba/tests/dns.py | 1 +
script/autobuild.py | 9 +-
selftest/README | 1 +
selftest/knownfail | 2 +-
selftest/selftest.pl | 6 +
selftest/target/Samba.pm | 9 +-
selftest/target/Samba3.pm | 15 +-
selftest/target/Samba4.pm | 19 +-
source3/auth/token_util.c | 2 +-
source3/client/client.c | 2 +-
source3/include/includes.h | 8 -
source3/include/local.h | 2 +
source3/include/lsa.h | 25 +
source3/include/printing.h | 1 +
source3/include/proto.h | 4 +-
source3/lib/access.c | 2 +-
source3/lib/eventlog/eventlog.c | 2 +-
source3/lib/id_cache.c | 2 +-
source3/lib/lsa.c | 67 ++
source3/lib/pthreadpool/pthreadpool.c | 6 +-
source3/lib/smbrun.c | 18 +-
source3/lib/username.c | 2 +-
source3/lib/util_cmdline.c | 3 +-
source3/lib/util_names.c | 10 +-
source3/lib/util_sock.c | 2 +-
source3/libads/ads_proto.h | 8 +
source3/libads/kerberos_keytab.c | 75 +-
source3/libads/ldap.c | 93 ++-
source3/libads/sasl.c | 124 +--
source3/libnet/libnet_dssync.c | 21 +-
source3/libnet/libnet_join.c | 59 +-
source3/librpc/idl/open_files.idl | 1 -
source3/libsmb/cli_smb2_fnum.c | 14 +
source3/libsmb/clidfs.c | 6 +-
source3/libsmb/libsmb_server.c | 5 +
source3/libsmb/ntlmssp.c | 18 +-
source3/modules/vfs_ceph.c | 13 +-
source3/modules/vfs_default.c | 29 +-
source3/modules/vfs_dirsort.c | 2 +-
source3/modules/vfs_glusterfs.c | 169 ++--
source3/modules/vfs_gpfs.c | 63 +-
source3/modules/vfs_media_harmony.c | 4 +-
source3/modules/vfs_streams_xattr.c | 5 +-
source3/modules/vfs_time_audit.c | 8 +-
source3/nmbd/nmbd.c | 6 +-
source3/nmbd/nmbd_nameregister.c | 76 +-
source3/nmbd/nmbd_subnetdb.c | 7 +-
source3/param/loadparm.c | 1 +
source3/passdb/lookup_sid.c | 2 +-
source3/passdb/pdb_interface.c | 2 +-
source3/passdb/pdb_samba_dsdb.c | 6 +-
source3/passdb/pdb_tdb.c | 2 +-
source3/printing/load.c | 4 +-
source3/printing/pcap.c | 54 +-
source3/printing/pcap.h | 13 +-
source3/printing/print_aix.c | 17 +-
source3/printing/print_iprint.c | 16 +-
source3/printing/print_standard.c | 8 +-
source3/printing/print_svid.c | 11 +-
source3/printing/printer_list.c | 17 +-
source3/printing/printer_list.h | 4 +-
source3/printing/printing.c | 70 +-
source3/printing/queue_process.c | 102 ++-
source3/printing/spoolssd.c | 38 +-
source3/registry/reg_api.c | 2 +-
source3/registry/regfio.c | 10 +-
source3/rpc_client/cli_netlogon.c | 1 +
source3/rpc_server/lsa/srv_lsa_nt.c | 50 +-
source3/rpc_server/netlogon/srv_netlog_nt.c | 15 +-
source3/rpc_server/samr/srv_samr_chgpasswd.c | 9 +-
source3/rpc_server/spoolss/srv_spoolss_nt.c | 252 ++++--
source3/rpc_server/srvsvc/srv_srvsvc_nt.c | 1 +
source3/rpc_server/wscript_build | 2 +-
source3/rpcclient/cmd_drsuapi.c | 4 +
source3/rpcclient/cmd_spoolss.c | 5 +-
source3/script/tests/test_smbclient_s3.sh | 4 +-
source3/smbd/dir.c | 2 +-
source3/smbd/dosmode.c | 13 +
source3/smbd/durable.c | 14 -
source3/smbd/globals.c | 2 +-
source3/smbd/lanman.c | 1 +
source3/smbd/mangle_hash.c | 4 +
source3/smbd/mangle_hash2.c | 2 +-
source3/smbd/negprot.c | 3 +-
source3/smbd/nttrans.c | 7 +-
source3/smbd/open.c | 79 +-
source3/smbd/oplock.c | 3 +
source3/smbd/posix_acls.c | 2 +-
source3/smbd/process.c | 2 +-
source3/smbd/proto.h | 1 +
source3/smbd/server.c | 22 +-
source3/smbd/server_reload.c | 74 +-
source3/smbd/smb2_find.c | 41 +-
source3/smbd/smb2_getinfo.c | 3 +-
source3/smbd/smb2_server.c | 5 -
source3/smbd/smb2_sesssetup.c | 4 +
source3/smbd/smb2_setinfo.c | 3 +-
source3/smbd/statcache.c | 2 +-
source3/smbd/vfs.c | 24 +-
source3/torture/torture.c | 2 +-
source3/utils/net_time.c | 30 +-
source3/utils/profiles.c | 6 +-
source3/utils/status.c | 7 +-
source3/winbindd/idmap.c | 4 +-
source3/winbindd/idmap_rfc2307.c | 1 +
source3/winbindd/wb_sids2xids.c | 33 +-
source3/winbindd/winbindd.c | 37 +
source3/winbindd/winbindd_ads.c | 14 +-
source3/winbindd/winbindd_cm.c | 10 +-
source3/winbindd/winbindd_dual_srv.c | 18 +
source3/wscript | 73 +-
source3/wscript_build | 13 +-
source4/auth/session.c | 5 +
source4/dns_server/dlz_bind9.c | 454 +++++------
source4/dns_server/dlz_minimal.h | 227 ++++--
source4/dns_server/dns_server.h | 6 +-
source4/dns_server/dns_update.c | 78 +-
source4/dns_server/dns_utils.c | 150 +---
source4/dns_server/dnsserver_common.c | 342 ++++++++
source4/dns_server/dnsserver_common.h | 50 ++
source4/dns_server/wscript_build | 24 +-
source4/dsdb/common/util.c | 4 +-
source4/dsdb/dns/dns_update.c | 13 +
source4/dsdb/pydsdb.c | 1 +
source4/dsdb/repl/drepl_out_helpers.c | 27 +-
source4/dsdb/samdb/ldb_modules/rootdse.c | 6 +-
source4/dsdb/samdb/ldb_modules/samldb.c | 192 ++++-
source4/dsdb/samdb/samdb.h | 6 +
source4/libnet/libnet_become_dc.c | 25 +-
source4/libnet/libnet_unbecome_dc.c | 25 +-
source4/librpc/rpc/dcerpc_schannel.c | 1 +
source4/rpc_server/dnsserver/dcerpc_dnsserver.c | 42 +-
source4/rpc_server/dnsserver/dnsdata.c | 67 +-
source4/rpc_server/dnsserver/dnsdb.c | 26 +-
source4/rpc_server/dnsserver/dnsserver.h | 7 +-
source4/rpc_server/dnsserver/dnsutils.c | 106 ++-
source4/rpc_server/lsa/dcesrv_lsa.c | 15 +-
source4/rpc_server/netlogon/dcerpc_netlogon.c | 91 ++-
source4/scripting/bin/samba_dnsupdate | 213 +++--
source4/selftest/tests.py | 2 +-
source4/setup/dns_update_list | 82 +-
source4/setup/named.conf.dlz | 7 +-
source4/setup/schema_samba4.ldif | 1 +
source4/torture/dns/dlz_bind9.c | 872 ++++++++++++++++++++-
source4/torture/drs/rpc/dssync.c | 21 +-
source4/torture/drs/rpc/msds_intid.c | 21 +-
source4/torture/ntp/ntp_signd.c | 1 +
source4/torture/rpc/dsgetinfo.c | 21 +-
source4/torture/rpc/lsa.c | 1 +
source4/torture/rpc/netlogon.c | 164 +++-
source4/torture/rpc/samba3rpc.c | 6 +-
source4/torture/rpc/samr.c | 2 +-
source4/torture/rpc/wkssvc.c | 10 +-
testprogs/blackbox/test_ldb.sh | 2 +
wscript | 2 +-
wscript_build | 13 +-
311 files changed, 6255 insertions(+), 2141 deletions(-)
diff --cc debian/changelog
index ca216fd,40abb9c..74d7a19
--- a/debian/changelog
+++ b/debian/changelog
@@@ -1,12 -1,59 +1,68 @@@
+ 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 at 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 at 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
+ versions, when verified. Closes: #771991
+
+ -- Jelmer Vernooij <jelmer at debian.org> Thu, 04 Dec 2014 21:03:54 +0100
+
+ samba (2:4.1.13+dfsg-2) unstable; urgency=medium
+
+ * Mask /etc/init.d/samba init script for systemd. This should make systemd
+ ignore the samba init script. Thanks to Michael Biebl for the suggestion.
+ Closes: #740942
+ * Disable samba init script on upgrade from wheezy to jessie.
+ Thanks again to Michael Biebl for the report.
+ Closes: #766690
+
+ -- Ivo De Decker <ivodd at debian.org> Sat, 25 Oct 2014 00:49:12 +0200
+
+ samba (2:4.1.13+dfsg-1) unstable; urgency=medium
+
+ * New upstream release.
+ * Bump standards version to 3.9.6 (no changes).
+
+ -- Ivo De Decker <ivodd at debian.org> Tue, 21 Oct 2014 20:22:19 +0200
+
+ samba (2:4.1.11+dfsg-2) unstable; urgency=medium
+
+ * Updated Italian translation. Thanks Luca Monducci. Closes: #760743
+ * Use HTTP in watch file, as ftp.samba.org is not working reliably for
+ me.
+ * Use Excluded-Files in debian/copyright for DFSG-nonfree files.
+ * Update Dutch translation. Thanks Frans Spiesschaert. Closes: #763650
+
+ -- Jelmer Vernooij <jelmer at debian.org> Sun, 07 Sep 2014 20:52:27 +0200
+
+samba (2:4.1.11+dfsg-1~bpo70+1) wheezy-backports; urgency=medium
+
+ * Rebuild for wheezy-backports.
+ * Restore build-dep on libgnutls-dev instead of libgnutls28-dev for
+ wheezy-backports.
+ * Update build-dep version for libldb-dev and libtdb-dev.
+
+ -- Ivo De Decker <ivo.dedecker at ugent.be> Wed, 20 Aug 2014 22:39:49 +0200
+
samba (2:4.1.11+dfsg-1) unstable; urgency=high
* New upstream release. Fixes:
diff --cc debian/control
index 06948fe,f4d3325..7ce089a
--- a/debian/control
+++ b/debian/control
@@@ -22,12 -26,12 +22,12 @@@ Build-Depends: bison
libblkid-dev,
libbsd-dev,
libcap-dev [linux-any],
- libctdb-dev (>= 2),
+ libctdb-dev (>= 1.10+git20110412),
libcups2-dev,
- libgnutls28-dev,
+ libgnutls-dev,
libheimntlm0-heimdal (>= 1.6~),
libldap2-dev,
- libldb-dev (>= 1:1.1.17~),
+ libldb-dev (>= 2:1.1.17~),
libncurses5-dev,
libntdb-dev (>= 1.0),
libpam0g-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