[Pkg-privacy-commits] [torbirdy] 08/10: 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 551470d5be2e8b523ce1b9ff71484225f9cf6971
Author: Ulrike Uhlig <u at 451f.org>
Date:   Mon Sep 11 16:42:00 2017 +0200

    Remove hardcoded SOCKS port patch and update changelog.
---
 debian/changelog                      |  1 +
 debian/patches/series                 |  2 --
 debian/patches/socks_port_preferences | 34 ----------------------------------
 3 files changed, 1 insertion(+), 36 deletions(-)

diff --git a/debian/changelog b/debian/changelog
index d56baf4..29dd4d8 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -7,6 +7,7 @@ torbirdy (0.2.3-1) unstable; urgency=medium
     - Update keyserver port to 9150 (Tor Browser default).
   * debian/watch: check for PGP signature.
   * 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
deleted file mode 100644
index 8716f70..0000000
--- a/debian/patches/series
+++ /dev/null
@@ -1,2 +0,0 @@
-socks_port
-socks_port_preferences
diff --git a/debian/patches/socks_port_preferences b/debian/patches/socks_port_preferences
deleted file mode 100644
index ea0fdb9..0000000
--- a/debian/patches/socks_port_preferences
+++ /dev/null
@@ -1,34 +0,0 @@
-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