[Pkg-privacy-commits] [torbirdy] 21/22: Delete patches.

[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 87086dcc5b999cdef973b91346f45a8d40223aa5
Author: Ulrike Uhlig <u at 451f.org>
Date:   Wed Apr 19 13:44:12 2017 +0200

    Delete patches.
---
 debian/patches/series                 |  3 ---
 debian/patches/socks_port             | 17 -----------------
 debian/patches/socks_port_enigmail    | 18 ------------------
 debian/patches/socks_port_preferences | 25 -------------------------
 4 files changed, 63 deletions(-)

diff --git a/debian/patches/series b/debian/patches/series
deleted file mode 100644
index b6695b0..0000000
--- a/debian/patches/series
+++ /dev/null
@@ -1,3 +0,0 @@
-socks_port
-socks_port_enigmail
-socks_port_preferences
diff --git a/debian/patches/socks_port b/debian/patches/socks_port
deleted file mode 100644
index 09d9a9b..0000000
--- a/debian/patches/socks_port
+++ /dev/null
@@ -1,17 +0,0 @@
-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
-
---- 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.
diff --git a/debian/patches/socks_port_enigmail b/debian/patches/socks_port_enigmail
deleted file mode 100644
index 3190a8c..0000000
--- a/debian/patches/socks_port_enigmail
+++ /dev/null
@@ -1,18 +0,0 @@
-Description: Configure SOCKS port used by enigmail to 9050
-Author: Ulrike Uhlig <u at 451f.org>
-Last-Update: 2016-07-02
-Bug-Debian: http://bugs.debian.org/756054
-
---- a/components/torbirdy.js
-+++ b/components/torbirdy.js
-@@ -274,8 +274,8 @@
-                                               // We want to force UTF-8 everywhere
-                                               "--display-charset utf-8 " +
-                                               // We want to ensure that Enigmail is proxy aware even when it runs gpg in a shell
--                                              "--keyserver-options http-proxy=socks5h://127.0.0.1:9150 ",
--                                            
-+                                              "--keyserver-options http-proxy=socks5h://127.0.0.1:9050 ",
-+
-   // The default key server should be a hidden service and this is the only known one (it's part of the normal SKS network)
-   "extensions.enigmail.keyserver": "hkp://qdigse2yzvuglcix.onion",
-   // Force GnuPG to use SHA512.
diff --git a/debian/patches/socks_port_preferences b/debian/patches/socks_port_preferences
deleted file mode 100644
index dfd0781..0000000
--- a/debian/patches/socks_port_preferences
+++ /dev/null
@@ -1,25 +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");
-@@ -41,7 +41,7 @@
-     if (pub.prefs.getBoolPref("extensions.torbirdy.enigmail.throwkeyid")) {
-       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";
-     }

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