summaryrefslogtreecommitdiffstats
path: root/config/chroot_local-patches/0002-Allow-specifying-that-Enigmail-keyserver-communicati.patch
diff options
context:
space:
mode:
Diffstat (limited to 'config/chroot_local-patches/0002-Allow-specifying-that-Enigmail-keyserver-communicati.patch')
-rw-r--r--config/chroot_local-patches/0002-Allow-specifying-that-Enigmail-keyserver-communicati.patch73
1 files changed, 21 insertions, 52 deletions
diff --git a/config/chroot_local-patches/0002-Allow-specifying-that-Enigmail-keyserver-communicati.patch b/config/chroot_local-patches/0002-Allow-specifying-that-Enigmail-keyserver-communicati.patch
index 0a19508..c00d0c8 100644
--- a/config/chroot_local-patches/0002-Allow-specifying-that-Enigmail-keyserver-communicati.patch
+++ b/config/chroot_local-patches/0002-Allow-specifying-that-Enigmail-keyserver-communicati.patch
@@ -32,66 +32,35 @@ Torbirdy's side.
chrome/content/overlay.js | 1 +
chrome/content/preferences.js | 13 ++++++++-----
defaults/preferences/prefs.js | 1 +
- 3 files changed, 10 insertions(+), 5 deletions(-)
-diff --git a/chrome/content/overlay.js b/chrome/content/overlay.js
-index 1f72c9d..f0c0304 100644
---- a/usr/share/xul-ext/torbirdy/chrome/content/overlay.js
-+++ b/usr/share/xul-ext/torbirdy/chrome/content/overlay.js
-@@ -40,6 +40,7 @@
- // Tor.
- if (type === 0) {
- myPanel.label = strbundle.getString("torbirdy.enabled.tor");
-+ org.torbirdy.prefs.setProxyTor();
- }
- // JonDo/Whonix.
- if (type === 1) {
-diff --git a/chrome/content/preferences.js b/chrome/content/preferences.js
-index 87f46aa..73ef18f 100644
+---
+
+Refreshed-by: Cyril Brulebois <cyril@debamax.com> on 2018-08-09 for Torbirdy 0.2.5
+
+Notes:
+ - chrome/content/overlay.js merged upstream.
+ - chrome/content/preferences.js partially merged upstream, including
+ differentiated handling of some options. Remaining diff: defaulting
+ to a socks5h://127.0.0.1:9050 proxy unless anonService is set to
+ “jondo”.
+ - defaults/preferences/prefs.js merged upstream.
+---
+ preferences.js | 5 +++--
+ 1 file changed, 3 insertions(+), 2 deletions(-)
+
--- a/usr/share/xul-ext/torbirdy/chrome/content/preferences.js
+++ b/usr/share/xul-ext/torbirdy/chrome/content/preferences.js
-@@ -41,17 +41,19 @@ if (!org.torbirdy.prefs) org.torbirdy.prefs = new function() {
- if (pub.prefs.getBoolPref("extensions.torbirdy.enigmail.throwkeyid")) {
+@@ -42,10 +42,11 @@
opts += "--throw-keyids ";
}
-- var proxy = "socks5h://127.0.0.1:9050";
-- if (anonService === "jondo") {
-- proxy = "http://127.0.0.1:4001";
-+ if (! pub.prefs.getBoolPref("extensions.torbirdy.gpg_already_torified")) {
+ if (! pub.prefs.getBoolPref("extensions.torbirdy.gpg_already_torified")) {
+ var proxy = "socks5h://127.0.0.1:9050";
-+ if (anonService === "jondo") {
+ if (anonService === "jondo") {
+- let proxy = "http://127.0.0.1:4001";
+- opts += "--keyserver-options=no-try-dns-srv,http-proxy=" + proxy + " ";
+ proxy = "http://127.0.0.1:4001";
-+ }
+ }
+ opts += "--keyserver-options=no-try-dns-srv,http-proxy=" + proxy + " ";
}
return opts +
- "--no-emit-version " +
- "--no-comments " +
- "--display-charset utf-8 " +
-- "--keyserver-options no-auto-key-retrieve,no-try-dns-srv,http-proxy=" +
-- proxy;
-+ "--keyserver-options no-auto-key-retrieve";
- };
-
- pub.updateKeyserver = function(anonService) {
-@@ -201,6 +203,7 @@ if (!org.torbirdy.prefs) org.torbirdy.prefs = new function() {
-
- pub.setPanelSettings(pub.strBundle.GetStringFromName("torbirdy.enabled.tor"), "green");
- pub.prefs.setIntPref(pub.prefBranch + 'proxy', 0);
-+ pub.setPreferences("extensions.enigmail.agentAdditionalParam", pub.setEnigmailPrefs("tor"));
- };
-
- pub.setProxyJonDo = function() {
-diff --git a/defaults/preferences/prefs.js b/defaults/preferences/prefs.js
-index 8b43562..ea316d3 100644
---- a/usr/share/xul-ext/torbirdy/defaults/preferences/prefs.js
-+++ b/usr/share/xul-ext/torbirdy/defaults/preferences/prefs.js
-@@ -5,6 +5,7 @@ pref("extensions.torbirdy.warn", true);
- pref("extensions.torbirdy.startup_folder", false);
- pref("extensions.torbirdy.enigmail.throwkeyid", false);
- pref("extensions.torbirdy.enigmail.confirmemail", false);
-+pref("extensions.torbirdy.gpg_already_torified", false);
- pref("extensions.torbirdy.timezone", true);
- pref("extensions.torbirdy.whonix_run", true);
- pref("extensions.torbirdy.info_run", false);