summaryrefslogtreecommitdiffstats
path: root/config/chroot_local-patches
diff options
context:
space:
mode:
authoranonym <anonym@riseup.net>2015-10-26 21:34:22 +0100
committeranonym <anonym@riseup.net>2015-10-26 21:34:22 +0100
commit4c85c1d89befeb57107f3f834d0101d051efac03 (patch)
treee3b1b32c30a731109215e0fb95271f43b3b2077a /config/chroot_local-patches
parentd0923e35e2e26357bfcb912caac4d226fefcda07 (diff)
parent18f4871264f5e5d4ba0e1c42fb774da0ba3c6b61 (diff)
Merge branch 'devel' into feature/jessie
Conflicts: config/base_branch features/images/TailsGreeterTorConf.png features/step_definitions/apt.rb features/step_definitions/checks.rb features/step_definitions/common_steps.rb features/step_definitions/firewall_leaks.rb features/step_definitions/tor.rb features/support/helpers/misc_helpers.rb
Diffstat (limited to 'config/chroot_local-patches')
-rw-r--r--config/chroot_local-patches/icedove_default_to_IMAP.diff15
-rw-r--r--config/chroot_local-patches/torbirdy-adjust-defaults.diff71
2 files changed, 86 insertions, 0 deletions
diff --git a/config/chroot_local-patches/icedove_default_to_IMAP.diff b/config/chroot_local-patches/icedove_default_to_IMAP.diff
new file mode 100644
index 0000000..486ff70
--- /dev/null
+++ b/config/chroot_local-patches/icedove_default_to_IMAP.diff
@@ -0,0 +1,15 @@
+--- /usr/share/xul-ext/torbirdy/chrome/content/emailwizard.xul.orig 2015-09-28 00:28:45.164177872 +0000
++++ /usr/share/xul-ext/torbirdy/chrome/content/emailwizard.xul 2015-09-28 00:28:55.400376965 +0000
+@@ -22,10 +22,10 @@
+
+ <menulist id="torbirdy-protocol">
+ <menupopup>
+- <menuitem label="POP3"
+- value="pop3" />
+ <menuitem label="IMAP"
+ value="imap" />
++ <menuitem label="POP3"
++ value="pop3" />
+ </menupopup>
+ </menulist>
+
diff --git a/config/chroot_local-patches/torbirdy-adjust-defaults.diff b/config/chroot_local-patches/torbirdy-adjust-defaults.diff
new file mode 100644
index 0000000..8144f17
--- /dev/null
+++ b/config/chroot_local-patches/torbirdy-adjust-defaults.diff
@@ -0,0 +1,71 @@
+--- /usr/share/xul-ext/torbirdy/chrome/content/preferences.js.orig 2015-07-27 07:34:13.195987276 +0000
++++ /usr/share/xul-ext/torbirdy/chrome/content/preferences.js 2015-07-27 07:44:12.579975436 +0000
+@@ -7,7 +7,7 @@
+ pub.prefBranch = "extensions.torbirdy.";
+ pub.customBranch = "extensions.torbirdy.custom.";
+
+- pub.torKeyserver = "hkp://qdigse2yzvuglcix.onion";
++ pub.torKeyserver = "hkp://pool.sks-keyservers.net";
+ pub.jondoKeyserver = "hkp://pool.sks-keyservers.net";
+
+ pub.prefs = Components.classes["@mozilla.org/preferences-service;1"]
+@@ -25,7 +25,7 @@
+
+ pub.setDefaultPrefs = function() {
+ pub.prefs.setCharPref("network.proxy.socks", "127.0.0.1");
+- pub.prefs.setIntPref("network.proxy.socks_port", 9050);
++ pub.prefs.setIntPref("network.proxy.socks_port", 9061);
+ pub.prefs.clearUserPref("network.proxy.http");
+ pub.prefs.clearUserPref("network.proxy.http_port");
+ pub.prefs.clearUserPref("network.proxy.ssl");
+@@ -43,7 +43,7 @@
+ "--no-comments " +
+ "--throw-keyids " +
+ "--display-charset utf-8 " +
+- "--keyserver-options no-auto-key-retrieve,no-try-dns-srv,http-proxy=http://127.0.0.1:8118";
++ "--keyserver-options no-auto-key-retrieve,no-try-dns-srv,http-proxy=socks5h://127.0.0.1:9050";
+ }
+ if (anonService === "jondo") {
+ return "--no-emit-version " +
+@@ -58,7 +58,7 @@
+ return "--no-emit-version " +
+ "--no-comments " +
+ "--display-charset utf-8 " +
+- "--keyserver-options no-auto-key-retrieve,no-try-dns-srv,http-proxy=http://127.0.0.1:8118";
++ "--keyserver-options no-auto-key-retrieve,no-try-dns-srv,http-proxy=socks5h://127.0.0.1:9050";
+ }
+ if (anonService === "jondo") {
+ return "--no-emit-version " +
+@@ -494,7 +494,7 @@
+ // Tor.
+ if (anonService === 0) {
+ pub.socksHost.value = '127.0.0.1';
+- pub.socksPort.value = '9050';
++ pub.socksPort.value = '9061';
+ }
+
+ // JonDo/Whonix.
+--- ./usr/share/xul-ext/torbirdy/components/torbirdy.js.orig 2015-07-27 07:56:54.811960380 +0000
++++ ./usr/share/xul-ext/torbirdy/components/torbirdy.js 2015-07-27 08:00:26.895956191 +0000
+@@ -43,7 +43,7 @@
+
+ // Configure Thunderbird to use the SOCKS5 proxy.
+ "network.proxy.socks": "127.0.0.1",
+- "network.proxy.socks_port": 9050,
++ "network.proxy.socks_port": 9061,
+ "network.proxy.socks_version": 5,
+
+ // Set DNS proxying through SOCKS5.
+@@ -215,10 +215,10 @@
+ // We want to force UTF-8 everywhere
+ "--display-charset utf-8 " +
+ // We want to ensure that Enigmail is proxy aware even when it runs gpg in a shell
+- "--keyserver-options http-proxy=http://127.0.0.1:8118 ",
++ "--keyserver-options http-proxy=socks5-hostname://127.0.0.1:9050 ",
+
+ // The default key server should be a hidden service and this is the only known one (it's part of the normal SKS network)
+- "extensions.enigmail.keyserver": "hkp://qdigse2yzvuglcix.onion",
++ "extensions.enigmail.keyserver": "hkp://pool.sks-keyservers.net",
+
+ // Force GnuPG to use SHA512.
+ "extensions.enigmail.mimeHashAlgorithm": 5,