commit 4955fae9bac8a15f4bc5d4c18aa5fe5f5d7c49c4 Author: Sukhbir Singh sukhbir@torproject.org Date: Mon Nov 17 23:23:20 2014 +0530

Add ControlPort patch for Tor Launcher --- projects/tor-launcher/build | 1 + projects/tor-launcher/config | 1 + projects/tor-launcher/controlport.patch | 25 +++++++++++++++++++++++++ 3 files changed, 27 insertions(+)

diff --git a/projects/tor-launcher/build b/projects/tor-launcher/build index f9b509e..d42b784 100644 --- a/projects/tor-launcher/build +++ b/projects/tor-launcher/build @@ -3,5 +3,6 @@ set -e tar xvf [% project %]-[% c('version') %].tar.gz cd [% project %]-[% c('version') %] patch -d src -p1 < ../topdir.patch +patch -d src -p1 < ../controlport.patch make package mv pkg/*.xpi [% dest_dir _ '/' _ c('filename') %] diff --git a/projects/tor-launcher/config b/projects/tor-launcher/config index 14734be..eae7385 100644 --- a/projects/tor-launcher/config +++ b/projects/tor-launcher/config @@ -6,3 +6,4 @@ tag_gpg_id: 1 filename: "[% project %]-[% c('version') %]-[% c('var/build_id') %].xpi" input_files: - filename: topdir.patch + - filename: controlport.patch diff --git a/projects/tor-launcher/controlport.patch b/projects/tor-launcher/controlport.patch new file mode 100644 index 0000000..7c9b904 --- /dev/null +++ b/projects/tor-launcher/controlport.patch @@ -0,0 +1,25 @@ +From 08800fd6f225b05817e134fa465d1b83fb42be8e Mon Sep 17 00:00:00 2001 +From: Sukhbir Singh sukhbir@torproject.org +Date: Mon, 17 Nov 2014 22:50:47 +0530 +Subject: [PATCH 1/1] Set ControlPort to 9153 + +--- + src/defaults/preferences/prefs.js | 2 +- + 1 file changed, 1 insertion(+), 1 deletion(-) + +diff --git a/src/defaults/preferences/prefs.js b/src/defaults/preferences/prefs.js +index 34bf1a7..b95b00f 100644 +--- a/src/defaults/preferences/prefs.js ++++ b/src/defaults/preferences/prefs.js +@@ -3,7 +3,7 @@ pref("extensions.torlauncher.logmethod", 1); // 0=stdout, 1=errorconsole, 2=deb + pref("extensions.torlauncher.max_tor_log_entries", 1000); + + pref("extensions.torlauncher.control_host", "127.0.0.1"); +-pref("extensions.torlauncher.control_port", 9151); ++pref("extensions.torlauncher.control_port", 9153); + + pref("extensions.torlauncher.start_tor", true); + pref("extensions.torlauncher.prompt_at_startup", true); +-- +2.1.3 +