[Pkg-privacy-commits] [torbrowser-launcher] 05/11: Set-torbrowser.start-tor-browser-and-usr.bin.torbrow.patch: new patch, that sets torbrowser.start-tor-browser and usr.bin.torbrowser-launcher AppArmor profiles to complain mode.

[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 7e1911d835d2a6cd50dec1bbd84d5f27cc618b9b
Author: intrigeri <intrigeri at boum.org>
Date:   Wed Aug 12 09:23:25 2015 +0000

    Set-torbrowser.start-tor-browser-and-usr.bin.torbrow.patch: new patch, that sets 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*.
    
    resolved Conflicts:
    	debian/patches/series
---
 ...ser.start-tor-browser-and-usr.bin.torbrow.patch | 40 ++++++++++++++++++++++
 debian/patches/series                              |  1 +
 2 files changed, 41 insertions(+)

diff --git a/debian/patches/Set-torbrowser.start-tor-browser-and-usr.bin.torbrow.patch b/debian/patches/Set-torbrowser.start-tor-browser-and-usr.bin.torbrow.patch
new file mode 100644
index 0000000..6160697
--- /dev/null
+++ b/debian/patches/Set-torbrowser.start-tor-browser-and-usr.bin.torbrow.patch
@@ -0,0 +1,40 @@
+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/torbrowser.start-tor-browser | 2 +-
+ apparmor/usr.bin.torbrowser-launcher  | 2 +-
+ 2 files changed, 2 insertions(+), 2 deletions(-)
+
+diff --git a/apparmor/torbrowser.start-tor-browser b/apparmor/torbrowser.start-tor-browser
+index 49487dc..4148c06 100644
+--- a/apparmor/torbrowser.start-tor-browser
++++ b/apparmor/torbrowser.start-tor-browser
+@@ -1,6 +1,6 @@
+ #include <tunables/global>
+ 
+-/home/*/.local/share/torbrowser/tbb/{i686,x86_64}/tor-browser_*/{Browser/,}start-tor-browser {
++/home/*/.local/share/torbrowser/tbb/{i686,x86_64}/tor-browser_*/{Browser/,}start-tor-browser flags=(complain) {
+   #include <abstractions/base>
+   #include <abstractions/bash>
+   #include <abstractions/fonts>
+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 414377c..90b543f 100644
--- a/debian/patches/series
+++ b/debian/patches/series
@@ -1 +1,2 @@
 AppArmor-allow-Tor-Browser-to-use-shared-libraries-s.patch
+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