- tor-commits - lists.torproject.org

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

28 Aug '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/maint-2.2] [Linux] Quote $XAUTHORITY properly
by erinn＠torproject.org 28 Aug '11

28 Aug '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/maint-2.2] [Linux] Document why we need to set XAUTHORITY in this script
by erinn＠torproject.org 28 Aug '11

28 Aug '11

commit 7ae480f81e481bdcafb6e837ba808c0604a2ac3e Author: Robert Ransom <rransom.8774(a)gmail.com> Date: Tue Aug 23 01:55:32 2011 -0400 [Linux] Document why we need to set XAUTHORITY in this script Otherwise, some GDM user who doesn't know why it needs to be set here will remove this chunk of script someday. (cherry picked from commit 34cdd1dcc58adc55e04549698349c060f6378648) --- src/RelativeLink/RelativeLink.sh | 3 +++ 1 files changed, 3 insertions(+), 0 deletions(-) diff --git a/src/RelativeLink/RelativeLink.sh b/src/RelativeLink/RelativeLink.sh index 33961c9..09013a9 100755 --- a/src/RelativeLink/RelativeLink.sh +++ b/src/RelativeLink/RelativeLink.sh @@ -14,6 +14,9 @@ if [ $1 ]; then printf "\nDebug enabled.\n\n" fi +# If XAUTHORITY is unset, set it to its default value of $HOME/.Xauthority +# before we change HOME below. (See xauth(1) and #1945.) XDM and KDM rely +# on applications using this default value. if [ -z "$XAUTHORITY" ]; then XAUTHORITY=~/.Xauthority export XAUTHORITY

1 0

r24972: {website} update vidalia version to Tom?\195?\161s can announce the ne (website/trunk/include)
by Erinn Clark 28 Aug '11

28 Aug '11

Author: erinn Date: 2011-08-28 16:59:59 +0000 (Sun, 28 Aug 2011) New Revision: 24972 Modified: website/trunk/include/versions.wmi Log: update vidalia version to Tom?\195?\161s can announce the new 0.2.14 release Modified: website/trunk/include/versions.wmi =================================================================== --- website/trunk/include/versions.wmi 2011-08-28 08:36:42 UTC (rev 24971) +++ website/trunk/include/versions.wmi 2011-08-28 16:59:59 UTC (rev 24972) @@ -49,7 +49,7 @@ <define-tag version-torbrowserbundleff5 whitespace=delete>2.2.30-1</define-tag> -<define-tag version-vidalia-stable whitespace=delete>0.2.12</define-tag> +<define-tag version-vidalia-stable whitespace=delete>0.2.14</define-tag> <define-tag version-androidbundle-tor whitespace=delete>0.2.2.25-alpha</define-tag> <define-tag version-androidbundle-orbot whitespace=delete>1.0.5.2</define-tag>

1 0

[torbrowser/master] update libevent library names in linux makefile
by erinn＠torproject.org 28 Aug '11

28 Aug '11

commit ac346131da10193391ca0c3fc2cc7368dddb4fe7 Author: Erinn Clark <erinn(a)torproject.org> Date: Sun Aug 28 15:23:15 2011 +0100 update libevent library names in linux makefile --- build-scripts/linux.mk | 8 ++++---- 1 files changed, 4 insertions(+), 4 deletions(-) diff --git a/build-scripts/linux.mk b/build-scripts/linux.mk index 690436b..59e5a9f 100644 --- a/build-scripts/linux.mk +++ b/build-scripts/linux.mk @@ -332,10 +332,10 @@ install-binaries: # zlib cp -d $(ZLIB)/libz.so $(ZLIB)/libz.so.1 $(ZLIB)/libz.so.1.2.3 $(LIBSDIR)/libz # Libevent - cp -d $(LIBEVENT)/libevent-2.0.so.5 $(LIBEVENT)/libevent-2.0.so.5.0.1 $(LIBEVENT)/libevent_core.so \ - $(LIBEVENT)/libevent_core-2.0.so.5 $(LIBEVENT)/libevent_core-2.0.so.5.0.1 \ - $(LIBEVENT)/libevent_extra-2.0.so.5 $(LIBEVENT)/libevent_extra-2.0.so.5.0.1 \ - $(LIBEVENT)/libevent_extra.so $(LIBEVENT)/libevent.so $(LIBSDIR) + cp -d $(LIBEVENT)/libevent-2.0.so.5 $(LIBEVENT)/libevent-2.0.so.5.1.2 $(LIBEVENT)/libevent_core.so \ + $(LIBEVENT)/libevent_core-2.0.so.5 $(LIBEVENT)/libevent_core-2.0.so.5.1.2 \ + $(LIBEVENT)/libevent_extra-2.0.so.5 $(LIBEVENT)/libevent_extra-2.0.so.5.1.2 \ + $(LIBEVENT)/libevent_extra.so $(LIBEVENT)/libevent.so $(LIBSDIR) # libpng cp -d $(LIBPNG)/libpng14.so* $(LIBSDIR) # OpenSSL

1 0

