- tor-commits - lists.torproject.org

[torbrowser/maint-2.2] [4093 Mac] Only make dyld log all library loads to syslog in debug mode
by erinn＠torproject.org 29 Sep '11

29 Sep '11

commit 69d3f33a6425f4339bc602e71f4b833eacda38c4 Author: Robert Ransom <rransom.8774(a)gmail.com> Date: Sun Sep 25 06:24:47 2011 -0700 [4093 Mac] Only make dyld log all library loads to syslog in debug mode --- src/RelativeLink/RelativeLinkOSX.sh | 10 ++++++++-- 1 files changed, 8 insertions(+), 2 deletions(-) diff --git a/src/RelativeLink/RelativeLinkOSX.sh b/src/RelativeLink/RelativeLinkOSX.sh index dbaa84b..cac07a1 100755 --- a/src/RelativeLink/RelativeLinkOSX.sh +++ b/src/RelativeLink/RelativeLinkOSX.sh @@ -7,6 +7,9 @@ # # To run in debug mode, simply pass -debug or --debug on the command line. # +# WARNING: In debug mode, this script may cause dyld to write to the system +# log file. +# # Copyright 2010 The Tor Project. See LICENSE for licensing information. DEBUG_TBB=0 @@ -22,8 +25,11 @@ export HOME DYLD_LIBRARY_PATH=${HOME}/Contents/Frameworks export LDPATH export DYLD_LIBRARY_PATH -DYLD_PRINT_LIBRARIES=1 -export DYLD_PRINT_LIBRARIES + +if [ "$DEBUG_TBB" -eq 1 ]; then + DYLD_PRINT_LIBRARIES=1 + export DYLD_PRINT_LIBRARIES +fi if [ "$DEBUG_TBB" -eq 1 ]; then printf "\nStarting Vidalia now\n"

1 0

[torbrowser/maint-2.2] [Linux] Don't set DYLD_PRINT_LIBRARIES env var
by erinn＠torproject.org 29 Sep '11

29 Sep '11

commit 97d3d69a33e3c4158fc1802c9a9b64c073a790eb Author: Robert Ransom <rransom.8774(a)gmail.com> Date: Sun Sep 25 06:26:49 2011 -0700 [Linux] Don't set DYLD_PRINT_LIBRARIES env var DYLD_PRINT_LIBRARIES does not affect the glibc dynamic loader at all, so these lines are useless. Fortunately, that means they were also harmless. --- 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 222bb6d..3e4159c 100755 --- a/src/RelativeLink/RelativeLink.sh +++ b/src/RelativeLink/RelativeLink.sh @@ -185,8 +185,6 @@ fi LDPATH="${HOME}/Lib/" export LDPATH export LD_LIBRARY_PATH -DYLD_PRINT_LIBRARIES=1 -export DYLD_PRINT_LIBRARIES if [ "${debug}" ]; then printf "\nStarting Vidalia now\n"

1 0

[torbrowser/maint-2.2] [Mac Linux] Fix minor comment issues in RelativeLink
by erinn＠torproject.org 29 Sep '11

29 Sep '11

commit 98c3b358c6d6915e7ee1cacfe5c3ba1034584ddc Author: Robert Ransom <rransom.8774(a)gmail.com> Date: Sun Sep 25 06:27:53 2011 -0700 [Mac Linux] Fix minor comment issues in RelativeLink --- src/RelativeLink/RelativeLink.sh | 2 +- src/RelativeLink/RelativeLinkOSX.sh | 4 ++-- 2 files changed, 3 insertions(+), 3 deletions(-) diff --git a/src/RelativeLink/RelativeLink.sh b/src/RelativeLink/RelativeLink.sh index 3e4159c..14f6423 100755 --- a/src/RelativeLink/RelativeLink.sh +++ b/src/RelativeLink/RelativeLink.sh @@ -1,7 +1,7 @@ #!/bin/sh # # GNU/Linux does not really require something like RelativeLink.c -# However, we do want to have the same look and feel with similiar features. +# However, we do want to have the same look and feel with similar features. # # To run in debug mode simply pass --debug # diff --git a/src/RelativeLink/RelativeLinkOSX.sh b/src/RelativeLink/RelativeLinkOSX.sh index cac07a1..94f4ed0 100755 --- a/src/RelativeLink/RelativeLinkOSX.sh +++ b/src/RelativeLink/RelativeLinkOSX.sh @@ -1,7 +1,7 @@ #!/bin/sh # -# GNU/Linux does not really require something like RelativeLink.c -# However, we do want to have the same look and feel with similiar features. +# Mac OS does not really require something like RelativeLink.c +# However, we do want to have the same look and feel with similar 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 #

