From 8a2bceb7d67f568f6ccda8e0c6f98d5b296803e939bea6347b5c5bfa3d4146ee Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Lars=20M=C3=BCller?= <lmuelle@suse.com>
Date: Tue, 1 Mar 2016 17:45:52 +0000
Subject: [PATCH] Relocate existing lock files to /var/lib/samba/lock;
 (bsc#968963).

OBS-URL: https://build.opensuse.org/package/show/network:samba:STABLE/samba?expand=0&rev=527
---
 patches.tar.bz2      | 4 ++--
 samba.changes        | 5 +++++
 samba.spec           | 6 +++++-
 vendor-files.tar.bz2 | 4 ++--
 4 files changed, 14 insertions(+), 5 deletions(-)

diff --git a/patches.tar.bz2 b/patches.tar.bz2
index 6af1457..9392af3 100644
--- a/patches.tar.bz2
+++ b/patches.tar.bz2
@@ -1,3 +1,3 @@
 version https://git-lfs.github.com/spec/v1
-oid sha256:abff919fade9fd55a74acd398865ab0ad9ef30052a25c876f54a831bbe512a45
-size 12703
+oid sha256:6f1cfb5be95e738f5532b1823d05d62cd74a0180d483213703f2eccb879e8100
+size 12725
diff --git a/samba.changes b/samba.changes
index 72055e8..e0f8f75 100644
--- a/samba.changes
+++ b/samba.changes
@@ -1,3 +1,8 @@
+-------------------------------------------------------------------
+Tue Mar  1 17:28:09 UTC 2016 - lmuelle@suse.com
+
+- Relocate existing lock files to /var/lib/samba/lock; (bsc#968963).
+
 -------------------------------------------------------------------
 Tue Feb 23 09:47:53 UTC 2016 - lmuelle@suse.com
 
diff --git a/samba.spec b/samba.spec
index 1f129a4..b98d510 100644
--- a/samba.spec
+++ b/samba.spec
@@ -142,7 +142,7 @@ BuildRequires:  libpcp-devel
 %else
 %define	build_make_smp_mflags %{?jobs:-j%jobs}
 %endif
-%define SOURCE_TIMESTAMP 3599
+%define SOURCE_TIMESTAMP 3607
 %define BRANCH %{version}
 %global with_mitkrb5 1
 %global with_dc 0
@@ -1574,6 +1574,10 @@ for fn in netlogon_creds_cli.tdb passdb.tdb secrets.tdb smbpasswd; do
 	test ! -e %{LOCKDIR}/private/$fn && test -e %{CONFIGDIR}/$fn && \
 		mv %{CONFIGDIR}/$fn %{LOCKDIR}/private
 done
+for fn in brlock.tdb dbwrap_watchers.tdb gencache_notrans.tdb leases.tdb locking.tdb mutex.tdb names.tdb printer_list.tdb serverid.tdb smbXsrv_client_global.tdb smbXsrv_open_global.tdb smbXsrv_session_global.tdb smbXsrv_tcon_global.tdb smbXsrv_version_global.tdb srv_fss.tdb; do
+	test ! -e %{LOCKDIR}/lock/$fn && test -e %{LOCKDIR}/$fn && \
+		mv %{LOCKDIR}/$fn %{LOCKDIR}/lock
+done
 %if 0%{?suse_version} && 0%{?suse_version} < 1221
 if [ ${1:-0} -gt 1 -a -f /var/adm/backup/etc_samba_smbfstab-move ]; then
 	test -f /etc/samba/cifstab && \
diff --git a/vendor-files.tar.bz2 b/vendor-files.tar.bz2
index 8221e67..417c837 100644
--- a/vendor-files.tar.bz2
+++ b/vendor-files.tar.bz2
@@ -1,3 +1,3 @@
 version https://git-lfs.github.com/spec/v1
-oid sha256:dfbf445865578d7e39cbe5d2d1f9f38b1c19496edc80b7f6ddb541ee4f80418e
-size 55671
+oid sha256:163edeacaedd59e3721c0c113cfd03abadf8b1648dac2a2f3bfe7010b967ef07
+size 55710