April 2015 - tor-commits - lists.torproject.org

[stem/master] Correct installation test for 64bit platforms
by atagar＠torproject.org 24 Apr '15

24 Apr '15

commit 2b44a15dd45ddec2085dfb2769604ef3f42049dd Author: Damian Johnson <atagar(a)torproject.org> Date: Fri Apr 24 08:17:01 2015 -0700 Correct installation test for 64bit platforms On 64bit platforms the 'lib' directory is called 'lib64' instead... /tmp/stem_test/lib64/python3.3/site-packages/stem-1.3.0_dev-py3.3.egg-info Caught by toralf. --- test/integ/installation.py | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/test/integ/installation.py b/test/integ/installation.py index f0ce9ed..3dfbd27 100644 --- a/test/integ/installation.py +++ b/test/integ/installation.py @@ -22,7 +22,7 @@ class TestInstallation(unittest.TestCase): try: os.chdir(base_directory) stem.util.system.call('python setup.py install --prefix /tmp/stem_test') - site_packages_paths = glob.glob('/tmp/stem_test/lib/*/site-packages') + site_packages_paths = glob.glob('/tmp/stem_test/lib*/*/site-packages') if len(site_packages_paths) != 1: self.fail('We should only have a single site-packages directory, but instead had: %s' % site_packages_paths)

1 0

[tor-messenger-build/master] mozilla: also use master for Windows builds
by boklm＠torproject.org 24 Apr '15

24 Apr '15

commit 5eea5ee71efc9940e81be3d22b01e6af28336cf1 Author: Nicolas Vigier <boklm(a)torproject.org> Date: Fri Apr 24 15:43:58 2015 +0200 mozilla: also use master for Windows builds --- projects/mozilla/config | 6 ------ 1 file changed, 6 deletions(-) diff --git a/projects/mozilla/config b/projects/mozilla/config index a7dadb9..ea23187 100644 --- a/projects/mozilla/config +++ b/projects/mozilla/config @@ -9,9 +9,3 @@ src: | steps: src: filename: "mozilla-[% c('version') %]-src.tar.gz" - -targets: - windows-i686: - # master does not currently build with mingw-w64, so we are - # staying with an older commit until the problem is fixed. - git_hash: efd5e9084a29e91c05b1fd9b26a56f424b73ac50

1 0

[translation/gettor] Update translations for gettor
by translation＠torproject.org 24 Apr '15

24 Apr '15

commit 9056e7573979c69b1d5e428c013782f159728d4a Author: Translation commit bot <translation(a)torproject.org> Date: Fri Apr 24 13:15:05 2015 +0000 Update translations for gettor --- es_MX/gettor.po | 17 +++++++++-------- 1 file changed, 9 insertions(+), 8 deletions(-) diff --git a/es_MX/gettor.po b/es_MX/gettor.po index b008e6a..75fc6f9 100644 --- a/es_MX/gettor.po +++ b/es_MX/gettor.po @@ -3,14 +3,15 @@ # This file is distributed under the same license as the PACKAGE package. # # Translators: +# Ciclovia Stiltskin <blueshoot(a)yahoo.com>, 2015 # Luis Gerardo Flores Ortiz <luisgflores(a)hotmail.com>, 2015 msgid "" msgstr "" "Project-Id-Version: The Tor Project\n" "Report-Msgid-Bugs-To: \n" "POT-Creation-Date: 2013-01-19 13:40+0100\n" -"PO-Revision-Date: 2015-02-06 23:40+0000\n" -"Last-Translator: Luis Gerardo Flores Ortiz <luisgflores(a)hotmail.com>\n" +"PO-Revision-Date: 2015-04-24 13:03+0000\n" +"Last-Translator: Ciclovia Stiltskin <blueshoot(a)yahoo.com>\n" "Language-Team: Spanish (Mexico) (http://www.transifex.com/projects/p/torproject/language/es_MX/)\n" "MIME-Version: 1.0\n" "Content-Type: text/plain; charset=UTF-8\n" @@ -129,14 +130,14 @@ msgstr "Si no selecciona ningún idioma, recibirá la versión en Inglés." msgid "" "SMALLER SIZED PACKAGES\n" "======================" -msgstr "" +msgstr "PAQUETES DE TAMAÑOS MAS PEQUEÑOS" #: lib/gettor/i18n.py:97 msgid "" "If your bandwith is low or your provider doesn't allow you to\n" "receive large attachments in your email, GetTor can send you several\n" "small packages instead of one big one." -msgstr "" +msgstr "Si su banda ancha es baja o si su proveedor no le permite\n recibir archivos adjuntos de gran tamaño en su correo electónico, GetTor puede enviarle paquetes pequeños en vez de uno grande. " #: lib/gettor/i18n.py:101 msgid "" @@ -145,23 +146,23 @@ msgid "" " \n" " windows\n" " split" -msgstr "" +msgstr "Simplemente incluya la palabra \"split\" de manera aislada en un nuevo renglón (¡esta parte\nes importante!) así como también:\n\nwindows\nsplit " #: lib/gettor/i18n.py:107 msgid "" "Sending this text in an email to GetTor will cause it to send you \n" "the Tor Browser Bundle in a number of 1,4MB attachments." -msgstr "" +msgstr "Mandar este texto por correo electrónico a GetTor producirá que se le envíe el Paquete Tor Browser en una cantidad de adjuntos de 1,4MB" #: lib/gettor/i18n.py:110 msgid "" "After having received all parts, you need to re-assemble them to \n" "one package again. This is done as follows:" -msgstr "" +msgstr "Después de haber recibido todas las partes, usted necesita reensamblarlas a un solo paquete nuevamente. Esto se realiza de la siguiente manera:" #: lib/gettor/i18n.py:113 msgid "1.) Save all received attachments into one folder on your disk." -msgstr "" +msgstr "1.) Guarde todos los archivos adjuntos recibidos en una carpeta en su disco duro." #: lib/gettor/i18n.py:115 msgid ""

1 0

[tor/master] Kludge include.am to work with automake <1.12
by nickm＠torproject.org 24 Apr '15

24 Apr '15

commit d579d751dc03c4a2f8dd31b6928a88bdc10d49a0 Author: Nick Mathewson <nickm(a)torproject.org> Date: Fri Apr 24 08:41:53 2015 -0400 Kludge include.am to work with automake <1.12 The SH_LOG_COMPILER feature doesn't work with older automakes, and those are still in use in many environments we want to support development on, like Debian Stable. Instead, use autoconf substitution to fill out the shebang lines on the shell scripts, and an intermediate make target to make them executable. This is a bugfix on the patches for #15344. Bug not in any released tor. --- src/test/include.am | 22 +++++++++++++++++----- src/test/test_bt.sh.in | 2 +- src/test/test_ntor.sh.in | 2 +- src/test/test_zero_length_keys.sh.in | 2 +- 4 files changed, 20 insertions(+), 8 deletions(-) diff --git a/src/test/include.am b/src/test/include.am index 3c9eed8..c693544 100644 --- a/src/test/include.am +++ b/src/test/include.am @@ -1,12 +1,24 @@ -TESTS += src/test/test src/test/test-slow src/test/test-memwipe \ - src/test/test_zero_length_keys.sh + +TESTSCRIPTS = src/test/test_zero_length_keys.sh if USEPYTHON -TESTS += src/test/test_ntor.sh src/test/test_bt.sh +TESTSCRIPTS += src/test/test_ntor.sh src/test/test_bt.sh endif -TEST_EXTENSIONS = .sh -SH_LOG_COMPILER = $(SHELL) +TESTS += src/test/test src/test/test-slow src/test/test-memwipe \ + $(TESTSCRIPTS) + +### This is a lovely feature, but it requires automake >= 1.12, and Tor +### doesn't require that yet. Below is a kludge to work around. +### +# TEST_EXTENSIONS = .sh +# SH_LOG_COMPILER = $(SHELL) + +check-am: set-test-permissions + +set-test-permissions: + chmod 755 $(TESTSCRIPTS) + noinst_PROGRAMS+= src/test/bench if UNITTESTS_ENABLED diff --git a/src/test/test_bt.sh.in b/src/test/test_bt.sh.in index d249875..ca8be96 100755 --- a/src/test/test_bt.sh.in +++ b/src/test/test_bt.sh.in @@ -1,4 +1,4 @@ -#!/bin/sh +#!@SHELL@ # Test backtrace functionality. exitcode=0 diff --git a/src/test/test_ntor.sh.in b/src/test/test_ntor.sh.in index 5fea8ce..be35384 100755 --- a/src/test/test_ntor.sh.in +++ b/src/test/test_ntor.sh.in @@ -1,4 +1,4 @@ -#!/bin/sh +#!@SHELL@ # Validate Tor's ntor implementation. exitcode=0 diff --git a/src/test/test_zero_length_keys.sh.in b/src/test/test_zero_length_keys.sh.in index 47467ba..d1492d5 100755 --- a/src/test/test_zero_length_keys.sh.in +++ b/src/test/test_zero_length_keys.sh.in @@ -1,4 +1,4 @@ -#!/bin/sh +#!@SHELL@ # Check that tor regenerates keys when key files are zero-length exitcode=0

1 0

[tor-messenger-build/master] Add patch to fix gecko-dev build with mingw-w64
by boklm＠torproject.org 24 Apr '15

24 Apr '15

