February 2021 - tor-commits - lists.torproject.org

[tor-browser-bundle-testsuite/master] Bug 40015: Add config for tb-build-01.tpo nightly builds
by gk＠torproject.org 25 Feb '21

25 Feb '21

commit 3880bda3ef2f40b14632ceb445b5837a6ad643d5 Author: Nicolas Vigier <boklm(a)torproject.org> Date: Fri Jan 15 21:36:55 2021 +0100 Bug 40015: Add config for tb-build-01.tpo nightly builds --- config/tb-build-01.torproject.org | 38 +++++++ .../tb-build-01.torproject.org.rbm.local.conf | 113 +++++++++++++++++++++ 2 files changed, 151 insertions(+) diff --git a/config/tb-build-01.torproject.org b/config/tb-build-01.torproject.org new file mode 100644 index 0000000..62f8bc1 --- /dev/null +++ b/config/tb-build-01.torproject.org @@ -0,0 +1,38 @@ +# vim: filetype=perl expandtab +use strict; +use FindBin; +use DateTime; +use TBBTestSuite::TestSuite::TorBrowserBuild; + +my $date = DateTime->now->ymd; +my $tbb_version = 'tbb-nightly.' . DateTime->now->ymd('.'); +my $name = "tor-browser-$date"; + +my $builds_dir_root = '/home/tb-builder/nightly-builds'; +my $reports_dir = "$builds_dir_root/reports"; + +if (-d "$reports_dir/r/$name") { + print "Doing nothing: $name already done\n"; + return ( args => [] ); +} + +my $testsuite = TBBTestSuite::TestSuite::TorBrowserBuild->new({ + tbb_version => $tbb_version, + publish_dir => "$builds_dir_root/tor-browser-builds/$tbb_version", + publish_url => "https://nightlies.tbb.torproject.org/nightly-builds/tor-browser-builds/$tbb…", + rbm_local_conf => "$FindBin::Bin/rbm-config/tb-build-01.torproject.org.rbm.local.conf", + make_clean => 1, + }); + +my %res = ( + name => $name, + args => [ $testsuite ], + tags => [ 'nightly' ], + 'reports-dir' => $reports_dir, + 'reports-url' => 'https://nightlies.tbb.torproject.org/nightly-builds/reports/', + 'email-subject' => '[build result: [% success ? "ok" : "failed" %]] [% options.name %]', + 'email-report' => 1, + 'email-to' => [ 'boklm(a)torproject.org', 'gk(a)torproject.org', 'sysrqb(a)torproject.org', ], + 'email-from' => 'Tor Browser Nightly Builds <tb-builder(a)tb-build-01.torproject.org>', +); +%res; diff --git a/rbm-config/tb-build-01.torproject.org.rbm.local.conf b/rbm-config/tb-build-01.torproject.org.rbm.local.conf new file mode 100644 index 0000000..1d323d3 --- /dev/null +++ b/rbm-config/tb-build-01.torproject.org.rbm.local.conf @@ -0,0 +1,113 @@ +--- +### This file is used to override options from rbm.conf to adapt them +### to your local setup. +### +### Copy this file as rbm.local.conf to enable it, and uncomment the +### options you want to modify. + + +### The tmp_dir option defines where temporary files are stored. The +### builds are made from this directory, so using a directory on a fast +### disk can improve build time. By default we are using a tmp directory +### under the tor-browser-build directory. +#tmp_dir: /tmp + +### The debug option defines whether a debugging shell should be opened +### automatically in the build directory/container in case of build +### failure. If you are doing automated builds, you might want to disable +### this. +#debug: 0 + +### The build_log option defines in which file the build logs of each +### component are stored. If you set it to '-' the logs are output on +### stdout and stderr. +#build_log: '-' + +### By default, the logs from previous builds are kept in the log files. +### If you set build_log_append to 0, then previous logs are cleaned +### when starting a new build. +#build_log_append: 0 + +buildconf: + buildconf: 1 + + ### The buildconf/num_procs option can be used to select the number of + ### build processes to run simultaneously. You can also use the + ### RBM_NUM_PROCS environment variable. The default is 4. + num_procs: 8 + + ### The buildconf/git_signtag_opt option is useful when you tag a release. + ### It is used to set the 'git tag' argument to select the keyid for + ### signing the tag. + #git_signtag_opt: '-u keyid' + +var: + local_conf: 1 + + ### The var/sign_build option defines if you want to sign the + ### sha256sums-unsigned-build.txt and + ### sha256sums-unsigned-build.incrementals.txt files with gpg. + sign_build: 1 + + ### The var/sign_build_gpg_opts option can be used to define some gpg + ### options to select the key to use to sign the sha256sums-unsigned-build.txt + ### and sha256sums-unsigned-build.incrementals.txt files. + #sign_build_gpg_opts: '--local-user XXXXXXXX' + + ### The clean configuration is used by the cleaning script to find the + ### branches and build targets you are using, to compute the list of + ### files that should be kept. + ### + ### If you only do alpha builds for all platforms, you can use the + ### following configuration: + clean: + HEAD: + - project: release + target: + - nightly + - torbrowser-all + # + ### If you are doing 'release' builds in the maint-7.0 branch and + ### 'alpha' builds in the master branch, you can use the following + ### configuration: + #clean: + # master: + # - project: release + # target: + # - alpha + # - torbrowser-all + # maint-7.0: + # - project: release + # target: + # - release + # - torbrowser-all + +targets: + + ### testbuild is based on alpha by default. Uncomment this if you want it + ### to be based on nightly. + #torbrowser-testbuild: + # - testbuild + # - nightly + + testbuild: + var: + testbuild: 1 + + ### Uncomment this if you want to create mar files in your test build. + #build_mar: 1 + + nightly: + + ### By default 'fetch' is set to 1 for nightly builds, meaning that new + ### commits will be fetched automatically during each build. You can + ### disable this during development if you want to do rebuilds to test + ### a specific change, but don't want rebuilds caused by unrelated + ### changes, or if you want to decide at which point new commits are + ### fetched. When 'fetch' is set to 'if_needed', new commits will only + ### be fetched if the selected commit (or branch, or tag) is not present, + ### which means that existing branches won't be updated. In that case + ### you can fetch new commits by running 'make fetch'. + fetch: 'if_needed' + +# vim: filetype=yaml sw=2

