- tor-commits - lists.torproject.org

[torbrowser/maint-2.2] update windows and linux to 2.2.32-1 as well
by erinn＠torproject.org 28 Aug '11

28 Aug '11

commit 17c0d034c0e078a9a4e6353a2e7a8279d4f3a72b Author: Erinn Clark <erinn(a)torproject.org> Date: Sun Aug 28 19:21:48 2011 +0100 update windows and linux to 2.2.32-1 as well --- README.LINUX-2.2 | 6 +++--- README.WIN-2.2 | 8 ++++---- build-scripts/windows.mk | 2 +- changelog.linux-2.2 | 9 +++++++++ changelog.win-2.2 | 11 ++++++++++- 5 files changed, 27 insertions(+), 9 deletions(-) diff --git a/README.LINUX-2.2 b/README.LINUX-2.2 index 47f2684..176ee30 100644 --- a/README.LINUX-2.2 +++ b/README.LINUX-2.2 @@ -4,10 +4,10 @@ Tor Browser Bundle for GNU/Linux 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/README.WIN-2.2 b/README.WIN-2.2 index 519c64f..5ab55a0 100644 --- a/README.WIN-2.2 +++ b/README.WIN-2.2 @@ -4,11 +4,11 @@ Tor Browser Bundle for Windows 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) -FirefoxPortable 5.0.1 +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) +FirefoxPortable 6.0 \_ 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/windows.mk b/build-scripts/windows.mk index 1a52f6a..294b2c6 100644 --- a/build-scripts/windows.mk +++ b/build-scripts/windows.mk @@ -138,7 +138,7 @@ NAME="Tor Browser" DISTDIR=tbbwin-alpha-dist ## Version and name of the compressed bundle (also used for source) -VERSION=$(RELEASE_VER)-2-alpha +VERSION=$(RELEASE_VER)-1-alpha DEFAULT_COMPRESSED_BASENAME=tor-browser-$(VERSION) IM_COMPRESSED_BASENAME=tor-im-browser-$(VERSION) DEFAULT_COMPRESSED_NAME=$(DEFAULT_COMPRESSED_BASENAME) diff --git a/changelog.linux-2.2 b/changelog.linux-2.2 index 1d29228..6d49e4a 100644 --- a/changelog.linux-2.2 +++ b/changelog.linux-2.2 @@ -1,3 +1,12 @@ +Tor Browser Bundle (2.2.32-1) alpha; suite=linux + + * 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-2) alpha; suite=linux * Fix x86_64 bundle to have the right libraries and binaries (closes: #3773) diff --git a/changelog.win-2.2 b/changelog.win-2.2 index bc070ec..96eae99 100644 --- a/changelog.win-2.2 +++ b/changelog.win-2.2 @@ -1,4 +1,13 @@ -Tor Browser Bundle (2.2.30-1) alpha; suite=windows +Tor Browser Bundle (2.2.32-1) alpha; suite=windows + + * 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=windows * Update Tor to 0.2.2.31-rc * Update Firefox to 6.0

1 0

[torbrowser/maint-2.2] give windows and linux the ability to write their tbb version into prefs.js too
by erinn＠torproject.org 28 Aug '11

28 Aug '11

