Merge lp:~cameronnemo/apparmor-profiles/pid-variable into lp:apparmor-profiles

[Cameron Norman]

This replaces a few obvious instances where @{pid} could be used.

[intrigeri (intrigeri)]

Looks good! I'm sorry nobody reviewed this earlier. Do you want to port this branch to the current state of the repository (that now has 16.04, and was moved to Git: https://code.launchpad.net/~apparmor-dev/apparmor-profiles/+git/apparmor-profiles)? Otherwise let me know, and I'll try to come around it one of these days.

Unmerged revisions

143. By Cameron Norman on 2015-06-08

Used @{pid} variable instead of [0-9]*

=== modified file 'ubuntu/15.04/opt.WorldOfGoo.WorldOfGoo'
--- ubuntu/15.04/opt.WorldOfGoo.WorldOfGoo	2014-10-24 19:02:18 +0000
+++ ubuntu/15.04/opt.WorldOfGoo.WorldOfGoo	2015-06-08 14:36:08 +0000
@@ -27,8 +27,8 @@
 
   /etc/timidity/freepats.cfg r,
 
-  owner @{PROC}/[0-9]*/cmdline r,
-  owner @{PROC}/[0-9]*/statm r,
+  owner @{PROC}/@{pid}/cmdline r,
+  owner @{PROC}/@{pid}/statm r,
   @{PROC}/filesystems r,
 
   # World of Goo seems to like to mmap files more than some of the
 
=== modified file 'ubuntu/15.04/opt.braid.braid'
--- ubuntu/15.04/opt.braid.braid	2014-10-24 19:02:18 +0000
+++ ubuntu/15.04/opt.braid.braid	2015-06-08 14:36:08 +0000
@@ -16,5 +16,5 @@
 
   /dev/input/event* r,
 
-  owner @{PROC}/[0-9]*/cmdline r,
+  owner @{PROC}/@{pid}/cmdline r,
 }
 
=== modified file 'ubuntu/15.04/opt.introversion.darwinia.darwinia'
--- ubuntu/15.04/opt.introversion.darwinia.darwinia	2014-10-24 19:02:18 +0000
+++ ubuntu/15.04/opt.introversion.darwinia.darwinia	2015-06-08 14:36:08 +0000
@@ -22,5 +22,5 @@
   owner @{HOME}/.darwinia/ rw,
   owner @{HOME}/.darwinia/** rw,
 
-  owner @{PROC}/[0-9]*/cmdline r,
+  owner @{PROC}/@{pid}/cmdline r,
 }
 
=== modified file 'ubuntu/15.04/usr.bin.evolution'
--- ubuntu/15.04/usr.bin.evolution	2014-10-24 19:02:18 +0000
+++ ubuntu/15.04/usr.bin.evolution	2015-06-08 14:36:08 +0000
@@ -25,8 +25,8 @@
   / r,
   deny /boot/{vmlinuz,initrd}* r,
   /etc/timezone r,
-  owner @{PROC}/*/fd/ r, # needed for addressbook manipulation
-  owner @{PROC}/[0-9]*/auxv r, # investigate
+  owner @{PROC}/@{pid}/fd/ r, # needed for addressbook manipulation
+  owner @{PROC}/@{pid}/auxv r, # investigate
   /usr/include/python2.7/pyconfig.h r,
   /usr/share/evolution-data-server-*/** r,
   /usr/share/evolution/** r,
@@ -147,7 +147,7 @@
     #include <abstractions/gnome>
     #include <abstractions/nameservice>
 
-    owner @{PROC}/[0-9]*/auxv r, # investigate
+    owner @{PROC}/@{pid}/auxv r, # investigate
 
     /bin/dash rix,
     /bin/rm ix,
 
=== modified file 'ubuntu/15.04/usr.bin.gwibber-service'
--- ubuntu/15.04/usr.bin.gwibber-service	2014-10-24 19:02:18 +0000
+++ ubuntu/15.04/usr.bin.gwibber-service	2015-06-08 14:36:08 +0000
@@ -45,8 +45,8 @@
   owner @{HOME}/.config/dconf/user r,
   owner @{HOME}/.cache/dconf/user rw,
 
-  owner @{PROC}/[0-9]*/auxv r,
-  owner @{PROC}/[0-9]*/mounts r,
+  owner @{PROC}/@{pid}/auxv r,
+  owner @{PROC}/@{pid}/mounts r,
 
   # noisy
   deny /usr/share/gwibber/** w,
 
=== modified file 'ubuntu/15.04/usr.bin.pidgin'
--- ubuntu/15.04/usr.bin.pidgin	2015-01-20 19:35:34 +0000
+++ ubuntu/15.04/usr.bin.pidgin	2015-06-08 14:36:08 +0000
@@ -65,8 +65,8 @@
   /usr/share/tcltk/** r,
   /usr/share/themes/ r,
 
-  owner @{PROC}/[0-9]*/auxv r,
-  owner @{PROC}/[0-9]*/fd/ r,
+  owner @{PROC}/@{pid}/auxv r,
+  owner @{PROC}/@{pid}/fd/ r,
 
   # Site-specific additions and overrides. See local/README for details.
   #include <local/usr.bin.pidgin>
 
=== modified file 'ubuntu/15.04/usr.bin.spotify'
--- ubuntu/15.04/usr.bin.spotify	2014-10-24 19:02:18 +0000
+++ ubuntu/15.04/usr.bin.spotify	2015-06-08 14:36:08 +0000
@@ -14,7 +14,7 @@
   /usr/share/spotify/theme/**.{png,ico} r,
   /usr/share/spotify/theme/**.{splang,xml} r,
 
-  owner @{PROC}/[0-9]*/task/ r,
+  owner @{PROC}/@{pid}/task/ r,
 
   owner @{HOME}/.cache/spotify/ rw,
   owner @{HOME}/.cache/spotify/** rw,
 
=== modified file 'ubuntu/15.04/usr.lib.postgresql.bin.postgres'
--- ubuntu/15.04/usr.lib.postgresql.bin.postgres	2014-10-24 19:02:18 +0000
+++ ubuntu/15.04/usr.lib.postgresql.bin.postgres	2015-06-08 14:36:08 +0000
@@ -12,5 +12,5 @@
   /var/lib/postgresql/** rwl,
   /{,var/}run/postgresql/** rw,
 
-  owner @{PROC}/[0-9]*/oom_adj rw,
+  owner @{PROC}/@{pid}/oom_adj rw,
 }