- tor-commits - lists.torproject.org

[torbrowser/master] Merge branches 'diginotar' and 'maint-2.2' into maint-2.2
by erinn＠torproject.org 23 Oct '11

23 Oct '11

commit 68493debd487ef18563db5351b78b3cde3a9f88a Merge: 652e344 0be3b04 Author: Erinn Clark <erinn(a)torproject.org> Date: Tue Aug 30 23:13:34 2011 +0100 Merge branches 'diginotar' and 'maint-2.2' into maint-2.2 .../0004-Remove-DigiNotar-root.patch | 1842 ++++++++++++++++++++ src/current-patches/0005-Smash-the-state.patch | 31 + 2 files changed, 1873 insertions(+), 0 deletions(-)

1 0

[torbrowser/master] bump libevent and firefox versions
by erinn＠torproject.org 23 Oct '11

23 Oct '11

commit e66f7de37e74b84040162e23ba69d02f3632da3b Author: Erinn Clark <erinn(a)torproject.org> Date: Wed Aug 31 18:19:39 2011 +0100 bump libevent and firefox versions --- build-scripts/osx.mk | 2 +- build-scripts/versions.mk | 4 ++-- build-scripts/windows.mk | 2 +- 3 files changed, 4 insertions(+), 4 deletions(-) diff --git a/build-scripts/osx.mk b/build-scripts/osx.mk index e54f5bb..816dd24 100644 --- a/build-scripts/osx.mk +++ b/build-scripts/osx.mk @@ -36,7 +36,7 @@ include $(PWD)/versions.mk ## Architecture ARCH_TYPE=i386 -BUILD_NUM=1 +BUILD_NUM=2 PLATFORM=MacOS ## Location of directory for source unpacking diff --git a/build-scripts/versions.mk b/build-scripts/versions.mk index d3fa14b..60ee138 100644 --- a/build-scripts/versions.mk +++ b/build-scripts/versions.mk @@ -3,8 +3,8 @@ RELEASE_VER=2.2.32 HTTPSEVERY_VER=1.0.0development.5 -FIREFOX_VER=6.0 -LIBEVENT_VER=2.0.13-stable +FIREFOX_VER=6.0.1 +LIBEVENT_VER=2.0.14-stable LIBPNG_VER=1.4.3 NOSCRIPT_VER=2.1.2.6 OPENSSL_VER=1.0.0d diff --git a/build-scripts/windows.mk b/build-scripts/windows.mk index cd39c0b..3bc3c2e 100644 --- a/build-scripts/windows.mk +++ b/build-scripts/windows.mk @@ -31,7 +31,7 @@ ## Include versions include $(PWD)/versions.mk -BUILD_NUM=1 +BUILD_NUM=2 PLATFORM=Windows ## Location of required libraries

1 0

[torbrowser/master] [Linux] Use ` ` instead of $( ) for consistency
by erinn＠torproject.org 23 Oct '11

23 Oct '11

commit f04699117137c662b98d96cf85e8632b4dbec575 Author: Robert Ransom <rransom.8774(a)gmail.com> Date: Wed Aug 24 03:21:10 2011 -0400 [Linux] Use ` ` instead of $( ) for consistency (cherry picked from commit 756d8db1ecadd09a8d8f947187ef31e8c40ff912) --- 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 7c2dc7d..5fd0acc 100755 --- a/src/RelativeLink/RelativeLink.sh +++ b/src/RelativeLink/RelativeLink.sh @@ -120,7 +120,7 @@ done # Try to be agnostic to where we're being started from, chdir to where # the script is. -mydir="$(dirname "$myname")" +mydir="`dirname "$myname"`" test -d "$mydir" && cd "$mydir" # If ${PWD} results in a zero length HOME, we can try something else...

1 0

[torbrowser/master] [Linux] Add UI improvements to complain suggested by velope
by erinn＠torproject.org 23 Oct '11

23 Oct '11

commit 2887bae388b663de2f6f3d1ccec6b5c8e0295d9b Author: Robert Ransom <rransom.8774(a)gmail.com> Date: Thu Aug 25 23:09:20 2011 -0400 [Linux] Add UI improvements to complain suggested by velope (cherry picked from commit a8243193ec3930329fa6e3928a2b2a8a42eafff1) --- src/RelativeLink/RelativeLink.sh | 19 ++++++++++++++++--- 1 files changed, 16 insertions(+), 3 deletions(-) diff --git a/src/RelativeLink/RelativeLink.sh b/src/RelativeLink/RelativeLink.sh index 462ca98..2894ed7 100755 --- a/src/RelativeLink/RelativeLink.sh +++ b/src/RelativeLink/RelativeLink.sh @@ -7,6 +7,8 @@ # # Copyright 2011 The Tor Project. See LICENSE for licensing information. +complain_dialog_title="Tor Browser Bundle" + # First, make sure DISPLAY is set. If it isn't, we're hosed; scream # at stderr and die. if [ "x$DISPLAY" = "x" ]; then @@ -63,13 +65,19 @@ complain () { # it returns non-zero.) # First, try zenity. - zenity --error --text="$1" + zenity --error --title="$complain_dialog_title" --text="$1" if [ "$?" -ne 127 ]; then return fi # Try xmessage. - xmessage "$1" + xmessage -title "$complain_dialog_title" \ + -center \ + -buttons OK \ + -default OK \ + -geometry 300 \ + -xrm '*message.scrollVertical: Never' \ + "$1" if [ "$?" -ne 127 ]; then return fi @@ -79,7 +87,12 @@ complain () { # be the least likely program to have available, but it might # be used by one of the 'lightweight' Gtk-based desktop # environments. - gxmessage "$1" + gxmessage -title "$complain_dialog_title" \ + -center \ + -buttons GTK_STOCK_OK \ + -default OK \ + -geometry 300 \ + "$1" if [ "$?" -ne 127 ]; then return fi

