From b13b1cb7a01a905326952da4737854cfc46fd0eab438f64f3cd887e31ff340b8 Mon Sep 17 00:00:00 2001
From: Christian Boltz <suse-beta@cboltz.de>
Date: Fri, 6 Jul 2012 22:51:54 +0000
Subject: [PATCH] Accepting request 127334 from home:cboltz

- update /bin/ping profile to also match /usr/bin/ping (usrMove)

OBS-URL: https://build.opensuse.org/request/show/127334
OBS-URL: https://build.opensuse.org/package/show/security:apparmor/apparmor?expand=0&rev=14
---
 apparmor-profiles-usrmove-bin-ping.diff | 13 +++++++++++++
 apparmor.changes                        |  5 +++++
 apparmor.spec                           |  4 ++++
 3 files changed, 22 insertions(+)
 create mode 100644 apparmor-profiles-usrmove-bin-ping.diff

diff --git a/apparmor-profiles-usrmove-bin-ping.diff b/apparmor-profiles-usrmove-bin-ping.diff
new file mode 100644
index 0000000..9ceaa30
--- /dev/null
+++ b/apparmor-profiles-usrmove-bin-ping.diff
@@ -0,0 +1,13 @@
+=== modified file 'profiles/apparmor.d/bin.ping'
+--- profiles/apparmor.d/bin.ping	2010-08-05 19:00:02 +0000
++++ profiles/apparmor.d/bin.ping	2012-07-01 11:05:38 +0000
+@@ -10,7 +10,7 @@
+ # ------------------------------------------------------------------
+ 
+ #include <tunables/global>
+-/bin/ping {
++/{usr/,}bin/ping {
+   #include <abstractions/base>
+   #include <abstractions/consoles>
+   #include <abstractions/nameservice>
+
diff --git a/apparmor.changes b/apparmor.changes
index 0f2e540..34d18f5 100644
--- a/apparmor.changes
+++ b/apparmor.changes
@@ -1,3 +1,8 @@
+-------------------------------------------------------------------
+Fri Jul  6 22:33:39 UTC 2012 - opensuse@cboltz.de
+
+- update /bin/ping profile to also match /usr/bin/ping (usrMove)
+
 -------------------------------------------------------------------
 Sat Jun  2 19:55:14 UTC 2012 - opensuse@cboltz.de
 
diff --git a/apparmor.spec b/apparmor.spec
index f7311f3..b3db812 100644
--- a/apparmor.spec
+++ b/apparmor.spec
@@ -62,6 +62,9 @@ Patch1:         apparmor-enable-profile-cache.diff
 # include autogenerated profile sniplet for samba shares (bnc#688040)
 Patch2:         apparmor-samba-include-permissions-for-shares.diff
 
+# usrMove /bin/ping -> /usr/bin/ping (sent upstream 2012-07-07)
+Patch3:         apparmor-profiles-usrmove-bin-ping.diff
+
 # split a long string in AppArmor.pm. Not accepted upstream because they want a solution without hardcoded width.
 Patch5:         apparmor-utils-string-split
 
@@ -398,6 +401,7 @@ SubDomain.
 %setup -q
 %patch1 -p1
 %patch2 -p0
+%patch3 -p0
 %patch5 -p1
 %patch12 -p1