November 2011 - tor-commits - lists.torproject.org

[thandy/master] Add a multiplatform ScriptWrapper
by nickm＠torproject.org 12 Nov '11

12 Nov '11

commit c01e9c0bcef743442c8e44641b8cb0f51585eb6e Author: Tomás Touceda <chiiph(a)torproject.org> Date: Sun Nov 6 14:05:17 2011 -0300 Add a multiplatform ScriptWrapper --- lib/thandy/packagesys/ThpPackages.py | 36 +++++++++++++++++++++++++++++++-- 1 files changed, 33 insertions(+), 3 deletions(-) diff --git a/lib/thandy/packagesys/ThpPackages.py b/lib/thandy/packagesys/ThpPackages.py index af66b80..d90af0c 100644 --- a/lib/thandy/packagesys/ThpPackages.py +++ b/lib/thandy/packagesys/ThpPackages.py @@ -9,6 +9,7 @@ import shutil import subprocess import sys import errno +import traceback from lockfile import LockFile, AlreadyLocked, LockFailed @@ -334,9 +335,9 @@ class ThpPackage(object): env['THP_VERBOSE'] = "1" env['THP_PURGE'] = "0" env['THP_TEMP_DIR'] = self._tmp_path - - sw = ScriptWrapper(os.path.join(self._tmp_path, "meta", - "scripts", script[0]), env) + + sw = ScriptBundleWrapper(os.path.join(self._tmp_path, "meta", + "scripts", script[0]), env) for type in script[1]: self._scripts[type] = sw @@ -397,3 +398,32 @@ class ScriptWrapper(object): env=self._env) self._process.wait() return self._process.returncode + +class ScriptBundleWrapper(object): + """ Wrapper for the scripts that runs the code without spawning + another python process. This is mostly for handling + multiplatform code. """ + def __init__(self, path = None, env = None): + super(ScriptBundleWrapper, self).__init__() + self._path = path + self._env = env + + def run(self): + """ Runs the script using the code class. """ + loc = {} + glob = {} + old_environ = os.environ.copy() + os.environ.clear() + os.environ.update(self._env) + try: + execfile(self._path, loc, glob) + except SystemExit, e: + return 1 + except: + traceback.print_exc() + return 1 + finally: + os.environ.clear() + os.environ.update(old_environ) + + return 0

1 0

[tor/master] Fix test_util.c compilation on MSVC
by nickm＠torproject.org 12 Nov '11

12 Nov '11

commit af12a7ac002cd1900e586461baac617b68a624f8 Author: Gisle Vanem <gvanem(a)broadpark.no> Date: Fri Nov 11 23:49:02 2011 -0500 Fix test_util.c compilation on MSVC "Those '{}' constructs are not well liked by MSVC (cl v.16.xx)." Received on tor-dev; fixes bug on 0.2.3.3-alpha. --- changes/fix-msvc | 4 ++++ src/test/test_util.c | 4 ++-- 2 files changed, 6 insertions(+), 2 deletions(-) diff --git a/changes/fix-msvc b/changes/fix-msvc new file mode 100644 index 0000000..62f0547 --- /dev/null +++ b/changes/fix-msvc @@ -0,0 +1,4 @@ + o Minor bugfixes: + - Make util unit tests build correctly with MSVC. Bugfix on + 0.2.3.3-alpha. Patch by Gisle Vanem. + diff --git a/src/test/test_util.c b/src/test/test_util.c index 2146299..64bf52e 100644 --- a/src/test/test_util.c +++ b/src/test/test_util.c @@ -1597,7 +1597,7 @@ test_util_join_win_cmdline(void *ptr) {"a\\\\\\b", "de fg", "H", NULL}, // Backslashes {"a\\\"b", "\\c", "D\\", NULL}, // Backslashes before quote {"a\\\\b c", "d", "E", NULL}, // Backslashes not before quote - {} // Terminator + { NULL } // Terminator }; const char *cmdlines[] = { @@ -1649,7 +1649,7 @@ test_util_split_lines(void *ptr) {"\n\rfoo\n\rbar\r\n", 12, {"foo", "bar", NULL}}, {"fo o\r\nb\tar", 10, {"fo o", "b.ar", NULL}}, {"\x0f""f\0o\0\n\x01""b\0r\0\r", 12, {".f.o.", ".b.r.", NULL}}, - {NULL, 0, {}} + {NULL, 0, { NULL }} }; int i, j;

1 0

r25202: {website} bump tbb versions to 2.2.34-2 (in website/trunk: . include)
by Erinn Clark 12 Nov '11

12 Nov '11