1 0

[torbrowser/maint-2.2] Merge branch 'bug4093' into maint-2.2
by erinn＠torproject.org 29 Sep '11

29 Sep '11

commit 8140d34b1cfa2626f0a81002c45500326d2c95ed Merge: 689b151 98c3b35 Author: Erinn Clark <erinn(a)torproject.org> Date: Thu Sep 29 15:42:18 2011 +0100 Merge branch 'bug4093' into maint-2.2 src/RelativeLink/RelativeLink.sh | 4 +--- src/RelativeLink/RelativeLinkOSX.sh | 23 ++++++++++++++++------- 2 files changed, 17 insertions(+), 10 deletions(-)

1 0

[torbrowser/maint-2.2] bump all tbb versions to 2.2.33-1, update changelogs and readmes
by erinn＠torproject.org 29 Sep '11

29 Sep '11

commit eb42c2f2ca4e144b036f082508635c5a2bda12ed Author: Erinn Clark <erinn(a)torproject.org> Date: Thu Sep 29 16:14:09 2011 +0100 bump all tbb versions to 2.2.33-1, update changelogs and readmes --- README.LINUX-2.2 | 8 ++++---- README.OSX-2.2 | 8 ++++---- README.WIN-2.2 | 10 +++++----- build-scripts/linux.mk | 2 +- build-scripts/osx.mk | 2 +- build-scripts/versions.mk | 8 ++++---- build-scripts/windows.mk | 2 +- changelog.linux-2.2 | 11 +++++++++++ changelog.osx-2.2 | 12 ++++++++++++ changelog.windows-2.2 | 12 ++++++++++++ 10 files changed, 55 insertions(+), 20 deletions(-) diff --git a/README.LINUX-2.2 b/README.LINUX-2.2 index 2f23ecf..5448f89 100644 --- a/README.LINUX-2.2 +++ b/README.LINUX-2.2 @@ -5,11 +5,11 @@ Included applications --------------------- Vidalia 0.2.14 (with Qt 4.6.2) -Tor 0.2.2.32 (with libevent-2.0.14-stable, zlib-1.2.5 and openssl-1.0.0d) -Firefox (Aurora) 6.0.2 +Tor 0.2.2.33 (with libevent-2.0.14-stable, zlib-1.2.5 and openssl-1.0.0e) +Firefox (Aurora) 7.0 \_ Torbutton 1.4.3 - |_ NoScript 2.1.2.7 - |_ HTTPS-Everywhere 1.0.0development.5 + |_ NoScript 2.1.2.8 + |_ HTTPS-Everywhere 1.0.3 Usage ----- diff --git a/README.OSX-2.2 b/README.OSX-2.2 index 0f63125..fd6ae31 100644 --- a/README.OSX-2.2 +++ b/README.OSX-2.2 @@ -5,11 +5,11 @@ Included applications --------------------- Vidalia 0.2.14 (with Qt 4.6.2) -Tor 0.2.2.32 (with libevent-2.0.14-stable, zlib-1.2.5 and openssl-1.0.0d) -Firefox (Aurora) 6.0.2 +Tor 0.2.2.33 (with libevent-2.0.14-stable, zlib-1.2.5 and openssl-1.0.0d) +Firefox (Aurora) 7.0 \_ Torbutton 1.4.3 - |_ NoScript 2.1.2.7 - |_ HTTPS-Everywhere 1.0.0development.5 + |_ NoScript 2.1.2.8 + |_ HTTPS-Everywhere 1.0.3 Usage ----- diff --git a/README.WIN-2.2 b/README.WIN-2.2 index 90f8fc7..bd27aa1 100644 --- a/README.WIN-2.2 +++ b/README.WIN-2.2 @@ -5,12 +5,12 @@ Included applications --------------------- Vidalia 0.2.14 (with Qt 4.6.2) -Tor 0.2.2.32 (with libevent-2.0.14-stable, zlib-1.2.5 and openssl-1.0.0d) -FirefoxPortable 6.0.2 - \_ Firefox (Aurora) 6.0.2 +Tor 0.2.2.33 (with libevent-2.0.14-stable, zlib-1.2.5 and openssl-1.0.0e) +FirefoxPortable 7.0 + \_ Firefox (Aurora) 7.0 \_ Torbutton 1.4.3 - |_ NoScript 2.1.2.7 - |_ HTTPS-Everywhere 1.0.0development.5 + |_ NoScript 2.1.2.8 + |_ HTTPS-Everywhere 1.0.3 Usage ----- diff --git a/build-scripts/linux.mk b/build-scripts/linux.mk index 3d6c6bf..c37447d 100644 --- a/build-scripts/linux.mk +++ b/build-scripts/linux.mk @@ -36,7 +36,7 @@ include $(PWD)/versions.mk ## Architecture ARCH_TYPE=$(shell uname -m) -BUILD_NUM=4 +BUILD_NUM=1 PLATFORM=Linux ## Location of directory for source unpacking diff --git a/build-scripts/osx.mk b/build-scripts/osx.mk index d19576e..1ea955b 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=4 +BUILD_NUM=1 PLATFORM=MacOS ## Location of directory for source unpacking diff --git a/build-scripts/versions.mk b/build-scripts/versions.mk index c44c3b5..af6335e 100644 --- a/build-scripts/versions.mk +++ b/build-scripts/versions.mk @@ -1,20 +1,20 @@ #!/usr/bin/make -RELEASE_VER=2.2.32 +RELEASE_VER=2.2.33 HTTPSEVERY_VER=1.0.3 FIREFOX_VER=7.0 LIBEVENT_VER=2.0.14-stable LIBPNG_VER=1.4.8 -NOSCRIPT_VER=2.1.2.7 -OPENSSL_VER=1.0.0d +NOSCRIPT_VER=2.1.2.8 +OPENSSL_VER=1.0.0e OTR_VER=3.2.0 PIDGIN_VER=2.6.4 QT_VER=4.6.2 TOR_VER=0.2.2.33 TORBUTTON_VER=1.4.3 VIDALIA_VER=0.2.14 -ZLIB_VER=1.4.0 +ZLIB_VER=1.2.5 ## Extension IDs FF_VENDOR_ID:=\{ec8030f7-c20a-464f-9b0e-13a3a9e97384\} diff --git a/build-scripts/windows.mk b/build-scripts/windows.mk index 741887c..d62aeff 100644 --- a/build-scripts/windows.mk +++ b/build-scripts/windows.mk @@ -31,7 +31,7 @@ ## Include versions include $(PWD)/versions.mk -BUILD_NUM=4 +BUILD_NUM=1 PLATFORM=Windows ## Location of required libraries diff --git a/changelog.linux-2.2 b/changelog.linux-2.2 index 15edc9c..df90085 100644 --- a/changelog.linux-2.2 +++ b/changelog.linux-2.2 @@ -1,3 +1,14 @@ +Tor Browser Bundle (2.2.33-1); suite=linux + + * Update Firefox to 7 + * Update OpenSSL to 1.0.0e (closes: #3996) + * Update Tor to 0.2.2.33 + * Update NoScript to 2.1.2.8 + * Downgrade HTTPS Everywhere to 1.0.3, because we don't want stable TBBs to + use development versions of extensions (closes: #4050) + + -- Erinn Clark <erinn(a)torproject.org> Thu Sep 29 15:52:32 BST 2011 + Tor Browser Bundle (2.2.32-4); suite=linux * Fix Makefile to allow for automatic retrieval of Qt and libpng (closes: #2255) diff --git a/changelog.osx-2.2 b/changelog.osx-2.2 index 72c0058..75eb8d8 100644 --- a/changelog.osx-2.2 +++ b/changelog.osx-2.2 @@ -1,3 +1,15 @@ +Tor Browser Bundle (2.2.33-1); suite=osx + + * Update Firefox to 7 + * Update Tor to 0.2.2.33 + * Update NoScript to 2.1.2.8 + * Downgrade HTTPS Everywhere to 1.0.3, because we don't want stable TBBs to + use development versions of extensions (closes: #4050) + * Stop TBB from logging so much information to the system by only allowing + dyld log library loads to syslog when it is in debug mode (closes: #4093) + + -- Erinn Clark <erinn(a)torproject.org> Thu Sep 29 15:44:48 BST 2011 + Tor Browser Bundle (2.2.32-4); suite=osx * New Firefox patches diff --git a/changelog.windows-2.2 b/changelog.windows-2.2 index b09bbf3..510cac2 100644 --- a/changelog.windows-2.2 +++ b/changelog.windows-2.2 @@ -1,3 +1,15 @@ +Tor Browser Bundle (2.2.33-1); suite=windows + + * Update Firefox to 7 + * Update OpenSSL to 1.0.0e (closes: #3996) + * Update Tor to 0.2.2.33 + * Update NoScript to 2.1.2.8 + * Downgrade HTTPS Everywhere to 1.0.3, because we don't want stable TBBs to + use development versions of extensions (closes: #4050) + * Begin building Vidalia with DEP/ASLR + + -- Erinn Clark <erinn(a)torproject.org> Thu Sep 29 15:51:02 BST 2011 + Tor Browser Bundle (2.2.32-4); suite=windows * Disable automatic port selection to accommodate Windows users with

1 0

[torbutton/master] Let's double-check the cookie env-var exists
by mikeperry＠torproject.org 29 Sep '11

29 Sep '11

commit 1c403f45618e500034533c9274aa0fa1227877c8 Author: Mike Perry <mikeperry-git(a)fscked.org> Date: Wed Sep 28 21:45:18 2011 -0700 Let's double-check the cookie env-var exists --- src/chrome/content/torbutton.js | 2 +- 1 files changed, 1 insertions(+), 1 deletions(-) diff --git a/src/chrome/content/torbutton.js b/src/chrome/content/torbutton.js index 5ee1a53..0d7ef88 100644 --- a/src/chrome/content/torbutton.js +++ b/src/chrome/content/torbutton.js @@ -525,7 +525,7 @@ function torbutton_init() { // FIXME: We might want a check to use to set this in the future, // but this works fine for now. m_tb_tbb = true; - } else { + } else if (environ.exists("TOR_CONTROL_COOKIE_AUTH_FILE")) { var cookie_path = environ.get("TOR_CONTROL_COOKIE_AUTH_FILE"); try { if ("" != cookie_path) {

1 0

[torbutton/master] Bug #3928: implement reading password from CookieAuthFile
by mikeperry＠torproject.org 29 Sep '11

29 Sep '11

