From 69c6ac8c6e41a389c55d26f9bf90ad71df3257d3e96dd71060e716c37d3fe3b4 Mon Sep 17 00:00:00 2001
From: Christian Boltz <suse-beta@cboltz.de>
Date: Wed, 16 Sep 2015 15:46:00 +0000
Subject: [PATCH] Accepting request 331541 from home:cboltz

undo adding samba-3.4-etc-samba-sock.diff - see boo#945563

OBS-URL: https://build.opensuse.org/request/show/331541
OBS-URL: https://build.opensuse.org/package/show/security:apparmor/apparmor?expand=0&rev=143
---
 apparmor.changes              |  2 --
 apparmor.spec                 |  4 ----
 samba-3.4-etc-samba-sock.diff | 17 -----------------
 3 files changed, 23 deletions(-)
 delete mode 100644 samba-3.4-etc-samba-sock.diff

diff --git a/apparmor.changes b/apparmor.changes
index 60bf085..ee6c143 100644
--- a/apparmor.changes
+++ b/apparmor.changes
@@ -1,8 +1,6 @@
 -------------------------------------------------------------------
 Sun Sep 13 20:16:57 UTC 2015 - opensuse@cboltz.de
 
-- add samba-3.4-etc-samba-sock.diff - Samba 3.4 needs write access
-  to /etc/samba/sock/ (boo#945563)
 - netstat moved to net-tools-deprecated in Tumbleweed (boo#944904)
 
 -------------------------------------------------------------------
diff --git a/apparmor.spec b/apparmor.spec
index c7dd609..1b34a9c 100644
--- a/apparmor.spec
+++ b/apparmor.spec
@@ -98,9 +98,6 @@ Patch8:         fix-initscript-aa_log_end_msg.diff
 # additional winbindd permissions (commited upstream trunk r3213, 2.9 r2946) - (boo#921098 #c15..19)
 Patch9:         apparmor-winbindd-r3213.diff
 
-# Samba 3.4 needs write access to /etc/samba/sock/ (boo#945563, submitted upstream 2015-09-12)
-Patch10:        samba-3.4-etc-samba-sock.diff
-
 Url:            https://launchpad.net/apparmor
 PreReq:         sed
 BuildRoot:      %{_tmppath}/%{name}-%{version}-build
@@ -451,7 +448,6 @@ SubDomain.
 %patch7 -p1
 %patch8
 %patch9
-%patch10
 
 # search for left-over multiline rules
 test -z "$(grep -r '^\s*\(unix\|dbus\)[^,]\(([^)]*)\)*[^,]*$' profiles/apparmor.d/)"
diff --git a/samba-3.4-etc-samba-sock.diff b/samba-3.4-etc-samba-sock.diff
deleted file mode 100644
index 0a456bd..0000000
--- a/samba-3.4-etc-samba-sock.diff
+++ /dev/null
@@ -1,17 +0,0 @@
-Samba 3.4 needs write access to /etc/samba/sock/
-
-https://bugzilla.opensuse.org/show_bug.cgi?id=945563
-
-=== modified file 'profiles/apparmor.d/abstractions/samba'
---- profiles/apparmor.d/abstractions/samba	2015-05-18 23:25:26 +0000
-+++ profiles/apparmor.d/abstractions/samba	2015-09-13 07:44:19 +0000
-@@ -10,6 +10,8 @@
- # ------------------------------------------------------------------
- 
-   /etc/samba/* r,
-+  /etc/samba/sock/ rw,
-+  /etc/samba/sock/* w,
-   /usr/share/samba/*.dat r,
-   /usr/share/samba/codepages/{lowcase,upcase,valid}.dat r,
-   /var/cache/samba/ w,
-