August 2011 - tor-commits - lists.torproject.org

[torbrowser/master] [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 037f07b7008643793704af280a847a82296591f7 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.) --- 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 deba909..2c3b7b8 100644 --- a/build-scripts/linux.mk +++ b/build-scripts/linux.mk @@ -457,7 +457,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 cp test/torbutton.xpi torbutton.xpi

1 0

[torbrowser/master] [Linux] Document why we need to set XAUTHORITY in this script
by erinn＠torproject.org 28 Aug '11

28 Aug '11

commit 34cdd1dcc58adc55e04549698349c060f6378648 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. --- 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

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

28 Aug '11

commit 630326fad2c3321557c438a6ac8c8aeb9e8224e0 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. --- 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] Quote some shell expansion results
by erinn＠torproject.org 28 Aug '11

28 Aug '11

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

28 Aug '11

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

28 Aug '11

commit e167e931c8e75d3915317ae3da5d3da747ef5065 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. --- 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] Unbreak the "foozer is already running as PID 31337." message
by erinn＠torproject.org 28 Aug '11

28 Aug '11

commit 0ca62c9b335c7a4e76c12ad4397f6e7653be89e0 Author: Robert Ransom <rransom.8774(a)gmail.com> Date: Wed Aug 24 01:21:17 2011 -0400 [Linux] Unbreak the "foozer is already running as PID 31337." message The $'\n\n' didn't do what I thought it would do. bashism? zshism? I have no idea where I saw that syntax. Still not quite right, because it used to (try to) complain about both Tor and Vidalia at the same time if both were running. --- 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 5be1bdc..708b68e 100755 --- a/src/RelativeLink/RelativeLink.sh +++ b/src/RelativeLink/RelativeLink.sh @@ -117,7 +117,7 @@ for process in tor vidalia done 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." + complain "`printf "%s is already running as PID %s.\n\nPlease shut down the above process(es) before running Tor Browser Bundle." "$process" "$pid"`" exit 1 fi

1 0

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

28 Aug '11

commit 69bea9b7c46b23662fb0ae456997e482a0ad1222 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 --- 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

r24971: {website} Update torbutton version to 1.4.1. (in website/trunk: include torbutton torbutton/en)
by Mike Perry 28 Aug '11

28 Aug '11

Author: mikeperry Date: 2011-08-28 08:36:42 +0000 (Sun, 28 Aug 2011) New Revision: 24971 Modified: website/trunk/include/versions.wmi website/trunk/torbutton/en/index.wml website/trunk/torbutton/update.rdf Log: Update torbutton version to 1.4.1. Modified: website/trunk/include/versions.wmi =================================================================== --- website/trunk/include/versions.wmi 2011-08-28 01:39:28 UTC (rev 24970) +++ website/trunk/include/versions.wmi 2011-08-28 08:36:42 UTC (rev 24971) @@ -84,8 +84,8 @@ <define-tag file-source-alpha whitespace=delete>tor-<version-alpha>.tar.gz</define-tag> <define-tag package-source-alpha whitespace=delete>/dist/<file-source-alpha></define-tag> -<define-tag version-torbutton whitespace=delete>1.4.0 (30 June 2011)</define-tag> -<define-tag version-hash-torbutton whitespace=delete>sha1:4df99e70b2991bb51ea70d0c217961174b24a98e</define-tag> +<define-tag version-torbutton whitespace=delete>1.4.1 (28 Aug 2011)</define-tag> +<define-tag version-hash-torbutton whitespace=delete>sha1:7f80cf8eea6d523fdb0bac94eefce52ebbb192be</define-tag> <define-tag version-torbutton-alpha whitespace=delete>None</define-tag> <define-tag version-hash-torbutton-alpha whitespace=delete>sha1:c7323cd408ebee28ee23b6a91fe056d59de668f5</define-tag> Modified: website/trunk/torbutton/en/index.wml =================================================================== --- website/trunk/torbutton/en/index.wml 2011-08-28 01:39:28 UTC (rev 24970) +++ website/trunk/torbutton/en/index.wml 2011-08-28 08:36:42 UTC (rev 24971) @@ -89,17 +89,19 @@ Current stable version:<version-torbutton> Current alpha version:<version-torbutton-alpha> - Authors: Mike Perry & Scott Squires + Maintainer: Mike Perry Install Stable: Click to <a href="https://www.torproject.org/dist/torbutton/torbutton-current.xpi" hash="<version-hash-torbutton>" onclick="return install(event);">install from this website</a>. + English Google Search: Google search plugins for <a href="/jsreq.html" title="Ref: 14938 (googleCA)" Modified: website/trunk/torbutton/update.rdf =================================================================== (Binary files differ)

1 0

[torbutton/master] Bump version to 1.4.1.
by mikeperry＠torproject.org 28 Aug '11

28 Aug '11

commit 9b9b597ab795e223828f8044ce0c7846f75089ae Author: Mike Perry <mikeperry-git(a)fscked.org> Date: Sat Aug 27 21:30:14 2011 -0700 Bump version to 1.4.1. --- src/install.rdf | 2 +- 1 files changed, 1 insertions(+), 1 deletions(-) diff --git a/src/install.rdf b/src/install.rdf index f3451b6..822eb4c 100644 --- a/src/install.rdf +++ b/src/install.rdf @@ -6,7 +6,7 @@ <em:name>Torbutton</em:name> <em:creator>Mike Perry & Kory Kirk</em:creator> <em:id>{e0204bd5-9d31-402b-a99d-a6aa8ffebdca}</em:id> - <em:version>1.4.0</em:version> + <em:version>1.4.1</em:version> <em:homepageURL>https://www.torproject.org/torbutton/</em:homepageURL> <em:optionsURL>chrome://torbutton/content/preferences.xul</em:optionsURL> <em:iconURL>chrome://torbutton/skin/tor.png</em:iconURL>

1 0