commit 26ce394f58ec33f1b488f6215cb6980f2d1b9a4c Author: Nicolas Vigier <boklm(a)torproject.org> Date: Fri Apr 24 13:06:14 2015 +0200 Add patch to fix gecko-dev build with mingw-w64 --- projects/instantbird/config | 2 ++ .../fix-versionhelpers.h-include.mozpatch | 36 ++++++++++++++++++++ 2 files changed, 38 insertions(+) diff --git a/projects/instantbird/config b/projects/instantbird/config index 5e88e3f..e4e3816 100644 --- a/projects/instantbird/config +++ b/projects/instantbird/config @@ -74,6 +74,8 @@ input_files: - filename: branding/default48.png - filename: fix-mingw-build.patch enable: '[% c("var/windows") %]' + - filename: fix-versionhelpers.h-include.mozpatch + enable: '[% c("var/windows") %]' - filename: 'mozconfig-[% c("var/osname") %]' name: mozconfig - name: python diff --git a/projects/instantbird/fix-versionhelpers.h-include.mozpatch b/projects/instantbird/fix-versionhelpers.h-include.mozpatch new file mode 100644 index 0000000..860db81 --- /dev/null +++ b/projects/instantbird/fix-versionhelpers.h-include.mozpatch @@ -0,0 +1,36 @@ +From cba17f0febd0978adf15d4a6cf21b4fbcb979884 Mon Sep 17 00:00:00 2001 +From: Nicolas Vigier <boklm(a)mars-attacks.org> +Date: Fri, 24 Apr 2015 12:20:57 +0200 +Subject: [PATCH] Fix versionhelpers.h include + +--- + media/gmp-clearkey/0.1/ClearKeySessionManager.cpp | 2 +- + media/gmp-clearkey/0.1/WMFUtils.cpp | 2 +- + 2 files changed, 2 insertions(+), 2 deletions(-) + +diff --git a/media/gmp-clearkey/0.1/ClearKeySessionManager.cpp b/media/gmp-clearkey/0.1/ClearKeySessionManager.cpp +index 1a9b96bb26ae..1cf9f351a1d0 100644 +--- a/media/gmp-clearkey/0.1/ClearKeySessionManager.cpp ++++ b/media/gmp-clearkey/0.1/ClearKeySessionManager.cpp +@@ -26,7 +26,7 @@ + #include "gmp-task-utils.h" + #if defined(ENABLE_WMF) + #include "WMFUtils.h" +-#include <VersionHelpers.h> ++#include <versionhelpers.h> + #endif + + #include <assert.h> +diff --git a/media/gmp-clearkey/0.1/WMFUtils.cpp b/media/gmp-clearkey/0.1/WMFUtils.cpp +index 6f2204a99223..afa651973375 100644 +--- a/media/gmp-clearkey/0.1/WMFUtils.cpp ++++ b/media/gmp-clearkey/0.1/WMFUtils.cpp +@@ -16,7 +16,7 @@ + + #include "WMFUtils.h" + #include "ClearKeyUtils.h" +-#include <VersionHelpers.h> ++#include <versionhelpers.h> + + #include <stdio.h> +

1 0

[tor-messenger-build/master] Update mingw-w64
by boklm＠torproject.org 24 Apr '15

24 Apr '15

commit fd44344b97e53ab827f33fec9e9f7906b7dd2027 Author: Nicolas Vigier <boklm(a)torproject.org> Date: Fri Apr 24 12:28:13 2015 +0200 Update mingw-w64 The newer commit is required to build gecko-dev. --- projects/mingw-w64/config | 3 +-- 1 file changed, 1 insertion(+), 2 deletions(-) diff --git a/projects/mingw-w64/config b/projects/mingw-w64/config index f75e03f..c01bf8f 100644 --- a/projects/mingw-w64/config +++ b/projects/mingw-w64/config @@ -1,8 +1,7 @@ # vim: filetype=yaml filename: '[% project %]-[% c("version") %]-[% c("var/build_id") %].tar.gz' git_url: http://git.code.sf.net/p/mingw-w64/mingw-w64 -#git_hash: 469ed5d227202b373409c8a3b4c1358be39b9983 -git_hash: bcd8f3f6d3bd4a227e8537010a869ddde711b8f6 +git_hash: 85b403445b2308fa6277aa26446da790866fe052 version: '[% c("abbrev") %]' remote_docker: 1 lsb_release:

1 0

[webwml/master] Update bridge docu to not recommend port 443 anymore
by sebastian＠torproject.org 24 Apr '15

24 Apr '15

