[Pkg-privacy-commits] [torbrowser-launcher] 05/06: Refresh patches.

[Intrigeri]

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

intrigeri pushed a commit to branch debian/sid
in repository torbrowser-launcher.

commit 3ae6775f5298549944180970b73378df3ba4db9a
Author: intrigeri <intrigeri at boum.org>
Date:   Sat Nov 14 12:54:11 2015 +0000

    Refresh patches.
---
 ...al-overrides-file-in-AppArmor-profiles.-C.patch | 23 +++-------------------
 ...ser.start-tor-browser-and-usr.bin.torbrow.patch | 16 +--------------
 2 files changed, 4 insertions(+), 35 deletions(-)

diff --git a/debian/patches/Include-local-overrides-file-in-AppArmor-profiles.-C.patch b/debian/patches/Include-local-overrides-file-in-AppArmor-profiles.-C.patch
index 4b70db6..6740ba4 100644
--- a/debian/patches/Include-local-overrides-file-in-AppArmor-profiles.-C.patch
+++ b/debian/patches/Include-local-overrides-file-in-AppArmor-profiles.-C.patch
@@ -6,12 +6,9 @@ Subject: Include local overrides file in AppArmor profiles. (Closes: #751451)
 ---
  apparmor/torbrowser.Browser.firefox   | 2 ++
  apparmor/torbrowser.Tor.tor           | 2 ++
- apparmor/torbrowser.start-tor-browser | 1 +
  apparmor/usr.bin.torbrowser-launcher  | 2 ++
  4 files changed, 7 insertions(+)
 
-diff --git a/apparmor/torbrowser.Browser.firefox b/apparmor/torbrowser.Browser.firefox
-index c2de426..2c9e01d 100644
 --- a/apparmor/torbrowser.Browser.firefox
 +++ b/apparmor/torbrowser.Browser.firefox
 @@ -80,4 +80,6 @@
@@ -21,29 +18,15 @@ index c2de426..2c9e01d 100644
 +
 +  #include <local/torbrowser.Browser.firefox>
  }
-diff --git a/apparmor/torbrowser.Tor.tor b/apparmor/torbrowser.Tor.tor
-index d9c805d..68a2fe1 100644
 --- a/apparmor/torbrowser.Tor.tor
 +++ b/apparmor/torbrowser.Tor.tor
-@@ -22,4 +22,6 @@
+@@ -21,4 +21,6 @@
+ 
    # OnionShare compatibility
-   /tmp/onionshare_*/ rw,
-   /tmp/onionshare_*/* rw,
+   /tmp/onionshare/** rw,
 +
 +  #include <local/torbrowser.Tor.tor>
  }
-diff --git a/apparmor/torbrowser.start-tor-browser b/apparmor/torbrowser.start-tor-browser
-index 3ca6368..49487dc 100644
---- a/apparmor/torbrowser.start-tor-browser
-+++ b/apparmor/torbrowser.start-tor-browser
-@@ -50,4 +50,5 @@
-   /usr/share/file/magic/ r,
-   /usr/share/zenity/zenity.ui r,
- 
-+  #include <local/torbrowser.start-tor-browser>
- }
-diff --git a/apparmor/usr.bin.torbrowser-launcher b/apparmor/usr.bin.torbrowser-launcher
-index 424aa5a..b8e081e 100644
 --- a/apparmor/usr.bin.torbrowser-launcher
 +++ b/apparmor/usr.bin.torbrowser-launcher
 @@ -49,4 +49,6 @@
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
index 6160697..257486c 100644
--- 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
@@ -2,29 +2,15 @@ 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.
+Subject: Set usr.bin.torbrowser-launcher AppArmor profile 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

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