Merge lp:~stolowski/unity8/apparmor-profile into lp:unity8
- apparmor-profile
- Merge into trunk
Status: | Merged |
---|---|
Approved by: | Michał Sawicz |
Approved revision: | 2411 |
Merged at revision: | 2441 |
Proposed branch: | lp:~stolowski/unity8/apparmor-profile |
Merge into: | lp:unity8 |
Diff against target: |
61 lines (+27/-0) 4 files modified
debian/control (+1/-0) debian/rules (+4/-0) debian/unity8.install (+1/-0) debian/usr.bin.unity8-dash (+21/-0) |
To merge this branch: | bzr merge lp:~stolowski/unity8/apparmor-profile |
Related bugs: |
Reviewer | Review Type | Date Requested | Status |
---|---|---|---|
Unity8 CI Bot | continuous-integration | Needs Fixing | |
Michał Sawicz | Approve | ||
Review via email: mp+272602@code.launchpad.net |
Commit message
Added apparmor profile for unity8-dash.
Description of the change
Added apparmor profile for unity8-dash. This is required for prompts about location access from scopes. Requires https:/
- 2410. By Paweł Stołowski
-
Added apparmor profile. Install icon so it's available for privacy settings
- 2411. By Paweł Stołowski
-
No need to install icon anymore
Unity8 CI Bot (unity8-ci-bot) wrote : | # |
FAILED: Continuous integration, rev:1992
https:/
Executed test runs:
SUCCESS: https:/
SUCCESS: https:/
UNSTABLE: https:/
SUCCESS: https:/
SUCCESS: https:/
SUCCESS: https:/
SUCCESS: https:/
SUCCESS: https:/
SUCCESS: https:/
deb: https:/
SUCCESS: https:/
deb: https:/
SUCCESS: https:/
deb: https:/
SUCCESS: https:/
deb: https:/
SUCCESS: https:/
deb: https:/
SUCCESS: https:/
deb: https:/
SUCCESS: https:/
deb: https:/
SUCCESS: https:/
deb: https:/
SUCCESS: https:/
deb: https:/
Click here to trigger a rebuild:
https:/
Unity8 CI Bot (unity8-ci-bot) wrote : | # |
FAILED: Continuous integration, rev:2411
https:/
Executed test runs:
SUCCESS: https:/
SUCCESS: https:/
SUCCESS: https:/
UNSTABLE: https:/
SUCCESS: https:/
SUCCESS: https:/
SUCCESS: https:/
SUCCESS: https:/
SUCCESS: https:/
deb: https:/
SUCCESS: https:/
deb: https:/
SUCCESS: https:/
deb: https:/
SUCCESS: https:/
deb: https:/
SUCCESS: https:/
deb: https:/
SUCCESS: https:/
deb: https:/
SUCCESS: https:/
deb: https:/
SUCCESS: https:/
deb: https:/
SUCCESS: https:/
deb: https:/
Click here to trigger a rebuild:
https:/
Unity8 CI Bot (unity8-ci-bot) wrote : | # |
FAILED: Continuous integration, rev:2411
https:/
Executed test runs:
SUCCESS: https:/
UNSTABLE: https:/
SUCCESS: https:/
SUCCESS: https:/
SUCCESS: https:/
SUCCESS: https:/
SUCCESS: https:/
SUCCESS: https:/
SUCCESS: https:/
deb: https:/
SUCCESS: https:/
deb: https:/
SUCCESS: https:/
deb: https:/
SUCCESS: https:/
deb: https:/
SUCCESS: https:/
deb: https:/
SUCCESS: https:/
deb: https:/
SUCCESS: https:/
deb: https:/
SUCCESS: https:/
deb: https:/
SUCCESS: https:/
deb: https:/
Click here to trigger a rebuild:
https:/
Unity8 CI Bot (unity8-ci-bot) wrote : | # |
FAILED: Continuous integration, rev:2411
https:/
Executed test runs:
SUCCESS: https:/
UNSTABLE: https:/
UNSTABLE: https:/
SUCCESS: https:/
SUCCESS: https:/
SUCCESS: https:/
SUCCESS: https:/
SUCCESS: https:/
SUCCESS: https:/
deb: https:/
SUCCESS: https:/
deb: https:/
SUCCESS: https:/
deb: https:/
SUCCESS: https:/
deb: https:/
SUCCESS: https:/
deb: https:/
SUCCESS: https:/
deb: https:/
SUCCESS: https:/
deb: https:/
SUCCESS: https:/
deb: https:/
SUCCESS: https:/
deb: https:/
Click here to trigger a rebuild:
https:/
Unity8 CI Bot (unity8-ci-bot) wrote : | # |
FAILED: Continuous integration, rev:2411
https:/
Executed test runs:
SUCCESS: https:/
UNSTABLE: https:/
UNSTABLE: https:/
SUCCESS: https:/
SUCCESS: https:/
SUCCESS: https:/
SUCCESS: https:/
SUCCESS: https:/
SUCCESS: https:/
deb: https:/
SUCCESS: https:/
deb: https:/
SUCCESS: https:/
deb: https:/
SUCCESS: https:/
deb: https:/
SUCCESS: https:/
deb: https:/
SUCCESS: https:/
deb: https:/
SUCCESS: https:/
deb: https:/
SUCCESS: https:/
deb: https:/
SUCCESS: https:/
deb: https:/
Click here to trigger a rebuild:
https:/
Preview Diff
1 | === modified file 'debian/control' | |||
2 | --- debian/control 2016-05-17 19:42:10 +0000 | |||
3 | +++ debian/control 2016-05-31 10:16:21 +0000 | |||
4 | @@ -5,6 +5,7 @@ | |||
5 | 5 | Build-Depends: cmake, | 5 | Build-Depends: cmake, |
6 | 6 | dbus-test-runner, | 6 | dbus-test-runner, |
7 | 7 | debhelper (>= 9), | 7 | debhelper (>= 9), |
8 | 8 | dh-apparmor, | ||
9 | 8 | doxyqml, | 9 | doxyqml, |
10 | 9 | # To allow cross-compiling to work, we also must append :native | 10 | # To allow cross-compiling to work, we also must append :native |
11 | 10 | # to g++ so we don't try to run armhf g++ | 11 | # to g++ so we don't try to run armhf g++ |
12 | 11 | 12 | ||
13 | === modified file 'debian/rules' | |||
14 | --- debian/rules 2016-04-27 15:01:10 +0000 | |||
15 | +++ debian/rules 2016-05-31 10:16:21 +0000 | |||
16 | @@ -29,6 +29,10 @@ | |||
17 | 29 | cd $(CURDIR) | 29 | cd $(CURDIR) |
18 | 30 | dh_install -X'*.pyc' --fail-missing | 30 | dh_install -X'*.pyc' --fail-missing |
19 | 31 | 31 | ||
20 | 32 | override_dh_installdeb: | ||
21 | 33 | dh_apparmor --profile-name=usr.bin.unity8-dash -punity8-dash | ||
22 | 34 | dh_installdeb | ||
23 | 35 | |||
24 | 32 | # use private lib directories | 36 | # use private lib directories |
25 | 33 | override_dh_makeshlibs: | 37 | override_dh_makeshlibs: |
26 | 34 | dh_makeshlibs -Nunity8-private -Nunity8-fake-env | 38 | dh_makeshlibs -Nunity8-private -Nunity8-fake-env |
27 | 35 | 39 | ||
28 | === modified file 'debian/unity8.install' | |||
29 | --- debian/unity8.install 2016-03-31 09:11:58 +0000 | |||
30 | +++ debian/unity8.install 2016-05-31 10:16:21 +0000 | |||
31 | @@ -1,3 +1,4 @@ | |||
32 | 1 | debian/usr.bin.unity8-dash etc/apparmor.d | ||
33 | 1 | var/lib/unity8/version | 2 | var/lib/unity8/version |
34 | 2 | data/unity8-dash.conf usr/share/upstart/sessions/ | 3 | data/unity8-dash.conf usr/share/upstart/sessions/ |
35 | 3 | data/unity8-filewatcher.conf usr/share/upstart/sessions/ | 4 | data/unity8-filewatcher.conf usr/share/upstart/sessions/ |
36 | 4 | 5 | ||
37 | === added file 'debian/usr.bin.unity8-dash' | |||
38 | --- debian/usr.bin.unity8-dash 1970-01-01 00:00:00 +0000 | |||
39 | +++ debian/usr.bin.unity8-dash 2016-05-31 10:16:21 +0000 | |||
40 | @@ -0,0 +1,21 @@ | |||
41 | 1 | # vim:syntax=apparmor | ||
42 | 2 | |||
43 | 3 | #include <tunables/global> | ||
44 | 4 | |||
45 | 5 | # v2 compatible wildly permissive profile | ||
46 | 6 | profile unity8-dash /usr/bin/unity8-dash (attach_disconnected) { | ||
47 | 7 | capability, | ||
48 | 8 | network, | ||
49 | 9 | / rwkl, | ||
50 | 10 | /** rwlkm, | ||
51 | 11 | /** pix, | ||
52 | 12 | |||
53 | 13 | mount, | ||
54 | 14 | remount, | ||
55 | 15 | umount, | ||
56 | 16 | pivot_root, | ||
57 | 17 | dbus, | ||
58 | 18 | signal, | ||
59 | 19 | ptrace, | ||
60 | 20 | unix, | ||
61 | 21 | } |
Lookin' good, waiting for CI.