Merge lp:~cameronnemo/apparmor/abstraction-fdo-applications-fixups into lp:apparmor/2.12

Proposed by Cameron Norman on 2015-06-08
Status: Merged
Merged at revision: 3706
Proposed branch: lp:~cameronnemo/apparmor/abstraction-fdo-applications-fixups
Merge into: lp:apparmor/2.12
Diff against target: 18 lines (+4/-4)
1 file modified
profiles/apparmor.d/abstractions/freedesktop.org (+4/-4)
To merge this branch: bzr merge lp:~cameronnemo/apparmor/abstraction-fdo-applications-fixups
Reviewer Review Type Date Requested Status
Christian Boltz 2015-06-08 Approve on 2017-09-10
intrigeri Approve on 2017-07-04
Review via email: mp+261336@code.launchpad.net
To post a comment you must log in.
Christian Boltz (cboltz) wrote :

What about merging the rules for main dir and sub dir? You'll get something like

/usr/{,local/}share/applications/{*/,} r,
/usr/{,local/}share/applications/{*/,}defaults.list r,
                                 ^^^^^

intrigeri (intrigeri) wrote :

Hi Cameron! Christian's suggestion makes sense to me. Are you still interested in pushing this MR forward, or should someone else take over?

review: Needs Fixing
3112. By Cameron Norman on 2017-07-03

Merged two rule groups

Cameron Norman (cameronnemo) wrote :

Made adjustments suggested

intrigeri (intrigeri) wrote :

Looks good to me, I would merge this. Thanks for the update!

review: Approve
intrigeri (intrigeri) wrote :

> Looks good to me, I would merge this. Thanks for the update!

Two months later: bump :)

Christian Boltz (cboltz) wrote :

Merged into trunk, 2.11, 2.10 and 2.9 branch.

Christian Boltz (cboltz) :
review: Approve
intrigeri (intrigeri) wrote :

Christian Boltz:
> Merged into trunk, 2.11, 2.10 and 2.9 branch.

Thanks a lot! :)

Preview Diff

[H/L] Next/Prev Comment, [J/K] Next/Prev File, [N/P] Next/Prev Hunk
1=== modified file 'profiles/apparmor.d/abstractions/freedesktop.org'
2--- profiles/apparmor.d/abstractions/freedesktop.org 2014-10-08 19:32:11 +0000
3+++ profiles/apparmor.d/abstractions/freedesktop.org 2017-07-03 19:55:25 +0000
4@@ -10,10 +10,10 @@
5 # ------------------------------------------------------------------
6
7 # system configuration
8- /usr/share/applications/ r,
9- /usr/share/applications/defaults.list r,
10- /usr/share/applications/mimeinfo.cache r,
11- /usr/share/applications/*.desktop r,
12+ /usr/{,local/}share/applications/{*/,} r,
13+ /usr/{,local/}share/applications/{*/,}defaults.list r,
14+ /usr/{,local/}share/applications/{*/,}mimeinfo.cache r,
15+ /usr/{,local/}share/applications/{*/,}*.desktop r,
16 /usr/share/icons/ r,
17 /usr/share/icons/** r,
18 /usr/share/pixmaps/ r,

Subscribers

People subscribed via source and target branches