commit 68fc46d8459f40b323306527fb7f166a04629dda Author: Sebastian Hahn <sebastian(a)torproject.org> Date: Fri Apr 24 10:27:13 2015 +0200 Update bridge docu to not recommend port 443 anymore This aids scanning resistance as per ticket #13996 --- docs/en/bridges.wml | 10 ++-------- 1 file changed, 2 insertions(+), 8 deletions(-) diff --git a/docs/en/bridges.wml b/docs/en/bridges.wml index 7403235..6a82cc1 100644 --- a/docs/en/bridges.wml +++ b/docs/en/bridges.wml @@ -281,7 +281,7 @@ the bridges. Almost instantly, you'll receive a reply that includes: <pre> - Here are your bridge: + Here are your bridges: 60.16.182.53:9001 87.237.118.139:444 @@ -323,19 +323,13 @@ your torrc file</a> to be just these four lines: <pre><code> SocksPort 0 - ORPort 443 + ORPort auto BridgeRelay 1 Exitpolicy reject *:* </code></pre></li> </ul> - If you get "Could not bind to 0.0.0.0:443: Permission denied" errors - on startup, you'll need to pick a higher ORPort (e.g. 8080) or do <a - href="<page docs/faq>#HowcanImakemyrelayaccessibletopeoplestuckbehindrestrictivefirewalls">some - complex port forwarding</a>. - - When configured as a bridge, your server will not appear in the public Tor network.

1 0

[tor-messenger-build/master] Add the icon files
by sukhbir＠torproject.org 24 Apr '15

24 Apr '15

commit 468d92490a848107cdf35a8b16f19573eca56cd9 Author: Sukhbir Singh <sukhbir(a)torproject.org> Date: Fri Apr 24 00:03:32 2015 -0400 Add the icon files --- projects/instantbird/branding/default.png | Bin 0 -> 2177 bytes projects/instantbird/branding/default16.png | Bin 0 -> 856 bytes projects/instantbird/branding/default48.png | Bin 0 -> 3524 bytes 3 files changed, 0 insertions(+), 0 deletions(-) diff --git a/projects/instantbird/branding/default.png b/projects/instantbird/branding/default.png new file mode 100644 index 0000000..81f18f2 Binary files /dev/null and b/projects/instantbird/branding/default.png differ diff --git a/projects/instantbird/branding/default16.png b/projects/instantbird/branding/default16.png new file mode 100644 index 0000000..9f8be9b Binary files /dev/null and b/projects/instantbird/branding/default16.png differ diff --git a/projects/instantbird/branding/default48.png b/projects/instantbird/branding/default48.png new file mode 100644 index 0000000..63a8cfb Binary files /dev/null and b/projects/instantbird/branding/default48.png differ

1 0

[tor-messenger-build/master] Add Tor Messenger icons for branding (16, 32, 48)
by sukhbir＠torproject.org 24 Apr '15

24 Apr '15

commit 49c042009f05ad0f62b75ac3c84a9c2f7d5436d2 Author: Sukhbir Singh <sukhbir(a)torproject.org> Date: Fri Apr 24 00:01:07 2015 -0400 Add Tor Messenger icons for branding (16, 32, 48) --- projects/instantbird/build | 3 +++ projects/instantbird/config | 3 +++ 2 files changed, 6 insertions(+) diff --git a/projects/instantbird/build b/projects/instantbird/build index 5a60536..d8b0aa2 100644 --- a/projects/instantbird/build +++ b/projects/instantbird/build @@ -46,6 +46,9 @@ do done cat ../spi-cacert.der >> mozilla/security/nss/lib/ckfw/builtins/certdata.txt cp ../cert_override.txt im/app/profile + +cp ../branding/default*.png im/branding/messenger/gtk/ + cd mozilla if ls -1 $rootdir/*.mozpatch > /dev/null 2>&1 then diff --git a/projects/instantbird/config b/projects/instantbird/config index 0edbf91..cfc1389 100644 --- a/projects/instantbird/config +++ b/projects/instantbird/config @@ -69,6 +69,9 @@ input_files: - filename: installer.patch - filename: cert_override.txt - filename: branding/name.patch + - filename: branding/default.png + - filename: branding/default16.png + - filename: branding/default48.png - filename: fix-mingw-build.patch enable: '[% c("var/windows") %]' - filename: 'mozconfig-[% c("var/osname") %]'

1 0

[tor-messenger-build/master] Merge branch 'master' of git-rw.torproject.org:tor-messenger-build
by sukhbir＠torproject.org 24 Apr '15

24 Apr '15

commit 5cc7da95acee577b8ec633cad4e489639349c109 Merge: 49c0420 6ce1187 Author: Sukhbir Singh <sukhbir(a)torproject.org> Date: Fri Apr 24 00:01:48 2015 -0400 Merge branch 'master' of git-rw.torproject.org:tor-messenger-build projects/binutils/config | 4 ++-- projects/instantbird/config | 6 +++--- projects/libgcrypt/config | 6 +++--- projects/libgpg-error/config | 6 +++--- projects/libotr/config | 6 +++--- projects/mingw-w64/config | 4 ++-- 6 files changed, 16 insertions(+), 16 deletions(-)

1 0