1 0

[torbrowser/master] [Linux] Accept -debug instead of --debug in RelativeLink.sh
by erinn＠torproject.org 23 Oct '11

23 Oct '11

commit 0d007d4789ac142d5929529de3b1a0cf2082d385 Author: Robert Ransom <rransom.8774(a)gmail.com> Date: Thu Aug 25 23:11:27 2011 -0400 [Linux] Accept -debug instead of --debug in RelativeLink.sh Suggested by velope. (cherry picked from commit 52458db5b9a108d81c4869f10c4ee2bee4aeac18) --- src/RelativeLink/RelativeLink.sh | 8 ++++++-- 1 files changed, 6 insertions(+), 2 deletions(-) diff --git a/src/RelativeLink/RelativeLink.sh b/src/RelativeLink/RelativeLink.sh index 2894ed7..08165c3 100755 --- a/src/RelativeLink/RelativeLink.sh +++ b/src/RelativeLink/RelativeLink.sh @@ -103,11 +103,15 @@ if [ "`id -u`" -eq 0 ]; then exit 1 fi -if [ "$#" -eq 1 -a "x$1" = "x--debug" ]; then +usage_message="usage: $0 [--debug]" +if [ "$#" -eq 1 -a $ "x$1" = "x--debug" -o "x$1" = "x-debug" $ ]; then debug=1 printf "\nDebug enabled.\n\n" +elif [ "$#" -eq 1 -a $ "x$1" = "x--help" -o "x$1" = "x-help" $ ]; then + echo $usage_message + exit 1 elif [ "$#" -ne 0 ]; then - complain "usage: $0 [--debug]" + complain $usage_message exit 1 fi

1 0

[torbrowser/master] [Linux] Be more strict about entering debug mode
by erinn＠torproject.org 23 Oct '11

23 Oct '11

