From eb55750eeff40317c8dd243fb973e77d31f490c936eec90c9224381f93a2511a Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Lars=20M=C3=BCller?= <lmuelle@suse.com>
Date: Wed, 16 Sep 2015 13:30:51 +0000
Subject: [PATCH] Package /var/lib/samba/private/sock with 0700 permissions;
 (bnc#946051).

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

diff --git a/patches.tar.bz2 b/patches.tar.bz2
index 8c6b61e..b66ac75 100644
--- a/patches.tar.bz2
+++ b/patches.tar.bz2
@@ -1,3 +1,3 @@
 version https://git-lfs.github.com/spec/v1
-oid sha256:a59d1cedc84c7025cd908504565a918a744416b65c210eafa808f249e668369f
-size 29330
+oid sha256:b67f27626d2de8af237aa565110757c9883e04ac6b1908d6266ec32d743b0400
+size 29269
diff --git a/samba.changes b/samba.changes
index 68ea7c2..3b4e9ea 100644
--- a/samba.changes
+++ b/samba.changes
@@ -1,3 +1,8 @@
+-------------------------------------------------------------------
+Wed Sep 16 13:06:36 UTC 2015 - lmuelle@suse.com
+
+- Package /var/lib/samba/private/sock with 0700 permissions; (bnc#946051).
+
 -------------------------------------------------------------------
 Fri Sep 11 15:53:45 UTC 2015 - lmuelle@suse.com
 
diff --git a/samba.spec b/samba.spec
index 32cf992..8d6aaca 100644
--- a/samba.spec
+++ b/samba.spec
@@ -144,7 +144,7 @@ BuildRequires:  systemd-devel
 %else
 %define	build_make_smp_mflags %{?jobs:-j%jobs}
 %endif
-%define SOURCE_TIMESTAMP 3479
+%define SOURCE_TIMESTAMP 3481
 %define BRANCH %{version}
 %global with_mitkrb5 1
 %global with_dc 0
@@ -1173,7 +1173,6 @@ CONFIGURE_OPTIONS="\
 	--with-pammodulesdir=%{_lib}/security \
 	--with-pam_smbpass \
 	--with-piddir=%{PIDDIR} \
-	--with-privatedir=%{CONFIGDIR} \
 	--with-quotas \
 	--with-syslog \
 %if 0%{?suse_version} > 1220
@@ -1224,7 +1223,7 @@ install -d -m 0755 -p \
 	%{buildroot}/%{_datadir}/omc/svcinfo.d \
 	%{buildroot}/%{_datadir}/samba/{LDAP,templates} \
 	%{buildroot}/%{_localstatedir}/adm \
-	%{buildroot}/%{LOCKDIR}/{drivers/{WIN40,W32X86,W32MIPS,W32ALPHA,W32PPC,IA64,x64},netlogon,msg,printing,profiles,winbindd_privileged} \
+	%{buildroot}/%{LOCKDIR}/{drivers/{WIN40,W32X86,W32MIPS,W32ALPHA,W32PPC,IA64,x64},netlogon,msg,printing,private/sock,profiles,winbindd_privileged} \
 	%{buildroot}/%{LOGDIR} \
 	%{buildroot}/%{PIDDIR} \
 	%{buildroot}/%{_var}/adm/fillup-templates \
@@ -1673,6 +1672,8 @@ fi
 %attr(0775,root,ntadmin) %{LOCKDIR}/drivers
 %dir %{LOCKDIR}/msg
 %{LOCKDIR}/netlogon
+%dir %{LOCKDIR}/private
+%attr(0700,root,root) %dir %{LOCKDIR}/private/sock
 %attr(0770,root,users) %dir %{LOCKDIR}/profiles
 %{_bindir}/smbstatus
 %{_sbindir}/nmbd
diff --git a/vendor-files.tar.bz2 b/vendor-files.tar.bz2
index 2bdbd91..efd5a8e 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:742de3afacfb450f4de61c3d480fb7f686d9e5a99693e57575ed2eaf18897f58
-size 52934
+oid sha256:3c9cf9426f10cd78e5979540812b845e42e38918efaf18b2b77588a0c0c21e45
+size 52927