Author: erinn Date: 2011-11-12 01:10:14 +0000 (Sat, 12 Nov 2011) New Revision: 25202 Modified: website/trunk/Makefile website/trunk/include/versions.wmi website/trunk/publish Log: bump tbb versions to 2.2.34-2 Modified: website/trunk/Makefile =================================================================== --- website/trunk/Makefile 2011-11-11 16:06:53 UTC (rev 25201) +++ website/trunk/Makefile 2011-11-12 01:10:14 UTC (rev 25202) @@ -10,9 +10,9 @@ # 4. make # 5. ./publish -export TORGIT=/home/runa/tordev/tor/.git -export STABLETAG=tor-0.2.2.33 -export DEVTAG=tor-0.2.3.5-alpha +export TORGIT=/Users/erinn/src/tor.git/.git +export STABLETAG=tor-0.2.2.24-alpha +export DEVTAG=tor-0.2.2.24-alpha WMLBASE=. SUBDIRS=docs eff projects press about download getinvolved donate torbutton Modified: website/trunk/include/versions.wmi =================================================================== --- website/trunk/include/versions.wmi 2011-11-11 16:06:53 UTC (rev 25201) +++ website/trunk/include/versions.wmi 2011-11-12 01:10:14 UTC (rev 25202) @@ -27,27 +27,27 @@ <define-tag version-osx-ppc-stable whitespace=delete>0.2.2.34</define-tag> <define-tag version-osx-ppc-alpha whitespace=delete>0.2.3.6-alpha</define-tag> -<define-tag version-torbrowserbundle whitespace=delete>2.2.34-1</define-tag> +<define-tag version-torbrowserbundle whitespace=delete>2.2.34-2</define-tag> <define-tag version-torbrowser-tor whitespace=delete>0.2.2.34</define-tag> -<define-tag version-torbrowser-tor-components whitespace=delete>libevent-2.0.14-stable, zlib-1.2.5, openssl-1.0.0e</define-tag> -<define-tag version-torbrowser-firefox whitespace=delete>7.0.1</define-tag> +<define-tag version-torbrowser-tor-components whitespace=delete>libevent-2.0.15-stable, zlib-1.2.5, openssl-1.0.0e</define-tag> +<define-tag version-torbrowser-firefox whitespace=delete>8.0</define-tag> <define-tag version-torbrowser-torbutton whitespace=delete>1.4.4.1</define-tag> <define-tag version-torbrowser-pidgin whitespace=delete>2.7.5</define-tag> <define-tag version-torbrowser-otr whitespace=delete>3.2</define-tag> <define-tag version-torbrowser-vidalia whitespace=delete>0.2.15</define-tag> <define-tag version-torimbrowserbundle whitespace=delete>1.3.21</define-tag> -<define-tag version-torbrowserbundlelinux32 whitespace=delete>2.2.34-1</define-tag> -<define-tag version-torbrowserbundlelinux64 whitespace=delete>2.2.34-1</define-tag> +<define-tag version-torbrowserbundlelinux32 whitespace=delete>2.2.34-2</define-tag> +<define-tag version-torbrowserbundlelinux64 whitespace=delete>2.2.34-2</define-tag> <define-tag version-gnu-torbrowser-tor whitespace=delete>0.2.2.34</define-tag> -<define-tag version-gnu-torbrowser-tor-components whitespace=delete>libevent-2.0.14, zlib-1.2.5, openssl-1.0.0e</define-tag> -<define-tag version-gnu-torbrowser-firefox whitespace=delete>7.0.1</define-tag> +<define-tag version-gnu-torbrowser-tor-components whitespace=delete>libevent-2.0.15-stable, zlib-1.2.5, openssl-1.0.0e</define-tag> +<define-tag version-gnu-torbrowser-firefox whitespace=delete>8.0</define-tag> <define-tag version-gnu-torbrowser-torbutton whitespace=delete>1.4.4.1</define-tag> <define-tag version-gnu-torbrowser-vidalia whitespace=delete>0.2.15</define-tag> -<define-tag version-torbrowserbundleosx whitespace=delete>2.2.34-1</define-tag> +<define-tag version-torbrowserbundleosx whitespace=delete>2.2.34-2</define-tag> <define-tag version-osx-torbrowser-tor whitespace=delete>0.2.2.34</define-tag> -<define-tag version-osx-torbrowser-firefox whitespace=delete>7.0.1</define-tag> +<define-tag version-osx-torbrowser-firefox whitespace=delete>8.0</define-tag> <define-tag version-osx-torbrowser-torbutton whitespace=delete>1.4.4.1</define-tag> <define-tag version-osx-torbrowser-vidalia whitespace=delete>0.2.15</define-tag> Modified: website/trunk/publish =================================================================== --- website/trunk/publish 2011-11-11 16:06:53 UTC (rev 25201) +++ website/trunk/publish 2011-11-12 01:10:14 UTC (rev 25202) @@ -1,16 +1,13 @@ #!/bin/sh set -e # stop if we encounter an error -make clean # clean cruft +svn update +make -j3 -svn update # get changes - -make -j3 # abuse the cores - # don't copy over stuff with permissions that make it useless chmod -R a+r * -rsync --exclude .svn --exclude .deps --exclude svn --exclude dist --exclude releases --exclude torbutton-current.xpi --exclude project -Prvz --delete . vescum.torproject.org:/srv/www-master.torproject.org/htdocs +rsync --exclude .svn --exclude .deps --exclude svn --exclude dist --exclude releases --exclude torbutton-current.xpi --exclude project -Prvz --delete . vescum:/srv/www-master.torproject.org/htdocs echo "Forcing mirror update" -ssh vescum.torproject.org '/home/mirroradm/bin/trigger-mirrors' -ssh vescum.torproject.org chmod g+w -R /srv/www-master.torproject.org/htdocs +ssh vescum '/home/mirroradm/bin/trigger-mirrors' +ssh vescum chmod g+w -R /srv/www-master.torproject.org/htdocs

