diff --git a/_service b/_service
index 911fe1c..9809a0f 100644
--- a/_service
+++ b/_service
@@ -10,6 +10,15 @@
.git
+
+ https://gitlab.suse.de/samba/vendor.git/
+ git
+ master
+ git.%h
+ vendor-files
+ vendor-files
+
+
samba
samba.spec
diff --git a/samba-4.6.2+git.19.c267455e57b.tar.bz2 b/samba-4.6.2+git.19.c267455e57b.tar.bz2
deleted file mode 100644
index cd92ef7..0000000
--- a/samba-4.6.2+git.19.c267455e57b.tar.bz2
+++ /dev/null
@@ -1,3 +0,0 @@
-version https://git-lfs.github.com/spec/v1
-oid sha256:d5692398d4e0efc3d7aef861ff3d945ab64020f7b7f53080472db56fff90e66b
-size 25948940
diff --git a/samba-4.6.3+git.21.0735c828d4f.tar.bz2 b/samba-4.6.3+git.21.0735c828d4f.tar.bz2
new file mode 100644
index 0000000..35d33b5
--- /dev/null
+++ b/samba-4.6.3+git.21.0735c828d4f.tar.bz2
@@ -0,0 +1,3 @@
+version https://git-lfs.github.com/spec/v1
+oid sha256:c44c3ec2277f638bf29db2812d687b8d8224e5bdeb185f179f0048ed70d562c8
+size 25956607
diff --git a/samba.changes b/samba.changes
index f1a266b..9215660 100644
--- a/samba.changes
+++ b/samba.changes
@@ -1,3 +1,69 @@
+-------------------------------------------------------------------
+Tue Apr 25 15:28:16 UTC 2017 - ddiss@suse.com
+
+- Update to 4.6.3; (bsc#1036011)
+ + s3:vfs:shadow_copy2: vfs_shadow_copy2 fails to list snapshots
+ from shares with GlusterFS backend; (bso#12743).
+ + Fix for Solaris C compiler; (bso#12559).
+ + s3: locking: Update oplock optimization for the leases era; (bso#12628).
+ + Make the Solaris C compiler happy; (bso#12693).
+ + s3: libgpo: Allow skipping GPO objects that don't have the
+ expected LDAP attributes; (bso#12695).
+ + Fix buffer overflow caused by wrong use of getgroups; (bso#12747).
+ + lib: debug: Avoid negative array access; (bso#12746).
+ + cleanupdb: Fix a memory read error; (bso#12748).
+ + streams_xattr and kernel oplocks results in
+ NT_STATUS_NETWORK_BUSY; (bso#7537).
+ + winbindd: idmap_autorid allocates ids for unknown SIDs from other
+ backends; (bso#11961).
+ + vfs_fruit: Resource fork open request with
+ flags=O_CREAT|O_RDONLY; (bso#12565).
+ + manpages/vfs_fruit: Document global options; (bso#12615).
+ + lib/pthreadpool: Fix a memory leak; (bso#12624).
+ + Lookup-domain for well-known SIDs on a DC; (bso#12727).
+ + winbindd: Fix error handling in rpc_lookup_sids(); (bso#12728).
+ + winbindd: Trigger possible passdb_dsdb initialisation; (bso#12729).
+ + credentials_krb5: use gss_acquire_cred for client-side GSSAPI
+ use case; (bso#12611).
+ + lib/crypto: Implement samba.crypto Python module for RC4; (bso#12690).
+ + ctdb-readonly: Avoid a tight loop waiting for revoke to
+ complete; (bso#12697).
+ + ctdb_event monitor command crashes if event is not specified;
+ (bso#12723).
+ + ctdb-docs: Fix documentation of "-n" option to 'ctdb tool'; (bso#12733).
+ + smbd: Fix smb1 findfirst with DFS; (bso#12558).
+ + smbd: Do an early exit on negprot failure; (bso#12610).
+ + winbindd: Fix substitution for 'template homedir'; (bso#12699).
+ + s4:kdc: Disable principal based autodetected referral detection;
+ (bso#12554).
+ + idmap_autorid: Allocate new domain range if the callers knows
+ the sid is valid; (bso#12613).
+ + LINKFLAGS_PYEMBED should not contain -L/some/path; (bso#12724).
+ + PAM auth with WBFLAG_PAM_GET_PWD_POLICY returns wrong policy for
+ trusted domain; (bso#12725).
+ + rpcclient: Allow -U'OTHERDOMAIN\user' again; (bso#12731).
+ + winbindd: Fix password policy for pam authentication; (bso#12725).
+ + s3:gse: Correctly handle external trusts with MIT; (bso#12554).
+ + auth/credentials: Always set the realm if we set the principal
+ from the ccache; (bso#12611).
+ + replace: Include sysmacros.h; (bso#12686).
+ + s3:vfs_expand_msdfs: Do not open the remote address as a file;
+ (bso#12687).
+ + s3:libsmb: Only print error message if kerberos use is forced;
+ (bso#12704).
+ + winbindd: Child process crashes when kerberos-authenticating
+ a user with wrong password; (bso#12708).
+ + vfs_fruit: Office document opens as read-only on macOS due to
+ CNID semantics; (bso#12715).
+ + vfs_acl_xattr: Fix failure to get ACL on Linux if memory is
+ fragmented; (bso#12737).
+
+-------------------------------------------------------------------
+Tue Apr 25 13:46:20 UTC 2017 - ddiss@suse.com
+
+- Generate and update vendor-files tarball from Git
+ + SuSEfirewall2 service samba-client only setup IPv4 rule; (bsc#1034416).
+
-------------------------------------------------------------------
Tue Apr 18 13:38:11 UTC 2017 - ddiss@suse.com
diff --git a/samba.spec b/samba.spec
index 6859548..04ed043 100644
--- a/samba.spec
+++ b/samba.spec
@@ -26,6 +26,7 @@
%define build_ceph 1
%endif
%endif
+%define vendor_files_git_vers git.9d8643a
Name: samba
BuildRequires: autoconf
@@ -146,7 +147,7 @@ BuildRequires: librados-devel
%define BRANCH %{version}
%global with_mitkrb5 1
%global with_dc 0
-Version: 4.6.2+git.19.c267455e57b
+Version: 4.6.3+git.21.0735c828d4f
Release: 0
Url: https://www.samba.org/
Obsoletes: samba-gplv3 < %{version}
@@ -159,7 +160,7 @@ Summary: A SMB/CIFS File, Print, and Authentication Server
License: GPL-3.0+
Group: Productivity/Networking/Samba
Source: samba-%{version}.tar.bz2
-Source1: vendor-files.tar.bz2
+Source1: vendor-files-%{vendor_files_git_vers}.tar.bz2
Source4: baselibs.conf
Source100: samba-client-rpmlintrc
Requires: /usr/bin/getent
@@ -1042,7 +1043,7 @@ that RADOS locks can be used for CTDB split-brain avoidance.
%setup -n samba-%{version} -q
# vendor-files (config, scripts, tools)
%setup -T -D -a 1 -n samba-%{version} -q
-install -m 0644 -p vendor-files/docu/rfc3454.txt source4/heimdal/lib/wind/
+install -m 0644 -p vendor-files-%{vendor_files_git_vers}/docu/rfc3454.txt source4/heimdal/lib/wind/
# Create and add vendor suffix
if test "%{_project}" != "openSUSE:Factory"; then
vendor_tag_release=$( grep -m 1 ^Release: ${RPM_SOURCE_DIR}/samba.spec | \
@@ -1198,9 +1199,9 @@ rm \
# CTDB
%if 0%{?suse_version}
-install -m 0644 vendor-files/config/sysconfig.ctdb %{buildroot}/%{_var}/adm/fillup-templates
+install -m 0644 vendor-files-%{vendor_files_git_vers}/config/sysconfig.ctdb %{buildroot}/%{_var}/adm/fillup-templates
%else
-install -m 0644 vendor-files/config/sysconfig.ctdb ${RPM_BUILD_ROOT}/%{_sysconfdir}/sysconfig/ctdb
+install -m 0644 vendor-files-%{vendor_files_git_vers}/config/sysconfig.ctdb ${RPM_BUILD_ROOT}/%{_sysconfdir}/sysconfig/ctdb
%endif
%if 0%{?suse_version} > 1220
install -m 0755 ctdb/config/ctdb.service %{buildroot}%{_unitdir}/ctdb.service
@@ -1227,7 +1228,7 @@ for i in $scripts; do
install -m 0755 "source3/script/${i}" examples/scripts/${i}
done
# configuration files
-pushd vendor-files
+pushd vendor-files-%{vendor_files_git_vers}
echo "# smb.conf is the main Samba configuration file. You find a full commented" >config/smb.conf
echo "# version at %{DOCDIR}/examples/smb.conf.%{VENDOR} if the" >>config/smb.conf
echo "# samba-doc package is installed." >>config/smb.conf
diff --git a/vendor-files-git.9d8643a.tar.bz2 b/vendor-files-git.9d8643a.tar.bz2
new file mode 100644
index 0000000..e6a7537
--- /dev/null
+++ b/vendor-files-git.9d8643a.tar.bz2
@@ -0,0 +1,3 @@
+version https://git-lfs.github.com/spec/v1
+oid sha256:af69f6fa99ba9cd788eb95219fd3b7bad022c6ce49ab0b5b29ca673c124c6275
+size 54089
diff --git a/vendor-files.tar.bz2 b/vendor-files.tar.bz2
deleted file mode 100644
index cf276f4..0000000
--- a/vendor-files.tar.bz2
+++ /dev/null
@@ -1,3 +0,0 @@
-version https://git-lfs.github.com/spec/v1
-oid sha256:ed1ba4bfee3f6a11175fa206152a1bc41a60e8d87d3f0d9ffff9314fbda20bb6
-size 55183