[Pkg-samba-maint] [samba] 01/03: Merge branch 'master' into wheezy-backports
Ivo De Decker
idd-guest at alioth.debian.org
Sun Sep 1 14:17:35 UTC 2013
This is an automated email from the git hooks/post-receive script.
idd-guest pushed a commit to branch wheezy-backports
in repository samba.
commit 11c39f69474330aa17be8a3cfca63e7fcf945603
Merge: 0ba902d 6490e3a
Author: Ivo De Decker <ivo.dedecker at ugent.be>
Date: Sun Sep 1 14:57:27 2013 +0200
Merge branch 'master' into wheezy-backports
WHATSNEW.txt | 61 ++++++++++++-
debian/changelog | 16 ++++
debian/control | 4 +-
debian/rules | 5 +-
debian/samba-common.dhcp | 2 +-
debian/samba.init | 108 ++++-------------------
debian/samba.logrotate | 2 +-
debian/samba.nmbd.init | 87 ++++++++++++++++++
debian/samba.nmbd.upstart | 21 +++++
debian/samba.reload-smbd.upstart | 12 +++
debian/samba.smbd.init | 88 ++++++++++++++++++
debian/samba.smbd.upstart | 19 ++++
debian/winbind.init | 9 ++
debian/winbind.upstart | 19 ++++
docs-xml/manpages-3/idmap_ad.8.xml | 9 +-
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 | 4 +-
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/libreplace_macros.m4 | 2 +-
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/VERSION | 2 +-
source3/configure | 20 +++--
source3/configure.in | 5 +-
source3/include/version.h | 4 +-
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/smbd/nttrans.c | 9 +-
source3/smbd/oplock_linux.c | 33 ++++---
source3/winbindd/idmap_ad.c | 5 +-
117 files changed, 708 insertions(+), 382 deletions(-)
diff --cc debian/changelog
index 7295616,a0cda53..ff64471
--- a/debian/changelog
+++ b/debian/changelog
@@@ -1,9 -1,19 +1,25 @@@
+ 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~bpo70+1) wheezy-backports; urgency=low
+
+ * Rebuild for wheezy-backports.
+
+ -- Ivo De Decker <ivo.dedecker at ugent.be> Sun, 11 Aug 2013 17:24:44 +0200
+
samba (2:3.6.17-1) unstable; urgency=high
* Team upload.
--
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