- tor-commits - lists.torproject.org

[torbrowser/master] add missing commit for removal of betterprivacy from linux bundles
by erinn＠torproject.org 24 Oct '11

24 Oct '11

commit eb7dec6deef77535bcd8c12fffe509c3101b972b Author: Erinn Clark <erinn(a)torproject.org> Date: Sun Aug 21 03:34:21 2011 +0200 add missing commit for removal of betterprivacy from linux bundles --- build-scripts/linux.mk | 2 +- 1 files changed, 1 insertions(+), 1 deletions(-) diff --git a/build-scripts/linux.mk b/build-scripts/linux.mk index 0bcefb3..14c691b 100644 --- a/build-scripts/linux.mk +++ b/build-scripts/linux.mk @@ -392,7 +392,7 @@ compressed-bundle_%: LANGCODE=$* make -f linux.mk compressed-bundle-localized bundle-localized_%.stamp: - make -f linux.mk copy-files_$* install-extensions install-betterprivacy install-lang-extensions patch-vidalia-language patch-firefox-language patch-pidgin-language update-extension-pref + make -f linux.mk copy-files_$* install-extensions install-lang-extensions patch-vidalia-language patch-firefox-language patch-pidgin-language update-extension-pref touch bundle-localized_$*.stamp bundle-localized: bundle-localized_$(LANGCODE).stamp

1 0

[torbrowser/master] tell windows to use gcc for CC
by erinn＠torproject.org 24 Oct '11

24 Oct '11

commit 00e711011b62fc3d74968d3b44d44cd80b210f5f Author: Erinn Clark <erinn(a)torproject.org> Date: Thu Aug 25 11:54:41 2011 +0200 tell windows to use gcc for CC --- build-scripts/windows.mk | 1 + 1 files changed, 1 insertions(+), 0 deletions(-) diff --git a/build-scripts/windows.mk b/build-scripts/windows.mk index da5dda1..1a52f6a 100644 --- a/build-scripts/windows.mk +++ b/build-scripts/windows.mk @@ -51,6 +51,7 @@ SEVENZIP="/c/Program Files/7-Zip/7z.exe" WGET=$(PYTHON) $(PWD)/pyget.py VIRUSSCAN=$(PYTHON) $(PWD)/virus-scan.py WINRAR="/c/Program Files/WinRAR/WinRAR.exe" +CC=gcc ## Location of directory for source unpacking

1 0

[torbrowser/master] [2824 Linux] Set UID:GID of files in TBB-Linux tarball to 0:0 (root:wheel)
by erinn＠torproject.org 24 Oct '11

24 Oct '11

