Merge lp:~ken-vandine/address-book-app/add_profile into lp:address-book-app

Proposed by Ken VanDine on 2016-12-01
Status: Merged
Approved by: Renato Araujo Oliveira Filho on 2016-12-08
Approved revision: 651
Merged at revision: 670
Proposed branch: lp:~ken-vandine/address-book-app/add_profile
Merge into: lp:address-book-app
Diff against target: 57 lines (+22/-0)
4 files modified
debian/address-book-app.install (+1/-0)
debian/apparmor/address-book-app (+15/-0)
debian/control.in (+1/-0)
debian/rules (+5/-0)
To merge this branch: bzr merge lp:~ken-vandine/address-book-app/add_profile
Reviewer Review Type Date Requested Status
Renato Araujo Oliveira Filho (community) 2016-12-01 Approve on 2016-12-08
system-apps-ci-bot continuous-integration Approve on 2016-12-01
Review via email: mp+312279@code.launchpad.net

Commit message

added apparmor profile for address-book-app

Description of the change

added apparmor profile for address-book-app

To post a comment you must log in.

FAILED: Continuous integration, rev:650
https://jenkins.canonical.com/system-apps/job/lp-address-book-app-ci/47/
Executed test runs:
    FAILURE: https://jenkins.canonical.com/system-apps/job/build/2100/console
    SUCCESS: https://jenkins.canonical.com/system-apps/job/build-0-fetch/2103
    SUCCESS: https://jenkins.canonical.com/system-apps/job/build-2-binpkg/arch=amd64,release=vivid+overlay/1930
        deb: https://jenkins.canonical.com/system-apps/job/build-2-binpkg/arch=amd64,release=vivid+overlay/1930/artifact/output/*zip*/output.zip
    FAILURE: https://jenkins.canonical.com/system-apps/job/build-2-binpkg/arch=amd64,release=xenial+overlay/1930/console
    FAILURE: https://jenkins.canonical.com/system-apps/job/build-2-binpkg/arch=amd64,release=zesty/1930/console
    SUCCESS: https://jenkins.canonical.com/system-apps/job/build-2-binpkg/arch=armhf,release=vivid+overlay/1930
        deb: https://jenkins.canonical.com/system-apps/job/build-2-binpkg/arch=armhf,release=vivid+overlay/1930/artifact/output/*zip*/output.zip
    FAILURE: https://jenkins.canonical.com/system-apps/job/build-2-binpkg/arch=armhf,release=xenial+overlay/1930/console
    FAILURE: https://jenkins.canonical.com/system-apps/job/build-2-binpkg/arch=armhf,release=zesty/1930/console
    SUCCESS: https://jenkins.canonical.com/system-apps/job/build-2-binpkg/arch=i386,release=vivid+overlay/1930
        deb: https://jenkins.canonical.com/system-apps/job/build-2-binpkg/arch=i386,release=vivid+overlay/1930/artifact/output/*zip*/output.zip
    FAILURE: https://jenkins.canonical.com/system-apps/job/build-2-binpkg/arch=i386,release=xenial+overlay/1930/console
    FAILURE: https://jenkins.canonical.com/system-apps/job/build-2-binpkg/arch=i386,release=zesty/1930/console

Click here to trigger a rebuild:
https://jenkins.canonical.com/system-apps/job/lp-address-book-app-ci/47/rebuild

review: Needs Fixing (continuous-integration)
651. By Ken VanDine on 2016-12-01

build dep on dh-apparmor

