- tor-commits - lists.torproject.org

[arm/release] Minor post-release tidying up
by atagar＠torproject.org 29 Sep '11

29 Sep '11

commit ce179d515c96a9dbd76d7159c51d84c5e5db4a37 Author: Damian Johnson <atagar(a)torproject.org> Date: Sun Sep 25 20:52:24 2011 -0700 Minor post-release tidying up --- ChangeLog | 4 ++-- src/version.py | 4 ++-- 2 files changed, 4 insertions(+), 4 deletions(-) diff --git a/ChangeLog b/ChangeLog index 402c355..472dd5d 100644 --- a/ChangeLog +++ b/ChangeLog @@ -1,6 +1,6 @@ CHANGE LOG -9/25/11 - version 1.4.4 +9/25/11 - version 1.4.4 (881c67a) Besides the normal bug fixes and minor features, this release introduces the control port interpretor. This is a new page or standalone prompt that gives raw control port access with several usability improvements (tab completion, history, irc style help, interpretor commands, etc). * added: control port interpretor which provides... @@ -13,7 +13,7 @@ Besides the normal bug fixes and minor features, this release introduces the con o /write option which dumps the interpretor backlog to a file * added: control socket support (feature request by dererk, ticket) * added: optional system wide torrc integration (thanks to ioerror, ticket) - * added: dialog for guards, bridges, and exits with exit port usage and client locales + * added: dialog for guards, bridges, and exits with exit port usage and client locales (feature request by waltman and ioerror) * added: configuration editor for the gui interface (implemented by krkhan) * added: notice that warns the user against running tor or arm as root * change: doing a manual redraw when the user presses ctrl+L (ticket) diff --git a/src/version.py b/src/version.py index a1c26cf..8e7f493 100644 --- a/src/version.py +++ b/src/version.py @@ -2,6 +2,6 @@ Provides arm's version and release date. """ -VERSION = '1.4.4_dev' -LAST_MODIFIED = "July 17, 2011" +VERSION = '1.4.5.0_dev' +LAST_MODIFIED = "September 25, 2011"

1 0

[arm/master] Dropping gtk/cagraph requirements
by atagar＠torproject.org 29 Sep '11

29 Sep '11

commit 6829582006173469595a7690e3e2c71a61ce208c Author: Damian Johnson <atagar(a)torproject.org> Date: Thu Sep 29 08:20:40 2011 -0700 Dropping gtk/cagraph requirements The arm gui is still a prototype and shouldn't introduce requrements for end users, or even be packaged yet. This properly does dependency checks when the user *requsts* the gui (fetching cagraph if unavailable) so this should make everyone happy. :) --- install | 2 +- setup.py | 5 ++++- 2 files changed, 5 insertions(+), 2 deletions(-) diff --git a/install b/install index 605f724..fead85c 100755 --- a/install +++ b/install @@ -1,5 +1,5 @@ #!/bin/sh -python src/prereq.py --both +python src/prereq.py if [ $? = 0 ]; then python setup.py -q install diff --git a/setup.py b/setup.py index 4513dee..bc97d00 100644 --- a/setup.py +++ b/setup.py @@ -6,6 +6,8 @@ import tempfile from src.version import VERSION from distutils.core import setup +INCLUDE_CAGRAPH = False + def getResources(dst, sourceDir): """ Provides a list of tuples of the form... @@ -93,8 +95,9 @@ if "install" in sys.argv: # When installing we include a bundled copy of TorCtl. However, when creating # a deb we have a dependency on the python-torctl package instead: # http://packages.debian.org/unstable/main/python-torctl -installPackages = ['arm', 'arm.cli', 'arm.cli.graphing', 'arm.cli.connections', 'arm.cli.menu', 'arm.gui', 'arm.gui.connections', 'arm.gui.graphing', 'arm.util', 'arm.cagraph', 'arm.cagraph.axis', 'arm.cagraph.series'] +installPackages = ['arm', 'arm.cli', 'arm.cli.graphing', 'arm.cli.connections', 'arm.cli.menu', 'arm.gui', 'arm.gui.connections', 'arm.gui.graphing', 'arm.util'] if not isDebInstall: installPackages.append('arm.TorCtl') +if INCLUDE_CAGRAPH: installPackages += ['arm.cagraph', 'arm.cagraph.axis', 'arm.cagraph.series'] setup(name='arm', version=VERSION,

