[Pkg-anonymity-tools] [torbrowser-launcher] 30/47: Merge branch 'gh92-rework-AppArmor-profiles' of https://github.com/intrigeri/torbrowser-launcher into intrigeri-gh92-rework-AppArmor-profiles

[Holger Levsen]

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

holger pushed a commit to branch master
in repository torbrowser-launcher.

commit b67afb82c778459f38147f5a0086db799e3f70e7
Merge: 71f2613 66e44a7
Author: Micah Lee <micah at micahflee.com>
Date:   Tue Jul 29 11:04:04 2014 -0700

    Merge branch 'gh92-rework-AppArmor-profiles' of https://github.com/intrigeri/torbrowser-launcher into intrigeri-gh92-rework-AppArmor-profiles
    
    Conflicts:
    	apparmor/torbrowser.Browser.firefox
    	apparmor/torbrowser.Tor.tor
    	apparmor/torbrowser.start-tor-browser

 apparmor/torbrowser.Browser.firefox   | 98 +++++++++++++----------------------
 apparmor/torbrowser.Tor.tor           | 12 ++---
 apparmor/torbrowser.start-tor-browser |  8 +--
 apparmor/usr.bin.torbrowser-launcher  | 28 +++-------
 4 files changed, 53 insertions(+), 93 deletions(-)

diff --cc apparmor/torbrowser.Browser.firefox
index 4b01a53,b045ba7..e324dab
--- a/apparmor/torbrowser.Browser.firefox
+++ b/apparmor/torbrowser.Browser.firefox
@@@ -1,8 -1,7 +1,6 @@@
  #include <tunables/global>
  
- @{HOME}/.torbrowser/tbb/{stable,alpha}/{i686,x86_64}/tor-browser_*/Browser/firefox {
-   #include <abstractions/base>
-   #include <abstractions/user-tmp>
 -/home/*/.torbrowser/tbb/{i686,x86_64}/tor-browser_*/Browser/firefox {
 -  #include <abstractions/gnome>
++@{HOME}/.torbrowser/tbb/{i686,x86_64}/tor-browser_*/Browser/firefox {
  
    network tcp,
  
diff --cc apparmor/torbrowser.Tor.tor
index 9bc89bd,7b12a32..0a63d3d
--- a/apparmor/torbrowser.Tor.tor
+++ b/apparmor/torbrowser.Tor.tor
@@@ -1,6 -1,6 +1,6 @@@
  #include <tunables/global>
  
- @{HOME}/.torbrowser/tbb/{stable,alpha}/{i686,x86_64}/tor-browser_*/Tor/tor {
 -/home/*/.torbrowser/tbb/{i686,x86_64}/tor-browser_*/Tor/tor {
++@{HOME}/.torbrowser/tbb/{i686,x86_64}/tor-browser_*/Tor/tor {
    #include <abstractions/base>
  
    network tcp,
diff --cc apparmor/torbrowser.start-tor-browser
index d629400,770fd8b..77dd5b2
--- a/apparmor/torbrowser.start-tor-browser
+++ b/apparmor/torbrowser.start-tor-browser
@@@ -1,6 -1,6 +1,6 @@@
  #include <tunables/global>
  
- @{HOME}/.torbrowser/tbb/{stable,alpha}/{i686,x86_64}/tor-browser_*/start-tor-browser {
 -/home/*/.torbrowser/tbb/{i686,x86_64}/tor-browser_*/start-tor-browser {
++@{Home}/.torbrowser/tbb/{i686,x86_64}/tor-browser_*/start-tor-browser {
    #include <abstractions/base>
    #include <abstractions/bash>
  

-- 
Alioth's /usr/local/bin/git-commit-notice on /srv/git.debian.org/git/collab-maint/torbrowser-launcher.git