1 0

[torbrowser/maint-2.2] update recommended-versions to 2.2.34-2
by erinn＠torproject.org 12 Nov '11

12 Nov '11

commit 64d23680b742444693780e8a487a0537d69d72d0 Author: Erinn Clark <erinn(a)torproject.org> Date: Sat Nov 12 01:01:58 2011 +0000 update recommended-versions to 2.2.34-2 --- build-scripts/recommended-versions | 10 +++++----- 1 files changed, 5 insertions(+), 5 deletions(-) diff --git a/build-scripts/recommended-versions b/build-scripts/recommended-versions index 2066e9e..e626308 100644 --- a/build-scripts/recommended-versions +++ b/build-scripts/recommended-versions @@ -1,7 +1,7 @@ [ -"2.2.34-1-Linux-i686", -"2.2.34-1-Linux-x86_64", -"2.2.34-1-MacOS-i386", -"2.2.34-1-MacOS-x86_64", -"2.2.34-1-Windows" +"2.2.34-2-Linux-i686", +"2.2.34-2-Linux-x86_64", +"2.2.34-2-MacOS-i386", +"2.2.34-2-MacOS-x86_64", +"2.2.34-2-Windows" ]

1 0

[torbrowser/maint-2.3] update recommended-versions to 2.2.34-2
by erinn＠torproject.org 12 Nov '11

12 Nov '11

commit 64d23680b742444693780e8a487a0537d69d72d0 Author: Erinn Clark <erinn(a)torproject.org> Date: Sat Nov 12 01:01:58 2011 +0000 update recommended-versions to 2.2.34-2 --- build-scripts/recommended-versions | 10 +++++----- 1 files changed, 5 insertions(+), 5 deletions(-) diff --git a/build-scripts/recommended-versions b/build-scripts/recommended-versions index 2066e9e..e626308 100644 --- a/build-scripts/recommended-versions +++ b/build-scripts/recommended-versions @@ -1,7 +1,7 @@ [ -"2.2.34-1-Linux-i686", -"2.2.34-1-Linux-x86_64", -"2.2.34-1-MacOS-i386", -"2.2.34-1-MacOS-x86_64", -"2.2.34-1-Windows" +"2.2.34-2-Linux-i686", +"2.2.34-2-Linux-x86_64", +"2.2.34-2-MacOS-i386", +"2.2.34-2-MacOS-x86_64", +"2.2.34-2-Windows" ]

1 0

[torbrowser/master] update recommended-versions to 2.2.34-2
by erinn＠torproject.org 12 Nov '11

12 Nov '11

commit 64d23680b742444693780e8a487a0537d69d72d0 Author: Erinn Clark <erinn(a)torproject.org> Date: Sat Nov 12 01:01:58 2011 +0000 update recommended-versions to 2.2.34-2 --- build-scripts/recommended-versions | 10 +++++----- 1 files changed, 5 insertions(+), 5 deletions(-) diff --git a/build-scripts/recommended-versions b/build-scripts/recommended-versions index 2066e9e..e626308 100644 --- a/build-scripts/recommended-versions +++ b/build-scripts/recommended-versions @@ -1,7 +1,7 @@ [ -"2.2.34-1-Linux-i686", -"2.2.34-1-Linux-x86_64", -"2.2.34-1-MacOS-i386", -"2.2.34-1-MacOS-x86_64", -"2.2.34-1-Windows" +"2.2.34-2-Linux-i686", +"2.2.34-2-Linux-x86_64", +"2.2.34-2-MacOS-i386", +"2.2.34-2-MacOS-x86_64", +"2.2.34-2-Windows" ]