commit 703a9aa38e53d4d043fe9c8d6c4566eca2ee8693 Author: Erinn Clark <erinn(a)torproject.org> Date: Sun Aug 28 19:24:58 2011 +0100 give windows and linux the ability to write their tbb version into prefs.js too --- build-scripts/linux.mk | 6 +++++- build-scripts/windows.mk | 6 +++++- 2 files changed, 10 insertions(+), 2 deletions(-) diff --git a/build-scripts/linux.mk b/build-scripts/linux.mk index 659e3b0..85f8830 100644 --- a/build-scripts/linux.mk +++ b/build-scripts/linux.mk @@ -392,7 +392,8 @@ compressed-bundle_%: LANGCODE=$* make -f linux.mk compressed-bundle-localized bundle-localized_%.stamp: - make -f linux.mk copy-files_$* install-extensions 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 write-tbb-version touch bundle-localized_$*.stamp bundle-localized: bundle-localized_$(LANGCODE).stamp @@ -466,3 +467,6 @@ update-extension-pref: ext_ver=$$(sed -n '/em:version/{s,.*="$.*$".*,\1,p;q}' $(BUNDLE)/Data/profile/extensions/langpack-$(LANGCODE)(a)firefox.mozilla.org/install.rdf) \ sed -i -e "s/SHPONKA/langpack-$(LANGCODE)@firefox.mozilla.org:$$ext_ver/g" $(BUNDLE)/Data/profile/prefs.js +write-tbb-version: + printf 'user_pref("torbrowser.version", "%s");\n' "$(RELEASE_VER)" >> $(BUNDLE)/Library/Application\ Support/Firefox/Profiles/profile/prefs.js + diff --git a/build-scripts/windows.mk b/build-scripts/windows.mk index 294b2c6..2016242 100644 --- a/build-scripts/windows.mk +++ b/build-scripts/windows.mk @@ -360,7 +360,8 @@ split-bundle_%: LANGCODE=$* make -f windows.mk split-bundle-localized bundle-localized_%.stamp: - make -f windows.mk copy-files_$* install-extensions install-torbutton install-httpseverywhere install-noscript patch-vidalia-language patch-firefox-language patch-pidgin-language + make -f windows.mk copy-files_$* install-extensions install-torbutton install-httpseverywhere install-noscript \ + patch-vidalia-language patch-firefox-language patch-pidgin-language write-tbb-version touch bundle-localized_$*.stamp bundle-localized: bundle-localized_$(LANGCODE).stamp @@ -439,6 +440,9 @@ patch-firefox-language: apply-prefs: cp $(DEST)/FirefoxPortable/Data/profile/prefs.js $(CONFIG_SRC) +write-tbb-version: + printf 'user_pref("torbrowser.version", "%s");\n' "$(RELEASE_VER)" >> $(BUNDLE)/Library/Application\ Support/Firefox/Profiles/profile/prefs.js + ## Export the source code of the bundle SRCNAME=$(COMPRESSED_NAME) SRCDEST=/tmp

1 0

