Accepting request 330817 from home:cboltz

- 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)

OBS-URL: https://build.opensuse.org/request/show/330817
OBS-URL: https://build.opensuse.org/package/show/security:apparmor/apparmor?expand=0&rev=141
This commit is contained in:
Christian Boltz 2015-09-13 20:30:22 +00:00 committed by Git OBS Bridge
parent 3c2e40e824
commit f480c778f4
3 changed files with 32 additions and 0 deletions

View File

@ -1,3 +1,10 @@
-------------------------------------------------------------------
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)
-------------------------------------------------------------------
Thu Jul 30 20:08:20 UTC 2015 - opensuse@cboltz.de

View File

@ -98,6 +98,9 @@ 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
@ -370,7 +373,11 @@ Requires: python-apparmor = %{version}
Requires: python-base
%endif
# aa-unconfined needs netstat
%if 0%{?suse_version} >= 1320
Recommends: net-tools-deprecated
%else
Recommends: net-tools
%endif
# aa-notify -p needs notify-send
Recommends: libnotify-tools
BuildArch: noarch
@ -444,6 +451,7 @@ SubDomain.
%patch7 -p1
%patch8
%patch9
%patch10
# search for left-over multiline rules
test -z "$(grep -r '^\s*\(unix\|dbus\)[^,]\(([^)]*)\)*[^,]*$' profiles/apparmor.d/)"

View File

@ -0,0 +1,17 @@
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,