[Pkg-privacy-commits] [torbirdy] 06/10: Update socks_port patch

[Ulrike Uhlig]

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

u-guest pushed a commit to branch debian/sid
in repository torbirdy.

commit 6f2e07118ed4a14d6a38cf298194d560047cb2ef
Author: Ulrike Uhlig <u at 451f.org>
Date:   Sat Jul 2 23:04:50 2016 +0200

    Update socks_port patch
---
 debian/patches/socks_port | 33 ++++++---------------------------
 1 file changed, 6 insertions(+), 27 deletions(-)

diff --git a/debian/patches/socks_port b/debian/patches/socks_port
index 3122683..09d9a9b 100644
--- a/debian/patches/socks_port
+++ b/debian/patches/socks_port
@@ -1,38 +1,17 @@
 Description: Configure SOCKS port to be 9050
  The default port is 9150, we want to use the system Tor port of 9050.
 Author: Jacob Appelbaum <jacob at appelbaum.net>
+Last-Update: 2016-07-02
 Bug-Debian: http://bugs.debian.org/756054
-Reviewed-By: Jacob Appelbaum <jacob at appelbaum.net>
-Last-Update: 2014-10-24
 
---- torbirdy-0.1.3.orig/components/torbirdy.js
-+++ torbirdy-0.1.3/components/torbirdy.js
-@@ -43,7 +43,7 @@ const TorBirdyPrefs = {
- 
+--- a/components/torbirdy.js
++++ b/components/torbirdy.js
+@@ -46,7 +46,7 @@
+
    // Configure Thunderbird to use the SOCKS5 proxy.
    "network.proxy.socks": "127.0.0.1",
 -  "network.proxy.socks_port": 9150,
 +  "network.proxy.socks_port": 9050,
    "network.proxy.socks_version": 5,
- 
+
    // Set DNS proxying through SOCKS5.
---- torbirdy-0.1.3.orig/chrome/content/preferences.js
-+++ torbirdy-0.1.3/chrome/content/preferences.js
-@@ -25,7 +25,7 @@ if (!org.torbirdy.prefs) org.torbirdy.pr
- 
-   pub.setDefaultPrefs = function() {
-     pub.prefs.setCharPref("network.proxy.socks", "127.0.0.1");
--    pub.prefs.setIntPref("network.proxy.socks_port", 9150);
-+    pub.prefs.setIntPref("network.proxy.socks_port", 9050);
-     pub.prefs.clearUserPref("network.proxy.http");
-     pub.prefs.clearUserPref("network.proxy.http_port");
-     pub.prefs.clearUserPref("network.proxy.ssl");
-@@ -494,7 +494,7 @@ if (!org.torbirdy.prefs) org.torbirdy.pr
-     // 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