1 0

[tor-browser-bundle-testsuite/master] Bug 40018: rsync to tbb-nightlies-master after each build
by gk＠torproject.org 25 Feb '21

25 Feb '21

commit 308a0861a110c92a1f1378b6577e8db9a9f11c6c Author: Nicolas Vigier <boklm(a)torproject.org> Date: Fri Feb 12 20:05:39 2021 +0100 Bug 40018: rsync to tbb-nightlies-master after each build --- config/tb-build-01.torproject.org | 17 +++++++++++++++++ tools/rsync-to-tbb-nightlies-master | 16 ++++++++++++++++ 2 files changed, 33 insertions(+) diff --git a/config/tb-build-01.torproject.org b/config/tb-build-01.torproject.org index 62f8bc1..c348e69 100644 --- a/config/tb-build-01.torproject.org +++ b/config/tb-build-01.torproject.org @@ -2,6 +2,8 @@ use strict; use FindBin; use DateTime; +use IO::CaptureOutput qw(capture_exec); +use File::Slurp; use TBBTestSuite::TestSuite::TorBrowserBuild; my $date = DateTime->now->ymd; @@ -11,6 +13,20 @@ my $name = "tor-browser-$date"; my $builds_dir_root = '/home/tb-builder/nightly-builds'; my $reports_dir = "$builds_dir_root/reports"; +my $run_rsync = sub { + # we fork to run the rsync in the background + # we do a double fork to prevent having zombie processes + my $pid = fork; + if ($pid) { + waitpid($pid, 0); + return; + } + exit 0 if fork; + + capture_exec("$FindBin::Bin/tools/rsync-to-tbb-nightlies-master"); + exit; +}; + if (-d "$reports_dir/r/$name") { print "Doing nothing: $name already done\n"; return ( args => [] ); @@ -34,5 +50,6 @@ my %res = ( 'email-report' => 1, 'email-to' => [ 'boklm(a)torproject.org', 'gk(a)torproject.org', 'sysrqb(a)torproject.org', ], 'email-from' => 'Tor Browser Nightly Builds <tb-builder(a)tb-build-01.torproject.org>', + 'test_post' => $run_rsync, ); %res; diff --git a/tools/rsync-to-tbb-nightlies-master b/tools/rsync-to-tbb-nightlies-master new file mode 100755 index 0000000..996996d --- /dev/null +++ b/tools/rsync-to-tbb-nightlies-master @@ -0,0 +1,16 @@ +#!/usr/bin/perl -w +use strict; +use FindBin; +use Path::Tiny; + +my $lockfile = "$FindBin::Bin/rsync-to-tbb-nightlies-master.lock"; +if (-f $lockfile) { + my $oldpid = path($lockfile)->slurp_utf8; + exit if kill 0, $oldpid; + unlink $lockfile; +} +path($lockfile)->spew_utf8($$); + +system('rsync', '-aH', '--delete-before', '/home/tb-builder/nightly-builds/', + 'tbb-nightlies@tbb-nightlies-master.torproject.org:/'); +unlink $lockfile;

1 0

[tor-browser-bundle-testsuite/master] Bug 40018: Add support for test_post option
by gk＠torproject.org 25 Feb '21

25 Feb '21

commit 7775ed32d9f4cab71db978f91b02d37f47aa105f Author: Nicolas Vigier <boklm(a)torproject.org> Date: Wed Feb 3 17:06:37 2021 +0100 Bug 40018: Add support for test_post option If the option test_post is defined and pointing to a subroutine, then this subroutine will be run after each test. We will be using this option to run an rsync after each Tor Browser build. --- TBBTestSuite/Tests.pm | 1 + 1 file changed, 1 insertion(+) diff --git a/TBBTestSuite/Tests.pm b/TBBTestSuite/Tests.pm index 532b31b..1ec15ab 100644 --- a/TBBTestSuite/Tests.pm +++ b/TBBTestSuite/Tests.pm @@ -81,6 +81,7 @@ sub run_tests { } $test->{finish_time} = time; $test->{run_time} = $test->{finish_time} - $test->{start_time}; + $options->{test_post}->($tbbinfos, $test) if ref $options->{test_post} eq 'CODE'; if ($test->{fail_type} eq 'fatal' && is_test_error($test)) { last; }

1 0

[tor-browser-bundle-testsuite/master] Bug 40015: Add script to start nightly build on tb-build-01
by gk＠torproject.org 25 Feb '21

25 Feb '21

commit 3afd1885b19ea7146012f01b357c2bffd9f99803 Author: Nicolas Vigier <boklm(a)torproject.org> Date: Fri Feb 12 20:21:12 2021 +0100 Bug 40015: Add script to start nightly build on tb-build-01 --- tools/tb-build-01-start-nightly-build | 14 ++++++++++++++ 1 file changed, 14 insertions(+) diff --git a/tools/tb-build-01-start-nightly-build b/tools/tb-build-01-start-nightly-build new file mode 100755 index 0000000..6a37459 --- /dev/null +++ b/tools/tb-build-01-start-nightly-build @@ -0,0 +1,14 @@ +#!/bin/bash +set -e + +cd /home/tb-builder/tor-browser-bundle-testsuite +export RBM_NO_DEBUG=1 +./tbb-testsuite --config=tb-build-01.torproject.org "$@" +/home/tb-builder/tor-browser-bundle-testsuite/clones/tor-browser-build/tools/prune-old-builds --days 1 --weeks 0 --months 0 ~/nightly-builds/tor-browser-builds +# sleep for 5m to give time to previous rsync to finish +sleep 5m +/home/tb-builder/tor-browser-bundle-testsuite/tools/rsync-to-tbb-nightlies-master +# Run static-update-component on tbb-nightlies-master: +# in /etc/ssh/userkeys/tbb-nightlies on tbb-nightlies-master we have a +# command="" option with this key running static-update-component +ssh -i /home/tb-builder/.ssh/id_rsa_static-update-component tbb-nightlies(a)tbb-nightlies-master.torproject.org true

1 0

[tor-browser/tor-browser-78.8.0esr-10.5-2] fixup! Bug 10760: Integrate TorButton to TorBrowser core
by gk＠torproject.org 25 Feb '21

25 Feb '21

commit b7aafa11b36fd32596e44bbdda1429e95d7fe3f4 Author: Georg Koppen <gk(a)torproject.org> Date: Thu Feb 25 12:28:38 2021 +0000 fixup! Bug 10760: Integrate TorButton to TorBrowser core --- toolkit/torproject/torbutton | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/toolkit/torproject/torbutton b/toolkit/torproject/torbutton index 10ce74fae813..c05af387ef34 160000 --- a/toolkit/torproject/torbutton +++ b/toolkit/torproject/torbutton @@ -1 +1 @@ -Subproject commit 10ce74fae8138696b52a7d27eaed5d43d8052b29 +Subproject commit c05af387ef3487f14a58b27214cf9ede57363c0e

1 0

[torbutton/master] Bug 40030: Add 'noscript' capability to NoScript
by gk＠torproject.org 25 Feb '21

25 Feb '21

commit c05af387ef3487f14a58b27214cf9ede57363c0e Author: HackerNCoder <hackerncoder(a)protonmail.ch> Date: Wed Feb 24 22:45:31 2021 +0000 Bug 40030: Add 'noscript' capability to NoScript --- modules/noscript-control.js | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) diff --git a/modules/noscript-control.js b/modules/noscript-control.js index 3cd5f602..ea735377 100644 --- a/modules/noscript-control.js +++ b/modules/noscript-control.js @@ -68,20 +68,20 @@ let log = (level, msg) => logger.log(level, msg); // ## NoScript settings // Minimum and maximum capability states as controlled by NoScript. -const max_caps = ["fetch", "font", "frame", "media", "object", "other", "script", "webgl"]; -const min_caps = ["frame", "other"]; +const max_caps = ["fetch", "font", "frame", "media", "object", "other", "script", "webgl", "noscript"]; +const min_caps = ["frame", "other", "noscript"]; // Untrusted capabilities for [Standard, Safer, Safest] safety levels. const untrusted_caps = [ max_caps, // standard safety: neither http nor https - ["frame", "font", "object", "other"], // safer: http + ["frame", "font", "object", "other", "noscript"], // safer: http min_caps, // safest: neither http nor https ]; // Default capabilities for [Standard, Safer, Safest] safety levels. const default_caps = [ max_caps, // standard: both http and https - ["fetch", "font", "frame", "object", "other", "script"], // safer: https only + ["fetch", "font", "frame", "object", "other", "script", "noscript"], // safer: https only min_caps, // safest: both http and https ];

1 0

[translation/tor-launcher-network-settings] https://gitweb.torproject.org/translation.git/commit/?h=tor-launcher-network-settings
by translation＠torproject.org 25 Feb '21

25 Feb '21

commit e5f765bde2c7f3d325613f4f3a19b7226f2f80d9 Author: Translation commit bot <translation(a)torproject.org> Date: Thu Feb 25 07:48:00 2021 +0000 https://gitweb.torproject.org/translation.git/commit/?h=tor-launcher-networ… --- my/network-settings.dtd | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/my/network-settings.dtd b/my/network-settings.dtd index ea6ad83062..54f6061a11 100644 --- a/my/network-settings.dtd +++ b/my/network-settings.dtd @@ -11,7 +11,7 @@ <!ENTITY torSettings.connectPrompt "Click “Connect” to connect to Tor."> <!ENTITY torSettings.configurePrompt "Click “Configure” to adjust network settings if you are in a country that censors Tor (such as Egypt, China, Turkey) or if you are connecting from a private network that requires a proxy."> -<!ENTITY torSettings.configure "Configure"> +<!ENTITY torSettings.configure "စီစဥ်မယ်"> <!ENTITY torSettings.connect "ချိတ်ဆက်ရန်">

1 0

[translation/tails-misc_release] https://gitweb.torproject.org/translation.git/commit/?h=tails-misc_release
by translation＠torproject.org 25 Feb '21

25 Feb '21

commit 17e4d35a1995e3c6af938485a9bd51ff58851627 Author: Translation commit bot <translation(a)torproject.org> Date: Thu Feb 25 07:46:41 2021 +0000 https://gitweb.torproject.org/translation.git/commit/?h=tails-misc_release --- my.po | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/my.po b/my.po index 23fe8327d3..c9c7b6ebce 100644 --- a/my.po +++ b/my.po @@ -8,8 +8,8 @@ msgstr "" "Project-Id-Version: Tor Project\n" "Report-Msgid-Bugs-To: \n" "POT-Creation-Date: 2021-01-05 11:44+0100\n" -"PO-Revision-Date: 2021-01-05 12:15+0000\n" -"Last-Translator: Transifex Bot <>\n" +"PO-Revision-Date: 2021-02-25 07:34+0000\n" +"Last-Translator: Lu Min Lwin <liminallavatory(a)protonmail.com>\n" "Language-Team: Burmese (http://www.transifex.com/otf/torproject/language/my/)\n" "MIME-Version: 1.0\n" "Content-Type: text/plain; charset=UTF-8\n"

1 0

[translation/tails-misc] https://gitweb.torproject.org/translation.git/commit/?h=tails-misc
by translation＠torproject.org 25 Feb '21

25 Feb '21

commit 39080daf4104dfb4f599a94e438539b92d714b3a Author: Translation commit bot <translation(a)torproject.org> Date: Thu Feb 25 07:45:57 2021 +0000 https://gitweb.torproject.org/translation.git/commit/?h=tails-misc --- my.po | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/my.po b/my.po index bf470873bf..329b9a2620 100644 --- a/my.po +++ b/my.po @@ -8,8 +8,8 @@ msgstr "" "Project-Id-Version: Tor Project\n" "Report-Msgid-Bugs-To: \n" "POT-Creation-Date: 2021-01-05 11:44+0100\n" -"PO-Revision-Date: 2021-01-05 12:15+0000\n" -"Last-Translator: Transifex Bot <>\n" +"PO-Revision-Date: 2021-02-25 07:34+0000\n" +"Last-Translator: Lu Min Lwin <liminallavatory(a)protonmail.com>\n" "Language-Team: Burmese (http://www.transifex.com/otf/torproject/language/my/)\n" "MIME-Version: 1.0\n" "Content-Type: text/plain; charset=UTF-8\n" @@ -1312,7 +1312,7 @@ msgstr "မှတ်တမ်း ပြရန်" #: config/chroot_local-includes/usr/local/sbin/tails-additional-software:157 msgid "Configure" -msgstr "" +msgstr "စီစဥ်မယ်" #. Translators: Don't translate {beginning} or {last}, they are #. placeholders and will be replaced.

1 0

[translation/donatepages-messagespot] https://gitweb.torproject.org/translation.git/commit/?h=donatepages-messagespot
by translation＠torproject.org 25 Feb '21

25 Feb '21

commit e8dec3bc806bac90617dd69e90393c665ea8a9b3 Author: Translation commit bot <translation(a)torproject.org> Date: Thu Feb 25 05:15:12 2021 +0000 https://gitweb.torproject.org/translation.git/commit/?h=donatepages-message… --- locale/my/LC_MESSAGES/messages.po | 7 ++++--- 1 file changed, 4 insertions(+), 3 deletions(-) diff --git a/locale/my/LC_MESSAGES/messages.po b/locale/my/LC_MESSAGES/messages.po index fde142e1b2..6aa01ca343 100644 --- a/locale/my/LC_MESSAGES/messages.po +++ b/locale/my/LC_MESSAGES/messages.po @@ -1,13 +1,14 @@ # # Translators: -# Yoon <theintnaingyoon(a)gmail.com>, 2018 +# tn.yoon <theintnaingyoon(a)gmail.com>, 2018 # Yatanar (Y) <yatanar.a4(a)gmail.com>, 2019 # Tor Project <support-team-private(a)lists.torproject.org>, 2019 # erinm, 2019 +# Thet Htut <tissueball(a)protonmail.com>, 2021 # msgid "" msgstr "" -"Last-Translator: erinm, 2019\n" +"Last-Translator: Thet Htut <tissueball(a)protonmail.com>, 2021\n" "Language-Team: Burmese (https://www.transifex.com/otf/teams/1519/my/)\n" "Language: my\n" "Plural-Forms: nplurals=1; plural=0;\n" @@ -700,7 +701,7 @@ msgstr "" #: tmp/cache_locale/92/92eb639bc328f3dd569fa22b60c4360b6fe38f1a4cd80a14fce862d91bd765cb.php:57 msgid "Sign Up" -msgstr "" +msgstr "အကောင့်အသစ်ဖွင့်မယ်" #: tmp/cache_locale/92/92eb639bc328f3dd569fa22b60c4360b6fe38f1a4cd80a14fce862d91bd765cb.php:65 msgid "Donate FAQs"

1 0