summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authoranonym <anonym@riseup.net>2016-03-18 14:15:36 +0100
committeranonym <anonym@riseup.net>2016-03-18 14:15:36 +0100
commite765d55c4bf24eaf91171bb6de3a29dd29e96068 (patch)
treee99808342b9b4330ffca64614a53d993db206d3a
parentd1cfa52d620c5c1e96f6d2340266b2afd4e56595 (diff)
parent531934254504d0f98e8a5cebfaf908f4dfb74ee6 (diff)
Merge branch 'stable' into devel
-rw-r--r--config/chroot_local-includes/usr/share/tails/torbrowser-AppArmor-profile.patch9
1 files changed, 4 insertions, 5 deletions
diff --git a/config/chroot_local-includes/usr/share/tails/torbrowser-AppArmor-profile.patch b/config/chroot_local-includes/usr/share/tails/torbrowser-AppArmor-profile.patch
index 70c61f2..9fb59dc 100644
--- a/config/chroot_local-includes/usr/share/tails/torbrowser-AppArmor-profile.patch
+++ b/config/chroot_local-includes/usr/share/tails/torbrowser-AppArmor-profile.patch
@@ -1,5 +1,3 @@
-diff --git a/apparmor/torbrowser.Browser.firefox b/apparmor/torbrowser.Browser.firefox
-index 17bff38..4f0b3a5 100644
--- a/apparmor/torbrowser.Browser.firefox
+++ b/apparmor/torbrowser.Browser.firefox
@@ -1,13 +1,15 @@
@@ -20,7 +18,7 @@ index 17bff38..4f0b3a5 100644
# Uncomment the following lines if you want to give the Tor Browser read-write
# access to most of your personal files.
-@@ -17,45 +19,52 @@
+@@ -17,46 +19,52 @@
#dbus,
network tcp,
@@ -56,6 +54,7 @@ index 17bff38..4f0b3a5 100644
- owner @{HOME}/.local/share/torbrowser/tbb/{i686,x86_64}/tor-browser_*/Browser/.** rwk,
- owner @{HOME}/.local/share/torbrowser/tbb/{i686,x86_64}/tor-browser_*/Browser/ rw,
- owner @{HOME}/.local/share/torbrowser/tbb/{i686,x86_64}/tor-browser_*/Browser/** rw,
+- owner @{HOME}/.local/share/torbrowser/tbb/{i686,x86_64}/tor-browser_*/Browser.bak/ rwk,
- owner @{HOME}/.local/share/torbrowser/tbb/{i686,x86_64}/tor-browser_*/Browser.bak/updated/ rwk,
- owner @{HOME}/.local/share/torbrowser/tbb/{i686,x86_64}/tor-browser_*/Browser/*.so mr,
- owner @{HOME}/.local/share/torbrowser/tbb/{i686,x86_64}/tor-browser_*/Browser/components/*.so mr,
@@ -102,7 +101,7 @@ index 17bff38..4f0b3a5 100644
/etc/mailcap r,
/etc/mime.types r,
-@@ -82,6 +91,30 @@
+@@ -83,6 +91,30 @@
/sys/devices/pci[0-9]*/**/uevent r,
owner /{dev,run}/shm/shmfd-* rw,
@@ -133,7 +132,7 @@ index 17bff38..4f0b3a5 100644
# KDE 4
owner @{HOME}/.kde/share/config/* r,
-@@ -89,5 +122,10 @@
+@@ -90,5 +122,10 @@
/etc/xfce4/defaults.list r,
/usr/share/xfce4/applications/ r,