[Pkg-samba-maint] [samba] 01/01: Merge 2:3.6.18-1 from Debian unstable
Steve Langasek
vorlon at alioth.debian.org
Sun Aug 25 17:00:59 UTC 2013
This is an automated email from the git hooks/post-receive script.
vorlon pushed a commit to branch ubuntu
in repository samba.
commit d1f5a7fd157f226453038d5f116773d441d00cf5
Merge: 1737fd1 6490e3a
Author: James Page <james.page at ubuntu.com>
Date: Sun Aug 25 10:00:01 2013 -0700
Merge 2:3.6.18-1 from Debian unstable
WHATSNEW.txt | 187 ++++++++-
debian/changelog | 76 ++++
debian/control | 1 +
debian/gbp.conf | 6 +
debian/patches/autoconf.patch | 14 +-
debian/patches/dont-build-VFS-examples.patch | 10 +-
debian/patches/undefined-symbols.patch | 12 +-
debian/rules | 1 +
debian/samba.init | 43 +++
docs-xml/manpages-3/idmap_ad.8.xml | 9 +-
docs-xml/smbdotconf/protocol/maxprotocol.xml | 3 +-
docs/manpages/dbwrap_tool.1 | 4 +-
docs/manpages/eventlogadm.8 | 4 +-
docs/manpages/findsmb.1 | 4 +-
docs/manpages/idmap_ad.8 | 6 +-
docs/manpages/idmap_adex.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_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 | 6 +-
docs/manpages/net.8 | 6 +-
docs/manpages/nmbd.8 | 6 +-
docs/manpages/nmblookup.1 | 6 +-
docs/manpages/ntlm_auth.1 | 6 +-
docs/manpages/pam_winbind.8 | 4 +-
docs/manpages/pam_winbind.conf.5 | 4 +-
docs/manpages/pdbedit.8 | 6 +-
docs/manpages/profiles.1 | 6 +-
docs/manpages/rpcclient.1 | 6 +-
docs/manpages/samba.7 | 4 +-
docs/manpages/sharesec.1 | 6 +-
docs/manpages/smb.conf.5 | 6 +-
docs/manpages/smbcacls.1 | 6 +-
docs/manpages/smbclient.1 | 6 +-
docs/manpages/smbcontrol.1 | 6 +-
docs/manpages/smbcquotas.1 | 6 +-
docs/manpages/smbd.8 | 6 +-
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 | 6 +-
docs/manpages/smbta-util.8 | 4 +-
docs/manpages/smbtar.1 | 4 +-
docs/manpages/smbtree.1 | 6 +-
docs/manpages/swat.8 | 6 +-
docs/manpages/tdbbackup.8 | 4 +-
docs/manpages/tdbdump.8 | 4 +-
docs/manpages/tdbtool.8 | 4 +-
docs/manpages/testparm.1 | 6 +-
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_pthread.8 | 4 +-
docs/manpages/vfs_audit.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_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 | 4 +-
docs/manpages/vfs_time_audit.8 | 4 +-
docs/manpages/vfs_xattr_tdb.8 | 4 +-
docs/manpages/vfstest.1 | 6 +-
docs/manpages/wbinfo.1 | 6 +-
docs/manpages/winbind_krb5_locator.7 | 4 +-
docs/manpages/winbindd.8 | 6 +-
lib/replace/getifaddrs.c | 28 +-
lib/replace/libreplace_macros.m4 | 2 +-
lib/replace/socket.c | 22 +-
lib/replace/test/getifaddrs.c | 24 +-
librpc/idl/security.idl | 3 +
packaging/RHEL-CTDB/samba.spec | 2 +-
packaging/RHEL/makerpms.sh | 2 +-
packaging/RHEL/samba.spec | 2 +-
pidl/idl.yp | 4 +-
pidl/lib/Parse/Pidl/IDL.pm | 4 +-
selftest/target/Samba3.pm | 2 +
source3/Makefile.in | 277 +++++++++-----
source3/VERSION | 2 +-
source3/configure | 523 ++++++++++++++++++--------
source3/configure.in | 50 ++-
source3/include/nt_printing.h | 8 +-
source3/include/version.h | 4 +-
source3/lib/system.c | 8 +-
source3/librpc/gen_ndr/ndr_security.c | 3 +
source3/librpc/gen_ndr/py_security.c | 3 +
source3/librpc/gen_ndr/security.h | 3 +
source3/modules/vfs_dirsort.c | 142 ++++---
source3/modules/vfs_gpfs.c | 6 +
source3/printing/nt_printing_ads.c | 135 ++++---
source3/rpc_server/spoolss/srv_spoolss_nt.c | 41 +-
source3/smbd/dir.c | 46 +--
source3/smbd/filename.c | 9 +-
source3/smbd/globals.h | 1 -
source3/smbd/nttrans.c | 21 +-
source3/smbd/open.c | 3 +-
source3/smbd/oplock_linux.c | 33 +-
source3/smbd/server_reload.c | 5 +-
source3/smbd/smb2_server.c | 145 ++++---
source3/utils/smbcontrol.c | 2 +-
source3/winbindd/idmap_ad.c | 5 +-
128 files changed, 1545 insertions(+), 761 deletions(-)
diff --cc debian/changelog
index ae155e9,a0cda53..87d1b94
--- a/debian/changelog
+++ b/debian/changelog
@@@ -1,65 -1,50 +1,141 @@@
++samba (2:3.6.18-1ubuntu1) saucy; urgency=low
++
++ * Merge from Debian unstable. Remaining changes:
++ + debian/patches/VERSION.patch:
++ - set SAMBA_VERSION_SUFFIX to Ubuntu.
++ + debian/smb.conf:
++ - add "(Samba, Ubuntu)" to server string.
++ - comment out the default [homes] share, and add a comment about
++ "valid users = %S" to show users how to restrict access to
++ \\server\username to only username.
++ + debian/samba-common.config:
++ - Do not change priority to high if dhclient3 is installed.
++ - Use priority medium instead of high for the workgroup question.
++ + debian/control:
++ - Don't build against or suggest ctdb.
++ - Add dependency on samba-common-bin to samba.
++ + Add ufw integration:
++ - Created debian/samba.ufw.profile
++ - debian/rules, debian/samba.install: install profile.
++ - debian/control: have samba suggest ufw.
++ + Add apport hook:
++ - Created debian/source_samba.py.
++ - debian/rules, debian/samba-common-bin.install: install hook.
++ + d/rules: Drop explicit configuration options for ctdb.
++ + debian/samba.logrotate: call upstart interfaces unconditionally instead
++ of hacking around with pid files.
++
++ -- James Page <james.page at ubuntu.com> Wed, 21 Aug 2013 15:39:35 +0100
++
+ samba (2:3.6.18-1) unstable; urgency=low
+
+ * Team upload.
+
+ [ Steve Langasek ]
+ * Split the samba init script into nmbd and smbd init scripts, for better
+ alignment with how init systems other than sysvinit work. This also
+ drops the override of the arguments to update-rc.d in debian/rules,
+ no longer needed in the post-insserv world.
+ * Add upstart jobs from Ubuntu for smbd, nmbd, and winbind.
+
+ [ Ivo De Decker ]
+ * New upstream release
+
+ -- Ivo De Decker <ivo.dedecker at ugent.be> Tue, 20 Aug 2013 22:06:45 +0200
+
+ 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) unstable; urgency=low
+
+ * Team upload.
+
+ [ Steve Langasek ]
+ * Drop support for running smbd from inetd; this is not well-supported
+ upstream, and can't correctly handle all of the long-running services
+ that are needed as part of modern samba. Closes: #707622.
+
+ [ Ivo De Decker ]
+ * New upstream release
+
+ -- Ivo De Decker <ivo.dedecker at ugent.be> Wed, 19 Jun 2013 21:05:07 +0200
+
+samba (2:3.6.15-1ubuntu2) saucy; urgency=low
+
+ * Cherry-pick 0383e7b04138ad94545a2191019873f26ae3e351 from Debian's
+ packaging repository to fix waf-as-source patch fuzz causing the package
+ to fail to unpack.
+
+ -- Iain Lane <iain.lane at canonical.com> Thu, 15 Aug 2013 13:30:54 +0100
+
+samba (2:3.6.15-1ubuntu1) saucy; urgency=low
+
+ * Merge from Debian git branch; remaining changes:
+ + debian/patches/VERSION.patch:
+ - set SAMBA_VERSION_SUFFIX to Ubuntu.
+ + debian/smb.conf:
+ - add "(Samba, Ubuntu)" to server string.
+ - comment out the default [homes] share, and add a comment about
+ "valid users = %S" to show users how to restrict access to
+ \\server\username to only username.
+ + debian/samba-common.config:
+ - Do not change priority to high if dhclient3 is installed.
+ - Use priority medium instead of high for the workgroup question.
+ + debian/control:
+ - Don't build against or suggest ctdb.
+ - Add dependency on samba-common-bin to samba.
+ + Add ufw integration:
+ - Created debian/samba.ufw.profile
+ - debian/rules, debian/samba.install: install profile.
+ - debian/control: have samba suggest ufw.
+ + Add apport hook:
+ - Created debian/source_samba.py.
+ - debian/rules, debian/samba-common-bin.install: install hook.
+ + d/rules: Drop explicit configuration options for ctdb.
+ + debian/samba.logrotate: call upstart interfaces unconditionally instead
+ of hacking around with pid files.
+ * Dropped changes, included in Debian:
+ + Switch to upstart:
+ - Added debian/samba.{nmbd,smbd}.upstart.
+ - Added debian/winbind.upstart.
+ - debian/samba-common.dhcp: Make upstart compatible.
+ * Drop debian/samba.if-up. The maintainer scripts merged from Debian are
+ actually now removing this file unconditionally from the filesystem on
+ install/upgrade and no one seems to have noticed; and it's been dropped
+ in Debian because it's reportedly no longer needed with current nmbd.
+ * Drop the Ubuntu-specific samba.preinst, superseded now by the
+ dpkg-maintscript-helper integration from dropping /etc/init.d/samba in
+ Debian as well.
+
+ -- Steve Langasek <steve.langasek at ubuntu.com> Sat, 18 May 2013 16:57:33 -0700
+
+samba (2:3.6.15-2) UNRELEASED; urgency=low
+
+ * Drop support for running smbd from inetd; this is not well-supported
+ upstream, and can't correctly handle all of the long-running services
+ that are needed as part of modern samba. Closes: #707622.
+ * Split the samba init script into nmbd and smbd init scripts, for better
+ alignment with how init systems other than sysvinit work. This also
+ drops the override of the arguments to update-rc.d in debian/rules,
+ no longer needed in the post-insserv world.
+ * Add upstart jobs from Ubuntu for smbd, nmbd, and winbind.
+
+ -- Steve Langasek <vorlon at debian.org> Mon, 13 May 2013 11:57:53 -0700
+
samba (2:3.6.15-1) unstable; urgency=high
* Team upload.
diff --cc debian/control
index 4263f45,791744d..491c70e
--- a/debian/control
+++ b/debian/control
@@@ -10,8 -9,10 +10,9 @@@ Build-Depends: debhelper (>= 9~), libpa
libkrb5-dev(>= 1.10+dfsg~), libldap2-dev , po-debconf, libpopt-dev, uuid-dev,
libtalloc-dev (>= 2.0.1-1~bpo50+1),
libtdb-dev (>= 1.2.6~),
+ libtevent-dev (>= 0.9.11~),
libcap-dev [linux-any],
libkeyutils-dev [linux-any],
- libctdb-dev (>= 1.10+git20110412),
pkg-config
Build-Conflicts: libfam-dev,python-ldb,python-ldb-dev
Standards-Version: 3.9.3
--
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