commit 7a1c6fd121dd001eb999ef03ebbbed264da37026 Author: Nicolas Vigier <boklm@torproject.org> Date: Sat Nov 7 00:45:48 2015 +0100 Bug 17492: Include default bridges configuration However, we exclude meek from the bridges configuration, as it currently doesn't work in Tor Messenger because it requires firefox. --- ChangeLog | 1 + projects/bundle-data/build | 4 ++-- projects/bundle-data/config | 11 +---------- projects/tor-messenger/build | 12 +++++++++++- projects/tor-messenger/build.osx | 8 +++++++- 5 files changed, 22 insertions(+), 14 deletions(-) diff --git a/ChangeLog b/ChangeLog index bdee35c..2f8fbd9 100644 --- a/ChangeLog +++ b/ChangeLog @@ -3,6 +3,7 @@ Tor Messenger 0.1.0b4 -- * Bug 16478: Update certificate pane in preferences window * ctypes-otr * Bug 17539: Pass username when interpolating resent string + * Bug 17492: Include default bridges configuration Tor Messenger 0.1.0b3 -- October 30 2015 * Windows diff --git a/projects/bundle-data/build b/projects/bundle-data/build index 3528675..64d1426 100644 --- a/projects/bundle-data/build +++ b/projects/bundle-data/build @@ -1,5 +1,5 @@ #!/bin/sh set -e tar xf [% project %]-[% c('version') %].tar.[% c('compress_tar') %] -cd [% project %]-[% c('version') %]/[% c("var/bundledir") %] -tar czf [% dest_dir _ '/' _ c('filename') %] . +cd [% project %]-[% c('version') %] +tar czf [% dest_dir _ '/' _ c('filename') %] Bundle-Data diff --git a/projects/bundle-data/config b/projects/bundle-data/config index 1fdc028..4e1d7d6 100644 --- a/projects/bundle-data/config +++ b/projects/bundle-data/config @@ -2,13 +2,4 @@ version: '[% c("abbrev") %]' git_url: https://git.torproject.org/builders/tor-browser-bundle.git git_hash: faa6152ada46c03bac9918dd69fa5646847be2e1 -filename: 'bundle-data-[% c("version") %]-[% c("var/osname") %].tar.gz' -var: - bundledir: Bundle-Data/linux -targets: - windows-i686: - var: - bundledir: Bundle-Data/windows - osx-x86_64: - var: - bundledir: Bundle-Data/mac/TorBrowser +filename: 'bundle-data-[% c("version") %].tar.gz' diff --git a/projects/tor-messenger/build b/projects/tor-messenger/build index 40641e0..7dba35b 100644 --- a/projects/tor-messenger/build +++ b/projects/tor-messenger/build @@ -6,6 +6,8 @@ set -e STOP; END -%] +rootdir=$(pwd) + mkdir bundle [% IF c("var/windows") -%] 7z x -y -obundle [% c('input_files_by_name/instantbird') %] @@ -23,7 +25,12 @@ rm -f bundle/Messenger/*.chk [% END -%] mkdir bundle/Messenger/TorMessenger -tar xf [% c('input_files_by_name/bundle-data') %] -C bundle/Messenger/TorMessenger +tar xf [% c('input_files_by_name/bundle-data') %] +[% IF c("var/linux") -%] +mv Bundle-Data/linux/* bundle/Messenger/TorMessenger/ +[% ELSE -%] +mv Bundle-Data/windows/* bundle/Messenger/TorMessenger/ +[% END -%] [% IF c("var/linux") %] tar xf [% c('input_files_by_name/gcc') %] @@ -45,6 +52,9 @@ tar xf ../../../[% c('input_files_by_name/ctypes-otr') %] mv ctypes-otr* 'ctypes-otr@tormessenger' mkdir tor-launcher@torproject.org 7z x -y -otor-launcher@torproject.org ../../../[% c('input_files_by_name/tor-launcher') %] +# exclude meek as it requires firefox +fgrep -v extensions.torlauncher.default_bridge.meek- $rootdir/Bundle-Data/PTConfigs/bridge_prefs.js >> \ + tor-launcher@torproject.org/defaults/preferences/prefs.js mkdir -p tor-launcher@torproject.org/TorBrowser/Data [% IF c("var/windows") -%] 7z x ../../../[% c('input_files_by_name/tor-browser') %] diff --git a/projects/tor-messenger/build.osx b/projects/tor-messenger/build.osx index 16e9b47..1c79518 100644 --- a/projects/tor-messenger/build.osx +++ b/projects/tor-messenger/build.osx @@ -7,10 +7,16 @@ mv TorMessenger.app Tor\ Messenger.app tar xf [% c('input_files_by_name/libdmg') %] export PATH="$(pwd)/libdmg-hfsplus:$PATH" +# extract bundle data files to Bundle-Data +tar xf [% c('input_files_by_name/bundle-data') %] + mkdir torbrowser cd torbrowser mkdir tor-launcher@torproject.org 7z x -y -otor-launcher@torproject.org $rootdir/[% c('input_files_by_name/tor-launcher') %] +# exclude meek as it requires firefox +fgrep -v extensions.torlauncher.default_bridge.meek- $rootdir/Bundle-Data/PTConfigs/bridge_prefs.js >> \ + tor-launcher@torproject.org/defaults/preferences/prefs.js 7z x $rootdir/[% c('input_files_by_name/tor-browser') %] bsdtar xf '0.unknown partition' sed -i 's/^SocksPort .*/SocksPort [% c("var/tor_socks_port") %]/' TorBrowser.app/TorBrowser/Data/Tor/torrc-defaults @@ -28,7 +34,7 @@ mv ctypes-otr* $rootdir/Tor\ Messenger.app/Contents/Resources/extensions/ctypes- cd .. mkdir Tor\ Messenger.app/TorMessenger -tar xf [% c('input_files_by_name/bundle-data') %] -C Tor\ Messenger.app/TorMessenger +mv Bundle-Data/mac/TorBrowser/* Tor\ Messenger.app/TorMessenger/ mkdir dmg mv Tor\ Messenger.app dmg