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

Proposed by Cameron Norman on 2015-06-08
Status: Needs review
Proposed branch: lp:~cameronnemo/apparmor-profiles/pid-variable
Merge into: lp:apparmor-profiles
Diff against target: 114 lines (+13/-13)
8 files modified
ubuntu/15.04/opt.WorldOfGoo.WorldOfGoo (+2/-2)
ubuntu/15.04/opt.braid.braid (+1/-1)
ubuntu/15.04/opt.introversion.darwinia.darwinia (+1/-1)
ubuntu/15.04/usr.bin.evolution (+3/-3)
ubuntu/15.04/usr.bin.gwibber-service (+2/-2)
ubuntu/15.04/usr.bin.pidgin (+2/-2)
ubuntu/15.04/usr.bin.spotify (+1/-1)
ubuntu/15.04/usr.lib.postgresql.bin.postgres (+1/-1)
To merge this branch: bzr merge lp:~cameronnemo/apparmor-profiles/pid-variable
Reviewer Review Type Date Requested Status
AppArmor Developers 2015-06-08 Pending
Review via email: mp+261400@code.launchpad.net

Description of the change

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

To post a comment you must log in.
intrigeri (intrigeri) wrote :

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]*

Preview Diff

[H/L] Next/Prev Comment, [J/K] Next/Prev File, [N/P] Next/Prev Hunk
=== 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 @@
2727
28 /etc/timidity/freepats.cfg r,28 /etc/timidity/freepats.cfg r,
2929
30 owner @{PROC}/[0-9]*/cmdline r,30 owner @{PROC}/@{pid}/cmdline r,
31 owner @{PROC}/[0-9]*/statm r,31 owner @{PROC}/@{pid}/statm r,
32 @{PROC}/filesystems r,32 @{PROC}/filesystems r,
3333
34 # World of Goo seems to like to mmap files more than some of the34 # World of Goo seems to like to mmap files more than some of the
3535
=== 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 @@
1616
17 /dev/input/event* r,17 /dev/input/event* r,
1818
19 owner @{PROC}/[0-9]*/cmdline r,19 owner @{PROC}/@{pid}/cmdline r,
20}20}
2121
=== 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 @@
22 owner @{HOME}/.darwinia/ rw,22 owner @{HOME}/.darwinia/ rw,
23 owner @{HOME}/.darwinia/** rw,23 owner @{HOME}/.darwinia/** rw,
2424
25 owner @{PROC}/[0-9]*/cmdline r,25 owner @{PROC}/@{pid}/cmdline r,
26}26}
2727
=== 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 @@
25 / r,25 / r,
26 deny /boot/{vmlinuz,initrd}* r,26 deny /boot/{vmlinuz,initrd}* r,
27 /etc/timezone r,27 /etc/timezone r,
28 owner @{PROC}/*/fd/ r, # needed for addressbook manipulation28 owner @{PROC}/@{pid}/fd/ r, # needed for addressbook manipulation
29 owner @{PROC}/[0-9]*/auxv r, # investigate29 owner @{PROC}/@{pid}/auxv r, # investigate
30 /usr/include/python2.7/pyconfig.h r,30 /usr/include/python2.7/pyconfig.h r,
31 /usr/share/evolution-data-server-*/** r,31 /usr/share/evolution-data-server-*/** r,
32 /usr/share/evolution/** r,32 /usr/share/evolution/** r,
@@ -147,7 +147,7 @@
147 #include <abstractions/gnome>147 #include <abstractions/gnome>
148 #include <abstractions/nameservice>148 #include <abstractions/nameservice>
149149
150 owner @{PROC}/[0-9]*/auxv r, # investigate150 owner @{PROC}/@{pid}/auxv r, # investigate
151151
152 /bin/dash rix,152 /bin/dash rix,
153 /bin/rm ix,153 /bin/rm ix,
154154
=== 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 @@
45 owner @{HOME}/.config/dconf/user r,45 owner @{HOME}/.config/dconf/user r,
46 owner @{HOME}/.cache/dconf/user rw,46 owner @{HOME}/.cache/dconf/user rw,
4747
48 owner @{PROC}/[0-9]*/auxv r,48 owner @{PROC}/@{pid}/auxv r,
49 owner @{PROC}/[0-9]*/mounts r,49 owner @{PROC}/@{pid}/mounts r,
5050
51 # noisy51 # noisy
52 deny /usr/share/gwibber/** w,52 deny /usr/share/gwibber/** w,
5353
=== 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 @@
65 /usr/share/tcltk/** r,65 /usr/share/tcltk/** r,
66 /usr/share/themes/ r,66 /usr/share/themes/ r,
6767
68 owner @{PROC}/[0-9]*/auxv r,68 owner @{PROC}/@{pid}/auxv r,
69 owner @{PROC}/[0-9]*/fd/ r,69 owner @{PROC}/@{pid}/fd/ r,
7070
71 # Site-specific additions and overrides. See local/README for details.71 # Site-specific additions and overrides. See local/README for details.
72 #include <local/usr.bin.pidgin>72 #include <local/usr.bin.pidgin>
7373
=== 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 @@
14 /usr/share/spotify/theme/**.{png,ico} r,14 /usr/share/spotify/theme/**.{png,ico} r,
15 /usr/share/spotify/theme/**.{splang,xml} r,15 /usr/share/spotify/theme/**.{splang,xml} r,
1616
17 owner @{PROC}/[0-9]*/task/ r,17 owner @{PROC}/@{pid}/task/ r,
1818
19 owner @{HOME}/.cache/spotify/ rw,19 owner @{HOME}/.cache/spotify/ rw,
20 owner @{HOME}/.cache/spotify/** rw,20 owner @{HOME}/.cache/spotify/** rw,
2121
=== 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 @@
12 /var/lib/postgresql/** rwl,12 /var/lib/postgresql/** rwl,
13 /{,var/}run/postgresql/** rw,13 /{,var/}run/postgresql/** rw,
1414
15 owner @{PROC}/[0-9]*/oom_adj rw,15 owner @{PROC}/@{pid}/oom_adj rw,
16}16}

Subscribers

People subscribed via source and target branches

to status/vote changes: