Pier Angelo Vendrame pushed to branch main at The Tor Project / Applications / tor-browser-build

Commits: 6da7839e by Pier Angelo Vendrame at 2023-01-12T14:14:50+01:00 Bug 40695: Do not ship the macOS tor shim anymore

We moved the requested operations to Tor Browser side.

- - - - -

2 changed files:

- − projects/browser/Bundle-Data/mac-tor.sh - projects/browser/build

Changes:

===================================== projects/browser/Bundle-Data/mac-tor.sh deleted ===================================== @@ -1,15 +0,0 @@ -#!/bin/sh -# Compiled Python modules require a compatible Python, which means 32-bit 2.6. -export VERSIONER_PYTHON_VERSION=2.6 -export DYLD_LIBRARY_PATH=.:$DYLD_LIBRARY_PATH -# Set the current working directory to the directory containing this executable, -# so that pluggable transport executables can be given with relative paths. This -# works around a change in OS X 10.9, where the current working directory is -# otherwise set to "/" when an application bundle is started from Finder.. -# https://trac.torproject.org/projects/tor/ticket/10030 -cd "$(dirname "$0")" -if [ ! -f tor.real -a -d ../../../MacOS/Tor ]; then - # On newer releases of Tor Browser, tor.real is in Contents/MacOS/Tor/.. - cd ../../../MacOS/Tor -fi -exec ./tor.real "$@"

===================================== projects/browser/build ===================================== @@ -211,15 +211,6 @@ tar -C ${TB_STAGE_DIR} -xf [% c('input_files_by_name/firefox') %]/browser.tar.gz rm -Rf Bundle-Data/mac mv $SKELETON_TMP Bundle-Data/mac

- [% IF c("var/tor-browser") -%] - # Install a "tor" shim that sets the working directory. See #10030. - for tbdir in "${TBDIRS[@]}" - do - mv "$tbdir/$TORBINPATH/tor" "$tbdir/$TORBINPATH/tor.real" - cp Bundle-Data/mac-tor.sh "$tbdir/$TORCONFIGPATH/tor" - done - [% END -%] - tar -C Bundle-Data/mac-applications.dmg -c . | tar -C $TB_STAGE_DIR -x [% END %]

View it on GitLab: https://gitlab.torproject.org/tpo/applications/tor-browser-build/-/commit/6d...