Merge lp:~cmiller/ubuntu/trusty/apparmor/chromium-new-sandbox-name into lp:ubuntu/trusty/apparmor

Proposed by Chad Miller
Status: Approved
Approved by: Jamie Strandboge
Approved revision: 64
Proposed branch: lp:~cmiller/ubuntu/trusty/apparmor/chromium-new-sandbox-name
Merge into: lp:ubuntu/trusty/apparmor
Diff against target: 69 lines (+15/-4)
3 files modified
debian/changelog (+7/-0)
debian/patches/0001-add-chromium-browser.patch (+6/-4)
profiles/apparmor.d/usr.bin.chromium-browser (+2/-0)
To merge this branch: bzr merge lp:~cmiller/ubuntu/trusty/apparmor/chromium-new-sandbox-name
Reviewer Review Type Date Requested Status
Chad Miller (community) Disapprove
Jamie Strandboge Approve
Ubuntu branches Pending
Review via email: mp+193657@code.launchpad.net
To post a comment you must log in.
Revision history for this message
Jamie Strandboge (jdstrand) wrote :

This is pending a landing ask and will be part of 2.8.0-0ubuntu34. Thanks!

As an aside, it probably makes sense to move this to the chromium-browser packaging like we do with firefox. You can probably follow https://wiki.ubuntu.com/ApparmorProfileMigration if you are interested (along with mimicking firefox's packaging to disable it on install). Note, this would not be a change for SRUs, so it would make the packaging diverge.

review: Approve
Revision history for this message
Chad Miller (cmiller) wrote :

I'm moving the entire apparmor profile to the chromium packaging, so this will be superceded. If it's not already applied, please feel free ignoring it.

review: Disapprove
Revision history for this message
Jamie Strandboge (jdstrand) wrote :

It's already in the archive and in this branch.

Unmerged revisions

64. By Chad Miller

debian/patches/0001-add-chromium-browser.patch: Follow new chromium-browser
sandbox name. Keep old name for now to allow transition. LP: #1247269

Preview Diff

[H/L] Next/Prev Comment, [J/K] Next/Prev File, [N/P] Next/Prev Hunk
1=== modified file 'debian/changelog'
2--- debian/changelog 2013-10-31 13:23:57 +0000
3+++ debian/changelog 2013-11-01 20:28:20 +0000
4@@ -1,3 +1,10 @@
5+apparmor (2.8.0-0ubuntu34) UNRELEASED; urgency=low
6+
7+ * debian/patches/0001-add-chromium-browser.patch: Follow new chromium-browser
8+ sandbox name. Keep old name for now to allow transition. LP: #1247269
9+
10+ -- Chad MILLER <chad.miller@canonical.com> Fri, 01 Nov 2013 16:18:54 -0400
11+
12 apparmor (2.8.0-0ubuntu33) trusty; urgency=low
13
14 * Convert to dh.
15
16=== modified file 'debian/patches/0001-add-chromium-browser.patch'
17--- debian/patches/0001-add-chromium-browser.patch 2013-04-08 14:57:14 +0000
18+++ debian/patches/0001-add-chromium-browser.patch 2013-11-01 20:28:20 +0000
19@@ -2,11 +2,11 @@
20 Description: chromium-browser profile
21 Forwarded: yes
22
23-Index: apparmor-2.8.0/profiles/apparmor.d/usr.bin.chromium-browser
24+Index: apparmor/profiles/apparmor.d/usr.bin.chromium-browser
25 ===================================================================
26---- /dev/null 1970-01-01 00:00:00.000000000 +0000
27-+++ apparmor-2.8.0/profiles/apparmor.d/usr.bin.chromium-browser 2013-04-08 14:51:55.000000000 -0500
28-@@ -0,0 +1,219 @@
29+--- /dev/null
30++++ apparmor/profiles/apparmor.d/usr.bin.chromium-browser
31+@@ -0,0 +1,221 @@
32 +# Author: Jamie Strandboge <jamie@canonical.com>
33 +#include <tunables/global>
34 +
35@@ -130,6 +130,7 @@
36 + # Allow transitions to ourself and our sandbox
37 + /usr/lib/chromium-browser/chromium-browser ix,
38 + /usr/lib/chromium-browser/chromium-browser-sandbox cx -> chromium_browser_sandbox,
39++ /usr/lib/chromium-browser/chrome-sandbox cx -> chromium_browser_sandbox,
40 +
41 + /bin/ps Uxr,
42 + /usr/lib/chromium-browser/xdg-settings Cxr -> xdgsettings,
43@@ -220,6 +221,7 @@
44 + /usr/bin/chromium-browser r,
45 + /usr/lib/chromium-browser/chromium-browser Px,
46 + /usr/lib/chromium-browser/chromium-browser-sandbox r,
47++ /usr/lib/chromium-browser/chrome-sandbox r,
48 +
49 + /dev/null rw,
50 +
51
52=== modified file 'profiles/apparmor.d/usr.bin.chromium-browser'
53--- profiles/apparmor.d/usr.bin.chromium-browser 2013-04-08 14:57:14 +0000
54+++ profiles/apparmor.d/usr.bin.chromium-browser 2013-11-01 20:28:20 +0000
55@@ -121,6 +121,7 @@
56 # Allow transitions to ourself and our sandbox
57 /usr/lib/chromium-browser/chromium-browser ix,
58 /usr/lib/chromium-browser/chromium-browser-sandbox cx -> chromium_browser_sandbox,
59+ /usr/lib/chromium-browser/chrome-sandbox cx -> chromium_browser_sandbox,
60
61 /bin/ps Uxr,
62 /usr/lib/chromium-browser/xdg-settings Cxr -> xdgsettings,
63@@ -211,6 +212,7 @@
64 /usr/bin/chromium-browser r,
65 /usr/lib/chromium-browser/chromium-browser Px,
66 /usr/lib/chromium-browser/chromium-browser-sandbox r,
67+ /usr/lib/chromium-browser/chrome-sandbox r,
68
69 /dev/null rw,
70

Subscribers

People subscribed via source and target branches

to all changes: