March 2015 - tor-commits - lists.torproject.org

[tor-messenger-build/master] Update permissions for start-tor-mail in build script
by sukhbir＠torproject.org 23 Mar '15

23 Mar '15

commit af9537d86218449c6eb5ef4a2564dc22257c2b25 Author: Sukhbir Singh <sukhbir(a)torproject.org> Date: Mon Mar 23 11:24:16 2015 +0530 Update permissions for start-tor-mail in build script --- projects/tor-mail/build | 1 + 1 file changed, 1 insertion(+) diff --git a/projects/tor-mail/build b/projects/tor-mail/build index 91ec5e7..e2c2bba 100644 --- a/projects/tor-mail/build +++ b/projects/tor-mail/build @@ -11,6 +11,7 @@ mkdir bundle/Mail tar xf [% c('input_files_by_name/thunderbird') %] -C bundle/Mail --strip 1 [% END -%] +chmod 755 start-tor-mail mv start-tor-mail bundle/ mkdir bundle/Mail/defaults/profile/

1 0

[tor-messenger-build/master] Revert topdir.patch merged upstream as it is not in 0.2.7.2
by sukhbir＠torproject.org 23 Mar '15

23 Mar '15

commit d1a698c6bc15ead24e1598e64979f9ab7d1b0211 Author: Sukhbir Singh <sukhbir(a)torproject.org> Date: Mon Mar 23 10:53:41 2015 +0530 Revert topdir.patch merged upstream as it is not in 0.2.7.2 --- projects/tor-launcher/build | 1 + projects/tor-launcher/config | 1 + projects/tor-launcher/topdir.patch | 12 ++++++++++++ 3 files changed, 14 insertions(+) diff --git a/projects/tor-launcher/build b/projects/tor-launcher/build index 4da21ee..a3c5f48 100644 --- a/projects/tor-launcher/build +++ b/projects/tor-launcher/build @@ -2,6 +2,7 @@ set -e tar xvf [% project %]-[% c('version') %].tar.gz cd [% project %]-[% c('version') %] +patch -d src -p1 < ../topdir.patch [% IF c("var/tor_control_port") -%] patch -p1 < ../controlport.patch [% END -%] diff --git a/projects/tor-launcher/config b/projects/tor-launcher/config index df501d3..baceb0d 100644 --- a/projects/tor-launcher/config +++ b/projects/tor-launcher/config @@ -8,6 +8,7 @@ filename: "[% project %]-[% c('version') %]-[% c('var/build_id') %].xpi" input_files: - filename: torbirdy.png - filename: torbirdy-logo.patch + - filename: topdir.patch - filename: controlport.patch content: '[% INCLUDE controlport.patch.tmpl -%]' refresh_input: 1 diff --git a/projects/tor-launcher/topdir.patch b/projects/tor-launcher/topdir.patch new file mode 100644 index 0000000..747416f --- /dev/null +++ b/projects/tor-launcher/topdir.patch @@ -0,0 +1,12 @@ +diff -ru tor-launcher/components/tl-process.js tor-launcher.n/components/tl-process.js +--- tor-launcher/components/tl-process.js 2014-10-11 01:18:10.000000000 +0200 ++++ tor-launcher.n/components/tl-process.js 2014-09-30 13:41:39.000000000 +0200 +@@ -694,7 +694,7 @@ + { + // For Thunderbird and Instantbird, paths are relative to this extension's folder. + topDir = Cc["@mozilla.org/file/directory_service;1"] +- .getService(Ci.nsIProperties).get("ProfD", Ci.nsIFile); ++ .getService(Ci.nsIProperties).get("CurProcD", Ci.nsIFile); + topDir.append("extensions"); + topDir.append(this.kTorLauncherExtPath); + }

1 0

[tor-messenger-build/master] Fix Tor Launcher version
by sukhbir＠torproject.org 23 Mar '15

23 Mar '15

commit 8e92e75ab777632203dd370a9361a8217de5ca84 Author: Sukhbir Singh <sukhbir(a)torproject.org> Date: Mon Mar 23 10:21:12 2015 +0530 Fix Tor Launcher version --- projects/tor-launcher/config | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/projects/tor-launcher/config b/projects/tor-launcher/config index 7611a1d..df501d3 100644 --- a/projects/tor-launcher/config +++ b/projects/tor-launcher/config @@ -1,5 +1,5 @@ # vim: filetype=yaml -version: 0.2.7.0.2 +version: 0.2.7.2 git_url: https://git.torproject.org/tor-launcher.git git_hash: '[% c("version") %]' gpg_keyring: mikeperry.gpg

1 0

[tor-messenger-build/master] Patch for adding TorBirdy's logo to Tor Launcher
by sukhbir＠torproject.org 23 Mar '15

23 Mar '15

commit 78ac3163ddea34b1f652d183d31ee8d9f50704fd Author: Sukhbir Singh <sukhbir(a)torproject.org> Date: Mon Mar 23 10:17:04 2015 +0530 Patch for adding TorBirdy's logo to Tor Launcher --- projects/tor-launcher/build | 4 ++++ projects/tor-launcher/config | 2 ++ projects/tor-launcher/torbirdy-logo.patch | 13 +++++++++++++ projects/tor-launcher/torbirdy.png | Bin 0 -> 15844 bytes 4 files changed, 19 insertions(+) diff --git a/projects/tor-launcher/build b/projects/tor-launcher/build index 0891389..4da21ee 100644 --- a/projects/tor-launcher/build +++ b/projects/tor-launcher/build @@ -5,5 +5,9 @@ cd [% project %]-[% c('version') %] [% IF c("var/tor_control_port") -%] patch -p1 < ../controlport.patch [% END -%] +[% IF c("var/tor-mail") -%] +cp ../torbirdy.png src/chrome/skin/tbb-logo.png +patch -p1 < ../torbirdy-logo.patch +[% END -%] make package mv pkg/*.xpi [% dest_dir _ '/' _ c('filename') %] diff --git a/projects/tor-launcher/config b/projects/tor-launcher/config index cd157fb..7611a1d 100644 --- a/projects/tor-launcher/config +++ b/projects/tor-launcher/config @@ -6,6 +6,8 @@ gpg_keyring: mikeperry.gpg tag_gpg_id: 1 filename: "[% project %]-[% c('version') %]-[% c('var/build_id') %].xpi" input_files: + - filename: torbirdy.png + - filename: torbirdy-logo.patch - filename: controlport.patch content: '[% INCLUDE controlport.patch.tmpl -%]' refresh_input: 1 diff --git a/projects/tor-launcher/torbirdy-logo.patch b/projects/tor-launcher/torbirdy-logo.patch new file mode 100644 index 0000000..0e5daa1 --- /dev/null +++ b/projects/tor-launcher/torbirdy-logo.patch @@ -0,0 +1,13 @@ +diff --git a/src/chrome/skin/network-settings.css b/src/chrome/skin/network-settings.css +index 331ae42..3331854 100644 +--- a/src/chrome/skin/network-settings.css ++++ b/src/chrome/skin/network-settings.css +@@ -90,7 +90,7 @@ button.firstAnswer { + .tbb-logo { + list-style-image: url("chrome://torlauncher/skin/tbb-logo.png"); + width: 115px; +- height: 80px; ++ height: 94px; + margin-right: 20px; + } + diff --git a/projects/tor-launcher/torbirdy.png b/projects/tor-launcher/torbirdy.png new file mode 100644 index 0000000..6fecc45 Binary files /dev/null and b/projects/tor-launcher/torbirdy.png differ

1 0

[tor-messenger-build/master] Make start-tor-mail an executable script
by sukhbir＠torproject.org 23 Mar '15

23 Mar '15

commit fdb856065dd5a42d537b57bb61077bedaf475c1a Author: Sukhbir Singh <sukhbir(a)torproject.org> Date: Mon Mar 23 10:10:16 2015 +0530 Make start-tor-mail an executable script --- 0 files changed diff --git a/projects/tor-mail/start-tor-mail b/projects/tor-mail/start-tor-mail old mode 100644 new mode 100755

1 0

[tor-messenger-build/master] Update Tor Launcher to latest release
by sukhbir＠torproject.org 23 Mar '15

23 Mar '15

commit 76a18b245a034ea95ad95f25562190e16942fd71 Author: Sukhbir Singh <sukhbir(a)torproject.org> Date: Mon Mar 23 10:08:39 2015 +0530 Update Tor Launcher to latest release --- projects/tor-launcher/config | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/projects/tor-launcher/config b/projects/tor-launcher/config index 7d35e66..cd157fb 100644 --- a/projects/tor-launcher/config +++ b/projects/tor-launcher/config @@ -1,5 +1,5 @@ # vim: filetype=yaml -version: 0.2.7.0.1 +version: 0.2.7.0.2 git_url: https://git.torproject.org/tor-launcher.git git_hash: '[% c("version") %]' gpg_keyring: mikeperry.gpg

1 0

[tor-messenger-build/master] Fix a typo in tor-mail/build script
by sukhbir＠torproject.org 23 Mar '15

23 Mar '15

commit a5161d881b651531b1748ce3540c290b746f3b4a Author: Sukhbir Singh <sukhbir(a)torproject.org> Date: Mon Mar 23 09:46:04 2015 +0530 Fix a typo in tor-mail/build script --- projects/tor-mail/build | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/projects/tor-mail/build b/projects/tor-mail/build index f4de32f..91ec5e7 100644 --- a/projects/tor-mail/build +++ b/projects/tor-mail/build @@ -18,9 +18,9 @@ mv user.js bundle/Mail/defaults/profile/ cd bundle/Mail/extensions mkdir castironthunderbirdclub(a)torproject.org -7z x -y -o castironthunderbirdclub(a)torproject.org $rootdir/[% c('input_files_by_name/torbirdy') %] +7z x -y -ocastironthunderbirdclub(a)torproject.org $rootdir/[% c('input_files_by_name/torbirdy') %] mkdir tor-launcher(a)torproject.org -7z x -y -o tor-launcher(a)torproject.org $rootdir/[% c('input_files_by_name/tor-launcher') %] +7z x -y -otor-launcher(a)torproject.org $rootdir/[% c('input_files_by_name/tor-launcher') %] mkdir -p tor-launcher(a)torproject.org/TorBrowser/Data [% IF c("var/windows") -%]

1 0

[tor-messenger-build/master] Remove Tor Launcher patch merged upstream (#13983)
by sukhbir＠torproject.org 23 Mar '15

23 Mar '15

commit f394f29c2221e88b124620382a190d50072d46bd Author: Sukhbir Singh <sukhbir(a)torproject.org> Date: Mon Mar 23 09:18:38 2015 +0530 Remove Tor Launcher patch merged upstream (#13983) --- projects/tor-launcher/config | 1 - projects/tor-launcher/topdir.patch | 12 ------------ 2 files changed, 13 deletions(-) diff --git a/projects/tor-launcher/config b/projects/tor-launcher/config index 7aca5ec..7d35e66 100644 --- a/projects/tor-launcher/config +++ b/projects/tor-launcher/config @@ -6,7 +6,6 @@ gpg_keyring: mikeperry.gpg tag_gpg_id: 1 filename: "[% project %]-[% c('version') %]-[% c('var/build_id') %].xpi" input_files: - - filename: topdir.patch - filename: controlport.patch content: '[% INCLUDE controlport.patch.tmpl -%]' refresh_input: 1 diff --git a/projects/tor-launcher/topdir.patch b/projects/tor-launcher/topdir.patch deleted file mode 100644 index 747416f..0000000 --- a/projects/tor-launcher/topdir.patch +++ /dev/null @@ -1,12 +0,0 @@ -diff -ru tor-launcher/components/tl-process.js tor-launcher.n/components/tl-process.js ---- tor-launcher/components/tl-process.js 2014-10-11 01:18:10.000000000 +0200 -+++ tor-launcher.n/components/tl-process.js 2014-09-30 13:41:39.000000000 +0200 -@@ -694,7 +694,7 @@ - { - // For Thunderbird and Instantbird, paths are relative to this extension's folder. - topDir = Cc["@mozilla.org/file/directory_service;1"] -- .getService(Ci.nsIProperties).get("ProfD", Ci.nsIFile); -+ .getService(Ci.nsIProperties).get("CurProcD", Ci.nsIFile); - topDir.append("extensions"); - topDir.append(this.kTorLauncherExtPath); - }

1 0

[tor-messenger-build/master] Also remove the earlier patch from the build file
by sukhbir＠torproject.org 23 Mar '15

23 Mar '15

commit 50f2c6eb47bbf487a9c3b85e872e62b8a6675e9a Author: Sukhbir Singh <sukhbir(a)torproject.org> Date: Mon Mar 23 09:21:36 2015 +0530 Also remove the earlier patch from the build file --- projects/tor-launcher/build | 1 - 1 file changed, 1 deletion(-) diff --git a/projects/tor-launcher/build b/projects/tor-launcher/build index 9a4a96f..0891389 100644 --- a/projects/tor-launcher/build +++ b/projects/tor-launcher/build @@ -2,7 +2,6 @@ set -e tar xvf [% project %]-[% c('version') %].tar.gz cd [% project %]-[% c('version') %] -patch -d src -p1 < ../topdir.patch [% IF c("var/tor_control_port") -%] patch -p1 < ../controlport.patch [% END -%]

1 0

[tor-messenger-build/master] Update Tor Mail build file with TorBirdy settings
by sukhbir＠torproject.org 23 Mar '15

23 Mar '15

commit f1e3464c75eb3c6456a5fcc755d206efbbfb29c1 Author: Sukhbir Singh <sukhbir(a)torproject.org> Date: Mon Mar 23 09:24:43 2015 +0530 Update Tor Mail build file with TorBirdy settings --- projects/tor-mail/build | 8 +++++--- 1 file changed, 5 insertions(+), 3 deletions(-) diff --git a/projects/tor-mail/build b/projects/tor-mail/build index c2b7498..f4de32f 100644 --- a/projects/tor-mail/build +++ b/projects/tor-mail/build @@ -17,17 +17,19 @@ mkdir bundle/Mail/defaults/profile/ mv user.js bundle/Mail/defaults/profile/ cd bundle/Mail/extensions -mkdir torbirdy -7z x -y -otorbirdy $rootdir/[% c('input_files_by_name/torbirdy') %] +mkdir castironthunderbirdclub(a)torproject.org +7z x -y -o castironthunderbirdclub(a)torproject.org $rootdir/[% c('input_files_by_name/torbirdy') %] mkdir tor-launcher(a)torproject.org -7z x -y -otor-launcher(a)torproject.org $rootdir/[% c('input_files_by_name/tor-launcher') %] +7z x -y -o tor-launcher(a)torproject.org $rootdir/[% c('input_files_by_name/tor-launcher') %] mkdir -p tor-launcher(a)torproject.org/TorBrowser/Data + [% IF c("var/windows") -%] 7z x ../../../[% c('input_files_by_name/tor-browser') %] mv \$_OUTDIR tor-browser_en-US [% ELSE -%] tar xf ../../../[% c('input_files_by_name/tor-browser') %] [% END -%] + sed -i 's/^SocksPort .*/SocksPort [% c("var/tor_socks_port") %]/' tor-browser_en-US/Browser/TorBrowser/Data/Tor/torrc-defaults sed -i 's/^ControlPort .*/ControlPort [% c("var/tor_control_port") %]/' tor-browser_en-US/Browser/TorBrowser/Data/Tor/torrc-defaults mv tor-browser_en-US/Browser/TorBrowser/Tor tor-launcher(a)torproject.org/TorBrowser/Tor

1 0