- tor-commits - lists.torproject.org

[torbrowser/maint-2.2] [Linux] Don't specify -geometry when complaining using [g]xmessage
by erinn＠torproject.org 28 Aug '11

28 Aug '11

commit b2a16034094fa4940c3f98e5d495db360117f307 Author: Robert Ransom <rransom.8774(a)gmail.com> Date: Fri Aug 26 04:38:06 2011 -0400 [Linux] Don't specify -geometry when complaining using [g]xmessage velope reported that it could make the dialog too small to show the message text. (cherry picked from commit a4c597d4f3bcdc931f6cbbdaa142d1b1997cddd9) --- 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 7df0983..5461539 100755 --- a/src/RelativeLink/RelativeLink.sh +++ b/src/RelativeLink/RelativeLink.sh @@ -87,7 +87,6 @@ complain () { -center \ -buttons OK \ -default OK \ - -geometry 300 \ -xrm '*message.scrollVertical: Never' \ "$complain_message" if [ "$?" -ne 127 ]; then @@ -103,7 +102,6 @@ complain () { -center \ -buttons GTK_STOCK_OK \ -default OK \ - -geometry 300 \ "$complain_message" if [ "$?" -ne 127 ]; then return

1 0

[torbrowser/maint-2.2] add missing linux 2.2.31-2 changelog entry
by erinn＠torproject.org 28 Aug '11

28 Aug '11

commit f8f22b1e5b401690a7021a1f7e9618a1a610c1e2 Author: Erinn Clark <erinn(a)torproject.org> Date: Sun Aug 28 17:31:31 2011 +0100 add missing linux 2.2.31-2 changelog entry --- changelog.linux-2.2 | 8 +++++++- 1 files changed, 7 insertions(+), 1 deletions(-) diff --git a/changelog.linux-2.2 b/changelog.linux-2.2 index dfd7fb8..1d29228 100644 --- a/changelog.linux-2.2 +++ b/changelog.linux-2.2 @@ -1,4 +1,10 @@ -Tor Browser Bundle (2.2.30-1) alpha; suite=linux +Tor Browser Bundle (2.2.31-2) alpha; suite=linux + + * Fix x86_64 bundle to have the right libraries and binaries (closes: #3773) + + -- Erinn Clark <erinn(a)torproject.org> Mon Aug 22 23:47:27 CEST 2011 + +Tor Browser Bundle (2.2.31-1) alpha; suite=linux * Update Tor to 0.2.2.31-rc * Update Firefox to 6.0

1 0

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

28 Aug '11

commit e3452cfec82d23f4a28fac5a8d5a4f0de636d623 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. (cherry picked from commit fa3a87a1837b30590f20918c41904e264816bd0e) --- 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/maint-2.2] [Linux] Exit successfully when run with the --help option
by erinn＠torproject.org 28 Aug '11

28 Aug '11

commit 5394b8fca9499711fe0d7c79054a536bfc24c447 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 (cherry picked from commit 71a997097d59f85d6a02a50e620092f92a684728) --- 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/maint-2.2] bump tbb osx to 2.2.32-1, tor to 0.2.2.32, vidalia to 0.2.14, torbutton to 1.4.1
by erinn＠torproject.org 28 Aug '11

28 Aug '11

commit e4fc65d12966f01a7f0550cac8cb94a14b7c1d37 Author: Erinn Clark <erinn(a)torproject.org> Date: Sun Aug 28 17:34:48 2011 +0100 bump tbb osx to 2.2.32-1, tor to 0.2.2.32, vidalia to 0.2.14, torbutton to 1.4.1 --- README.OSX-2.2 | 6 +++--- build-scripts/versions.mk | 8 ++++---- changelog.osx-2.2 | 11 ++++++++++- 3 files changed, 17 insertions(+), 8 deletions(-) diff --git a/README.OSX-2.2 b/README.OSX-2.2 index 750e540..de6e27c 100644 --- a/README.OSX-2.2 +++ b/README.OSX-2.2 @@ -4,10 +4,10 @@ Tor Browser Bundle for Mac OS X Included applications --------------------- -Vidalia 0.2.12 (with Qt 4.6.2) -Tor 0.2.2.31-rc (with libevent-2.0.13-stable, zlib-1.2.5 and openssl-1.0.0d) +Vidalia 0.2.14 (with Qt 4.6.2) +Tor 0.2.2.32 (with libevent-2.0.13-stable, zlib-1.2.5 and openssl-1.0.0d) Firefox (Aurora) 6.0 - \_ Torbutton 1.4.0 + \_ Torbutton 1.4.1 |_ NoScript 2.1.2.6 |_ HTTPS-Everywhere 1.0.0development.5 diff --git a/build-scripts/versions.mk b/build-scripts/versions.mk index 28b7d82..d3fa14b 100644 --- a/build-scripts/versions.mk +++ b/build-scripts/versions.mk @@ -1,6 +1,6 @@ #!/usr/bin/make -RELEASE_VER=2.2.31 +RELEASE_VER=2.2.32 HTTPSEVERY_VER=1.0.0development.5 FIREFOX_VER=6.0 @@ -12,9 +12,9 @@ OTR_VER=3.2.0 PIDGIN_VER=2.6.4 POLIPO_VER=1.0.4.1 QT_VER=4.6.2 -TOR_VER=0.2.2.31-rc -TORBUTTON_VER=1.4.0 -VIDALIA_VER=0.2.12 +TOR_VER=0.2.2.32 +TORBUTTON_VER=1.4.1 +VIDALIA_VER=0.2.14 ZLIB_VER=1.4.0 ## Extension IDs diff --git a/changelog.osx-2.2 b/changelog.osx-2.2 index ff6763d..2b9edcb 100644 --- a/changelog.osx-2.2 +++ b/changelog.osx-2.2 @@ -1,4 +1,13 @@ -Tor Browser Bundle (2.2.30-1) alpha; suite=osx +Tor Browser Bundle (2.2.32-1) alpha; suite=osx + + * Update Tor to 0.2.2.32 + * Update Vidalia to 0.2.14 + * Update Torbutton to 1.4.1 + * Enable automatic port choosing (closes: #2264) + + -- Erinn Clark <erinn(a)torproject.org> Sun Aug 28 17:20:46 BST 2011 + +Tor Browser Bundle (2.2.31-1) alpha; suite=osx * Update Tor to 0.2.2.31-rc * Update Firefox to 6.0

