- tor-commits - lists.torproject.org

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

24 Oct '11

commit a4c597d4f3bcdc931f6cbbdaa142d1b1997cddd9 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. --- 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] [Linux] Make complain support kdialog
by erinn＠torproject.org 24 Oct '11

24 Oct '11

commit ed5f99dc8ace80da6df532ebf257f4e807a92132 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). --- 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] Accept -debug instead of --debug in RelativeLink.sh
by erinn＠torproject.org 24 Oct '11

24 Oct '11

commit 52458db5b9a108d81c4869f10c4ee2bee4aeac18 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. --- 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] Correct bugs in RelativeLink.sh debug output (spotted by velope)
by erinn＠torproject.org 24 Oct '11

24 Oct '11

commit 792b995928b7e107abb50c1dcd8659869f40ee93 Author: Robert Ransom <rransom.8774(a)gmail.com> Date: Fri Aug 26 04:45:03 2011 -0400 [Linux] Correct bugs in RelativeLink.sh debug output (spotted by velope) --- 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 2c95fa3..04d91fa 100755 --- a/src/RelativeLink/RelativeLink.sh +++ b/src/RelativeLink/RelativeLink.sh @@ -205,7 +205,7 @@ if [ "${debug}" ]; then 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" + printf "\nWe think this because of the following:\n${BOUND}\n" fi done @@ -227,5 +227,5 @@ if [ "$exitcode" -ne 0 ]; then complain "Vidalia exited abnormally. Exit code: $exitcode" exit "$exitcode" else - echo '\nVidalia exited cleanly.\n' + printf '\nVidalia exited cleanly.\n' fi

1 0

[torbrowser/maint-2.2] [Linux] Add missing quotes (spotted by velope)
by erinn＠torproject.org 24 Oct '11

24 Oct '11

commit 7dc48b20ea1e4cb0783fb842fdd060b0c22f7ccb Author: Robert Ransom <rransom.8774(a)gmail.com> Date: Fri Aug 26 04:40:18 2011 -0400 [Linux] Add missing quotes (spotted by velope) --- 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

[torbrowser/maint-2.2] bump tbb linux to 1.3.24 for firefox 3.6.17 releases
by erinn＠torproject.org 24 Oct '11

24 Oct '11

commit 47209dc8990ac0990bdfc2cd48ec2f4d197d8e13 Author: Erinn Clark <erinn(a)torproject.org> Date: Sat Apr 30 02:02:58 2011 +0300 bump tbb linux to 1.3.24 for firefox 3.6.17 releases --- README | 7 +++++-- build-scripts/Makefile | 4 ++-- 2 files changed, 7 insertions(+), 4 deletions(-) diff --git a/README b/README index d672ac9..d5b7eb7 100644 --- a/README +++ b/README @@ -7,8 +7,8 @@ Included applications Vidalia 0.2.12 (with Qt 4.6.2) Tor 0.2.1.30 (with libevent-1.4.13, zlib-1.2.3 and openssl-0.9.8p) Polipo 1.0.4.1 -FirefoxPortable 3.6.16 - \_ Firefox 3.6.16 +FirefoxPortable 3.6.17 + \_ Firefox 3.6.17 \_ Torbutton 1.2.5 \_ HTTPS Everywhere 0.9.9.development.4 PidginPortable 2.7.4 @@ -340,3 +340,6 @@ Changelog 1.3.23: Released 2011-04-13 Fix langpack mistake that made Firefox only use English + +1.3.24: Released 2011-04-30 + Update Firefox to 3.6.17 diff --git a/build-scripts/Makefile b/build-scripts/Makefile index 61f8ee8..ad82762 100644 --- a/build-scripts/Makefile +++ b/build-scripts/Makefile @@ -18,7 +18,7 @@ OPENSSL=/e/build/openssl-0.9.8p/ ## Versions TORBUTTON_VERSION=1.2.5 -FIREFOX_VERSION=3.6.16 +FIREFOX_VERSION=3.6.17 PIDGIN_VERSION=2.7.5 ## Location of bundle components @@ -49,7 +49,7 @@ DEST="Generic Bundle" NAME="Tor Browser" ## Version and name of the compressed bundle (also used for source) -VERSION=1.3.23 +VERSION=1.3.24 DEFAULT_COMPRESSED_BASENAME=tor-browser- IM_COMPRESSED_BASENAME=tor-im-browser- DEFAULT_COMPRESSED_NAME=$(DEFAULT_COMPRESSED_BASENAME)$(VERSION)

1 0

[torbrowser/maint-2.2] bump tbb osx to 1.0.17-dev and tor 0.2.2.27-beta
by erinn＠torproject.org 24 Oct '11

24 Oct '11

commit 0ea85ee9ec00a4bcb1b6d2b139f57581f8bf9e34 Author: Erinn Clark <erinn(a)torproject.org> Date: Thu May 19 20:06:31 2011 -0300 bump tbb osx to 1.0.17-dev and tor 0.2.2.27-beta --- README.OSX | 14 ++++++++++---- build-scripts/osx.mk | 8 ++++---- 2 files changed, 14 insertions(+), 8 deletions(-) diff --git a/README.OSX b/README.OSX index 6f3a530..6e63c7c 100644 --- a/README.OSX +++ b/README.OSX @@ -5,13 +5,13 @@ Included applications --------------------- Vidalia 0.2.12 (with Qt 4.6.2) -Tor 0.2.2.25-alpha (with libevent-2.0.10-stable, zlib-1.2.3 and openssl-0.9.8p) +Tor 0.2.2.27-beta (with libevent-2.0.10-stable, zlib-1.2.3 and openssl-0.9.8p) Polipo 1.0.4.1 Firefox 3.6.17 \_ Torbutton 1.2.5 - |_ NoScript 2.1.0.1 - |_ HTTPS-Everywhere 0.9.9.development.4 - |_ BetterPrivacy 1.49 + |_ NoScript 2.1.0.5 + |_ HTTPS-Everywhere 0.9.9.development.5 + |_ BetterPrivacy 1.50 Usage ----- @@ -24,6 +24,12 @@ To exit, close Firefox and Vidalia. Changelog --------- +1.0.17: Released 2011-05-19 + Update Tor to 0.2.2.27-beta + Update NoScript to 2.1.0.5 + Update HTTPS-Everywhere to 0.9.9.development.5 + Update BetterPrivacy to 1.50 + 1.0.16: Released 2011-04-30 Update Tor to 0.2.2.25-alpha Update Firefox to 3.6.17 diff --git a/build-scripts/osx.mk b/build-scripts/osx.mk index b933d11..e89159e 100644 --- a/build-scripts/osx.mk +++ b/build-scripts/osx.mk @@ -41,17 +41,17 @@ BUILT_DIR=$(FETCH_DIR)/built TBB_FINAL=$(BUILT_DIR)/TBBL ## Versions for our source packages -HTTPSEVERY_VER=0.9.9.development.4 +HTTPSEVERY_VER=0.9.9.development.5 FIREFOX_VER=3.6.17 LIBEVENT_VER=2.0.10-stable LIBPNG_VER=1.4.3 -NOSCRIPT_VER=2.1.0.1 +NOSCRIPT_VER=2.1.0.5 OPENSSL_VER=0.9.8p 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.25-alpha +TOR_VER=0.2.2.27-beta TORBUTTON_VER=1.2.5 VIDALIA_VER=0.2.12 ZLIB_VER=1.2.3 @@ -208,7 +208,7 @@ NAME=TorBrowser DISTDIR=tbbosx-dist ## Version and name of the compressed bundle (also used for source) -VERSION=1.0.16-dev +VERSION=1.0.17-dev DEFAULT_COMPRESSED_BASENAME=TorBrowser-$(VERSION)-osx-$(ARCH_TYPE)- IM_COMPRESSED_BASENAME=TorBrowser-IM-$(VERSION)- DEFAULT_COMPRESSED_NAME=$(DEFAULT_COMPRESSED_BASENAME)

1 0

[torbrowser/maint-2.2] add openssl 1.0.0d to the stable windows bundle too
by erinn＠torproject.org 24 Oct '11

24 Oct '11

commit 356249f03c314b334db8266220b5c9ee812f666b Author: Erinn Clark <erinn(a)torproject.org> Date: Mon May 2 03:01:04 2011 +0300 add openssl 1.0.0d to the stable windows bundle too --- README | 3 ++- 1 files changed, 2 insertions(+), 1 deletions(-) diff --git a/README b/README index 277841a..ef0808e 100644 --- a/README +++ b/README @@ -5,7 +5,7 @@ Included applications --------------------- Vidalia 0.2.12 (with Qt 4.6.2) -Tor 0.2.1.30 (with libevent-2.0.10-stable, zlib-1.2.5 and openssl-0.9.8p) +Tor 0.2.1.30 (with libevent-2.0.10-stable, zlib-1.2.5 and openssl-1.0.0d) Polipo 1.0.4.1 FirefoxPortable 3.6.17 \_ Firefox 3.6.17 @@ -345,3 +345,4 @@ Changelog Update Firefox to 3.6.17 Update Libevent to 2.0.10-stable Update zlib to 1.2.5 + Update OpenSSL to 1.0.0d

1 0

[torbrowser/maint-2.2] actually, bump libevent and zlib in the windows tbb too
by erinn＠torproject.org 24 Oct '11

