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

[bridgedb/develop] Update bridgedb.pot file with changed BridgeDB strings for translation.
by isis＠torproject.org 19 Mar '15

19 Mar '15

commit 4ad7667f12607731fa0996821f1e4824f5c1972b Author: Isis Lovecruft <isis(a)torproject.org> Date: Thu Mar 19 22:16:18 2015 +0000 Update bridgedb.pot file with changed BridgeDB strings for translation. --- lib/bridgedb/i18n/templates/bridgedb.pot | 29 +++++++++++++++-------------- 1 file changed, 15 insertions(+), 14 deletions(-) diff --git a/lib/bridgedb/i18n/templates/bridgedb.pot b/lib/bridgedb/i18n/templates/bridgedb.pot index 276841e..160c2ba 100644 --- a/lib/bridgedb/i18n/templates/bridgedb.pot +++ b/lib/bridgedb/i18n/templates/bridgedb.pot @@ -6,12 +6,12 @@ #, fuzzy msgid "" msgstr "" -"Project-Id-Version: bridgedb 0.2.4-3-ge333d91\n" +"Project-Id-Version: bridgedb 0.2.4-234-g193c80a-dirty\n" "Report-Msgid-Bugs-To: " "'https://trac.torproject.org/projects/tor/newticket?component=BridgeDB&keywo…" "=bridgedb-reported,msgid&cc=isis,sysrqb&owner=isis'\n" -"POT-Creation-Date: 2015-02-03 03:24+0000\n" -"PO-Revision-Date: 2015-02-03 03:24+0000\n" +"POT-Creation-Date: 2015-03-19 22:13+0000\n" +"PO-Revision-Date: 2015-03-19 22:13+0000\n" "Last-Translator: Isis Lovecruft <isis(a)torproject.org>\n" "Language-Team: LANGUAGE <LL(a)li.org>\n" "MIME-Version: 1.0\n" @@ -30,7 +30,7 @@ msgstr "" #. "fteproxy" #. "Tor" #. "Tor Browser" -#: lib/bridgedb/HTTPServer.py:122 +#: lib/bridgedb/HTTPServer.py:107 msgid "Sorry! Something went wrong with your request." msgstr "" @@ -205,12 +205,13 @@ msgstr "" #: lib/bridgedb/strings.py:121 #, python-format msgid "" -"To enter bridges into Tor Browser, follow the instructions on the %s Tor\n" -"Browser download page %s to start Tor Browser." +"To enter bridges into Tor Browser, first go to the %s Tor Browser download\n" +"page %s and then follow the instructions there for downloading and starting\n" +"Tor Browser." msgstr "" #. TRANSLATORS: Please DO NOT translate "Tor". -#: lib/bridgedb/strings.py:125 +#: lib/bridgedb/strings.py:126 msgid "" "When the 'Tor Network Settings' dialogue pops up, click 'Configure' and " "follow\n" @@ -218,7 +219,7 @@ msgid "" msgstr "" #. TRANSLATORS: Please DO NOT translate "Tor". -#: lib/bridgedb/strings.py:129 +#: lib/bridgedb/strings.py:130 msgid "" "Does your Internet Service Provider (ISP) block or otherwise censor " "connections\n" @@ -226,7 +227,7 @@ msgid "" msgstr "" #. TRANSLATORS: Please DO NOT translate "Tor". -#: lib/bridgedb/strings.py:133 +#: lib/bridgedb/strings.py:134 msgid "" "Select 'Yes' and then click 'Next'. To configure your new bridges, copy and\n" "paste the bridge lines into the text input box. Finally, click 'Connect', and" @@ -235,29 +236,29 @@ msgid "" "button in the 'Tor Network Settings' wizard for further assistance." msgstr "" -#: lib/bridgedb/strings.py:141 +#: lib/bridgedb/strings.py:142 msgid "Displays this message." msgstr "" #. TRANSLATORS: Please try to make it clear that "vanilla" here refers to the #. same non-Pluggable Transport bridges described above as being #. "plain-ol'-vanilla" bridges. -#: lib/bridgedb/strings.py:145 +#: lib/bridgedb/strings.py:146 msgid "Request vanilla bridges." msgstr "" -#: lib/bridgedb/strings.py:146 +#: lib/bridgedb/strings.py:147 msgid "Request IPv6 bridges." msgstr "" #. TRANSLATORS: Please DO NOT translate the word the word "TYPE". -#: lib/bridgedb/strings.py:148 +#: lib/bridgedb/strings.py:149 msgid "Request a Pluggable Transport by TYPE." msgstr "" #. TRANSLATORS: Please DO NOT translate "BridgeDB". #. TRANSLATORS: Please DO NOT translate "GnuPG". -#: lib/bridgedb/strings.py:151 +#: lib/bridgedb/strings.py:152 msgid "Get a copy of BridgeDB's public GnuPG key." msgstr ""

1 0

[bridgedb/develop] Merge branch 'translations/2015-03-19-update' into develop
by isis＠torproject.org 19 Mar '15

19 Mar '15

commit 83bdce523a74e8597281f0e395fff9ff875f399d Merge: 193c80a 4ad7667 Author: Isis Lovecruft <isis(a)torproject.org> Date: Thu Mar 19 22:17:37 2015 +0000 Merge branch 'translations/2015-03-19-update' into develop lib/bridgedb/i18n/templates/bridgedb.pot | 29 +++++++++++++++-------------- 1 file changed, 15 insertions(+), 14 deletions(-)

1 0

[bridgedb/develop] Add test for proxy.ProxySet with missing PROXY_LIST_FILE.
by isis＠torproject.org 19 Mar '15

19 Mar '15

commit 164c545622c3940b3f25eccf561b999899fa16b5 Author: Isis Lovecruft <isis(a)torproject.org> Date: Thu Mar 19 04:13:51 2015 +0000 Add test for proxy.ProxySet with missing PROXY_LIST_FILE. --- lib/bridgedb/test/test_proxy.py | 5 +++++ 1 file changed, 5 insertions(+) diff --git a/lib/bridgedb/test/test_proxy.py b/lib/bridgedb/test/test_proxy.py index 144cf70..6d62f22 100644 --- a/lib/bridgedb/test/test_proxy.py +++ b/lib/bridgedb/test/test_proxy.py @@ -157,6 +157,11 @@ class LoadProxiesFromFileIntegrationTests(unittest.TestCase): proxies = proxy.loadProxiesFromFile(self.fn0) self.assertEqual(len(proxies), 3) + def test_proxy_loadProxiesFromFile_1_file_missing(self): + """Test loading proxies from one file that doesn't exist.""" + proxies = proxy.loadProxiesFromFile('%s-missing' % self.__class__.__name__) + self.assertEqual(len(proxies), 0) + def test_proxy_loadProxiesFromFile_1_file_and_proxyset(self): """Test loading proxies from one file.""" proxyList = proxy.ProxySet(['1.1.1.1'])

1 0

[bridgedb/develop] Add test for (broken) b.proxy.ProxySet.intersection().
by isis＠torproject.org 19 Mar '15

19 Mar '15

commit 0becb7592d0b8480daf2608a0b5032cc733b3c62 Author: Isis Lovecruft <isis(a)torproject.org> Date: Thu Mar 19 04:29:53 2015 +0000 Add test for (broken) b.proxy.ProxySet.intersection(). --- lib/bridgedb/test/test_proxy.py | 14 ++++++++++++++ 1 file changed, 14 insertions(+) diff --git a/lib/bridgedb/test/test_proxy.py b/lib/bridgedb/test/test_proxy.py index 144cf70..2a2b4b5 100644 --- a/lib/bridgedb/test/test_proxy.py +++ b/lib/bridgedb/test/test_proxy.py @@ -476,6 +476,20 @@ class ProxySetUnittests(unittest.TestCase): """ProxySet.issubset() on a subset should return True.""" self.assertTrue(self.proxyList.issuperset(set(self.proxies[:1]))) + def test_ProxySet_intersection(self): + """ProxySet.intersection() should return the combination of two + disjoint sets. + """ + raise unittest.SkipTest( + ("FIXME: bridgedb.proxy.ProxySet.intersection() is broken and " + "always returns an empty set().")) + + a = self.proxies + a.extend(self.moarProxies) + a = set(a) + b = self.proxyList.intersection(set(self.moarProxies)) + self.assertItemsEqual(a, b) + def test_ProxySet_remove(self): """ProxySet.remove() should subtract proxies which were already added to the set.

1 0

[bridgedb/develop] Merge branch 'hotfix/0.2.4-14797-4405-missing-proxylistfile' into develop
by isis＠torproject.org 19 Mar '15

19 Mar '15

commit 35ace70a2e85aadfcad1c55759afd7152d2eaf9a Merge: 0becb75 164c545 Author: Isis Lovecruft <isis(a)torproject.org> Date: Thu Mar 19 04:36:49 2015 +0000 Merge branch 'hotfix/0.2.4-14797-4405-missing-proxylistfile' into develop lib/bridgedb/test/test_proxy.py | 5 +++++ 1 file changed, 5 insertions(+)

1 0

[bridgedb/develop] Clarify Tor Browser installation instructions.
by isis＠torproject.org 19 Mar '15

19 Mar '15

commit 1a5f320570e6170cec721682f320a204a3454765 Author: Isis Lovecruft <isis(a)torproject.org> Date: Thu Mar 19 22:04:16 2015 +0000 Clarify Tor Browser installation instructions. * FIXES #15155: https://trac.torproject.org/projects/tor/ticket/15155 * THANKS TO qbi, nickm, and weasel for suggestions. --- lib/bridgedb/strings.py | 5 +++-- 1 file changed, 3 insertions(+), 2 deletions(-) diff --git a/lib/bridgedb/strings.py b/lib/bridgedb/strings.py index 1991b5f..a9a06bc 100644 --- a/lib/bridgedb/strings.py +++ b/lib/bridgedb/strings.py @@ -119,8 +119,9 @@ HOWTO_TBB = { 0: _("""How to start using your bridges"""), # TRANSLATORS: Please DO NOT translate "Tor Browser". 1: _("""\ -To enter bridges into Tor Browser, follow the instructions on the %s Tor -Browser download page %s to start Tor Browser."""), +To enter bridges into Tor Browser, first go to the %s Tor Browser download +page %s and then follow the instructions there for downloading and starting +Tor Browser."""), # TRANSLATORS: Please DO NOT translate "Tor". 2: _("""\ When the 'Tor Network Settings' dialogue pops up, click 'Configure' and follow

1 0

[bridgedb/develop] Merge branch 'fix/15155-instructions-string' into develop
by isis＠torproject.org 19 Mar '15

19 Mar '15

commit 193c80a27b150bbc260f90c33998781301b32165 Merge: 35ace70 1a5f320 Author: Isis Lovecruft <isis(a)torproject.org> Date: Thu Mar 19 22:07:44 2015 +0000 Merge branch 'fix/15155-instructions-string' into develop lib/bridgedb/strings.py | 5 +++-- 1 file changed, 3 insertions(+), 2 deletions(-)

1 0

[tor-messenger-build/master] Add thunderbird
by boklm＠torproject.org 19 Mar '15

19 Mar '15

commit 2c28bee39ec6137026afa1948fe1c6679efb0a85 Author: Nicolas Vigier <boklm(a)torproject.org> Date: Thu Mar 19 13:16:14 2015 +0100 Add thunderbird --- keyring/thunderbird.gpg | Bin 0 -> 2780 bytes projects/thunderbird/build | 7 +++++++ projects/thunderbird/config | 18 ++++++++++++++++++ 3 files changed, 25 insertions(+) diff --git a/keyring/thunderbird.gpg b/keyring/thunderbird.gpg new file mode 100644 index 0000000..f21b9f5 Binary files /dev/null and b/keyring/thunderbird.gpg differ diff --git a/projects/thunderbird/build b/projects/thunderbird/build new file mode 100644 index 0000000..d7cbf9b --- /dev/null +++ b/projects/thunderbird/build @@ -0,0 +1,7 @@ +#!/bin/sh +set -e +mv [% c('input_files_by_name/thunderbird') %] [% c('var/src_filename') %] +grep [% c('var/moz_osname') %]/en-US/[% c('var/src_filename') %] sha512sums-[% c("version") %] | \ + perl -pe 's/[% c('var/moz_osname') %]\/en-US\/[% c('var/src_filename') %]$/[% c('var/src_filename') %]/' | \ + sha512sum -c +cp -p [% c('var/src_filename') %] [% dest_dir %]/[% c('filename') %] diff --git a/projects/thunderbird/config b/projects/thunderbird/config new file mode 100644 index 0000000..135376f --- /dev/null +++ b/projects/thunderbird/config @@ -0,0 +1,18 @@ +# vim: filetype=yaml +version: 31.5.0 +filename: 'thunderbird-[% c("version") %]-[% c("var/osname") %].[% c("var/extension") %]' + +var: + moz_osname: '[% c("var/osname") %]' + extension: tar.bz2 + src_filename: 'thunderbird-[% c("version") %].[% c("var/extension") %]' + +input_files: + - filename: 'mozilla-thunderbird-[% c("version") %]-[% c("var/moz_osname") %].[% c("var/extension") %]' + URL: 'https://ftp.mozilla.org/pub/mozilla.org/thunderbird/releases/[% c("version") %]/[% c("var/moz_osname") %]/en-US/[% c("var/src_filename") %]' + name: thunderbird + - filename: 'sha512sums-[% c("version") %]' + URL: 'https://ftp.mozilla.org/pub/mozilla.org/thunderbird/releases/[% c("version") %]/SHA512SUMS' + file_gpg_id: 1 + sig_ext: asc + gpg_keyring: thunderbird.gpg

1 0

[tor-messenger-build/master] Add torbirdy
by boklm＠torproject.org 19 Mar '15

19 Mar '15

commit 0001910f66af1ca01528cd1f708c0c812adfc26d Author: Nicolas Vigier <boklm(a)torproject.org> Date: Thu Mar 19 13:34:21 2015 +0100 Add torbirdy --- projects/torbirdy/build | 7 +++++++ projects/torbirdy/config | 5 +++++ 2 files changed, 12 insertions(+) diff --git a/projects/torbirdy/build b/projects/torbirdy/build new file mode 100644 index 0000000..ea0756a --- /dev/null +++ b/projects/torbirdy/build @@ -0,0 +1,7 @@ +#!/bin/sh +set -e +tar xvf [% project %]-[% c('version') %].tar.gz +cd [% project %]-[% c('version') %] +make make-xpi +cd .. +mv -f torbirdy-[% c("version") %].xpi [% dest_dir _ '/' _ c('filename') %] diff --git a/projects/torbirdy/config b/projects/torbirdy/config new file mode 100644 index 0000000..db8a70b --- /dev/null +++ b/projects/torbirdy/config @@ -0,0 +1,5 @@ +# vim: filetype=yaml +filename: 'torbirdy-[% c("version") %].xpi' +version: 0.1.4 +git_hash: 4cdded42ca5c6f900c893a8b3d27c50ce6854eac +git_url: https://git.torproject.org/torbirdy.git

1 0

[tor-messenger-build/master] Add tor-mail and tor-messenger targets
by boklm＠torproject.org 19 Mar '15

19 Mar '15

commit 2ad1ddf890bc0362ffb1d6e72e9cb6ca652234c3 Author: Nicolas Vigier <boklm(a)torproject.org> Date: Thu Mar 19 21:09:02 2015 +0100 Add tor-mail and tor-messenger targets --- Makefile | 6 +++--- rbm.conf | 8 ++++++++ tools/clean-old | 11 +++++++---- 3 files changed, 18 insertions(+), 7 deletions(-) diff --git a/Makefile b/Makefile index 5ffe4c1..b2472b7 100644 --- a/Makefile +++ b/Makefile @@ -3,13 +3,13 @@ rbm=./rbm/rbm all: submodule-update tor-messenger-linux-x86_64 tor-messenger-linux-i686 tor-messenger-windows-i686 tor-messenger-linux-x86_64: - $(rbm) build tor-messenger --target linux-x86_64 + $(rbm) build tor-messenger --target tor-messenger --target linux-x86_64 tor-messenger-linux-i686: - $(rbm) build tor-messenger --target linux-i686 + $(rbm) build tor-messenger --target tor-messenger --target linux-i686 tor-messenger-windows-i686: - $(rbm) build tor-messenger --target windows-i686 + $(rbm) build tor-messenger --target tor-messenger --target windows-i686 submodule-update: git submodule update --init diff --git a/rbm.conf b/rbm.conf index 0d385b4..d4bdf8f 100644 --- a/rbm.conf +++ b/rbm.conf @@ -67,6 +67,14 @@ targets: osx: 1 osname: osx-x86_64 + tor-messenger: + var: + tor-messenger: 1 + + tor-mail: + var: + tor-mail: 1 + # The no_build_id target can be useful if you want to quickly display # a build template or other option but don't want to spend time to # compute the various build ids diff --git a/tools/clean-old b/tools/clean-old index e3be7fa..a4de55f 100755 --- a/tools/clean-old +++ b/tools/clean-old @@ -6,6 +6,7 @@ use FindBin; my $rbm = "$FindBin::Bin/../rbm/rbm"; my $projects_dir = "$FindBin::Bin/../projects"; +my $product_target = 'tor-messenger'; my @targets = qw(linux-x86_64 linux-i686 windows-i686 osx-x86_64); my @sig_ext = qw(.sig .gpg .asc); my $docker_image_prefix = docker_image_prefix(); @@ -19,12 +20,14 @@ sub clean_project_build_files { my %keep_files; foreach my $target (@targets) { my ($out, $err, $success) = capture_exec($rbm, - 'showconf', $project, 'filename', "--target=$target"); + 'showconf', $project, 'filename', "--target=$product_target", + "--target=$target"); return unless $success; chomp $out; $keep_files{$out} = 1; ($out, $err, $success) = capture_exec($rbm, - 'showconf', $project, 'var/input_files_list', "--target=$target"); + 'showconf', $project, 'var/input_files_list', + "--target=$product_target", "--target=$target"); next unless $success; my @input_files = split("\n", $out); foreach my $input_file (@input_files) { @@ -84,12 +87,12 @@ sub clean_docker_images { next unless -f "$project/config"; foreach my $target (@targets) { my ($out, $err, $success) = capture_exec($rbm, 'showconf', $project, - 'remote_docker', "--target=$target"); + 'remote_docker', "--target=$product_target", "--target=$target"); next unless $success; chomp $out; next unless $out; ($out, $err, $success) = capture_exec($rbm, 'showconf', $project, - 'docker_image', "--target=$target"); + 'docker_image', "--target=$product_target", "--target=$target"); next unless $success; chomp $out; my (undef, $image_file) = split(':', $out);

1 0