Merge lp:~osomon/webbrowser-app/here-tos-apparmor-exception into lp:webbrowser-app

[Olivier Tilloy]

Add an exception to the generated apparmor profile to allow reading HERE’s TOS in the browser.

[lp:~osomon/webbrowser-app/here-tos-apparmor-exception]

1242. By Olivier Tilloy on 2015-10-20

Revert the previous revision as there is a much simpler way of achieving this.

1243. By Olivier Tilloy on 2015-10-20

Add an exception to the apparmor profile to allow reading HERE’s TOS in the browser.

[PS Jenkins bot (ps-jenkins)]

FAILED: Continuous integration, rev:1241
http://jenkins.qa.ubuntu.com/job/webbrowser-app-ci/2378/
Executed test runs:
    None: http://jenkins.qa.ubuntu.com/job/generic-deb-autopilot-vivid-touch/4725/console
    None: http://jenkins.qa.ubuntu.com/job/webbrowser-app-vivid-amd64-ci/1132/console
    None: http://jenkins.qa.ubuntu.com/job/webbrowser-app-vivid-armhf-ci/1132/console
    None: http://jenkins.qa.ubuntu.com/job/webbrowser-app-vivid-i386-ci/1132/console
    None: http://jenkins.qa.ubuntu.com/job/generic-mediumtests-builder-vivid-armhf/4722/console

Click here to trigger a rebuild:
http://s-jenkins.ubuntu-ci:8080/job/webbrowser-app-ci/2378/rebuild

review: Needs Fixing (continuous-integration)

[PS Jenkins bot (ps-jenkins)]

PASSED: Continuous integration, rev:1243
http://jenkins.qa.ubuntu.com/job/webbrowser-app-ci/2379/
Executed test runs:
    SUCCESS: http://jenkins.qa.ubuntu.com/job/generic-deb-autopilot-vivid-touch/4726
    SUCCESS: http://jenkins.qa.ubuntu.com/job/webbrowser-app-vivid-amd64-ci/1133
    SUCCESS: http://jenkins.qa.ubuntu.com/job/webbrowser-app-vivid-armhf-ci/1133
        deb: http://jenkins.qa.ubuntu.com/job/webbrowser-app-vivid-armhf-ci/1133/artifact/work/output/*zip*/output.zip
    SUCCESS: http://jenkins.qa.ubuntu.com/job/webbrowser-app-vivid-i386-ci/1133
    SUCCESS: http://jenkins.qa.ubuntu.com/job/generic-deb-autopilot-runner-vivid-mako/3813
    SUCCESS: http://jenkins.qa.ubuntu.com/job/generic-mediumtests-builder-vivid-armhf/4723
        deb: http://jenkins.qa.ubuntu.com/job/generic-mediumtests-builder-vivid-armhf/4723/artifact/work/output/*zip*/output.zip
    SUCCESS: http://s-jenkins.ubuntu-ci:8080/job/touch-flash-device/24392

Click here to trigger a rebuild:
http://s-jenkins.ubuntu-ci:8080/job/webbrowser-app-ci/2379/rebuild

review: Approve (continuous-integration)

[Olivier Tilloy (osomon)]

Tested on krillin with the packages generated by the CI job, this fixes bug #1507667 and doesn’t seem to introduce any regressions wrt browsing the file system.

review: Approve

=== modified file 'debian/webbrowser-app-apparmor.manifest'
--- debian/webbrowser-app-apparmor.manifest	2015-09-29 20:14:26 +0000
+++ debian/webbrowser-app-apparmor.manifest	2015-10-20 17:15:19 +0000
@@ -29,7 +29,8 @@
       },
       "read_path": [
         "/usr/share/applications/",
-        "@{HOME}/.local/share/applications/"
+        "@{HOME}/.local/share/applications/",
+        "/custom/vendor/here/location-provider/consent/*.html"
       ]
     }
   }