[Pkg-privacy-commits] [torbirdy] 01/04: Revert "Remove hardcoded SOCKS port patch and update changelog."

[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 b5c953f135d263ad4684081b97b842d0d537a165
Author: Ulrike Uhlig <u at 451f.org>
Date:   Tue Sep 12 11:57:59 2017 +0200

    Revert "Remove hardcoded SOCKS port patch and update changelog."
    
    We do want Torbirdy to work with system Tor by default.
    See #858034.
    
    This reverts commit 551470d5be2e8b523ce1b9ff71484225f9cf6971.
---
 debian/changelog                      |  1 -
 debian/patches/series                 |  2 ++
 debian/patches/socks_port_preferences | 34 ++++++++++++++++++++++++++++++++++
 3 files changed, 36 insertions(+), 1 deletion(-)

diff --git a/debian/changelog b/debian/changelog
index 093bbab..2f5b4ac 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -8,7 +8,6 @@ torbirdy (0.2.3-1) unstable; urgency=medium
   * debian/watch: check for PGP signature.
   * debian/control: Change uploader email address.
   * Improve debian/README.source.
-  * Remove hardcoded SOCKS port patch.
 
  -- Ulrike Uhlig <ulrike at debian.org>  Mon, 11 Sep 2017 15:31:15 +0200
 
diff --git a/debian/patches/series b/debian/patches/series
new file mode 100644
index 0000000..8716f70
--- /dev/null
+++ b/debian/patches/series
@@ -0,0 +1,2 @@
+socks_port
+socks_port_preferences
diff --git a/debian/patches/socks_port_preferences b/debian/patches/socks_port_preferences
new file mode 100644
index 0000000..ea0fdb9
--- /dev/null
+++ b/debian/patches/socks_port_preferences
@@ -0,0 +1,34 @@
+Description: Configure SOCKS port preferences using system tor port 9050
+Author: Ulrike Uhlig <u at 451f.org>
+Last-Update: 2016-07-02
+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);
++    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");
+@@ -42,7 +42,7 @@
+       opts += "--throw-keyids ";
+     }
+     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