commit de8c53cece3a8a99a60921fd42364c0faee0d8e7 Author: Jérémy Bobbio <lunar(a)debian.org> Date: Wed Sep 14 12:07:47 2011 +0200 Bug #3928: implement reading password from CookieAuthFile Using environment variable TOR_CONTROL_COOKIE_AUTH_FILE, one can now specify the path to the Tor CookieAuthFile. The password will be read from here if the environment lacks TOR_CONTROL_PASSWD. --- src/chrome/content/torbutton.js | 30 ++++++++++++++++++++++++++++++ 1 files changed, 30 insertions(+), 0 deletions(-) diff --git a/src/chrome/content/torbutton.js b/src/chrome/content/torbutton.js index 1ebd6bb..5ee1a53 100644 --- a/src/chrome/content/torbutton.js +++ b/src/chrome/content/torbutton.js @@ -525,6 +525,15 @@ function torbutton_init() { // FIXME: We might want a check to use to set this in the future, // but this works fine for now. m_tb_tbb = true; + } else { + var cookie_path = environ.get("TOR_CONTROL_COOKIE_AUTH_FILE"); + try { + if ("" != cookie_path) { + m_tb_control_pass = torbutton_read_authentication_cookie(cookie_path); + } + } catch(e) { + torbutton_log(4, 'unable to read authentication cookie'); + } } if (environ.exists("TOR_CONTROL_PORT")) { @@ -1304,6 +1313,27 @@ function torbutton_socket_readline(input) { return str; } +function torbutton_read_authentication_cookie(path) { + var file = Components.classes['@mozilla.org/file/local;1'] + .createInstance(Components.interfaces.nsILocalFile); + file.initWithPath(path); + var fileStream = Components.classes['@mozilla.org/network/file-input-stream;1'] + .createInstance(Components.interfaces.nsIFileInputStream); + fileStream.init(file, 1, 0, false); + var binaryStream = Components.classes['@mozilla.org/binaryinputstream;1'] + .createInstance(Components.interfaces.nsIBinaryInputStream); + binaryStream.setInputStream(fileStream); + var array = binaryStream.readByteArray(fileStream.available()); + binaryStream.close(); + fileStream.close(); + return torbutton_array_to_hexdigits(array); +} + +function torbutton_array_to_hexdigits(array) { + return array.map(function(c) { + return String("0" + c.toString(16)).slice(-2) + }).join(''); +}; // Executes a command on the control port. // Return 0 in error, 1 for success. function torbutton_send_ctrl_cmd(command) {

1 0

r25139: {website} make the ppc bundle links point to the actual ppc bundles. (website/trunk/projects/en)
by Andrew Lewman 29 Sep '11

29 Sep '11