1 0

[arm/master] Switching deb build from adding to removing pkgs
by atagar＠torproject.org 29 Sep '11

29 Sep '11

commit 054b1f29b1e651bf8141287c98da7e428b8129c7 Author: Damian Johnson <atagar(a)torproject.org> Date: Thu Sep 29 08:27:53 2011 -0700 Switching deb build from adding to removing pkgs It makes more sense for the deb flag to remove packages from the base install rather than the omission adding. The rpm builds will be doing something similar so making the tweak now so we can add the rpm flag to the torctl removal check. --- setup.py | 4 ++-- 1 files changed, 2 insertions(+), 2 deletions(-) diff --git a/setup.py b/setup.py index bc97d00..1f5d463 100644 --- a/setup.py +++ b/setup.py @@ -95,8 +95,8 @@ if "install" in sys.argv: # When installing we include a bundled copy of TorCtl. However, when creating # a deb we have a dependency on the python-torctl package instead: # http://packages.debian.org/unstable/main/python-torctl -installPackages = ['arm', 'arm.cli', 'arm.cli.graphing', 'arm.cli.connections', 'arm.cli.menu', 'arm.gui', 'arm.gui.connections', 'arm.gui.graphing', 'arm.util'] -if not isDebInstall: installPackages.append('arm.TorCtl') +installPackages = ['arm', 'arm.cli', 'arm.cli.graphing', 'arm.cli.connections', 'arm.cli.menu', 'arm.gui', 'arm.gui.connections', 'arm.gui.graphing', 'arm.util', 'arm.TorCtl'] +if isDebInstall: installPackages.remove('arm.TorCtl') if INCLUDE_CAGRAPH: installPackages += ['arm.cagraph', 'arm.cagraph.axis', 'arm.cagraph.series'] setup(name='arm',

1 0

[torbrowser/maint-2.2] [Mac] Unbreak the --debug option
by erinn＠torproject.org 29 Sep '11

29 Sep '11

commit c3f2484f06d3b625d666ebff4634d68b3b5a9d62 Author: Robert Ransom <rransom.8774(a)gmail.com> Date: Sun Sep 25 06:22:39 2011 -0700 [Mac] Unbreak the --debug option Previously, it had no effect at all. --- src/RelativeLink/RelativeLinkOSX.sh | 9 ++++++--- 1 files changed, 6 insertions(+), 3 deletions(-) diff --git a/src/RelativeLink/RelativeLinkOSX.sh b/src/RelativeLink/RelativeLinkOSX.sh index f448cf1..dbaa84b 100755 --- a/src/RelativeLink/RelativeLinkOSX.sh +++ b/src/RelativeLink/RelativeLinkOSX.sh @@ -5,11 +5,14 @@ # 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 +# To run in debug mode, simply pass -debug or --debug on the command line. # # Copyright 2010 The Tor Project. See LICENSE for licensing information. -if [ "$1" == "--debug" ]; then +DEBUG_TBB=0 + +if [ "x$1" = "x--debug" -o "x$1" = "x-debug" ]; then + DEBUG_TBB=1 printf "\nDebug enabled.\n\n" fi @@ -22,7 +25,7 @@ export DYLD_LIBRARY_PATH DYLD_PRINT_LIBRARIES=1 export DYLD_PRINT_LIBRARIES -if [ "${debug}" ]; then +if [ "$DEBUG_TBB" -eq 1 ]; then printf "\nStarting Vidalia now\n" cd "${HOME}" printf "\nLaunching Vidalia from: `pwd`\n"

1 0

[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