summaryrefslogtreecommitdiffstats
path: root/config/chroot_local-patches
diff options
context:
space:
mode:
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/apparmor-adjust-totem-profile.diff12
-rw-r--r--config/chroot_local-patches/gdm-background.diff2
-rw-r--r--config/chroot_local-patches/keep_polipo_on_shutdown.diff7
-rw-r--r--config/chroot_local-patches/torify_wgetrc.patch13
-rw-r--r--config/chroot_local-patches/torsocks_gobby-0.5.patch2
-rw-r--r--config/chroot_local-patches/torsocks_liferea.patch12
7 files changed, 34 insertions, 22 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/apparmor-adjust-totem-profile.diff b/config/chroot_local-patches/apparmor-adjust-totem-profile.diff
new file mode 100644
index 0000000..f50dc68
--- /dev/null
+++ b/config/chroot_local-patches/apparmor-adjust-totem-profile.diff
@@ -0,0 +1,12 @@
+--- a/etc/apparmor.d/usr.bin.totem 2014-09-16 11:17:44.000000000 +0000
++++ b/etc/apparmor.d/usr.bin.totem 2014-11-28 09:40:26.960000000 +0000
+@@ -8,6 +8,9 @@
+ #include <abstractions/python>
+ #include <abstractions/totem>
+
++ # We wrap Totem to run it with torsocks
++ /etc/tor/torsocks.conf r,
++
+ # Maybe in an abstraction?
+ /usr/include/**/pyconfig.h r,
+
diff --git a/config/chroot_local-patches/gdm-background.diff b/config/chroot_local-patches/gdm-background.diff
index bc3c159..e1d43a9 100644
--- a/config/chroot_local-patches/gdm-background.diff
+++ b/config/chroot_local-patches/gdm-background.diff
@@ -6,7 +6,7 @@
+[org.gnome.desktop.background]
+picture-options='none'
-+primary-color='#0064BA'
++primary-color='#204A87'
+
# Greeter session choice
# ======================
diff --git a/config/chroot_local-patches/keep_polipo_on_shutdown.diff b/config/chroot_local-patches/keep_polipo_on_shutdown.diff
deleted file mode 100644
index d86f9fc..0000000
--- a/config/chroot_local-patches/keep_polipo_on_shutdown.diff
+++ /dev/null
@@ -1,7 +0,0 @@
-Tails specific: no need to stop properly on shutdown.
-
---- chroot.orig/etc/init.d/polipo 2012-09-24 10:05:13.173051981 +0200
-+++ chroot/etc/init.d/polipo 2012-09-24 10:47:23.717869294 +0200
-@@ -7,1 +7,1 @@
--# Default-Stop: 0 1 6
-+# Default-Stop:
diff --git a/config/chroot_local-patches/torify_wgetrc.patch b/config/chroot_local-patches/torify_wgetrc.patch
deleted file mode 100644
index a90dde7..0000000
--- a/config/chroot_local-patches/torify_wgetrc.patch
+++ /dev/null
@@ -1,13 +0,0 @@
---- chroot.orig/etc/wgetrc 2010-09-05 13:43:50.000000000 +0000
-+++ chroot/etc/wgetrc 2011-12-02 12:31:23.566907236 +0000
-@@ -76,8 +76,8 @@
-
- # You can set the default proxies for Wget to use for http, https, and ftp.
- # They will override the value in the environment.
--#https_proxy = http://proxy.yoyodyne.com:18023/
--#http_proxy = http://proxy.yoyodyne.com:18023/
-+https_proxy = http://127.0.0.1:8118/
-+http_proxy = http://127.0.0.1:8118/
- #ftp_proxy = http://proxy.yoyodyne.com:18023/
-
- # If you do not want to use proxy at all, set this to off.
diff --git a/config/chroot_local-patches/torsocks_gobby-0.5.patch b/config/chroot_local-patches/torsocks_gobby-0.5.patch
index 4146164..e801ec9 100644
--- a/config/chroot_local-patches/torsocks_gobby-0.5.patch
+++ b/config/chroot_local-patches/torsocks_gobby-0.5.patch
@@ -6,7 +6,7 @@ diff -Naur chroot.orig/usr/share/applications/gobby-0.5.desktop chroot/usr/share
Comment[fr]=Éditer des fichiers texte de manière collaborative
Comment[ja]=テキストを共同作業で編集する
-Exec=gobby-0.5
-+Exec=torify gobby-0.5
++Exec=torsocks gobby-0.5
Terminal=false
Type=Application
Icon=gobby-0.5
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
+