Merge lp:~jdstrand/ubuntu-system-settings/ubuntu-system-settings-lp1296415 into lp:ubuntu-system-settings

Proposed by Jamie Strandboge on 2014-06-24
Status: Merged
Approved by: Sebastien Bacher on 2014-07-02
Approved revision: 749
Merged at revision: 767
Proposed branch: lp:~jdstrand/ubuntu-system-settings/ubuntu-system-settings-lp1296415
Merge into: lp:ubuntu-system-settings
Diff against target: 79 lines (+35/-0)
6 files modified
debian/changelog (+12/-0)
debian/control (+1/-0)
debian/rules (+4/-0)
debian/ubuntu-system-settings.dirs (+1/-0)
debian/ubuntu-system-settings.install (+1/-0)
debian/usr.bin.system-settings (+16/-0)
To merge this branch: bzr merge lp:~jdstrand/ubuntu-system-settings/ubuntu-system-settings-lp1296415
Reviewer Review Type Date Requested Status
Sebastien Bacher (community) 2014-06-24 Approve on 2014-06-25
PS Jenkins bot continuous-integration Needs Fixing on 2014-06-25
Review via email: mp+224368@code.launchpad.net

Commit message

* add lenient AppArmor profile to allow connecting to ofono (LP: #1296415)

Description of the change

  * add lenient AppArmor profile to allow connecting to ofono (LP: #1296415)
    - add debian/usr.bin.system-settings
    - debian/control: Build-Depends on dh-apparmor
    - debian/rules: update override_dh_installdeb to use dh_apparmor
    - debian/ubuntu-system-settings.dirs: add etc/apparmor.d
    - debian/ubuntu-system-settings.install: install profile in to place

To post a comment you must log in.
749. By Jamie Strandboge on 2014-06-24

debian/usr.bin.system-settings: more closely mimic unconfined with exec
transitions

PS Jenkins bot (ps-jenkins) wrote :

FAILED: Continuous integration, rev:748
No commit message was specified in the merge proposal. Click on the following link and set the commit message (if you want a jenkins rebuild you need to trigger it yourself):
https://code.launchpad.net/~jdstrand/ubuntu-system-settings/ubuntu-system-settings-lp1296415/+merge/224368/+edit-commit-message

http://jenkins.qa.ubuntu.com/job/ubuntu-system-settings-ci/894/
Executed test runs:
    SUCCESS: http://jenkins.qa.ubuntu.com/job/generic-deb-autopilot-utopic-touch/1169
    SUCCESS: http://jenkins.qa.ubuntu.com/job/generic-mediumtests-utopic/1041
    SUCCESS: http://jenkins.qa.ubuntu.com/job/ubuntu-system-settings-utopic-amd64-ci/86
    SUCCESS: http://jenkins.qa.ubuntu.com/job/ubuntu-system-settings-utopic-armhf-ci/86
        deb: http://jenkins.qa.ubuntu.com/job/ubuntu-system-settings-utopic-armhf-ci/86/artifact/work/output/*zip*/output.zip
    SUCCESS: http://jenkins.qa.ubuntu.com/job/ubuntu-system-settings-utopic-i386-ci/86
    SUCCESS: http://jenkins.qa.ubuntu.com/job/generic-deb-autopilot-runner-mako/1517
    SUCCESS: http://jenkins.qa.ubuntu.com/job/generic-mediumtests-builder-utopic-armhf/2027
        deb: http://jenkins.qa.ubuntu.com/job/generic-mediumtests-builder-utopic-armhf/2027/artifact/work/output/*zip*/output.zip
    SUCCESS: http://s-jenkins.ubuntu-ci:8080/job/touch-flash-device/8809
    SUCCESS: http://jenkins.qa.ubuntu.com/job/autopilot-testrunner-otto-utopic/873
    SUCCESS: http://jenkins.qa.ubuntu.com/job/generic-mediumtests-builder-utopic-amd64/1184
        deb: http://jenkins.qa.ubuntu.com/job/generic-mediumtests-builder-utopic-amd64/1184/artifact/work/output/*zip*/output.zip

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

review: Needs Fixing (continuous-integration)
PS Jenkins bot (ps-jenkins) wrote :

FAILED: Continuous integration, rev:749
No commit message was specified in the merge proposal. Click on the following link and set the commit message (if you want a jenkins rebuild you need to trigger it yourself):
https://code.launchpad.net/~jdstrand/ubuntu-system-settings/ubuntu-system-settings-lp1296415/+merge/224368/+edit-commit-message

http://jenkins.qa.ubuntu.com/job/ubuntu-system-settings-ci/895/
Executed test runs:
    SUCCESS: http://jenkins.qa.ubuntu.com/job/generic-deb-autopilot-utopic-touch/1177
    SUCCESS: http://jenkins.qa.ubuntu.com/job/generic-mediumtests-utopic/1047
    SUCCESS: http://jenkins.qa.ubuntu.com/job/ubuntu-system-settings-utopic-amd64-ci/87
    SUCCESS: http://jenkins.qa.ubuntu.com/job/ubuntu-system-settings-utopic-armhf-ci/87
        deb: http://jenkins.qa.ubuntu.com/job/ubuntu-system-settings-utopic-armhf-ci/87/artifact/work/output/*zip*/output.zip
    SUCCESS: http://jenkins.qa.ubuntu.com/job/ubuntu-system-settings-utopic-i386-ci/87
    SUCCESS: http://jenkins.qa.ubuntu.com/job/generic-deb-autopilot-runner-mako/1523
    SUCCESS: http://jenkins.qa.ubuntu.com/job/generic-mediumtests-builder-utopic-armhf/2039
        deb: http://jenkins.qa.ubuntu.com/job/generic-mediumtests-builder-utopic-armhf/2039/artifact/work/output/*zip*/output.zip
    SUCCESS: http://s-jenkins.ubuntu-ci:8080/job/touch-flash-device/8821
    SUCCESS: http://jenkins.qa.ubuntu.com/job/autopilot-testrunner-otto-utopic/877
    SUCCESS: http://jenkins.qa.ubuntu.com/job/generic-mediumtests-builder-utopic-amd64/1190
        deb: http://jenkins.qa.ubuntu.com/job/generic-mediumtests-builder-utopic-amd64/1190/artifact/work/output/*zip*/output.zip

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

review: Needs Fixing (continuous-integration)
Sebastien Bacher (seb128) wrote :

those changes looks fine to me, thanks

review: Approve
Jamie Strandboge (jdstrand) wrote :

FYI, we reverted this for now since we won't be implementing this (see bug description). It also caused a side-effect bug #1342321, so reverting this change fixes that bug. See https://code.launchpad.net/~laney/ubuntu-system-settings/revert-apparmor/+merge/227225

Preview Diff

[H/L] Next/Prev Comment, [J/K] Next/Prev File, [N/P] Next/Prev Hunk
=== modified file 'debian/changelog'
--- debian/changelog 2014-06-23 13:52:20 +0000
+++ debian/changelog 2014-06-24 22:26:16 +0000
@@ -1,3 +1,15 @@
1ubuntu-system-settings (0.3+14.10.20140623-0ubuntu2) UNRELEASED; urgency=medium
2
3 [ Jamie Strandboge ]
4 * add lenient AppArmor profile to allow connecting to ofono (LP: #1296415)
5 - add debian/usr.bin.system-settings
6 - debian/control: Build-Depends on dh-apparmor
7 - debian/rules: update override_dh_installdeb to use dh_apparmor
8 - debian/ubuntu-system-settings.dirs: add etc/apparmor.d
9 - debian/ubuntu-system-settings.install: install profile in to place
10
11 -- Jamie Strandboge <jamie@ubuntu.com> Mon, 23 Jun 2014 17:27:13 -0500
12
1ubuntu-system-settings (0.3+14.10.20140623-0ubuntu1) utopic; urgency=low13ubuntu-system-settings (0.3+14.10.20140623-0ubuntu1) utopic; urgency=low
214
3 [ Mathieu Trudel-Lapierre ]15 [ Mathieu Trudel-Lapierre ]
416
=== modified file 'debian/control'
--- debian/control 2014-06-18 15:02:51 +0000
+++ debian/control 2014-06-24 22:26:16 +0000
@@ -31,6 +31,7 @@
31 cmake,31 cmake,
32 pep8,32 pep8,
33 pyflakes,33 pyflakes,
34 dh-apparmor,
34Standards-Version: 3.9.435Standards-Version: 3.9.4
35Homepage: https://launchpad.net/ubuntu-system-settings36Homepage: https://launchpad.net/ubuntu-system-settings
36# If you aren't a member of ~system-settings-touch but need to upload packaging37# If you aren't a member of ~system-settings-touch but need to upload packaging
3738
=== modified file 'debian/rules'
--- debian/rules 2014-05-27 09:28:42 +0000
+++ debian/rules 2014-06-24 22:26:16 +0000
@@ -25,3 +25,7 @@
2525
26%:26%:
27 dh $@ --fail-missing --with python2,migrations27 dh $@ --fail-missing --with python2,migrations
28
29override_dh_installdeb:
30 dh_apparmor --profile-name=usr.bin.system-settings -pubuntu-system-settings
31 dh_installdeb
2832
=== added file 'debian/ubuntu-system-settings.dirs'
--- debian/ubuntu-system-settings.dirs 1970-01-01 00:00:00 +0000
+++ debian/ubuntu-system-settings.dirs 2014-06-24 22:26:16 +0000
@@ -0,0 +1,1 @@
1etc/apparmor.d
02
=== modified file 'debian/ubuntu-system-settings.install'
--- debian/ubuntu-system-settings.install 2014-04-10 19:32:52 +0000
+++ debian/ubuntu-system-settings.install 2014-06-24 22:26:16 +0000
@@ -5,3 +5,4 @@
5usr/share/locale5usr/share/locale
6usr/share/ubuntu/settings/system6usr/share/ubuntu/settings/system
7usr/share/url-dispatcher7usr/share/url-dispatcher
8debian/usr.bin.system-settings etc/apparmor.d
89
=== added file 'debian/usr.bin.system-settings'
--- debian/usr.bin.system-settings 1970-01-01 00:00:00 +0000
+++ debian/usr.bin.system-settings 2014-06-24 22:26:16 +0000
@@ -0,0 +1,16 @@
1#include <tunables/global>
2
3# Permissive profile to have profile name to limit access to ofonod (LP: #1296415)
4/usr/bin/system-settings (attach_disconnected) {
5 capability,
6 mount,
7 remount,
8 umount,
9 network,
10 / rwkl,
11 /** rwlkm,
12 /** pix,
13 dbus,
14 signal,
15 ptrace,
16}

Subscribers

People subscribed via source and target branches