[Pkg-privacy-commits] [torbirdy] 06/08: Update SOCKS port patch

[Ulrike Uhlig]

This is an automated email from the git hooks/post-receive script.

ulrike pushed a commit to branch debian/sid
in repository torbirdy.

commit f3d8909d5d3d5630718a3a72a95cfe0b8b6f04de
Author: Ulrike Uhlig <u at 451f.org>
Date:   Wed Apr 19 16:03:39 2017 +0200

    Update SOCKS port patch
---
 debian/patches/socks_port_preferences | 23 ++++++++++++++++-------
 1 file changed, 16 insertions(+), 7 deletions(-)

diff --git a/debian/patches/socks_port_preferences b/debian/patches/socks_port_preferences
index dfd0781..ea0fdb9 100644
--- a/debian/patches/socks_port_preferences
+++ b/debian/patches/socks_port_preferences
@@ -6,7 +6,7 @@ Bug-Debian: http://bugs.debian.org/756054
 --- a/chrome/content/preferences.js
 +++ b/chrome/content/preferences.js
 @@ -25,7 +25,7 @@
-
+ 
    pub.setDefaultPrefs = function() {
      pub.prefs.setCharPref("network.proxy.socks", "127.0.0.1");
 -    pub.prefs.setIntPref("network.proxy.socks_port", 9150);
@@ -14,12 +14,21 @@ Bug-Debian: http://bugs.debian.org/756054
      pub.prefs.clearUserPref("network.proxy.http");
      pub.prefs.clearUserPref("network.proxy.http_port");
      pub.prefs.clearUserPref("network.proxy.ssl");
-@@ -41,7 +41,7 @@
-     if (pub.prefs.getBoolPref("extensions.torbirdy.enigmail.throwkeyid")) {
+@@ -42,7 +42,7 @@
        opts += "--throw-keyids ";
      }
--    var proxy = "socks5h://127.0.0.1:9150";
-+    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")) {
+-      var proxy = "socks5h://127.0.0.1:9150";
++      var proxy = "socks5h://127.0.0.1:9050";
+       if (anonService === "jondo") {
+         proxy = "http://127.0.0.1:4001";
+       }
+@@ -440,7 +440,7 @@
+     // Tor.
+     if (anonService === 0) {
+       pub.socksHost.value = '127.0.0.1';
+-      pub.socksPort.value = '9150';
++      pub.socksPort.value = '9050';
      }
+ 
+     // JonDo/Whonix.

-- 
Alioth's /usr/local/bin/git-commit-notice on /srv/git.debian.org/git/pkg-privacy/packages/torbirdy.git