24 Oct '11

commit 94e1d894ae8985f85083297ee874d15c00167e6b Author: Erinn Clark <erinn(a)torproject.org> Date: Sat Apr 30 04:25:02 2011 +0300 actually, bump libevent and zlib in the windows tbb too --- README | 4 +++- 1 files changed, 3 insertions(+), 1 deletions(-) diff --git a/README b/README index d5b7eb7..277841a 100644 --- a/README +++ b/README @@ -5,7 +5,7 @@ Included applications --------------------- Vidalia 0.2.12 (with Qt 4.6.2) -Tor 0.2.1.30 (with libevent-1.4.13, zlib-1.2.3 and openssl-0.9.8p) +Tor 0.2.1.30 (with libevent-2.0.10-stable, zlib-1.2.5 and openssl-0.9.8p) Polipo 1.0.4.1 FirefoxPortable 3.6.17 \_ Firefox 3.6.17 @@ -343,3 +343,5 @@ Changelog 1.3.24: Released 2011-04-30 Update Firefox to 3.6.17 + Update Libevent to 2.0.10-stable + Update zlib to 1.2.5

1 0

[torbrowser/maint-2.2] bump tbb linux to 1.1.9-dev and tor to 0.2.2.27-beta
by erinn＠torproject.org 24 Oct '11

24 Oct '11

commit 5d4ff6d4cea2326cddf06a2f23560b2b286f009d Author: Erinn Clark <erinn(a)torproject.org> Date: Thu May 19 22:28:53 2011 -0300 bump tbb linux to 1.1.9-dev and tor to 0.2.2.27-beta --- README.Linux | 14 ++++++++++---- build-scripts/linux.mk | 8 ++++---- 2 files changed, 14 insertions(+), 8 deletions(-) diff --git a/README.Linux b/README.Linux index 739c439..1062aae 100644 --- a/README.Linux +++ b/README.Linux @@ -5,12 +5,12 @@ Included applications --------------------- Vidalia 0.2.12 (with Qt 4.6.2) -Tor 0.2.2.25-alpha (with libevent-2.0.10-stable, zlib-1.2.3 and openssl-0.9.8p) +Tor 0.2.2.27-beta (with libevent-2.0.10-stable, zlib-1.2.3 and openssl-0.9.8p) Firefox 3.6.17 \_ Torbutton 1.2.5 - |_ NoScript 2.1.0.1 - |_ BetterPrivacy 1.49 - |_ HTTPS Everywhere 0.9.9.development.4 + |_ NoScript 2.1.0.5 + |_ BetterPrivacy 1.50 + |_ HTTPS Everywhere 0.9.9.development.5 Usage ----- @@ -29,6 +29,12 @@ To exit, close Firefox. Vidalia will automatically clean up and exit. Changelog --------- +1.1.9: Released 2011-05-19 + Update Tor to 0.2.2.27-beta + Update NoScript to 2.1.0.5 + Update BetterPrivacy to 1.50 + Update HTTPS Everywhere to 0.9.9.development.5 + 1.1.8: Released 2011-04-30 Update Tor to 0.2.2.25-alpha Update Firefox to 3.6.17 diff --git a/build-scripts/linux.mk b/build-scripts/linux.mk index a2cc481..0b2378d 100644 --- a/build-scripts/linux.mk +++ b/build-scripts/linux.mk @@ -41,17 +41,17 @@ BUILT_DIR=$(FETCH_DIR)/built TBB_FINAL=$(BUILT_DIR)/TBBL ## Versions for our source packages -HTTPSEVERY_VER=0.9.9.development.4 +HTTPSEVERY_VER=0.9.9.development.5 FIREFOX_VER=3.6.17 LIBEVENT_VER=2.0.10-stable LIBPNG_VER=1.4.3 -NOSCRIPT_VER=2.1.0.1 +NOSCRIPT_VER=2.1.0.5 OPENSSL_VER=0.9.8p 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.25-alpha +TOR_VER=0.2.2.27-beta TORBUTTON_VER=1.2.5 VIDALIA_VER=0.2.12 ZLIB_VER=1.2.3 @@ -216,7 +216,7 @@ NAME=tor-browser DISTDIR=tbbl-dist ## Version and name of the compressed bundle (also used for source) -VERSION=1.1.8-dev +VERSION=1.1.9-dev DEFAULT_COMPRESSED_BASENAME=tor-browser-gnu-linux-$(ARCH_TYPE)-$(VERSION)- IM_COMPRESSED_BASENAME=tor-im-browser-gnu-linux-$(VERSION)- DEFAULT_COMPRESSED_NAME=$(DEFAULT_COMPRESSED_BASENAME)$(VERSION)

1 0