Merge lp:~jdstrand/powerd/powerd-lp1296415 into lp:powerd

Proposed by Jamie Strandboge on 2014-06-24
Status: Rejected
Rejected by: Jamie Strandboge on 2014-07-17
Proposed branch: lp:~jdstrand/powerd/powerd-lp1296415
Merge into: lp:powerd
Diff against target: 70 lines (+27/-0)
6 files modified
debian/control (+1/-0)
debian/dirs (+1/-0)
debian/install (+1/-0)
debian/rules (+4/-0)
debian/upstart (+4/-0)
debian/usr.bin.powerd (+16/-0)
To merge this branch: bzr merge lp:~jdstrand/powerd/powerd-lp1296415
Reviewer Review Type Date Requested Status
PS Jenkins bot continuous-integration Approve on 2014-06-24
Ubuntu Phablet Team 2014-06-24 Pending
Review via email: mp+224366@code.launchpad.net

Commit message

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

Description of the change

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

To post a comment you must log in.
PS Jenkins bot (ps-jenkins) wrote :
review: Approve (continuous-integration)
lp:~jdstrand/powerd/powerd-lp1296415 updated on 2014-06-24
133. By Jamie Strandboge on 2014-06-24

debian/usr.bin.powerd: more closely mimic confined with exec transitions

PS Jenkins bot (ps-jenkins) wrote :
review: Approve (continuous-integration)
Jamie Strandboge (jdstrand) wrote :

Rejecting for now since we won't be implementing this (see bug description).

Unmerged revisions

133. By Jamie Strandboge on 2014-06-24

debian/usr.bin.powerd: more closely mimic confined with exec transitions

132. By Jamie Strandboge on 2014-06-24

revert change to debian/changelog-- let autolanding handle it

131. By Jamie Strandboge on 2014-06-24

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

Preview Diff

[H/L] Next/Prev Comment, [J/K] Next/Prev File, [N/P] Next/Prev Hunk
1=== modified file 'debian/control'
2--- debian/control 2014-05-29 06:53:15 +0000
3+++ debian/control 2014-06-24 22:23:58 +0000
4@@ -13,6 +13,7 @@
5 libupower-glib-dev,
6 uuid-dev,
7 libhardware-dev (>= 0.1.0+git20131207+e452e83-0ubuntu12),
8+ dh-apparmor,
9 Standards-Version: 3.9.4
10 Homepage: https://launchpad.net/powerd
11 # If you aren't a member of ~phablet-team but need to upload packaging changes,
12
13=== added file 'debian/dirs'
14--- debian/dirs 1970-01-01 00:00:00 +0000
15+++ debian/dirs 2014-06-24 22:23:58 +0000
16@@ -0,0 +1,1 @@
17+etc/apparmor.d
18
19=== modified file 'debian/install'
20--- debian/install 2013-05-22 17:35:03 +0000
21+++ debian/install 2014-06-24 22:23:58 +0000
22@@ -1,1 +1,2 @@
23 debian/powerd.conf etc/dbus-1/system.d/
24+debian/usr.bin.powerd etc/apparmor.d
25
26=== modified file 'debian/rules'
27--- debian/rules 2013-06-04 06:19:10 +0000
28+++ debian/rules 2014-06-24 22:23:58 +0000
29@@ -10,3 +10,7 @@
30
31 override_dh_install:
32 dh_install --fail-missing
33+
34+override_dh_installdeb:
35+ dh_apparmor --profile-name=usr.bin.powerd -ppowerd
36+ dh_installdeb
37
38=== modified file 'debian/upstart'
39--- debian/upstart 2013-08-14 11:07:09 +0000
40+++ debian/upstart 2014-06-24 22:23:58 +0000
41@@ -8,4 +8,8 @@
42 #uncomment the line below to enable debugging
43 #env POWERD_DEBUG=1
44
45+pre-start script
46+ /lib/init/apparmor-profile-load usr.bin.powerd
47+end script
48+
49 exec /usr/bin/powerd
50
51=== added file 'debian/usr.bin.powerd'
52--- debian/usr.bin.powerd 1970-01-01 00:00:00 +0000
53+++ debian/usr.bin.powerd 2014-06-24 22:23:58 +0000
54@@ -0,0 +1,16 @@
55+#include <tunables/global>
56+
57+# Permissive profile to have profile name to limit access to ofonod (LP: #1296415)
58+/usr/bin/powerd (attach_disconnected) {
59+ capability,
60+ mount,
61+ remount,
62+ umount,
63+ network,
64+ / rwkl,
65+ /** rwlkm,
66+ /** pix,
67+ dbus,
68+ signal,
69+ ptrace,
70+}

Subscribers

People subscribed via source and target branches