Accepting request 254373 from home:cboltz

- add apparmor-profiles-ntpd-pid-location.diff to cover new ntpd pid
  location (bnc#899746)

OBS-URL: https://build.opensuse.org/request/show/254373
OBS-URL: https://build.opensuse.org/package/show/security:apparmor/apparmor?expand=0&rev=102

apparmor-profiles-ntpd-pid-location.diff

@@ -0,0 +1,12 @@
+=== modified file 'profiles/apparmor.d/usr.sbin.ntpd'
+--- profiles/apparmor.d/usr.sbin.ntpd	2013-11-14 20:48:51 +0000
++++ profiles/apparmor.d/usr.sbin.ntpd	2014-10-06 17:57:46 +0000
+@@ -55,6 +55,7 @@
+   /var/opt/novell/xad/rpc/xadsd rw,
+   /{,var/}run/nscd/services r,
+   /{,var/}run/ntpd.pid w,
++  /{,var/}run/ntp/ntpd.pid w,
+   /var/tmp/ntp* rwl,
+   @{PROC}/@{pid}/net/if_inet6 r,
+ 
+

apparmor.changes

@@ -1,3 +1,9 @@
+-------------------------------------------------------------------
+Mon Oct  6 18:07:50 UTC 2014 - opensuse@cboltz.de
+
+- add apparmor-profiles-ntpd-pid-location.diff to cover new ntpd pid
+  location (bnc#899746)
+
 -------------------------------------------------------------------
 Sun Oct  5 18:53:43 UTC 2014 - opensuse@cboltz.de
 

apparmor.spec

@@ -88,6 +88,9 @@ Patch4:         apparmor-2.5.1-edirectory-profile
 # Ruby 2.0 mkmf prefixes everything with $(DESTDIR), bnc#822277, kkaempf@suse.de
 Patch5:         ruby-2_0-mkmf-destdir.patch
 
+# Allow new pid location in ntpd profile (bnc#899746 - commited upstream trunk r2723, 2.8 branch r2145)
+Patch6:         apparmor-profiles-ntpd-pid-location.diff
+
 Url:            https://launchpad.net/apparmor
 PreReq:         sed
 BuildRoot:      %{_tmppath}/%{name}-%{version}-build
@@ -427,6 +430,8 @@ SubDomain.
 %patch5 -p1
 %endif
 
+%patch6
+
 %build
 echo _libdir: %{_libdir}  ruby: %{rb_sitearch}  python: %{python3_sitearch} # test if _libdir breaks it or if it's broken by default on <= 12.1