1 0

[translation/tsum] Update translations for tsum
by translation＠torproject.org 12 Nov '11

12 Nov '11

commit e6918ca63b8b877ece41950c5f4f739229546157 Author: Translation commit bot <translation(a)torproject.org> Date: Sat Nov 12 00:45:04 2011 +0000 Update translations for tsum --- es/tsum.po | 6 ++++-- 1 files changed, 4 insertions(+), 2 deletions(-) diff --git a/es/tsum.po b/es/tsum.po index b90102e..5bff370 100644 --- a/es/tsum.po +++ b/es/tsum.po @@ -17,8 +17,8 @@ msgstr "" "Project-Id-Version: The Tor Project\n" "Report-Msgid-Bugs-To: https://trac.torproject.org/projects/tor\n" "POT-Creation-Date: 2011-11-05 17:16+0000\n" -"PO-Revision-Date: 2011-11-11 19:20+0000\n" -"Last-Translator: runasand <runa.sandvik(a)gmail.com>\n" +"PO-Revision-Date: 2011-11-12 00:27+0000\n" +"Last-Translator: Gioyik <gioyik(a)gmail.com>\n" "Language-Team: Spanish (Castilian) (http://www.transifex.net/projects/p/torproject/team/es/)\n" "MIME-Version: 1.0\n" "Content-Type: text/plain; charset=UTF-8\n" @@ -615,6 +615,8 @@ msgid "" "## Frequently Asked Questions\n" "This section will answer some of the most common questions. If your question is not mentioned here, please send an email to help(a)rt.torproject.org." msgstr "" +"# # Preguntas frecuentes \n" +"Esta sección responderá algunas de las preguntas más comunes. Si su pregunta no se está aquí, por favor envíe un correo electrónico a help(a)rt.torproject.org." #. type: Plain text #: en/tsum.text:244

1 0

[translation/tsum] Update translations for tsum
by translation＠torproject.org 11 Nov '11

11 Nov '11

commit 823f8b31c9f60aacfbdaa81867b7ca7394ed8fef Author: Translation commit bot <translation(a)torproject.org> Date: Fri Nov 11 19:45:05 2011 +0000 Update translations for tsum --- es/tsum.po | 6 ++---- 1 files changed, 2 insertions(+), 4 deletions(-) diff --git a/es/tsum.po b/es/tsum.po index 2c00213..b90102e 100644 --- a/es/tsum.po +++ b/es/tsum.po @@ -17,8 +17,8 @@ msgstr "" "Project-Id-Version: The Tor Project\n" "Report-Msgid-Bugs-To: https://trac.torproject.org/projects/tor\n" "POT-Creation-Date: 2011-11-05 17:16+0000\n" -"PO-Revision-Date: 2011-11-10 15:29+0000\n" -"Last-Translator: Gioyik <gioyik(a)gmail.com>\n" +"PO-Revision-Date: 2011-11-11 19:20+0000\n" +"Last-Translator: runasand <runa.sandvik(a)gmail.com>\n" "Language-Team: Spanish (Castilian) (http://www.transifex.net/projects/p/torproject/team/es/)\n" "MIME-Version: 1.0\n" "Content-Type: text/plain; charset=UTF-8\n" @@ -615,8 +615,6 @@ msgid "" "## Frequently Asked Questions\n" "This section will answer some of the most common questions. If your question is not mentioned here, please send an email to help(a)rt.torproject.org." msgstr "" -"## Preguntas Frecuentes\n" -"This section will answer some of the most common questions. If your question is not mentioned here, please send an email to help(a)rt.torproject.org." #. type: Plain text #: en/tsum.text:244

1 0

[tor/master] Stop using "u32" and "u8" in aes.c
by nickm＠torproject.org 11 Nov '11

11 Nov '11