commit 5d9c3ad0228b3884a0913f01ae1646a5cad70f6e Author: Robert Ransom <rransom.8774(a)gmail.com> Date: Wed Aug 24 03:32:49 2011 -0400 [Linux] Be more strict about entering debug mode Previously, a GUI user could start TBB in debug mode by dragging and dropping a file onto start-tor-browser. Found by taylanub (see ticket #3432). (cherry picked from commit 76596fca6bfd65df9502832d53e5e0f75ef01f4b) --- src/RelativeLink/RelativeLink.sh | 7 +++++-- 1 files changed, 5 insertions(+), 2 deletions(-) diff --git a/src/RelativeLink/RelativeLink.sh b/src/RelativeLink/RelativeLink.sh index 5fd0acc..462ca98 100755 --- a/src/RelativeLink/RelativeLink.sh +++ b/src/RelativeLink/RelativeLink.sh @@ -90,9 +90,12 @@ if [ "`id -u`" -eq 0 ]; then exit 1 fi -if [ "$1" ]; then - debug="$1" +if [ "$#" -eq 1 -a "x$1" = "x--debug" ]; then + debug=1 printf "\nDebug enabled.\n\n" +elif [ "$#" -ne 0 ]; then + complain "usage: $0 [--debug]" + exit 1 fi # If XAUTHORITY is unset, set it to its default value of $HOME/.Xauthority

1 0

[torbrowser/master] [Linux] Trim leading newlines in complain messages (patch by velope)
by erinn＠torproject.org 23 Oct '11

23 Oct '11

commit 168936436404a98e9b1393a66626d619698e247c Author: Robert Ransom <rransom.8774(a)gmail.com> Date: Fri Aug 26 04:23:50 2011 -0400 [Linux] Trim leading newlines in complain messages (patch by velope) (cherry picked from commit ccfb64406fb371b3e48377a2fb32ed45d3496107) --- 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 a1a1510..7df0983 100755 --- a/src/RelativeLink/RelativeLink.sh +++ b/src/RelativeLink/RelativeLink.sh @@ -47,9 +47,12 @@ fi # Usage: complain message # message must not begin with a dash. complain () { + # Trim leading newlines, to avoid breaking formatting in some dialogs. + complain_message="`echo "$1" | sed '/./,$!d'`" + # If we're being run in a terminal, complain there. if [ "$ARE_WE_RUNNING_IN_A_TERMINAL" -ne 0 ]; then - echo "$1" >&2 + echo "$complain_message" >&2 return fi @@ -65,13 +68,16 @@ complain () { # it returns non-zero.) # First, try zenity. - zenity --error --title="$complain_dialog_title" --text="$1" + zenity --error \ + --title="$complain_dialog_title" \ + --text="$complain_message" if [ "$?" -ne 127 ]; then return fi # Try kdialog. - kdialog --title "$complain_dialog_title" --error "$1" + kdialog --title "$complain_dialog_title" \ + --error "$complain_message" if [ "$?" -ne 127 ]; then return fi @@ -83,7 +89,7 @@ complain () { -default OK \ -geometry 300 \ -xrm '*message.scrollVertical: Never' \ - "$1" + "$complain_message" if [ "$?" -ne 127 ]; then return fi @@ -98,7 +104,7 @@ complain () { -buttons GTK_STOCK_OK \ -default OK \ -geometry 300 \ - "$1" + "$complain_message" if [ "$?" -ne 127 ]; then return fi

1 0

[torbrowser/master] [Linux] Make complain support kdialog
by erinn＠torproject.org 23 Oct '11

23 Oct '11

commit 75410a2a4cdd80b9a6ec9592a339fc81e185b1e1 Author: Robert Ransom <rransom.8774(a)gmail.com> Date: Fri Aug 26 01:03:10 2011 -0400 [Linux] Make complain support kdialog Note that the version of kdialog in debian-live-6.0.1-i386-kde-desktop.iso does not set the window size properly for five or more lines of text. We may or may not run into that bug in this script, but there's nothing we can do about it (except possibly report it upstream). (cherry picked from commit ed5f99dc8ace80da6df532ebf257f4e807a92132) --- src/RelativeLink/RelativeLink.sh | 6 ++++++ 1 files changed, 6 insertions(+), 0 deletions(-) diff --git a/src/RelativeLink/RelativeLink.sh b/src/RelativeLink/RelativeLink.sh index 08165c3..8013f38 100755 --- a/src/RelativeLink/RelativeLink.sh +++ b/src/RelativeLink/RelativeLink.sh @@ -70,6 +70,12 @@ complain () { return fi + # Try kdialog. + kdialog --title "$complain_dialog_title" --error "$1" + if [ "$?" -ne 127 ]; then + return + fi + # Try xmessage. xmessage -title "$complain_dialog_title" \ -center \

1 0

[torbrowser/master] [Linux] Use $complain_dialog_title for generality
by erinn＠torproject.org 23 Oct '11

23 Oct '11

commit 0ff817026165eafa966e83ea767124a44a792c13 Author: Robert Ransom <rransom.8774(a)gmail.com> Date: Fri Aug 26 03:50:53 2011 -0400 [Linux] Use $complain_dialog_title for generality (cherry picked from commit 0b1c288a7f7d41dcaeb76ee6cc14e10481d121c2) --- 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 8013f38..a1a1510 100755 --- a/src/RelativeLink/RelativeLink.sh +++ b/src/RelativeLink/RelativeLink.sh @@ -12,7 +12,7 @@ complain_dialog_title="Tor Browser Bundle" # 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 "$complain_dialog_title must be run within the X Window System." >&2 echo "Exiting." >&2 exit 1 fi

1 0

[torbrowser/master] [Linux] Add missing quotes (spotted by velope)
by erinn＠torproject.org 23 Oct '11

23 Oct '11

commit d6c37e52ee84f6f10870b87f2f445c5538871b0e Author: Robert Ransom <rransom.8774(a)gmail.com> Date: Fri Aug 26 04:40:18 2011 -0400 [Linux] Add missing quotes (spotted by velope) (cherry picked from commit 7dc48b20ea1e4cb0783fb842fdd060b0c22f7ccb) --- src/RelativeLink/RelativeLink.sh | 4 ++-- 1 files changed, 2 insertions(+), 2 deletions(-) diff --git a/src/RelativeLink/RelativeLink.sh b/src/RelativeLink/RelativeLink.sh index 5461539..2c95fa3 100755 --- a/src/RelativeLink/RelativeLink.sh +++ b/src/RelativeLink/RelativeLink.sh @@ -118,10 +118,10 @@ if [ "$#" -eq 1 -a $ "x$1" = "x--debug" -o "x$1" = "x-debug" $ ]; then debug=1 printf "\nDebug enabled.\n\n" elif [ "$#" -eq 1 -a $ "x$1" = "x--help" -o "x$1" = "x-help" $ ]; then - echo $usage_message + echo "$usage_message" exit 1 elif [ "$#" -ne 0 ]; then - complain $usage_message + complain "$usage_message" exit 1 fi

1 0