[torbrowser/master] [Linux] Exit successfully when run with the --help option
by erinn＠torproject.org 28 Aug '11

28 Aug '11

commit 71a997097d59f85d6a02a50e620092f92a684728 Author: Robert Ransom <rransom.8774(a)gmail.com> Date: Fri Aug 26 04:55:19 2011 -0400 [Linux] Exit successfully when run with the --help option --- 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 04d91fa..248750e 100755 --- a/src/RelativeLink/RelativeLink.sh +++ b/src/RelativeLink/RelativeLink.sh @@ -119,7 +119,7 @@ if [ "$#" -eq 1 -a $ "x$1" = "x--debug" -o "x$1" = "x-debug" $ ]; then printf "\nDebug enabled.\n\n" elif [ "$#" -eq 1 -a $ "x$1" = "x--help" -o "x$1" = "x-help" $ ]; then echo "$usage_message" - exit 1 + exit 0 elif [ "$#" -ne 0 ]; then complain "$usage_message" exit 1

1 0

[torbrowser/master] [Linux] Start TBB anyway when the launcher script is run with invalid args
by erinn＠torproject.org 28 Aug '11

28 Aug '11

commit fa3a87a1837b30590f20918c41904e264816bd0e Author: Robert Ransom <rransom.8774(a)gmail.com> Date: Fri Aug 26 07:07:05 2011 -0400 [Linux] Start TBB anyway when the launcher script is run with invalid args Suggested by velope, because the most likely cause of oddball command-line arguments is that someone dragged-and-dropped one or more files on the start-tor-browser icon using a GUI file manager. --- src/RelativeLink/RelativeLink.sh | 7 ++++--- 1 files changed, 4 insertions(+), 3 deletions(-) diff --git a/src/RelativeLink/RelativeLink.sh b/src/RelativeLink/RelativeLink.sh index 248750e..1d2f4e3 100755 --- a/src/RelativeLink/RelativeLink.sh +++ b/src/RelativeLink/RelativeLink.sh @@ -120,9 +120,6 @@ if [ "$#" -eq 1 -a $ "x$1" = "x--debug" -o "x$1" = "x-debug" $ ]; then elif [ "$#" -eq 1 -a $ "x$1" = "x--help" -o "x$1" = "x-help" $ ]; then echo "$usage_message" exit 0 -elif [ "$#" -ne 0 ]; then - complain "$usage_message" - exit 1 fi # If XAUTHORITY is unset, set it to its default value of $HOME/.Xauthority @@ -212,6 +209,8 @@ if [ "${debug}" ]; then printf "\nStarting Vidalia now\n" cd "${HOME}" printf "\nLaunching Vidalia from: `pwd`\n" + # XXX Someday we should pass whatever command-line arguments we got + # (probably filenames or URLs) to Firefox. ./App/vidalia --loglevel debug --logfile vidalia-debug-log \ --datadir Data/Vidalia/ printf "\nVidalia exited with the following return code: $?\n" @@ -221,6 +220,8 @@ fi # not in debug mode, run proceed normally printf "\nLaunching Tor Browser Bundle for Linux in ${HOME}\n" cd "${HOME}" +# XXX Someday we should pass whatever command-line arguments we got +# (probably filenames or URLs) to Firefox. ./App/vidalia --datadir Data/Vidalia/ exitcode="$?" if [ "$exitcode" -ne 0 ]; then

1 0

[torbrowser/master] Merge branches 'fixes-2011-08-23-01-master' and 'master'
by erinn＠torproject.org 28 Aug '11

28 Aug '11

commit ccaaff799914e929231ec69d22d2d6fb725663b1 Merge: 52906e8 fa3a87a Author: Erinn Clark <erinn(a)torproject.org> Date: Sun Aug 28 13:09:49 2011 +0100 Merge branches 'fixes-2011-08-23-01-master' and 'master' build-scripts/linux.mk | 2 +- src/RelativeLink/RelativeLink.sh | 176 +++++++++++++++++++++++++++++++++---- 2 files changed, 158 insertions(+), 20 deletions(-)

1 0

[torbrowser/master] [Linux] Quote another variable expansion that should be quoted
by erinn＠torproject.org 28 Aug '11

28 Aug '11

commit 02148bded38663e0906a4a63f7783a245ce4fe0b Author: Robert Ransom <rransom.8774(a)gmail.com> Date: Wed Aug 24 02:59:53 2011 -0400 [Linux] Quote another variable expansion that should be quoted Otherwise, bad things can happen if TBB is in a directory whose name contains spaces. --- 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 a6287bc..fd8ed0c 100755 --- a/src/RelativeLink/RelativeLink.sh +++ b/src/RelativeLink/RelativeLink.sh @@ -105,7 +105,7 @@ fi # Try to be agnostic to where we're being started from, chdir to where # the script is. -mydir="$(dirname $0)" +mydir="$(dirname "$0")" test -d "$mydir" && cd "$mydir" # If ${PWD} results in a zero length HOME, we can try something else...

1 0

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

28 Aug '11

commit bd0cdaafaa4b53c258fd6ba591d4be1c4e8ead96 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 --- 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