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
1=== modified file 'ubuntu/15.04/opt.WorldOfGoo.WorldOfGoo'
2--- ubuntu/15.04/opt.WorldOfGoo.WorldOfGoo 2014-10-24 19:02:18 +0000
3+++ ubuntu/15.04/opt.WorldOfGoo.WorldOfGoo 2015-06-08 14:36:08 +0000
4@@ -27,8 +27,8 @@
5
6 /etc/timidity/freepats.cfg r,
7
8- owner @{PROC}/[0-9]*/cmdline r,
9- owner @{PROC}/[0-9]*/statm r,
10+ owner @{PROC}/@{pid}/cmdline r,
11+ owner @{PROC}/@{pid}/statm r,
12 @{PROC}/filesystems r,
13
14 # World of Goo seems to like to mmap files more than some of the
15
16=== modified file 'ubuntu/15.04/opt.braid.braid'
17--- ubuntu/15.04/opt.braid.braid 2014-10-24 19:02:18 +0000
18+++ ubuntu/15.04/opt.braid.braid 2015-06-08 14:36:08 +0000
19@@ -16,5 +16,5 @@
20
21 /dev/input/event* r,
22
23- owner @{PROC}/[0-9]*/cmdline r,
24+ owner @{PROC}/@{pid}/cmdline r,
25 }
26
27=== modified file 'ubuntu/15.04/opt.introversion.darwinia.darwinia'
28--- ubuntu/15.04/opt.introversion.darwinia.darwinia 2014-10-24 19:02:18 +0000
29+++ ubuntu/15.04/opt.introversion.darwinia.darwinia 2015-06-08 14:36:08 +0000
30@@ -22,5 +22,5 @@
31 owner @{HOME}/.darwinia/ rw,
32 owner @{HOME}/.darwinia/** rw,
33
34- owner @{PROC}/[0-9]*/cmdline r,
35+ owner @{PROC}/@{pid}/cmdline r,
36 }
37
38=== modified file 'ubuntu/15.04/usr.bin.evolution'
39--- ubuntu/15.04/usr.bin.evolution 2014-10-24 19:02:18 +0000
40+++ ubuntu/15.04/usr.bin.evolution 2015-06-08 14:36:08 +0000
41@@ -25,8 +25,8 @@
42 / r,
43 deny /boot/{vmlinuz,initrd}* r,
44 /etc/timezone r,
45- owner @{PROC}/*/fd/ r, # needed for addressbook manipulation
46- owner @{PROC}/[0-9]*/auxv r, # investigate
47+ owner @{PROC}/@{pid}/fd/ r, # needed for addressbook manipulation
48+ owner @{PROC}/@{pid}/auxv r, # investigate
49 /usr/include/python2.7/pyconfig.h r,
50 /usr/share/evolution-data-server-*/** r,
51 /usr/share/evolution/** r,
52@@ -147,7 +147,7 @@
53 #include <abstractions/gnome>
54 #include <abstractions/nameservice>
55
56- owner @{PROC}/[0-9]*/auxv r, # investigate
57+ owner @{PROC}/@{pid}/auxv r, # investigate
58
59 /bin/dash rix,
60 /bin/rm ix,
61
62=== modified file 'ubuntu/15.04/usr.bin.gwibber-service'
63--- ubuntu/15.04/usr.bin.gwibber-service 2014-10-24 19:02:18 +0000
64+++ ubuntu/15.04/usr.bin.gwibber-service 2015-06-08 14:36:08 +0000
65@@ -45,8 +45,8 @@
66 owner @{HOME}/.config/dconf/user r,
67 owner @{HOME}/.cache/dconf/user rw,
68
69- owner @{PROC}/[0-9]*/auxv r,
70- owner @{PROC}/[0-9]*/mounts r,
71+ owner @{PROC}/@{pid}/auxv r,
72+ owner @{PROC}/@{pid}/mounts r,
73
74 # noisy
75 deny /usr/share/gwibber/** w,
76
77=== modified file 'ubuntu/15.04/usr.bin.pidgin'
78--- ubuntu/15.04/usr.bin.pidgin 2015-01-20 19:35:34 +0000
79+++ ubuntu/15.04/usr.bin.pidgin 2015-06-08 14:36:08 +0000
80@@ -65,8 +65,8 @@
81 /usr/share/tcltk/** r,
82 /usr/share/themes/ r,
83
84- owner @{PROC}/[0-9]*/auxv r,
85- owner @{PROC}/[0-9]*/fd/ r,
86+ owner @{PROC}/@{pid}/auxv r,
87+ owner @{PROC}/@{pid}/fd/ r,
88
89 # Site-specific additions and overrides. See local/README for details.
90 #include <local/usr.bin.pidgin>
91
92=== modified file 'ubuntu/15.04/usr.bin.spotify'
93--- ubuntu/15.04/usr.bin.spotify 2014-10-24 19:02:18 +0000
94+++ ubuntu/15.04/usr.bin.spotify 2015-06-08 14:36:08 +0000
95@@ -14,7 +14,7 @@
96 /usr/share/spotify/theme/**.{png,ico} r,
97 /usr/share/spotify/theme/**.{splang,xml} r,
98
99- owner @{PROC}/[0-9]*/task/ r,
100+ owner @{PROC}/@{pid}/task/ r,
101
102 owner @{HOME}/.cache/spotify/ rw,
103 owner @{HOME}/.cache/spotify/** rw,
104
105=== modified file 'ubuntu/15.04/usr.lib.postgresql.bin.postgres'
106--- ubuntu/15.04/usr.lib.postgresql.bin.postgres 2014-10-24 19:02:18 +0000
107+++ ubuntu/15.04/usr.lib.postgresql.bin.postgres 2015-06-08 14:36:08 +0000
108@@ -12,5 +12,5 @@
109 /var/lib/postgresql/** rwl,
110 /{,var/}run/postgresql/** rw,
111
112- owner @{PROC}/[0-9]*/oom_adj rw,
113+ owner @{PROC}/@{pid}/oom_adj rw,
114 }

Subscribers

People subscribed via source and target branches

to status/vote changes: