[Pkg-privacy-commits] [torbrowser-launcher] 05/11: Set usr.bin.torbrowser-launcher AppArmor profiles to complain mode to make it work again (based on 70c750e).

[Holger Levsen]

This is an automated email from the git hooks/post-receive script.

holger pushed a commit to branch debian/jessie
in repository torbrowser-launcher.

commit cf1d2834f8ddbb2267c74109443638c7fbfbf0ff
Author: intrigeri <intrigeri at boum.org>
Date:   Wed Aug 12 09:23:25 2015 +0000

    Set usr.bin.torbrowser-launcher AppArmor profiles to complain mode to make it work again (based on 70c750e).
---
 debian/changelog                                   |  2 ++
 ...ser.start-tor-browser-and-usr.bin.torbrow.patch | 27 ++++++++++++++++++++++
 debian/patches/series                              |  1 +
 3 files changed, 30 insertions(+)

diff --git a/debian/changelog b/debian/changelog
index f5e8409..5a3bb81 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -12,6 +12,8 @@ torbrowser-launcher (0.1.9-1+deb8u2) UNRELEASED; urgency=medium
   * Cherry-picks from 0.2.2:
     - 39901c6 Stop confining start-tor-browser script with AppArmor, and
       fix profiles to work with TBB 4.5+ (#181)
+    - Set usr.bin.torbrowser-launcher AppArmor profiles to complain mode to
+      make it work again (based on 70c750e).
 
  -- Holger Levsen <holger at debian.org>  Fri, 15 Jan 2016 20:46:52 +0100
 
diff --git a/debian/patches/0005-Set-torbrowser.start-tor-browser-and-usr.bin.torbrow.patch b/debian/patches/0005-Set-torbrowser.start-tor-browser-and-usr.bin.torbrow.patch
new file mode 100644
index 0000000..681f344
--- /dev/null
+++ b/debian/patches/0005-Set-torbrowser.start-tor-browser-and-usr.bin.torbrow.patch
@@ -0,0 +1,27 @@
+From: intrigeri <intrigeri at boum.org>
+Date: Wed, 12 Aug 2015 09:21:28 +0000
+Forwarded: not-needed
+Bug: https://github.com/micahflee/torbrowser-launcher/issues/181
+Subject: Set torbrowser.start-tor-browser and usr.bin.torbrowser-launcher
+ AppArmor profiles to complain mode.
+
+They have been broken for three months now. Patches have been discussed on
+GitHub for a while, but no clean solution has been implemented yet,
+so for the time being, let's make torbrowser-launcher *work*.
+---
+ apparmor/usr.bin.torbrowser-launcher  | 2 +-
+ 1 files changed, 1 insertions(+), 1 deletions(-)
+
+diff --git a/apparmor/usr.bin.torbrowser-launcher b/apparmor/usr.bin.torbrowser-launcher
+index b8e081e..80aace4 100644
+--- a/apparmor/usr.bin.torbrowser-launcher
++++ b/apparmor/usr.bin.torbrowser-launcher
+@@ -1,7 +1,7 @@
+ # Last Modified: Thu Jan  2 15:12:38 2014
+ #include <tunables/global>
+ 
+-/usr/bin/torbrowser-launcher {
++/usr/bin/torbrowser-launcher flags=(complain) {
+   #include <abstractions/base>
+   #include <abstractions/nameservice>
+   #include <abstractions/python>
diff --git a/debian/patches/series b/debian/patches/series
index 004a16e..2089cd0 100644
--- a/debian/patches/series
+++ b/debian/patches/series
@@ -2,3 +2,4 @@
 0002-execute-.-start-tor-browser.desktop-instead-of-.-Bro.patch
 0003-Stop-letting-Tor-Browser-act-as-a-default-browser.patch
 0004-Stop-confining-start-tor-browser-script-with-AppArmo.patch
+0005-Set-torbrowser.start-tor-browser-and-usr.bin.torbrow.patch

-- 
Alioth's /usr/local/bin/git-commit-notice on /srv/git.debian.org/git/pkg-privacy/packages/torbrowser-launcher.git