commit 2600de07f355ea5e544c5ec338f13cd6c1649f23 Author: Sukhbir Singh sukhbir@torproject.org Date: Thu Jul 21 13:47:27 2016 -0400

Update build.osx to reflect changes in Tor Browser Bundle --- projects/tor-messenger/build.osx | 33 +++++++++++++++++---------------- 1 file changed, 17 insertions(+), 16 deletions(-)

diff --git a/projects/tor-messenger/build.osx b/projects/tor-messenger/build.osx index 99dc5a2..c7f46c7 100755 --- a/projects/tor-messenger/build.osx +++ b/projects/tor-messenger/build.osx @@ -2,7 +2,6 @@ set -e rootdir=$(pwd) tar xf [% c('input_files_by_name/instantbird') %] -mv TorMessenger.app Tor\ Messenger.app

tar xf [% c('input_files_by_name/libdmg') %] export PATH="$(pwd)/libdmg-hfsplus:$PATH" @@ -18,36 +17,38 @@ cat $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 -sed -i 's/^ControlPort .*/ControlPort [% c("var/tor_control_port") %]/' TorBrowser.app/TorBrowser/Data/Tor/torrc-defaults +sed -i 's/^SocksPort .*/SocksPort [% c("var/tor_socks_port") %]/' TorBrowser.app/Contents/Resources/TorBrowser/Tor/torrc-defaults +sed -i 's/^ControlPort .*/ControlPort [% c("var/tor_control_port") %]/' TorBrowser.app/Contents/Resources/TorBrowser/Tor/torrc-defaults # use meek in standalone mode: https://lists.torproject.org/pipermail/tor-dev/2015-November/009887.html -sed -i 's/(ClientTransportPlugin meek exec) [^ ]+ -- /\1 /' TorBrowser.app/TorBrowser/Data/Tor/torrc-defaults -mkdir -p tor-launcher@torproject.org/TorBrowser/Data +sed -i 's/(ClientTransportPlugin meek exec) [^ ]+ -- /\1 /' TorBrowser.app/Contents/Resources/TorBrowser/Tor/torrc-defaults + # trac 17476 -rm -Rf TorBrowser.app/TorBrowser/Tor/PluggableTransports/TorBrowser.app.meek-http-helper/ -rm -f TorBrowser.app/TorBrowser/Tor/PluggableTransports/meek-client-torbrowser -mv TorBrowser.app/TorBrowser/Tor tor-launcher@torproject.org/TorBrowser/Tor -mv TorBrowser.app/TorBrowser/Data/Tor tor-launcher@torproject.org/TorBrowser/Data/Tor -mv tor-launcher@torproject.org $rootdir/Tor\ Messenger.app/Contents/Resources/extensions/ +rm -Rf TorBrowser.app/Contents/Resources/TorBrowser/Tor/PluggableTransports/TorBrowser.app.meek-http-helper/ +rm -f TorBrowser.app/Contents/Resources/TorBrowser/Tor/PluggableTransports/meek-client-torbrowser + +mkdir -p $rootdir/TorMessenger.app/Contents/Resources/distribution/extensions/ +mv tor-launcher@torproject.org $rootdir/TorMessenger.app/Contents/Resources/distribution/extensions/ cd ..

mkdir ctypes-otr cd ctypes-otr tar xf $rootdir/[% c('input_files_by_name/ctypes-otr') %] -mv ctypes-otr* $rootdir/Tor\ Messenger.app/Contents/Resources/extensions/ctypes-otr@tormessenger +mv ctypes-otr* $rootdir/TorMessenger.app/Contents/Resources/distribution/extensions/ctypes-otr@tormessenger cd ..

-mkdir Tor\ Messenger.app/TorMessenger -mv Bundle-Data/mac/TorBrowser/* Tor\ Messenger.app/TorMessenger/ +mkdir TorMessenger.app/TorBrowser/ +mv torbrowser/TorBrowser.app/Contents/Resources/TorBrowser/ $rootdir/TorMessenger.app/Contents/Resources/ + +mv torbrowser/TorBrowser.app/Contents/MacOS/Tor/ $rootdir/TorMessenger.app/Contents/MacOS/

mkdir dmg -mv Tor\ Messenger.app dmg +mv TorMessenger.app dmg cd dmg find . -executable -exec chmod 750 {} ; find . ! -executable -exec chmod 640 {} ; find . -type f | sed -e 's/^.///' | sort | xargs -i echo "{}={}" > ../filelist.txt find . -type l | sed -e 's/^.///' | sort | xargs -i echo "{}={}" >> ../filelist.txt

-mkisofs -D -V "Tor Messenger" -no-pad -R -apple -o ../Tor\ Messenger-uncompressed.dmg -path-list ../filelist.txt -graft-points -gid 20 -dir-mode 0750 -new-dir-mode 0750 +mkisofs -D -V "Tor Messenger" -no-pad -R -apple -o ../TorMessenger-uncompressed.dmg -path-list ../filelist.txt -graft-points -gid 20 -dir-mode 0750 -new-dir-mode 0750 cd .. -dmg dmg Tor\ Messenger-uncompressed.dmg [% dest_dir _ '/' _ c('filename') %] +dmg dmg TorMessenger-uncompressed.dmg [% dest_dir _ '/' _ c('filename') %]