[Pkg-mozext-commits] [torbirdy] 05/08: Patch Tor port to be 9050

[Jacob Appelbaum]

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

error pushed a commit to branch master
in repository torbirdy.

commit 060e1573f88eb1468553c5822c321ea1de395fdb
Author: Jacob Appelbaum <jacob at appelbaum.net>
Date:   Fri Oct 24 17:02:35 2014 +0000

    Patch Tor port to be 9050
---
 chrome/content/preferences.js | 4 ++--
 components/torbirdy.js        | 2 +-
 debian/changelog              | 1 +
 3 files changed, 4 insertions(+), 3 deletions(-)

diff --git a/chrome/content/preferences.js b/chrome/content/preferences.js
index 1930f98..265ddd9 100644
--- a/chrome/content/preferences.js
+++ b/chrome/content/preferences.js
@@ -25,7 +25,7 @@ if (!org.torbirdy.prefs) org.torbirdy.prefs = new function() {
 
   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.prefs = new function() {
     // Tor.
     if (anonService === 0) {
       pub.socksHost.value = '127.0.0.1';
-      pub.socksPort.value = '9150';
+      pub.socksPort.value = '9050';
     }
 
     // JonDo/Whonix.
diff --git a/components/torbirdy.js b/components/torbirdy.js
index 40adadb..a2da628 100644
--- a/components/torbirdy.js
+++ b/components/torbirdy.js
@@ -43,7 +43,7 @@ const TorBirdyPrefs = {
 
   // 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/changelog b/debian/changelog
index f8be688..21b11c7 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -2,6 +2,7 @@ torbirdy (0.1.3-1) UNRELEASED; urgency=low
 
   * New upstream release
   * Add dependency on Tor daemon 
+  * Patch TorBirdy to use 9050 (Closes: #756054)
 
  -- Jacob Appelbaum <jacob at appelbaum.net>  Fri, 24 Oct 2014 16:49:01 +0000
 

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