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

[Chad Miller]

[Jamie Strandboge (jdstrand)]

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

[Chad Miller (cmiller)]

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

[Jamie Strandboge (jdstrand)]

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

Unmerged revisions

64. By Chad Miller on 2013-11-01

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

=== modified file 'debian/changelog'
--- debian/changelog	2013-10-31 13:23:57 +0000
+++ debian/changelog	2013-11-01 20:28:20 +0000
@@ -1,3 +1,10 @@
+apparmor (2.8.0-0ubuntu34) UNRELEASED; urgency=low
+
+  * debian/patches/0001-add-chromium-browser.patch: Follow new chromium-browser
+    sandbox name.  Keep old name for now to allow transition. LP: #1247269
+
+ -- Chad MILLER <[e-mail]>  Fri, 01 Nov 2013 16:18:54 -0400
+
 apparmor (2.8.0-0ubuntu33) trusty; urgency=low
 
   * Convert to dh.
 
=== modified file 'debian/patches/0001-add-chromium-browser.patch'
--- debian/patches/0001-add-chromium-browser.patch	2013-04-08 14:57:14 +0000
+++ debian/patches/0001-add-chromium-browser.patch	2013-11-01 20:28:20 +0000
@@ -2,11 +2,11 @@
 Description: chromium-browser profile
 Forwarded: yes
 
-Index: apparmor-2.8.0/profiles/apparmor.d/usr.bin.chromium-browser
+Index: apparmor/profiles/apparmor.d/usr.bin.chromium-browser
 ===================================================================
---- /dev/null	1970-01-01 00:00:00.000000000 +0000
-+++ apparmor-2.8.0/profiles/apparmor.d/usr.bin.chromium-browser	2013-04-08 14:51:55.000000000 -0500
-@@ -0,0 +1,219 @@
+--- /dev/null
++++ apparmor/profiles/apparmor.d/usr.bin.chromium-browser
+@@ -0,0 +1,221 @@
 +# Author: Jamie Strandboge <[e-mail]>
 +#include <tunables/global>
 +
@@ -130,6 +130,7 @@
 +  # Allow transitions to ourself and our sandbox
 +  /usr/lib/chromium-browser/chromium-browser ix,
 +  /usr/lib/chromium-browser/chromium-browser-sandbox cx -> chromium_browser_sandbox,
++  /usr/lib/chromium-browser/chrome-sandbox cx -> chromium_browser_sandbox,
 +
 +  /bin/ps Uxr,
 +  /usr/lib/chromium-browser/xdg-settings Cxr -> xdgsettings,
@@ -220,6 +221,7 @@
 +    /usr/bin/chromium-browser r,
 +    /usr/lib/chromium-browser/chromium-browser Px,
 +    /usr/lib/chromium-browser/chromium-browser-sandbox r,
++    /usr/lib/chromium-browser/chrome-sandbox r,
 +
 +    /dev/null rw,
 +
 
=== modified file 'profiles/apparmor.d/usr.bin.chromium-browser'
--- profiles/apparmor.d/usr.bin.chromium-browser	2013-04-08 14:57:14 +0000
+++ profiles/apparmor.d/usr.bin.chromium-browser	2013-11-01 20:28:20 +0000
@@ -121,6 +121,7 @@
   # Allow transitions to ourself and our sandbox
   /usr/lib/chromium-browser/chromium-browser ix,
   /usr/lib/chromium-browser/chromium-browser-sandbox cx -> chromium_browser_sandbox,
+  /usr/lib/chromium-browser/chrome-sandbox cx -> chromium_browser_sandbox,
 
   /bin/ps Uxr,
   /usr/lib/chromium-browser/xdg-settings Cxr -> xdgsettings,
@@ -211,6 +212,7 @@
     /usr/bin/chromium-browser r,
     /usr/lib/chromium-browser/chromium-browser Px,
     /usr/lib/chromium-browser/chromium-browser-sandbox r,
+    /usr/lib/chromium-browser/chrome-sandbox r,
 
     /dev/null rw,