PASSED: Continuous integration, rev:651
https://jenkins.canonical.com/system-apps/job/lp-address-book-app-ci/48/
Executed test runs:
    SUCCESS: https://jenkins.canonical.com/system-apps/job/build/2101
    SUCCESS: https://jenkins.canonical.com/system-apps/job/test-0-autopkgtest/label=phone-armhf,release=vivid+overlay,testname=default/517
    SUCCESS: https://jenkins.canonical.com/system-apps/job/build-0-fetch/2104
    SUCCESS: https://jenkins.canonical.com/system-apps/job/build-2-binpkg/arch=amd64,release=vivid+overlay/1932
        deb: https://jenkins.canonical.com/system-apps/job/build-2-binpkg/arch=amd64,release=vivid+overlay/1932/artifact/output/*zip*/output.zip
    SUCCESS: https://jenkins.canonical.com/system-apps/job/build-2-binpkg/arch=amd64,release=xenial+overlay/1932
        deb: https://jenkins.canonical.com/system-apps/job/build-2-binpkg/arch=amd64,release=xenial+overlay/1932/artifact/output/*zip*/output.zip
    SUCCESS: https://jenkins.canonical.com/system-apps/job/build-2-binpkg/arch=amd64,release=zesty/1932
        deb: https://jenkins.canonical.com/system-apps/job/build-2-binpkg/arch=amd64,release=zesty/1932/artifact/output/*zip*/output.zip
    SUCCESS: https://jenkins.canonical.com/system-apps/job/build-2-binpkg/arch=armhf,release=vivid+overlay/1932
        deb: https://jenkins.canonical.com/system-apps/job/build-2-binpkg/arch=armhf,release=vivid+overlay/1932/artifact/output/*zip*/output.zip
    SUCCESS: https://jenkins.canonical.com/system-apps/job/build-2-binpkg/arch=armhf,release=xenial+overlay/1932
        deb: https://jenkins.canonical.com/system-apps/job/build-2-binpkg/arch=armhf,release=xenial+overlay/1932/artifact/output/*zip*/output.zip
    SUCCESS: https://jenkins.canonical.com/system-apps/job/build-2-binpkg/arch=armhf,release=zesty/1932
        deb: https://jenkins.canonical.com/system-apps/job/build-2-binpkg/arch=armhf,release=zesty/1932/artifact/output/*zip*/output.zip
    SUCCESS: https://jenkins.canonical.com/system-apps/job/build-2-binpkg/arch=i386,release=vivid+overlay/1932
        deb: https://jenkins.canonical.com/system-apps/job/build-2-binpkg/arch=i386,release=vivid+overlay/1932/artifact/output/*zip*/output.zip
    SUCCESS: https://jenkins.canonical.com/system-apps/job/build-2-binpkg/arch=i386,release=xenial+overlay/1932
        deb: https://jenkins.canonical.com/system-apps/job/build-2-binpkg/arch=i386,release=xenial+overlay/1932/artifact/output/*zip*/output.zip
    SUCCESS: https://jenkins.canonical.com/system-apps/job/build-2-binpkg/arch=i386,release=zesty/1932
        deb: https://jenkins.canonical.com/system-apps/job/build-2-binpkg/arch=i386,release=zesty/1932/artifact/output/*zip*/output.zip

Click here to trigger a rebuild:
https://jenkins.canonical.com/system-apps/job/lp-address-book-app-ci/48/rebuild

review: Approve (continuous-integration)

looks good to me.

review: Approve

Preview Diff

[H/L] Next/Prev Comment, [J/K] Next/Prev File, [N/P] Next/Prev Hunk
1=== modified file 'debian/address-book-app.install'
2--- debian/address-book-app.install 2014-06-25 22:02:31 +0000
3+++ debian/address-book-app.install 2016-12-01 18:14:00 +0000
4@@ -5,3 +5,4 @@
5 usr/share/url-dispatcher/urls/
6 usr/share/content-hub/peers/address-book-app
7 usr/share/locale/*/LC_MESSAGES/address-book-app.mo
8+debian/apparmor/address-book-app etc/apparmor.d
9
10=== added directory 'debian/apparmor'
11=== added file 'debian/apparmor/address-book-app'
12--- debian/apparmor/address-book-app 1970-01-01 00:00:00 +0000
13+++ debian/apparmor/address-book-app 2016-12-01 18:14:00 +0000
14@@ -0,0 +1,15 @@
15+# vim:syntax=apparmor
16+#include <tunables/global>
17+
18+# Mostly unconfined. Don't allow capability or any mount rules. Also ensure that
19+# exec inherits from this profile
20+profile address-book-app (attach_disconnected) {
21+ network,
22+ / rwkl,
23+ /** rwlkm,
24+ /** pix,
25+ dbus,
26+ signal,
27+ ptrace,
28+ unix,
29+}
30
31=== modified file 'debian/control.in'
32--- debian/control.in 2016-11-17 11:54:15 +0000
33+++ debian/control.in 2016-12-01 18:14:00 +0000
34@@ -5,6 +5,7 @@
35 Build-Depends: cmake,
36 dbus,
37 debhelper (>= 9),
38+ dh-apparmor,
39 dh-translations,
40 libgl1-mesa-dev | libgl-dev,
41 libgles2-mesa-dev,
42
43=== modified file 'debian/rules'
44--- debian/rules 2016-07-22 15:22:45 +0000
45+++ debian/rules 2016-12-01 18:14:00 +0000
46@@ -8,6 +8,11 @@
47 %:
48 dh $@ --parallel --fail-missing --with translations
49
50+override_dh_auto_install:
51+ dh_auto_install
52+ dh_apparmor -paddress-book-app --profile-name=address-book-app
53+
54+
55 override_dh_translations:
56 # Override dh_translations to work around http://pad.lv/1183262.
57 # Unfortunately, the default build directory is not exposed

Subscribers

People subscribed via source and target branches