commit be1cafddd4bdc24f9701b5dbe3b869a329b7f26e Author: Erinn Clark erinn@torproject.org Date: Fri Nov 15 18:07:43 2013 -0200

use dcf's patch to fix missing geoip issue. closes #10092. --- build-scripts/config/mozconfig-lin-i386 | 16 ---------------- build-scripts/osx-alpha.mk | 3 ++- build-scripts/osx.mk | 3 ++- src/current-patches/osx/macosx-tor.sh | 8 ++++++++ 4 files changed, 12 insertions(+), 18 deletions(-)

diff --git a/build-scripts/config/mozconfig-lin-i386 b/build-scripts/config/mozconfig-lin-i386 deleted file mode 100755 index 4421981..0000000 --- a/build-scripts/config/mozconfig-lin-i386 +++ /dev/null @@ -1,16 +0,0 @@ -. $topsrcdir/browser/config/mozconfig - -mk_add_options MOZ_OBJDIR=@TOPSRCDIR@/obj-@CONFIG_GUESS@ -mk_add_options MOZ_APP_DISPLAYNAME=TorBrowser -mk_add_options MOZ_MAKE_FLAGS="-s --no-print-directory -j2" -mk_add_options MOZILLA_OFFICIAL=1 -mk_add_options BUILD_OFFICIAL=1 - -ac_add_options --disable-optimize -ac_add_options --enable-official-branding -ac_add_options --enable-strip -ac_add_options --disable-tests -ac_add_options --disable-debug -ac_add_options --disable-maintenance-service -ac_add_options --disable-crashreporter -ac_add_options --disable-webrtc diff --git a/build-scripts/osx-alpha.mk b/build-scripts/osx-alpha.mk index 1429c5b..83ebc23 100644 --- a/build-scripts/osx-alpha.mk +++ b/build-scripts/osx-alpha.mk @@ -289,7 +289,8 @@ install-binaries: $(BUILT_DIR)/bin/macdeployqt $(VIDALIA) -no-plugins # Vidalia cp -R $(VIDALIA) $(APPDIR)/Vidalia.app - cp $(TOR) $(APPDIR) + cp $(TOR) $(APPDIR)/tor.real + cp ../src/current-patches/osx/macosx-tor.sh $(APPDIR)/tor ifeq ($(USE_OBFSPROXY),1) cp $(OBFSPROXY) $(APPDIR) endif diff --git a/build-scripts/osx.mk b/build-scripts/osx.mk index 898a040..349e908 100644 --- a/build-scripts/osx.mk +++ b/build-scripts/osx.mk @@ -252,7 +252,8 @@ install-binaries: $(BUILT_DIR)/bin/macdeployqt $(VIDALIA) -no-plugins # Vidalia cp -R $(VIDALIA) $(APPDIR)/Vidalia.app - cp $(TOR) $(APPDIR) + cp $(TOR) $(APPDIR)/tor.real + cp ../src/current-patches/osx/macosx-tor.sh $(APPDIR)/tor

## Fixup ## Collect up license files diff --git a/src/current-patches/osx/macosx-tor.sh b/src/current-patches/osx/macosx-tor.sh new file mode 100755 index 0000000..5f7c099 --- /dev/null +++ b/src/current-patches/osx/macosx-tor.sh @@ -0,0 +1,8 @@ +#!/bin/sh +# 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")" +exec ./tor.real "$@"