commit 7d8edfcceb05c6a85ed34090c87615624cdfb3af Author: Nick Mathewson <nickm(a)torproject.org> Date: Tue Nov 8 22:54:52 2011 -0500 Stop using "u32" and "u8" in aes.c --- src/common/aes.c | 22 ++++++++-------------- 1 files changed, 8 insertions(+), 14 deletions(-) diff --git a/src/common/aes.c b/src/common/aes.c index ab8f7f6..c7e0aff 100644 --- a/src/common/aes.c +++ b/src/common/aes.c @@ -44,12 +44,6 @@ #endif /*======================================================================*/ -/* From rijndael-alg-fst.h */ - -typedef uint32_t u32; -typedef uint8_t u8; - -/*======================================================================*/ /* Interface to AES code, and counter implementation */ /** Implements an AES counter-mode cipher. */ @@ -65,27 +59,27 @@ struct aes_cnt_cipher { #define USING_COUNTER_VARS /** These four values, together, implement a 128-bit counter, with * counter0 as the low-order word and counter3 as the high-order word. */ - u32 counter3; - u32 counter2; - u32 counter1; - u32 counter0; + uint32_t counter3; + uint32_t counter2; + uint32_t counter1; + uint32_t counter0; #endif #ifndef USE_RIJNDAEL_COUNTER_OPTIMIZATION #define USING_COUNTER_BUFS union { /** The counter, in big-endian order, as bytes. */ - u8 buf[16]; + uint8_t buf[16]; /** The counter, in big-endian order, as big-endian words. Note that * on big-endian platforms, this is redundant with counter3...0, * so we just use these values instead. */ - u32 buf32[4]; + uint32_t buf32[4]; } ctr_buf; #endif /** The encrypted value of ctr_buf. */ - u8 buf[16]; + uint8_t buf[16]; /** Our current stream position within buf. */ - u8 pos; + uint8_t pos; }; #if !defined(USING_COUNTER_VARS)

1 0

[tor/master] Remove vestiges of RIJNDAEL_COUNTER_OPTIMIZATION
by nickm＠torproject.org 11 Nov '11

11 Nov '11

commit 46d236c68428a0fd0f008ec2a34ae08f1640b9b7 Author: Nick Mathewson <nickm(a)torproject.org> Date: Tue Nov 8 22:57:15 2011 -0500 Remove vestiges of RIJNDAEL_COUNTER_OPTIMIZATION --- src/common/aes.c | 13 ++++--------- 1 files changed, 4 insertions(+), 9 deletions(-) diff --git a/src/common/aes.c b/src/common/aes.c index c7e0aff..9c03b80 100644 --- a/src/common/aes.c +++ b/src/common/aes.c @@ -55,7 +55,7 @@ struct aes_cnt_cipher { AES_KEY key; #endif -#if !defined(WORDS_BIGENDIAN) || defined(USE_RIJNDAEL_COUNTER_OPTIMIZATION) +#if !defined(WORDS_BIGENDIAN) #define USING_COUNTER_VARS /** These four values, together, implement a 128-bit counter, with * counter0 as the low-order word and counter3 as the high-order word. */ @@ -65,8 +65,6 @@ struct aes_cnt_cipher { uint32_t counter0; #endif -#ifndef USE_RIJNDAEL_COUNTER_OPTIMIZATION -#define USING_COUNTER_BUFS union { /** The counter, in big-endian order, as bytes. */ uint8_t buf[16]; @@ -75,7 +73,7 @@ struct aes_cnt_cipher { * so we just use these values instead. */ uint32_t buf32[4]; } ctr_buf; -#endif + /** The encrypted value of ctr_buf. */ uint8_t buf[16]; /** Our current stream position within buf. */ @@ -149,9 +147,8 @@ aes_set_key(aes_cnt_cipher_t *cipher, const char *key, int key_bits) cipher->counter2 = 0; cipher->counter3 = 0; #endif -#ifdef USING_COUNTER_BUFS + memset(cipher->ctr_buf.buf, 0, sizeof(cipher->ctr_buf.buf)); -#endif cipher->pos = 0; _aes_fill_buf(cipher); @@ -171,7 +168,7 @@ aes_free_cipher(aes_cnt_cipher_t *cipher) tor_free(cipher); } -#if defined(USING_COUNTER_VARS) && defined(USING_COUNTER_BUFS) +#if defined(USING_COUNTER_VARS) #define UPDATE_CTR_BUF(c, n) STMT_BEGIN \ (c)->ctr_buf.buf32[3-(n)] = htonl((c)->counter ## n); \ STMT_END @@ -273,9 +270,7 @@ aes_set_iv(aes_cnt_cipher_t *cipher, const char *iv) cipher->counter0 = ntohl(get_uint32(iv+12)); #endif cipher->pos = 0; -#ifndef USE_RIJNDAEL_COUNTER_OPTIMIZATION memcpy(cipher->ctr_buf.buf, iv, 16); -#endif _aes_fill_buf(cipher); }

1 0