[Pkg-samba-maint] [samba] 01/05: Merge tag 'debian/2%4.1.7+dfsg-2' into wheezy-backports
Ivo De Decker
ivodd at moszumanska.debian.org
Fri May 16 22:26:20 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 b7ca399fe161c7c0af294a7079a9ff0775d17d81
Merge: abe3162 46c3d3f
Author: Ivo De Decker <ivo.dedecker at ugent.be>
Date: Fri May 16 14:41:02 2014 +0200
Merge tag 'debian/2%4.1.7+dfsg-2' into wheezy-backports
samba Debian release 2:4.1.7+dfsg-2
Conflicts:
debian/changelog
VERSION | 2 +-
WHATSNEW.txt | 117 ++++++++++++-
buildtools/wafadmin/Tools/perl.py | 23 ++-
buildtools/wafsamba/wscript | 3 +-
debian/changelog | 18 ++
debian/control | 6 +
debian/patches/readline63.patch | 35 ----
debian/patches/series | 1 -
debian/rules | 3 -
.../smbdotconf/printing/spoolssarchitecture.xml | 15 ++
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 | 4 +-
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 | 17 +-
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 | 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 | 4 +-
docs/manpages/winbind_krb5_locator.7 | 4 +-
docs/manpages/winbindd.8 | 4 +-
lib/replace/wscript | 30 +++-
lib/tevent/tevent_queue.c | 4 +
libcli/smb/smb2cli_create.c | 10 +-
libcli/smb/smbXcli_base.c | 62 +++++++
libcli/smb/smbXcli_base.h | 6 +
libcli/smb/smb_constants.h | 27 +++
libcli/smbreadline/smbreadline.c | 2 +-
librpc/idl/lsa.idl | 4 +-
librpc/ndr/ndr_nbt.c | 2 +-
pidl/lib/Parse/Pidl/Samba4/NDR/Client.pm | 14 ++
pidl/lib/wscript_build | 35 +++-
pidl/wscript | 30 +++-
python/samba/tests/dns.py | 30 ++++
script/autobuild.py | 7 +-
source3/auth/token_util.c | 101 ++++++++++++
source3/build/charset.py | 6 +
source3/client/client.c | 9 +-
source3/include/client.h | 5 +-
source3/include/ctdbd_conn.h | 2 +-
source3/include/libsmb_internal.h | 1 +
source3/include/messages.h | 6 +
source3/include/smb.h | 23 +--
source3/lib/ctdbd_conn.c | 36 +++-
source3/lib/messages.c | 17 ++
source3/lib/messages_local.c | 38 +++++
source3/lib/smbd_tevent_queue.c | 81 +++++++++
source3/lib/smbd_tevent_queue.h | 34 ++++
source3/libads/ldap.c | 11 +-
source3/libsmb/async_smb.c | 22 ---
source3/libsmb/cliconnect.c | 25 ++-
source3/libsmb/clidfs.c | 95 ++++++++---
source3/libsmb/clientgen.c | 26 ++-
source3/libsmb/clirap.c | 110 +++++++++++++
source3/libsmb/clirap.h | 11 ++
source3/libsmb/clitrans.c | 21 ---
source3/libsmb/libsmb_file.c | 27 ++-
source3/libsmb/libsmb_server.c | 15 +-
source3/libsmb/libsmb_stat.c | 11 +-
source3/locking/brlock.c | 34 ++--
source3/modules/vfs_streams_depot.c | 10 +-
source3/param/loadparm.c | 2 +-
source3/printing/nt_printing.c | 29 +++-
source3/printing/printer_list.c | 1 +
source3/printing/queue_process.c | 6 +
source3/printing/spoolssd.c | 39 +++--
source3/rpc_client/rpc_transport_np.c | 57 ++++++-
source3/rpc_server/spoolss/srv_spoolss_nt.c | 1 +
source3/rpc_server/srv_pipe.c | 40 ++---
source3/rpcclient/cmd_fss.c | 57 ++++++-
source3/smbd/globals.h | 1 +
source3/smbd/ipc.c | 10 +-
source3/smbd/msdfs.c | 31 +++-
source3/smbd/process.c | 83 +++++++++-
source3/smbd/reply.c | 54 +++---
source3/smbd/server.c | 7 +
source3/smbd/server_exit.c | 17 +-
source3/smbd/service.c | 12 +-
source3/smbd/sesssetup.c | 19 ++-
source3/smbd/smb2_lock.c | 42 +++--
source3/smbd/smb2_server.c | 16 ++
source3/smbd/smb2_sesssetup.c | 183 +++++++++++++++++++--
source3/smbd/smb2_tcon.c | 180 ++++++++++++++++++--
source3/torture/torture.c | 2 +-
source3/utils/smbfilter.c | 2 +-
source3/winbindd/wb_lookupsids.c | 2 +-
source3/winbindd/winbindd_dual_srv.c | 8 +-
source3/wscript_build | 1 +
source4/cldap_server/cldap_server.c | 2 +-
source4/dns_server/dns_query.c | 14 +-
source4/dns_server/dns_server.c | 8 +-
source4/heimdal_build/config.h | 3 +-
source4/kdc/kdc.c | 2 +-
source4/ldap_server/ldap_server.c | 4 +-
source4/lib/socket/interface.c | 26 +--
source4/libcli/raw/smb.h | 14 --
source4/rpc_server/dcerpc_server.c | 4 +-
source4/smb_server/service_smb.c | 4 +-
source4/torture/smb2/lock.c | 24 +--
source4/torture/smb2/notify.c | 88 +++++++++-
source4/web_server/web_server.c | 4 +-
178 files changed, 2105 insertions(+), 622 deletions(-)
diff --cc debian/changelog
index e02cc71,a1f685c..9a2d2e4
--- a/debian/changelog
+++ b/debian/changelog
@@@ -1,9 -1,21 +1,27 @@@
+ samba (2:4.1.7+dfsg-2) unstable; urgency=medium
+
+ * Build-depend on heimdal-dev instead of libkrb5-dev.
+ * Add versioned build-dep on libgmp10 for now, which should be pulled in by
+ libhogweed2, to be able to build in outdated build environments (like on
+ most buildds). This is a workaround for #745233.
+
+ -- Ivo De Decker <ivo.dedecker at ugent.be> Sun, 20 Apr 2014 13:44:39 +0200
+
+ samba (2:4.1.7+dfsg-1) unstable; urgency=medium
+
+ * New upstream release.
+ * Remove readline63.patch, integrated upstream.
+ * Add build-dep on libkrb5-dev, no longer pulled in by libcups2-dev.
+ * Don't try to delete Parse/Yapp/Driver.pm, which is no longer installed.
+
+ -- Ivo De Decker <ivo.dedecker at ugent.be> Sat, 19 Apr 2014 13:39:09 +0200
+
+samba (2:4.1.6+dfsg-1~bpo70+1) wheezy-backports; urgency=medium
+
+ * Rebuild for wheezy-backports.
+
+ -- Ivo De Decker <ivo.dedecker at ugent.be> Wed, 19 Mar 2014 21:40:55 +0100
+
samba (2:4.1.6+dfsg-1) unstable; urgency=high
* New upstream security release. Fixes:
diff --cc debian/control
index 37f5693,053687e..f0df579
--- a/debian/control
+++ b/debian/control
@@@ -22,8 -26,10 +26,10 @@@ Build-Depends: bison
libblkid-dev,
libbsd-dev,
libcap-dev [linux-any],
- libctdb-dev (>= 2),
+ libctdb-dev (>= 1.10+git20110412),
libcups2-dev,
+ # workaround for #745233 and outdated buildd-chroots
+ libgmp10 (>= 2:6.0.0),
libgnutls-dev,
libheimntlm0-heimdal (>= 1.6~),
libldap2-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