Author: phobos Date: 2011-09-29 01:05:49 +0000 (Thu, 29 Sep 2011) New Revision: 25139 Modified: website/trunk/projects/en/vidalia.wml Log: make the ppc bundle links point to the actual ppc bundles. Modified: website/trunk/projects/en/vidalia.wml =================================================================== --- website/trunk/projects/en/vidalia.wml 2011-09-29 00:11:12 UTC (rev 25138) +++ website/trunk/projects/en/vidalia.wml 2011-09-29 01:05:49 UTC (rev 25139) @@ -66,8 +66,8 @@ (<a href="../dist/vidalia-bundles/vidalia-bundle-<version-stable>-<version-vidalia-stable>-i386.dmg.asc">sig</a>) </li> <li> - <a href="../dist/vidalia-bundles/vidalia-bundle-<version-stable>-<version-vidalia-stable>-i386.dmg">Mac OS X PPC Only</a> - (<a href="../dist/vidalia-bundles/vidalia-bundle-<version-stable>-<version-vidalia-stable>-i386.dmg.asc">sig</a>) + <a href="../dist/vidalia-bundles/vidalia-bundle-<version-stable>-<version-vidalia-stable>-ppc.dmg">Mac OS X PPC Only</a> + (<a href="../dist/vidalia-bundles/vidalia-bundle-<version-stable>-<version-vidalia-stable>-ppc.dmg.asc">sig</a>) </li> <li> <a href="<page docs/debian-vidalia>">Instructions for Debian/Ubuntu/Knoppix Repositories</a>

1 0

r25138: {website} minor fixes (website/trunk/docs/en)
by Roger Dingledine 29 Sep '11

29 Sep '11

Author: arma Date: 2011-09-29 00:11:12 +0000 (Thu, 29 Sep 2011) New Revision: 25138 Modified: website/trunk/docs/en/faq.wml Log: minor fixes Modified: website/trunk/docs/en/faq.wml =================================================================== --- website/trunk/docs/en/faq.wml 2011-09-28 23:38:14 UTC (rev 25137) +++ website/trunk/docs/en/faq.wml 2011-09-29 00:11:12 UTC (rev 25138) @@ -739,7 +739,8 @@ <hr> <a id="TBBFlash"></a> -<h3><a class="anchor" href="#TBBFlash">Why doesn't Flash work?</a></h3> +<h3><a class="anchor" href="#TBBFlash">I can't view videos on YouTube +and other Flash-based sites. Why?</a></h3> <p> <a href="https://www.torproject.org/torbutton/torbutton-faq.html.en#noflash">Answer</a> @@ -754,7 +755,7 @@ <p> We build Firefox from source in order to include our <a href="https://gitweb.torproject.org/torbrowser.git/tree/maint-2.2:/src/current-pa…">Firefox -privacy fixes</>. The default Firefox build process calls the resulting +privacy fixes</a>. The default Firefox build process calls the resulting browser "Aurora". </p>

1 0

[torbrowser/maint-2.2] add build options to make vidalia use DEP/ASLR on windows
by erinn＠torproject.org 29 Sep '11

29 Sep '11

commit 689b151a56a5ba4e547dc8d168142078ce40248e Author: Erinn Clark <erinn(a)torproject.org> Date: Thu Sep 29 00:41:55 2011 +0100 add build options to make vidalia use DEP/ASLR on windows --- build-scripts/windows.mk | 2 +- 1 files changed, 1 insertions(+), 1 deletions(-) diff --git a/build-scripts/windows.mk b/build-scripts/windows.mk index 09299a2..741887c 100644 --- a/build-scripts/windows.mk +++ b/build-scripts/windows.mk @@ -82,7 +82,7 @@ build-openssl: cd $(OPENSSL_DIR) && make install VIDALIA_DIR=$(FETCH_DIR)/vidalia-$(VIDALIA_VER) -VIDALIA_OPTS=-DCMAKE_EXE_LINKER_FLAGS="-static-libstdc++" -DWIN2K=1 -DQT_MAKE_EXECUTABLE=/c/Qt/$(QT_VER)/bin/qmake -DCMAKE_BUILD_TYPE=minsizerel -DMINGW_BINARY_DIR=$(MING) -DOPENSSL_BINARY_DIR=$(OPENSSL) -DWIX_BINARY_DIR=$(WIX_LIB) +VIDALIA_OPTS=-DCMAKE_EXE_LINKER_FLAGS="-static-libstdc++ -Wl,--nxcompat -Wl,--dynamicbase" -DWIN2K=1 -DQT_MAKE_EXECUTABLE=/c/Qt/$(QT_VER)/bin/qmake -DCMAKE_BUILD_TYPE=minsizerel -DMINGW_BINARY_DIR=$(MING) -DOPENSSL_BINARY_DIR=$(OPENSSL) -DWIX_BINARY_DIR=$(WIX_LIB) build-vidalia: -mkdir $(VIDALIA_DIR)/build cd $(VIDALIA_DIR)/build && cmake -G "MSYS Makefiles" $(VIDALIA_OPTS) ..

1 0