[torbrowser/maint-2.2] update prefs.js (closes: #3545, #3818, #3339)
by erinn＠torproject.org 28 Aug '11

28 Aug '11

commit 80578211b0031a47c429105ed2d8c3c4dc92ae65 Author: Erinn Clark <erinn(a)torproject.org> Date: Sun Aug 28 17:36:11 2011 +0100 update prefs.js (closes: #3545, #3818, #3339) --- build-scripts/config/no-polipo-4.0.js | 5 +++-- 1 files changed, 3 insertions(+), 2 deletions(-) diff --git a/build-scripts/config/no-polipo-4.0.js b/build-scripts/config/no-polipo-4.0.js index 2437752..bea5d44 100644 --- a/build-scripts/config/no-polipo-4.0.js +++ b/build-scripts/config/no-polipo-4.0.js @@ -38,7 +38,7 @@ user_pref("browser.places.migratePostDataAnnotations", false); user_pref("browser.places.smartBookmarksVersion", 2); user_pref("browser.places.updateRecentTagsUri", false); user_pref("browser.preferences.advanced.selectedTabIndex", 0); -user_pref("browser.privatebrowsing.autostart", true); +user_pref("browser.privatebrowsing.autostart", false); user_pref("browser.rights.3.shown", true); user_pref("browser.safebrowsing.enabled", false); user_pref("browser.safebrowsing.malware.enabled", false); @@ -49,7 +49,7 @@ user_pref("browser.shell.checkDefaultBrowser", false); user_pref("browser.startup.homepage", "https://check.torproject.org/?lang=en-US&small=1"); user_pref("browser.startup.homepage_override.buildID", "20110325121920"); user_pref("browser.startup.homepage_override.mstone", "rv:2.0"); -user_pref("browser.urlbar.autocomplete.enabled", false); +user_pref("browser.urlbar.autocomplete.enabled", true); user_pref("browser.zoom.siteSpecific", false); user_pref("capability.policy.maonoscript.javascript.enabled", "allAccess"); user_pref("capability.policy.maonoscript.sites", "addons.mozilla.org about: about:addons about:blank about:blocked about:certerror about:config about:crashes about:credits about:home about:neterror about:plugins about:privatebrowsing about:sessionrestore chrome: resource:"); @@ -136,6 +136,7 @@ user_pref("noscript.showTemp", false); user_pref("noscript.showTempAllowPage", false); user_pref("noscript.showTempToPerm", false); user_pref("noscript.showUntrusted", false); +user_pref("noscript.STS.enabled", false); user_pref("noscript.subscription.lastCheck", -142148139); user_pref("noscript.temp", ""); user_pref("noscript.untrusted", "");

1 0

[torbrowser/maint-2.2] enable auto port choosing (closes: #2264)
by erinn＠torproject.org 28 Aug '11

28 Aug '11

commit 1e3792839c3bdb1f11755a32faa3e122d9c038ba Author: Erinn Clark <erinn(a)torproject.org> Date: Sun Aug 28 17:36:48 2011 +0100 enable auto port choosing (closes: #2264) --- build-scripts/config/torrc-osx | 3 ++- build-scripts/config/vidalia.conf.ff-osx | 2 ++ 2 files changed, 4 insertions(+), 1 deletions(-) diff --git a/build-scripts/config/torrc-osx b/build-scripts/config/torrc-osx index 9d32985..4c7f0d9 100644 --- a/build-scripts/config/torrc-osx +++ b/build-scripts/config/torrc-osx @@ -8,5 +8,6 @@ GeoIPFile ../../Contents/Resources/Data/Tor/geoip Log notice stdout # Bind to this address to listen to connections from SOCKS-speaking # applications. -SocksPort 9050 +SocksPort auto SocksListenAddress 127.0.0.1 +ControlPort auto diff --git a/build-scripts/config/vidalia.conf.ff-osx b/build-scripts/config/vidalia.conf.ff-osx index b261d9e..2c40be6 100644 --- a/build-scripts/config/vidalia.conf.ff-osx +++ b/build-scripts/config/vidalia.conf.ff-osx @@ -7,3 +7,5 @@ LanguageCode=en ControlPort=9051 TorExecutable=../../Contents/MacOS/tor Torrc=../../Library/Vidalia/torrc +AutoControl=true +DataDirectory=../../Contents/Resources/Data/Tor

1 0

[torbrowser/maint-2.2] make tbb write its version into the prefs.js file (closes: #3654)
by erinn＠torproject.org 28 Aug '11

28 Aug '11

commit 017ca6774ee2defa22e93fbbe00f3bf7000c9111 Author: Erinn Clark <erinn(a)torproject.org> Date: Sun Aug 28 17:37:29 2011 +0100 make tbb write its version into the prefs.js file (closes: #3654) --- build-scripts/osx.mk | 6 ++++-- 1 files changed, 4 insertions(+), 2 deletions(-) diff --git a/build-scripts/osx.mk b/build-scripts/osx.mk index 0b07e67..2e8b290 100644 --- a/build-scripts/osx.mk +++ b/build-scripts/osx.mk @@ -351,9 +351,8 @@ bundle_%: compressed-bundle_%: LANGCODE=$* make -f osx.mk compressed-bundle-localized bundle-localized_%.stamp: - make -f osx.mk copy-files_$* install-extensions install-httpseverywhere install-noscript install-lang-extensions patch-vidalia-language patch-firefox-language patch-pidgin-language update-extension-pref final + make -f osx.mk copy-files_$* install-extensions install-httpseverywhere install-noscript install-lang-extensions patch-vidalia-language patch-firefox-language patch-pidgin-language update-extension-pref write-tbb-version final touch bundle-localized_$*.stamp - cp extensions/torbutton.xpi . bundle-localized: bundle-localized_$(LANGCODE).stamp @@ -433,5 +432,8 @@ update-extension-pref: ext_ver=$$(sed -n '/em:version/{s,.*="$.*$".*,\1,p;q;}' $(BUNDLE)/Library/Application\ Support/Firefox/Profiles/profile/extensions/langpack-$(LANGCODE)(a)firefox.mozilla.org/install.rdf) \ sed -i -e "s/SHPONKA/langpack-$(LANGCODE)@firefox.mozilla.org:$$ext_ver/g" $(BUNDLE)/Library/Application\ Support/Firefox/Profiles/profile/prefs.js +write-tbb-version: + printf 'user_pref("torbrowser.version", "%s");\n' "$(RELEASE_VER)" >> $(BUNDLE)/Library/Application\ Support/Firefox/Profiles/profile/prefs.js + final: mv $(BUNDLE) $(BUNDLE).app

1 0

[torbrowser/maint-2.2] [Linux] Add UI improvements to complain suggested by velope
by erinn＠torproject.org 28 Aug '11

28 Aug '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/maint-2.2] [Linux] Accept -debug instead of --debug in RelativeLink.sh
by erinn＠torproject.org 28 Aug '11

28 Aug '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/maint-2.2] [Linux] Make complain support kdialog
by erinn＠torproject.org 28 Aug '11

28 Aug '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/maint-2.2] [Linux] Use $complain_dialog_title for generality
by erinn＠torproject.org 28 Aug '11

28 Aug '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/maint-2.2] [Linux] Trim leading newlines in complain messages (patch by velope)
by erinn＠torproject.org 28 Aug '11

28 Aug '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