Merge lp:~ken-vandine/gallery-app/add_profile into lp:gallery-app

Proposed by Ken VanDine on 2016-12-01
Status: Merged
Approved by: Arthur Mello on 2016-12-12
Approved revision: 1335
Merged at revision: 1345
Proposed branch: lp:~ken-vandine/gallery-app/add_profile
Merge into: lp:gallery-app
Diff against target: 53 lines (+18/-0)
4 files modified
debian/apparmor/gallery-app (+15/-0)
debian/control (+1/-0)
debian/gallery-app.install (+1/-0)
debian/rules (+1/-0)
To merge this branch: bzr merge lp:~ken-vandine/gallery-app/add_profile
Reviewer Review Type Date Requested Status
Arthur Mello (community) 2016-12-01 Approve on 2016-12-12
system-apps-ci-bot continuous-integration Approve on 2016-12-01
Review via email: mp+312280@code.launchpad.net

Commit message

added apparmor profile for gallery-app

Description of the change

added apparmor profile for gallery-app

To post a comment you must log in.

FAILED: Continuous integration, rev:1334
https://jenkins.canonical.com/system-apps/job/lp-gallery-app-ci/29/
Executed test runs:
    FAILURE: https://jenkins.canonical.com/system-apps/job/build/2099/console
    SUCCESS: https://jenkins.canonical.com/system-apps/job/build-0-fetch/2102
    SUCCESS: https://jenkins.canonical.com/system-apps/job/build-2-binpkg/arch=amd64,release=vivid+overlay/1931
        deb: https://jenkins.canonical.com/system-apps/job/build-2-binpkg/arch=amd64,release=vivid+overlay/1931/artifact/output/*zip*/output.zip
    FAILURE: https://jenkins.canonical.com/system-apps/job/build-2-binpkg/arch=amd64,release=xenial+overlay/1931/console
    FAILURE: https://jenkins.canonical.com/system-apps/job/build-2-binpkg/arch=amd64,release=zesty/1931/console
    SUCCESS: https://jenkins.canonical.com/system-apps/job/build-2-binpkg/arch=armhf,release=vivid+overlay/1931
        deb: https://jenkins.canonical.com/system-apps/job/build-2-binpkg/arch=armhf,release=vivid+overlay/1931/artifact/output/*zip*/output.zip
    FAILURE: https://jenkins.canonical.com/system-apps/job/build-2-binpkg/arch=armhf,release=xenial+overlay/1931/console
    FAILURE: https://jenkins.canonical.com/system-apps/job/build-2-binpkg/arch=armhf,release=zesty/1931/console
    SUCCESS: https://jenkins.canonical.com/system-apps/job/build-2-binpkg/arch=i386,release=vivid+overlay/1931
        deb: https://jenkins.canonical.com/system-apps/job/build-2-binpkg/arch=i386,release=vivid+overlay/1931/artifact/output/*zip*/output.zip
    FAILURE: https://jenkins.canonical.com/system-apps/job/build-2-binpkg/arch=i386,release=xenial+overlay/1931/console
    FAILURE: https://jenkins.canonical.com/system-apps/job/build-2-binpkg/arch=i386,release=zesty/1931/console

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

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

build dep on dh-apparmor

PASSED: Continuous integration, rev:1335
https://jenkins.canonical.com/system-apps/job/lp-gallery-app-ci/30/
Executed test runs:
    SUCCESS: https://jenkins.canonical.com/system-apps/job/build/2102
    SUCCESS: https://jenkins.canonical.com/system-apps/job/test-0-autopkgtest/label=phone-armhf,release=vivid+overlay,testname=default/518
    SUCCESS: https://jenkins.canonical.com/system-apps/job/build-0-fetch/2105
    SUCCESS: https://jenkins.canonical.com/system-apps/job/build-2-binpkg/arch=amd64,release=vivid+overlay/1933
        deb: https://jenkins.canonical.com/system-apps/job/build-2-binpkg/arch=amd64,release=vivid+overlay/1933/artifact/output/*zip*/output.zip
    SUCCESS: https://jenkins.canonical.com/system-apps/job/build-2-binpkg/arch=amd64,release=xenial+overlay/1933
        deb: https://jenkins.canonical.com/system-apps/job/build-2-binpkg/arch=amd64,release=xenial+overlay/1933/artifact/output/*zip*/output.zip
    SUCCESS: https://jenkins.canonical.com/system-apps/job/build-2-binpkg/arch=amd64,release=zesty/1933
        deb: https://jenkins.canonical.com/system-apps/job/build-2-binpkg/arch=amd64,release=zesty/1933/artifact/output/*zip*/output.zip
    SUCCESS: https://jenkins.canonical.com/system-apps/job/build-2-binpkg/arch=armhf,release=vivid+overlay/1933
        deb: https://jenkins.canonical.com/system-apps/job/build-2-binpkg/arch=armhf,release=vivid+overlay/1933/artifact/output/*zip*/output.zip
    SUCCESS: https://jenkins.canonical.com/system-apps/job/build-2-binpkg/arch=armhf,release=xenial+overlay/1933
        deb: https://jenkins.canonical.com/system-apps/job/build-2-binpkg/arch=armhf,release=xenial+overlay/1933/artifact/output/*zip*/output.zip
    SUCCESS: https://jenkins.canonical.com/system-apps/job/build-2-binpkg/arch=armhf,release=zesty/1933
        deb: https://jenkins.canonical.com/system-apps/job/build-2-binpkg/arch=armhf,release=zesty/1933/artifact/output/*zip*/output.zip
    SUCCESS: https://jenkins.canonical.com/system-apps/job/build-2-binpkg/arch=i386,release=vivid+overlay/1933
        deb: https://jenkins.canonical.com/system-apps/job/build-2-binpkg/arch=i386,release=vivid+overlay/1933/artifact/output/*zip*/output.zip
    SUCCESS: https://jenkins.canonical.com/system-apps/job/build-2-binpkg/arch=i386,release=xenial+overlay/1933
        deb: https://jenkins.canonical.com/system-apps/job/build-2-binpkg/arch=i386,release=xenial+overlay/1933/artifact/output/*zip*/output.zip
    SUCCESS: https://jenkins.canonical.com/system-apps/job/build-2-binpkg/arch=i386,release=zesty/1933
        deb: https://jenkins.canonical.com/system-apps/job/build-2-binpkg/arch=i386,release=zesty/1933/artifact/output/*zip*/output.zip

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

review: Approve (continuous-integration)
Arthur Mello (artmello) wrote :

lgtm

review: Approve

Preview Diff

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

Subscribers

People subscribed via source and target branches