commit 312b16cf1b9a60d39e1bed2c442e43fabb77ea2c Author: Robert Ransom <rransom.8774(a)gmail.com> Date: Tue Aug 23 01:36:33 2011 -0400 [2824 Linux] Set UID:GID of files in TBB-Linux tarball to 0:0 (root:wheel) As a result of this change, the build process for TBB for Linux now requires 'Tardy' (http://tardy.sourceforge.net/ ; Debian package 'tardy'). (I tested this Tardy command line with version 1.12 from Debian Squeeze, but not as part of the TBB build process.) (cherry picked from commit 037f07b7008643793704af280a847a82296591f7) --- build-scripts/linux.mk | 2 +- 1 files changed, 1 insertions(+), 1 deletions(-) diff --git a/build-scripts/linux.mk b/build-scripts/linux.mk index 14c691b..659e3b0 100644 --- a/build-scripts/linux.mk +++ b/build-scripts/linux.mk @@ -400,7 +400,7 @@ bundle-localized: bundle-localized_$(LANGCODE).stamp compressed-bundle-localized: bundle-localized_$(LANGCODE).stamp -rm -f $(DISTDIR)/$(COMPRESSED_NAME)_$(LANGCODE).tar.gz -mkdir $(DISTDIR) - tar -cvzf $(DISTDIR)/$(DEFAULT_COMPRESSED_BASENAME)$(LANGCODE).tar.gz $(NAME)_$(LANGCODE); + tar -cvf - $(NAME)_$(LANGCODE) |tardy -unu 0 -una root -gnu 0 -gna wheel |gzip -c9 >$(DISTDIR)/$(DEFAULT_COMPRESSED_BASENAME)$(LANGCODE).tar.gz rm *.zip *.xpi copy-files_%: generic-bundle.stamp

1 0

[torbrowser/master] [Linux] Quote $XAUTHORITY properly
by erinn＠torproject.org 24 Oct '11

24 Oct '11

commit 08893694389291bac39a71292fef70b113075ed7 Author: Robert Ransom <rransom.8774(a)gmail.com> Date: Tue Aug 23 01:46:42 2011 -0400 [Linux] Quote $XAUTHORITY properly I would be moderately surprised if any program put a shell metacharacter in that variable, but it could happen. (cherry picked from commit 60e114c5598a6c3b2615745b8c49e1a45fab8052) --- src/RelativeLink/RelativeLink.sh | 2 +- 1 files changed, 1 insertions(+), 1 deletions(-) diff --git a/src/RelativeLink/RelativeLink.sh b/src/RelativeLink/RelativeLink.sh index 99e5255..33961c9 100755 --- a/src/RelativeLink/RelativeLink.sh +++ b/src/RelativeLink/RelativeLink.sh @@ -14,7 +14,7 @@ if [ $1 ]; then printf "\nDebug enabled.\n\n" fi -if [ -z $XAUTHORITY ]; then +if [ -z "$XAUTHORITY" ]; then XAUTHORITY=~/.Xauthority export XAUTHORITY fi

1 0

[torbrowser/master] [Linux] Quote some shell expansion results
by erinn＠torproject.org 24 Oct '11

24 Oct '11

commit caab38074c7fa416873f368ad9605ec46a5f9c66 Author: Robert Ransom <rransom.8774(a)gmail.com> Date: Tue Aug 23 02:05:20 2011 -0400 [Linux] Quote some shell expansion results At the very least, `pwd` and $HOME need to be enclosed in double quotes (so that spaces in directory names won't automatically break things). (cherry picked from commit d9c40aa4f2a4e5bf62a6420a514e8f0b1e7a05ca) --- src/RelativeLink/RelativeLink.sh | 16 ++++++++-------- 1 files changed, 8 insertions(+), 8 deletions(-) diff --git a/src/RelativeLink/RelativeLink.sh b/src/RelativeLink/RelativeLink.sh index 63c0414..e33b1a8 100755 --- a/src/RelativeLink/RelativeLink.sh +++ b/src/RelativeLink/RelativeLink.sh @@ -7,8 +7,8 @@ # # Copyright 2010 The Tor Project. See LICENSE for licensing information. -if [ $1 ]; then - debug=$1 +if [ "$1" ]; then + debug="$1" printf "\nDebug enabled.\n\n" fi @@ -28,7 +28,7 @@ test -d "$mydir" && cd "$mydir" # If ${PWD} results in a zero length HOME, we can try something else... if [ ! "${PWD}" ]; then # "hacking around some braindamage" - HOME=`pwd` + HOME="`pwd`" export HOME surveysays="This system has a messed up shell.\n" else @@ -37,12 +37,12 @@ else fi if ldd ./App/Firefox/firefox-bin | grep -q "libz\.so\.1.*not found"; then - LD_LIBRARY_PATH=${HOME}/Lib:${HOME}/Lib/libz + LD_LIBRARY_PATH="${HOME}/Lib:${HOME}/Lib/libz" else - LD_LIBRARY_PATH=${HOME}/Lib + LD_LIBRARY_PATH="${HOME}/Lib" fi -LDPATH=${HOME}/Lib/ +LDPATH="${HOME}/Lib/" export LDPATH export LD_LIBRARY_PATH DYLD_PRINT_LIBRARIES=1 @@ -51,7 +51,7 @@ export DYLD_PRINT_LIBRARIES # if any relevant processes are running, inform the user and exit cleanly RUNNING=0 for process in tor vidalia - do pid=`pidof $process` + do pid="`pidof $process`" if [ -n "$pid" ]; then printf "\n$process is already running as PID $pid\n\n" RUNNING=1 @@ -72,7 +72,7 @@ if [ "${debug}" ]; then # this is likely unportable to Mac OS X or other netstat binaries for port in "8118" "9050" do - BOUND=`netstat -tan 2>&1|grep 127.0.0.1":${port}[^:]"|grep -v TIME_WAIT` + BOUND="`netstat -tan 2>&1|grep 127.0.0.1":${port}[^:]"|grep -v TIME_WAIT`" if [ "${BOUND}" ]; then printf "\nLikely problem detected: It appears that you have something listening on ${port}\n" printf "\nWe think this because of the following: ${BOUND}\n"

1 0

[torbrowser/master] [Linux] Remove a bogus comment
by erinn＠torproject.org 24 Oct '11

24 Oct '11

commit de606d90aba5d440501dec30c66d8ba044ee7c04 Author: Robert Ransom <rransom.8774(a)gmail.com> Date: Tue Aug 23 01:58:56 2011 -0400 [Linux] Remove a bogus comment The commonly used Linux desktop environments' file managers do not allow C programs to have custom icons. (cherry picked from commit 630326fad2c3321557c438a6ac8c8aeb9e8224e0) --- src/RelativeLink/RelativeLink.sh | 2 -- 1 files changed, 0 insertions(+), 2 deletions(-) diff --git a/src/RelativeLink/RelativeLink.sh b/src/RelativeLink/RelativeLink.sh index 09013a9..63c0414 100755 --- a/src/RelativeLink/RelativeLink.sh +++ b/src/RelativeLink/RelativeLink.sh @@ -2,8 +2,6 @@ # # GNU/Linux does not really require something like RelativeLink.c # However, we do want to have the same look and feel with similiar features. -# In the future, we may want this to be a C binary with a custom icon but at the moment -# it's quite simple to just use a shell script # # To run in debug mode simply pass --debug #

1 0

[torbrowser/master] [Linux] Properly detect being run from a GUI program started by startx
by erinn＠torproject.org 24 Oct '11

24 Oct '11

commit e38c3b482d537efd140b7cc6b290df50312449e2 Author: Robert Ransom <rransom.8774(a)gmail.com> Date: Wed Aug 24 02:55:08 2011 -0400 [Linux] Properly detect being run from a GUI program started by startx (cherry picked from commit bd0cdaafaa4b53c258fd6ba591d4be1c4e8ead96) --- src/RelativeLink/RelativeLink.sh | 47 +++++++++++++++++++++++++++++-------- 1 files changed, 37 insertions(+), 10 deletions(-) diff --git a/src/RelativeLink/RelativeLink.sh b/src/RelativeLink/RelativeLink.sh index e5239a6..a6287bc 100755 --- a/src/RelativeLink/RelativeLink.sh +++ b/src/RelativeLink/RelativeLink.sh @@ -7,21 +7,52 @@ # # Copyright 2010 The Tor Project. See LICENSE for licensing information. +# First, make sure DISPLAY is set. If it isn't, we're hosed; scream +# at stderr and die. +if [ "x$DISPLAY" = "x" ]; then + echo "The Tor Browser Bundle for Linux must be run within the X Window System." >&2 + echo "Exiting." >&2 + exit 1 +fi + +# Determine whether we are running in a terminal. If we are, we +# should send our error messages to stderr... +ARE_WE_RUNNING_IN_A_TERMINAL=0 +if [ -t 1 -o -t 2 ]; then + ARE_WE_RUNNING_IN_A_TERMINAL=1 +fi + +# ...unless we're running in the same terminal as startx or xinit. In +# that case, the user is probably running us from a GUI file manager +# in an X session started by typing startx at the console. +# +# Hopefully, the local ps command supports BSD-style options. (The ps +# commands usually used on Linux and FreeBSD do; do any other OSes +# support running Linux binaries?) +ps T 2>/dev/null |grep startx 2>/dev/null |grep -v grep 2>&1 >/dev/null +not_running_in_same_terminal_as_startx="$?" +ps T 2>/dev/null |grep xinit 2>/dev/null |grep -v grep 2>&1 >/dev/null +not_running_in_same_terminal_as_xinit="$?" + +# not_running_in_same_terminal_as_foo has the value 1 if we are *not* +# running in the same terminal as foo. +if [ "$not_running_in_same_terminal_as_startx" -eq 0 -o \ + "$not_running_in_same_terminal_as_xinit" -eq 0 ]; then + ARE_WE_RUNNING_IN_A_TERMINAL=0 +fi + # Complain about an error, by any means necessary. # Usage: complain message # message must not begin with a dash. complain () { # If we're being run in a terminal, complain there. - # - # FIXME Hopefully the user didn't run startx on the console and then - # double-click 'start-tor-browser' in a GUI file manager. - if [ -t 2 ]; then + if [ "$ARE_WE_RUNNING_IN_A_TERMINAL" -ne 0 ]; then echo "$1" >&2 return fi - # Otherwise, hope that we're being run in a GUI of some sort, - # and try to pop up a message there in the nicest way + # Otherwise, we're being run by a GUI program of some sort; + # try to pop up a message in the GUI in the nicest way # possible. # # In mksh, non-existent commands return 127; I'll assume all @@ -30,10 +61,6 @@ complain () { # close button, so we do need to look at the exact exit code, # not just assume the command failed to display a message if # it returns non-zero.) - # - # If DISPLAY isn't set, the first command on the list will - # fail with a non-127 exit code; that feels wrong somehow, but - # there's nothing better we can do in that case anyway. # First, try zenity. zenity --error --text="$1"

1 0

[torbrowser/master] [Linux] Add a 'complain' shell function to RelativeLink.sh
by erinn＠torproject.org 24 Oct '11

24 Oct '11

commit 3d91888298e06b166a34fb70a7ed6a86493f4005 Author: Robert Ransom <rransom.8774(a)gmail.com> Date: Wed Aug 24 00:46:50 2011 -0400 [Linux] Add a 'complain' shell function to RelativeLink.sh If the user is running start-tor-browser from a GUI file manager, he/she/it probably won't see any messages we output to stdout/stderr. The 'complain' function tries to make sure the user will actually see an error message. (cherry picked from commit e167e931c8e75d3915317ae3da5d3da747ef5065) --- src/RelativeLink/RelativeLink.sh | 51 ++++++++++++++++++++++++++++++++++++++ 1 files changed, 51 insertions(+), 0 deletions(-) diff --git a/src/RelativeLink/RelativeLink.sh b/src/RelativeLink/RelativeLink.sh index fe00dcd..0435054 100755 --- a/src/RelativeLink/RelativeLink.sh +++ b/src/RelativeLink/RelativeLink.sh @@ -7,6 +7,57 @@ # # Copyright 2010 The Tor Project. See LICENSE for licensing information. +# Complain about an error, by any means necessary. +# Usage: complain message +# message must not begin with a dash. +complain () { + # If we're being run in a terminal, complain there. + # + # FIXME Hopefully the user didn't run startx on the console and then + # double-click 'start-tor-browser' in a GUI file manager. + if [ -t 2 ]; then + echo "$1" >&2 + return + fi + + # Otherwise, hope that we're being run in a GUI of some sort, + # and try to pop up a message there in the nicest way + # possible. + # + # In mksh, non-existent commands return 127; I'll assume all + # other shells set the same exit code if they can't run a + # command. (xmessage returns 1 if the user clicks the WM + # close button, so we do need to look at the exact exit code, + # not just assume the command failed to display a message if + # it returns non-zero.) + # + # If DISPLAY isn't set, the first command on the list will + # fail with a non-127 exit code; that feels wrong somehow, but + # there's nothing better we can do in that case anyway. + + # First, try zenity. + zenity --error --text="$1" + if [ "$?" -ne 127 ]; then + return + fi + + # Try xmessage. + xmessage "$1" + if [ "$?" -ne 127 ]; then + return + fi + + # Try gxmessage. This one isn't installed by default on + # Debian with the default GNOME installation, so it seems to + # be the least likely program to have available, but it might + # be used by one of the 'lightweight' Gtk-based desktop + # environments. + gxmessage "$1" + if [ "$?" -ne 127 ]; then + return + fi +} + if [ "`id -u`" -eq 0 ]; then echo "The Tor Browser Bundle should not be run as root. Exiting." exit 1

1 0

[torbrowser/master] [Linux] Complain properly when both 'tor' and 'vidalia' are running
by erinn＠torproject.org 24 Oct '11

24 Oct '11

commit c9b2015f0ff13c2fd794c671190977ad2dd3fb9d Author: Robert Ransom <rransom.8774(a)gmail.com> Date: Wed Aug 24 01:51:18 2011 -0400 [Linux] Complain properly when both 'tor' and 'vidalia' are running There is now an unfortunate blank line at the beginning of the message; I don't know how to fix it with plain POSIX sh. (cherry picked from commit 59e48ff7af775140a3209f52aef8640de1da7ead) --- src/RelativeLink/RelativeLink.sh | 6 +++--- 1 files changed, 3 insertions(+), 3 deletions(-) diff --git a/src/RelativeLink/RelativeLink.sh b/src/RelativeLink/RelativeLink.sh index 708b68e..e5239a6 100755 --- a/src/RelativeLink/RelativeLink.sh +++ b/src/RelativeLink/RelativeLink.sh @@ -106,18 +106,18 @@ export DYLD_PRINT_LIBRARIES # if any relevant processes are running, inform the user and exit cleanly RUNNING=0 +RUNNING_MESSAGE="" for process in tor vidalia # FIXME pidof isn't POSIX do pid="`pidof $process`" if [ -n "$pid" ]; then - printf "\n$process is already running as PID $pid\n\n" + RUNNING_MESSAGE="`printf "%s\n%s is already running as PID %s." "$RUNNING_MESSAGE" "$process" "$pid"`" RUNNING=1 - break fi done if [ "$RUNNING" -eq 1 ]; then - complain "`printf "%s is already running as PID %s.\n\nPlease shut down the above process(es) before running Tor Browser Bundle." "$process" "$pid"`" + complain "`printf "%s\n\nPlease shut down the above process(es) before running Tor Browser Bundle." "$RUNNING_MESSAGE"`" exit 1 fi

1 0

[torbrowser/master] [2525 Linux] Handle being launched using a symlink
by erinn＠torproject.org 24 Oct '11

24 Oct '11

commit 49c7b9bacfa962db8a463d1099110b96ea3e3b97 Author: Robert Ransom <rransom.8774(a)gmail.com> Date: Wed Aug 24 03:10:31 2011 -0400 [2525 Linux] Handle being launched using a symlink (cherry picked from commit 7bf12712a8aa2556fdb023c69bbf51d727a17b90) --- src/RelativeLink/RelativeLink.sh | 17 ++++++++++++++++- 1 files changed, 16 insertions(+), 1 deletions(-) diff --git a/src/RelativeLink/RelativeLink.sh b/src/RelativeLink/RelativeLink.sh index fd8ed0c..1321e0c 100755 --- a/src/RelativeLink/RelativeLink.sh +++ b/src/RelativeLink/RelativeLink.sh @@ -103,9 +103,24 @@ if [ -z "$XAUTHORITY" ]; then export XAUTHORITY fi +# If this script is being run through a symlink, we need to know where +# in the filesystem the script itself is, not where the symlink is. +myname="$0" +while [ -L "$myname" ]; do + # XXX readlink is not POSIX, but is present in GNU coreutils + # and on FreeBSD. Unfortunately, the -f option (which follows + # a whole chain of symlinks until it reaches a non-symlink + # path name) is a GNUism, so we can't safely use it. (Using + # it would be rude to FreeBSD users who currently have no + # other officially supported choice than TBB for Linux, and + # might even break compatibility with older versions of the + # GNU utility.) + myname="`readlink -n "$myname"`" +done + # Try to be agnostic to where we're being started from, chdir to where # the script is. -mydir="$(dirname "$0")" +mydir="$(dirname "$myname")" test -d "$mydir" && cd "$mydir" # If ${PWD} results in a zero length HOME, we can try something else...

1 0