[Pkg-samba-maint] [samba] 01/05: Merge tag 'debian/2%4.1.5+dfsg-1' into wheezy-backports
Ivo De Decker
ivodd at moszumanska.debian.org
Sat Mar 1 16:36:07 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 ba0d174669d626ff4bbd22970a6f59b88b414753
Merge: a9c4efd 9d2c669
Author: Ivo De Decker <ivo.dedecker at ugent.be>
Date: Sat Mar 1 16:18:58 2014 +0100
Merge tag 'debian/2%4.1.5+dfsg-1' into wheezy-backports
samba Debian release 2:4.1.5+dfsg-1
Conflicts:
debian/changelog
.gitignore | 4 +
README.packaging4 | 13 -
VERSION | 2 +-
WHATSNEW.txt | 205 ++++-
debian/bin/xsltproc | 6 +-
debian/changelog | 50 ++
debian/control | 9 +-
debian/gbp.conf | 2 +-
debian/patches/26_heimdal_compat | 32 +-
debian/po/ar.po | 4 +-
debian/po/ast.po | 4 +-
debian/po/be.po | 4 +-
debian/po/bg.po | 4 +-
debian/po/bn.po | 4 +-
debian/po/bs.po | 4 +-
debian/po/ca.po | 4 +-
debian/po/cs.po | 4 +-
debian/po/da.po | 4 +-
debian/po/de.po | 4 +-
debian/po/dz.po | 2 +-
debian/po/el.po | 4 +-
debian/po/eo.po | 4 +-
debian/po/es.po | 4 +-
debian/po/et.po | 4 +-
debian/po/eu.po | 4 +-
debian/po/fi.po | 4 +-
debian/po/fr.po | 4 +-
debian/po/gl.po | 4 +-
debian/po/gu.po | 4 +-
debian/po/he.po | 4 +-
debian/po/hu.po | 4 +-
debian/po/id.po | 4 +-
debian/po/it.po | 4 +-
debian/po/ja.po | 4 +-
debian/po/ka.po | 4 +-
debian/po/km.po | 4 +-
debian/po/ko.po | 4 +-
debian/po/ku.po | 4 +-
debian/po/lt.po | 4 +-
debian/po/ml.po | 4 +-
debian/po/mr.po | 2 +-
debian/po/nb.po | 4 +-
debian/po/ne.po | 4 +-
debian/po/nl.po | 4 +-
debian/po/nn.po | 4 +-
debian/po/pl.po | 4 +-
debian/po/pt.po | 4 +-
debian/po/pt_BR.po | 4 +-
debian/po/ro.po | 4 +-
debian/po/ru.po | 4 +-
debian/po/sk.po | 4 +-
debian/po/sl.po | 4 +-
debian/po/sq.po | 4 +-
debian/po/sv.po | 4 +-
debian/po/ta.po | 2 +-
debian/po/templates.pot | 2 +-
debian/po/th.po | 4 +-
debian/po/tl.po | 4 +-
debian/po/tr.po | 4 +-
debian/po/vi.po | 4 +-
debian/po/wo.po | 4 +-
debian/po/zh_CN.po | 4 +-
debian/po/zh_TW.po | 4 +-
debian/rules | 10 +-
debian/samba-common.config | 4 +-
debian/samba-common.dirs | 1 -
debian/samba-common.install | 2 +-
debian/samba-common.links | 1 -
debian/samba-common.maintscript | 1 +
debian/samba-common.postinst | 10 +
debian/samba-common.preinst | 11 +
debian/samba-common.templates | 2 +-
debian/samba-libs.install | 4 -
debian/samba.install | 4 +
debian/watch | 6 +-
docs-xml/build/DTD/samba.entities | 64 +-
docs-xml/manpages/dbwrap_tool.1.xml | 8 +-
docs-xml/manpages/idmap_ad.8.xml | 2 +-
docs-xml/manpages/idmap_autorid.8.xml | 2 +-
docs-xml/manpages/net.8.xml | 280 ++++++-
docs-xml/manpages/nmbd.8.xml | 36 +-
docs-xml/manpages/nmblookup.1.xml | 43 +-
docs-xml/manpages/ntlm_auth.1.xml | 42 +-
docs-xml/manpages/pdbedit.8.xml | 4 +-
docs-xml/manpages/profiles.1.xml | 10 +-
docs-xml/manpages/rpcclient.1.xml | 3 +-
docs-xml/manpages/samba-regedit.8.xml | 27 +-
docs-xml/manpages/samba.7.xml | 2 +-
docs-xml/manpages/samba.8.xml | 2 +-
docs-xml/manpages/sharesec.1.xml | 18 +-
docs-xml/manpages/smbcacls.1.xml | 46 +-
docs-xml/manpages/smbclient.1.xml | 20 +-
docs-xml/manpages/smbcontrol.1.xml | 14 +-
docs-xml/manpages/smbcquotas.1.xml | 32 +-
docs-xml/manpages/smbd.8.xml | 33 +-
docs-xml/manpages/smbget.1.xml | 9 +
docs-xml/manpages/smbpasswd.5.xml | 2 +-
docs-xml/manpages/smbstatus.1.xml | 20 +-
docs-xml/manpages/smbta-util.8.xml | 4 -
docs-xml/manpages/smbtree.1.xml | 2 +-
docs-xml/manpages/testparm.1.xml | 38 +-
docs-xml/manpages/vfs_cacheprime.8.xml | 2 +-
docs-xml/manpages/vfs_shadow_copy2.8.xml | 290 +++++--
docs-xml/manpages/vfs_smb_traffic_analyzer.8.xml | 2 +-
docs-xml/manpages/wbinfo.1.xml | 97 +++
docs-xml/manpages/winbindd.8.xml | 31 +-
docs-xml/smbdotconf/filename/manglingmethod.xml | 2 +-
.../smbdotconf/misc/directorynamecachesize.xml | 2 +-
.../smbdotconf/misc/fakedirectorycreatetimes.xml | 2 +-
docs-xml/smbdotconf/misc/rpcserver.xml | 2 +-
.../smbdotconf/protocol/aclallowexecutealways.xml | 2 +-
docs-xml/smbdotconf/protocol/ntaclsupport.xml | 2 +-
docs-xml/smbdotconf/security/aclgroupcontrol.xml | 2 +-
docs-xml/smbdotconf/security/smbencrypt.xml | 2 +-
docs-xml/smbdotconf/security/usernamemapscript.xml | 2 +-
docs-xml/smbdotconf/winbind/idmapconfig.xml | 2 +-
docs/manpages/dbwrap_tool.1 | 15 +-
docs/manpages/eventlogadm.8 | 4 +-
docs/manpages/findsmb.1 | 4 +-
docs/manpages/idmap_ad.8 | 6 +-
docs/manpages/idmap_autorid.8 | 6 +-
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 | 224 +++++-
docs/manpages/nmbd.8 | 28 +-
docs/manpages/nmblookup.1 | 31 +-
docs/manpages/ntlm_auth.1 | 53 +-
docs/manpages/pam_winbind.8 | 4 +-
docs/manpages/pam_winbind.conf.5 | 4 +-
docs/manpages/pdbedit.8 | 11 +-
docs/manpages/profiles.1 | 55 +-
docs/manpages/rpcclient.1 | 31 +-
docs/manpages/samba-regedit.8 | 50 +-
docs/manpages/samba-tool.8 | 4 +-
docs/manpages/samba.7 | 6 +-
docs/manpages/samba.8 | 9 +-
docs/manpages/sharesec.1 | 16 +-
docs/manpages/smb.conf.5 | 24 +-
docs/manpages/smbcacls.1 | 91 ++-
docs/manpages/smbclient.1 | 45 +-
docs/manpages/smbcontrol.1 | 57 +-
docs/manpages/smbcquotas.1 | 55 +-
docs/manpages/smbd.8 | 26 +-
docs/manpages/smbget.1 | 16 +-
docs/manpages/smbgetrc.5 | 4 +-
docs/manpages/smbpasswd.5 | 6 +-
docs/manpages/smbpasswd.8 | 4 +-
docs/manpages/smbspool.8 | 4 +-
docs/manpages/smbstatus.1 | 16 +-
docs/manpages/smbta-util.8 | 6 +-
docs/manpages/smbtar.1 | 4 +-
docs/manpages/smbtree.1 | 29 +-
docs/manpages/testparm.1 | 57 +-
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 | 6 +-
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 | 231 +++++-
docs/manpages/vfs_smb_traffic_analyzer.8 | 6 +-
docs/manpages/vfs_streams_depot.8 | 4 +-
docs/manpages/vfs_streams_xattr.8 | 4 +-
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 | 71 +-
docs/manpages/winbind_krb5_locator.7 | 4 +-
docs/manpages/winbindd.8 | 28 +-
examples/perfcounter/perf_writer_disk.c | 8 +-
lib/crypto/md5.c | 9 +-
lib/ldb/common/attrib_handlers.c | 2 +-
lib/ntdb/man/ntdbtool.8.xml | 4 -
lib/util/samba_util.h | 4 +-
libcli/nbt/man/nmblookup4.1.xml | 2 +-
nsswitch/wbinfo.c | 1 +
selftest/flapping | 1 -
selftest/knownfail | 1 +
selftest/skip | 2 -
selftest/target/Samba3.pm | 8 +
source3/include/memcache.h | 3 +-
source3/include/printing.h | 1 +
source3/include/proto.h | 2 +
source3/include/smb.h | 10 +-
source3/lib/msg_channel.c | 100 +--
source3/lib/substitute.c | 43 +-
source3/lib/util.c | 42 +
source3/libads/ads_struct.c | 2 +
source3/libnet/libnet_join.c | 17 +-
source3/libsmb/cli_smb2_fnum.c | 31 +-
source3/libsmb/cli_smb2_fnum.h | 1 +
source3/libsmb/clilist.c | 2 +-
source3/libsmb/libsmb_xattr.c | 6 +-
source3/modules/vfs_btrfs.c | 22 +-
source3/modules/vfs_dirsort.c | 119 ++-
source3/modules/vfs_glusterfs.c | 78 +-
source3/modules/vfs_shadow_copy2.c | 723 +++++++++++++----
source3/modules/vfs_streams_depot.c | 13 +-
source3/modules/vfs_streams_xattr.c | 13 +-
source3/passdb/passdb.c | 8 +-
source3/passdb/pdb_ldap.c | 24 +-
source3/passdb/py_passdb.c | 14 +-
source3/printing/printing.c | 45 +-
source3/rpc_server/spoolss/srv_spoolss_nt.c | 40 +-
source3/selftest/tests.py | 9 +
source3/smbd/aio.c | 4 +-
source3/smbd/dir.c | 168 +++-
source3/smbd/filename.c | 10 +-
source3/smbd/globals.h | 31 +-
source3/smbd/nttrans.c | 6 +-
source3/smbd/open.c | 9 +-
source3/smbd/oplock.c | 2 +
source3/smbd/process.c | 5 +-
source3/smbd/proto.h | 1 -
source3/smbd/reply.c | 14 +-
source3/smbd/smb2_create.c | 3 +-
source3/smbd/smb2_ioctl_network_fs.c | 21 +-
source3/smbd/smb2_lock.c | 2 +-
source3/smbd/smb2_notify.c | 55 ++
source3/smbd/smb2_read.c | 12 +-
source3/smbd/smb2_server.c | 886 ++++++++++-----------
source3/smbd/smbd.h | 2 +-
source3/torture/torture.c | 2 +-
source3/utils/net.c | 5 +
source3/utils/net_sam.c | 2 +
source3/utils/ntlm_auth.c | 6 +-
source3/utils/passwd_util.c | 14 +-
source3/utils/sharesec.c | 6 +-
source3/utils/smbcacls.c | 6 +-
source3/utils/smbpasswd.c | 14 +
source3/winbindd/wb_fill_pwent.c | 73 +-
source3/winbindd/winbindd_cache.c | 13 +
source3/winbindd/winbindd_dual.c | 2 +-
source3/winbindd/winbindd_util.c | 60 +-
source4/kdc/hdb-samba4-plugin.c | 24 +-
source4/kdc/hdb-samba4.c | 5 +
source4/lib/registry/man/regdiff.1.xml | 3 -
source4/torture/basic/delaywrite.c | 95 +++
source4/torture/man/smbtorture.1.xml | 4 -
source4/torture/smb2/ioctl.c | 64 ++
testsuite/nsswitch/getgrent_r.c | 2 +-
276 files changed, 4658 insertions(+), 1714 deletions(-)
diff --cc debian/changelog
index 44773a9,cd675bd..fb4683e
--- a/debian/changelog
+++ b/debian/changelog
@@@ -1,11 -1,53 +1,61 @@@
+ samba (2:4.1.5+dfsg-1) unstable; urgency=medium
+
+ [ Jelmer Vernooij ]
+ * Fix watch file.
+
+ [ Ivo De Decker ]
+ * New upstream release.
+ * Remove the part of patch 26_heimdal_compat integrated upstream.
+
+ -- Ivo De Decker <ivo.dedecker at ugent.be> Sat, 22 Feb 2014 23:17:59 +0100
+
+ samba (2:4.1.4+dfsg-3) unstable; urgency=medium
+
+ * Move samba.dckeytab module to samba package, as it relies on hdb.
+ Closes: #736405, #736430
+
+ -- Jelmer Vernooij <jelmer at debian.org> Fri, 24 Jan 2014 23:35:14 +0000
+
+ samba (2:4.1.4+dfsg-2) unstable; urgency=medium
+
+ [ Jelmer Vernooij ]
+ * Depend on newer version of ctdb, as Samba won't build against older
+ versions without --enable-old-ctdb.
+ * Bump standards version to 3.9.5 (no changes).
+ * Move libpac, db_glue and hdb module from samba-libs to samba package
+ to reduce size and dependency set of libs package.
+ * Fix compatibility with newer versions of the Heimdal HDB API.
+ + Update 26_heimdal_compat: Fix initialization of HDB plugin. Thanks Jeff
+ Clark. Closes: #732342
+ + Add dependency on specific version of the Heimdal HDB API.
+ Closes: #732344
+
+ [ Steve Langasek ]
+ * dhcp3-client is superseded by dhcp-client; update the references in
+ the package. Closes: #736070.
+ * Move the dhcp client hook from /etc/dhcp3 to /etc/dhcp.
+ Closes: #649100.
+ * debian/bin/xsltproc: don't use $FAKETIME as the variable name in our
+ wrapper script, this seems to make faketime unhappy.
+
+ -- Jelmer Vernooij <jelmer at debian.org> Sat, 18 Jan 2014 20:26:35 +0000
+
+ samba (2:4.1.4+dfsg-1) unstable; urgency=medium
+
+ * New upstream release.
+ * Update version of talloc build-deps to 2.0.8.
+ * python-samba: add depends on python-ntdb.
+
+ -- Ivo De Decker <ivo.dedecker at ugent.be> Sat, 18 Jan 2014 14:07:15 +0100
+
+samba (2:4.1.3+dfsg-2~bpo70+1) wheezy-backports; urgency=medium
+
+ * Rebuild for wheezy-backports.
+ * Update version of talloc build-deps to 2.0.8.
+ In sid, the version is newer, so this issue doesn't show up.
+
+ -- Ivo De Decker <ivo.dedecker at ugent.be> Sat, 04 Jan 2014 13:42:16 +0100
+
samba (2:4.1.3+dfsg-2) unstable; urgency=medium
* Add debug symbols for all binaries to samba-dbg. Closes: #732493
--
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