1 0

[torbrowser/maint-2.2] [Linux] Remove a bogus comment
by erinn＠torproject.org 28 Aug '11

28 Aug '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/maint-2.2] [Linux] Add a 'complain' shell function to RelativeLink.sh
by erinn＠torproject.org 28 Aug '11

28 Aug '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/maint-2.2] [Linux] Quote some shell expansion results
by erinn＠torproject.org 28 Aug '11

28 Aug '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/maint-2.2] [2824 Linux] Explicitly refuse to run TBB-Linux as root
by erinn＠torproject.org 28 Aug '11

28 Aug '11

commit 449751d3fb137da992deb481028bb3c16d2bd1df Author: Robert Ransom <rransom.8774(a)gmail.com> Date: Tue Aug 23 02:09:08 2011 -0400 [2824 Linux] Explicitly refuse to run TBB-Linux as root (cherry picked from commit 063c2f62567282c0c3093f35b414ee52ff87aee4) --- src/RelativeLink/RelativeLink.sh | 5 +++++ 1 files changed, 5 insertions(+), 0 deletions(-) diff --git a/src/RelativeLink/RelativeLink.sh b/src/RelativeLink/RelativeLink.sh index e33b1a8..fe00dcd 100755 --- a/src/RelativeLink/RelativeLink.sh +++ b/src/RelativeLink/RelativeLink.sh @@ -7,6 +7,11 @@ # # Copyright 2010 The Tor Project. See LICENSE for licensing information. +if [ "`id -u`" -eq 0 ]; then + echo "The Tor Browser Bundle should not be run as root. Exiting." + exit 1 +fi + if [ "$1" ]; then debug="$1" printf "\nDebug enabled.\n\n"

1 0

[torbrowser/maint-2.2] [Linux] Use complain to report all currently detected errors
by erinn＠torproject.org 28 Aug '11

28 Aug '11

commit a373383064afe14adfbe7cbc56253bc217c3d0fd Author: Robert Ransom <rransom.8774(a)gmail.com> Date: Wed Aug 24 00:47:15 2011 -0400 [Linux] Use complain to report all currently detected errors (cherry picked from commit 69bea9b7c46b23662fb0ae456997e482a0ad1222) --- src/RelativeLink/RelativeLink.sh | 16 +++++++++++----- 1 files changed, 11 insertions(+), 5 deletions(-) diff --git a/src/RelativeLink/RelativeLink.sh b/src/RelativeLink/RelativeLink.sh index 0435054..5be1bdc 100755 --- a/src/RelativeLink/RelativeLink.sh +++ b/src/RelativeLink/RelativeLink.sh @@ -59,7 +59,7 @@ complain () { } if [ "`id -u`" -eq 0 ]; then - echo "The Tor Browser Bundle should not be run as root. Exiting." + complain "The Tor Browser Bundle should not be run as root. Exiting." exit 1 fi @@ -107,16 +107,18 @@ export DYLD_PRINT_LIBRARIES # if any relevant processes are running, inform the user and exit cleanly RUNNING=0 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=1 + break fi done -if [ $RUNNING -eq 1 ]; then - printf "Please shut down the above process(es) before running Tor Browser Bundle.\n\n" - exit 0 +if [ "$RUNNING" -eq 1 ]; then + complain "$process is already running as PID $pid."$'\n\n'"Please shut down the above process(es) before running Tor Browser Bundle." + exit 1 fi @@ -148,4 +150,8 @@ fi printf "\nLaunching Tor Browser Bundle for Linux in ${HOME}\n" cd "${HOME}" ./App/vidalia --datadir Data/Vidalia/ -printf "\nExited cleanly. Goodbye.\n" +exitcode="$?" +if [ "$exitcode" -ne 0 ]; then + complain "Vidalia exited abnormally. Exit code: $exitcode" + exit "$exitcode" +fi

1 0