Accepting request 77678 from security:apparmor:factory

- Add apparmor-securityfs-systemd.patch: do not mount securityfs
  when running under systemd, just access the directory, systemd
  will automount it (bnc#704460).

OBS-URL: https://build.opensuse.org/request/show/77678
OBS-URL: https://build.opensuse.org/package/show/openSUSE:Factory/apparmor?expand=0&rev=18

apparmor-securityfs-systemd.patch

@@ -0,0 +1,13 @@
+Index: apparmor-2.6.0/parser/rc.apparmor.functions
+===================================================================
+--- apparmor-2.6.0.orig/parser/rc.apparmor.functions
++++ apparmor-2.6.0/parser/rc.apparmor.functions
+@@ -295,7 +295,7 @@ is_apparmor_loaded() {
+ }
+ 
+ is_securityfs_mounted() {
+-	grep -q securityfs /proc/filesystems && grep -q securityfs /proc/mounts
++	test -d ${SECURITYFS} -a -d /sys/fs/cgroup/systemd || grep -q securityfs /proc/filesystems && grep -q securityfs /proc/mounts
+ 	return $?
+ }
+ 

apparmor.changes

@@ -1,3 +1,10 @@
+-------------------------------------------------------------------
+Tue Aug  2 09:19:45 UTC 2011 - fcrozat@suse.com
+
+- Add apparmor-securityfs-systemd.patch: do not mount securityfs
+  when running under systemd, just access the directory, systemd
+  will automount it (bnc#704460).
+
 -------------------------------------------------------------------
 Fri Jun 24 16:02:21 CEST 2011 - jeffm@suse.de
 

apparmor.spec

@@ -74,6 +74,7 @@ Patch18:        apparmor-profiles-usr.sbin.dnsmasq
 Patch19:        klog-needs-CAP_SYSLOG
 Patch20:        apparmor-profiles-dhclient
 Patch21:        apparmor-utils-subdomain-compat
+Patch22:        apparmor-securityfs-systemd.patch
 License:        GPLv2+
 BuildRoot:      %{_tmppath}/%{name}-%{version}-build
 Url:            https://launchpad.net/apparmor
@@ -467,6 +468,7 @@ SubDomain.
 %patch19 -p1
 %patch20 -p1
 %patch21 -p1
+%patch22 -p1
 
 %build
 export SUSE_ASNEEDED=0