Merge lp:~laney/ubuntu-system-settings/revert-apparmor into lp:ubuntu-system-settings

[Iain Lane]

revert lenient AppArmor profile since we won't be limiting access to ofono in this manner. Furthermore, due to a naive check in media-hub-server for the connecting process' profile name, this allows system-settings to playback files via media-hub-server again (LP: #1342321)

[PS Jenkins bot (ps-jenkins)]

PASSED: Continuous integration, rev:806
http://jenkins.qa.ubuntu.com/job/ubuntu-system-settings-ci/1014/
Executed test runs:
    SUCCESS: http://jenkins.qa.ubuntu.com/job/generic-deb-autopilot-utopic-touch/2147
    SUCCESS: http://jenkins.qa.ubuntu.com/job/generic-mediumtests-utopic/1794
    SUCCESS: http://jenkins.qa.ubuntu.com/job/ubuntu-system-settings-utopic-amd64-ci/206
    SUCCESS: http://jenkins.qa.ubuntu.com/job/ubuntu-system-settings-utopic-armhf-ci/206
        deb: http://jenkins.qa.ubuntu.com/job/ubuntu-system-settings-utopic-armhf-ci/206/artifact/work/output/*zip*/output.zip
    SUCCESS: http://jenkins.qa.ubuntu.com/job/ubuntu-system-settings-utopic-i386-ci/206
    SUCCESS: http://jenkins.qa.ubuntu.com/job/generic-deb-autopilot-runner-mako/2361
    SUCCESS: http://jenkins.qa.ubuntu.com/job/generic-mediumtests-builder-utopic-armhf/3306
        deb: http://jenkins.qa.ubuntu.com/job/generic-mediumtests-builder-utopic-armhf/3306/artifact/work/output/*zip*/output.zip
    SUCCESS: http://s-jenkins.ubuntu-ci:8080/job/touch-flash-device/10017
    SUCCESS: http://jenkins.qa.ubuntu.com/job/autopilot-testrunner-otto-utopic/1502
    SUCCESS: http://jenkins.qa.ubuntu.com/job/generic-mediumtests-builder-utopic-amd64/2007
        deb: http://jenkins.qa.ubuntu.com/job/generic-mediumtests-builder-utopic-amd64/2007/artifact/work/output/*zip*/output.zip

Click here to trigger a rebuild:
http://s-jenkins.ubuntu-ci:8080/job/ubuntu-system-settings-ci/1014/rebuild

review: Approve (continuous-integration)

[Sebastien Bacher (seb128)]

thanks

review: Approve

[Jamie Strandboge (jdstrand)]

This probably also needs to create debian/ubuntu-system-settings.maintscript with:
rm_conffile /etc/apparmor.d/usr.bin.system-settings 0.3+14.10.20140715-0ubuntu2~

[Iain Lane (laney)]

On Fri, Jul 18, 2014 at 07:12:16PM -0000, Jamie Strandboge wrote:
> This probably also needs to create debian/ubuntu-system-settings.maintscript with:
> rm_conffile /etc/apparmor.d/usr.bin.system-settings 0.3+14.10.20140715-0ubuntu2~

True. I think this won't matter for system upgrades but for apt upgrades
we should do this. This branch landed so I'm going to propose another
one to add it.

--
Iain Lane [ <email address hidden> ]
Debian Developer [ <email address hidden> ]
Ubuntu Developer [ <email address hidden> ]

[Jamie Strandboge (jdstrand)]

Right, I just confirmed this on r144, /etc/apparmor.d/usr.bin.system-settings is not present so the images are fixed now.

=== modified file 'debian/control'
--- debian/control	2014-07-11 23:29:19 +0000
+++ debian/control	2014-07-17 16:39:20 +0000
@@ -32,7 +32,6 @@
                pep8,
                python3-pep8,
                pyflakes,
-               dh-apparmor,
 Standards-Version: 3.9.4
 Homepage: https://launchpad.net/ubuntu-system-settings
 # If you aren't a member of ~system-settings-touch but need to upload packaging

=== modified file 'debian/rules'
--- debian/rules	2014-07-09 00:20:19 +0000
+++ debian/rules	2014-07-17 16:39:20 +0000
@@ -25,7 +25,3 @@
 
 %:
 	dh $@ --fail-missing --with python3,migrations
-
-override_dh_installdeb:
-	dh_apparmor --profile-name=usr.bin.system-settings -pubuntu-system-settings
-	dh_installdeb

=== removed file 'debian/ubuntu-system-settings.dirs'
--- debian/ubuntu-system-settings.dirs	2014-06-24 20:15:04 +0000
+++ debian/ubuntu-system-settings.dirs	1970-01-01 00:00:00 +0000
@@ -1,1 +0,0 @@
-etc/apparmor.d

=== modified file 'debian/ubuntu-system-settings.install'
--- debian/ubuntu-system-settings.install	2014-06-24 20:15:04 +0000
+++ debian/ubuntu-system-settings.install	2014-07-17 16:39:20 +0000
@@ -5,4 +5,3 @@
 usr/share/locale
 usr/share/ubuntu/settings/system
 usr/share/url-dispatcher
-debian/usr.bin.system-settings etc/apparmor.d

=== removed file 'debian/usr.bin.system-settings'
--- debian/usr.bin.system-settings	2014-06-24 22:25:42 +0000
+++ debian/usr.bin.system-settings	1970-01-01 00:00:00 +0000
@@ -1,16 +0,0 @@
-#include <tunables/global>
-
-# Permissive profile to have profile name to limit access to ofonod (LP: #1296415)
-/usr/bin/system-settings (attach_disconnected) {
-  capability,
-  mount,
-  remount,
-  umount,
-  network,
-  /   rwkl,
-  /** rwlkm,
-  /** pix,
-  dbus,
-  signal,
-  ptrace,
-}