summaryrefslogtreecommitdiffstats
path: root/config/chroot_local-patches
diff options
context:
space:
mode:
authorintrigeri <intrigeri@boum.org>2015-02-26 10:04:49 +0000
committerintrigeri <intrigeri@boum.org>2015-02-26 10:04:49 +0000
commit40dcfbfd4b9b69c8d9d1d802773c5dadaa36d597 (patch)
treed632689a174a5452c32f493c45d7bd4206c7eed1 /config/chroot_local-patches
parent76647ef668eb4d25c82209123c730f0710ce2048 (diff)
parent22c1001eb5349f183f8ba04fa4f6328aec2b7937 (diff)
Merge branch 'devel' into feature/jessie
Conflicts: auto/build config/chroot_apt/preferences config/chroot_local-packageslists/tails-common.list config/chroot_local-patches/gdm-background.diff features/images/UnsafeBrowserStartVerification.png features/step_definitions/apt.rb features/step_definitions/evince.rb po/POTFILES.in wiki/src/contribute/design/memory_erasure.mdwn wiki/src/support/known_issues.mdwn
Diffstat (limited to 'config/chroot_local-patches')
-rw-r--r--config/chroot_local-patches/apparmor-adjust-tor-abstraction.diff8
-rw-r--r--config/chroot_local-patches/torsocks_liferea.patch12
2 files changed, 20 insertions, 0 deletions
diff --git a/config/chroot_local-patches/apparmor-adjust-tor-abstraction.diff b/config/chroot_local-patches/apparmor-adjust-tor-abstraction.diff
new file mode 100644
index 0000000..73e3a8e
--- /dev/null
+++ b/config/chroot_local-patches/apparmor-adjust-tor-abstraction.diff
@@ -0,0 +1,8 @@
+--- a/etc/apparmor.d/abstractions/tor 2015-02-10 11:41:02.140216000 +0000
++++ b/etc/apparmor.d/abstractions/tor 2015-02-10 11:41:11.468216000 +0000
+@@ -24,3 +24,4 @@
+ /usr/share/tor/** r,
+
+ /usr/bin/obfsproxy PUx,
++ /usr/bin/obfs4proxy PUx,
+
diff --git a/config/chroot_local-patches/torsocks_liferea.patch b/config/chroot_local-patches/torsocks_liferea.patch
new file mode 100644
index 0000000..41921cc
--- /dev/null
+++ b/config/chroot_local-patches/torsocks_liferea.patch
@@ -0,0 +1,12 @@
+--- a/usr/share/applications/liferea.desktop 2015-02-15 12:58:23.564000000 +0000
++++ b/usr/share/applications/liferea.desktop 2015-02-15 12:58:40.708000000 +0000
+@@ -124,7 +124,7 @@
+ Comment[tr]=Haber kaynaklarını indir ve görüntüle
+ Comment[uk]=Звантаження і перегляд подач
+ Comment[zh_CN]=下载并查看 Feed
+-Exec=liferea
++Exec=torsocks liferea
+ Icon=liferea
+ StartupNotify=true
+ Terminal=false
+