July 2021 - tbb-commits - lists.torproject.org

[tor-browser-build/maint-10.5] Add/fix ChangeLog entries
by sysrqb＠torproject.org 06 Jul '21

06 Jul '21

commit bfc240b015e096ea6c9927f8be032528bc321e4f Author: Matthew Finkel <sysrqb(a)torproject.org> Date: Tue Jul 6 01:49:00 2021 +0000 Add/fix ChangeLog entries --- projects/tor-browser/Bundle-Data/Docs/ChangeLog.txt | 4 +++- 1 file changed, 3 insertions(+), 1 deletion(-) diff --git a/projects/tor-browser/Bundle-Data/Docs/ChangeLog.txt b/projects/tor-browser/Bundle-Data/Docs/ChangeLog.txt index 454d32d..04ad87d 100644 --- a/projects/tor-browser/Bundle-Data/Docs/ChangeLog.txt +++ b/projects/tor-browser/Bundle-Data/Docs/ChangeLog.txt @@ -1,7 +1,7 @@ Tor Browser 10.5 -- July 6 2021 * All Platforms * Update NoScript to 11.2.9 - * Update Tor Launcher to 0.2.29 + * Update Tor Launcher to 0.2.30 * Translations update * Bug 25483: Provide Snowflake based on Pion for Windows, macOS, and Linux * Bug 33761: Remove unnecessary snowflake dependencies @@ -20,6 +20,7 @@ Tor Browser 10.5 -- July 6 2021 * Bug 40011: Rename tor-browser-brand.ftl to brand.ftl [torbutton] * Bug 40012: Fix about:tor not loading some images in 82 [torbutton] * Bug 40138: Move our primary nightly MAR signing key to tor-browser [tor-browser-build] + * Bug 40209: Implement Basic Crypto Safety [tor-browser] * Bug 40428: Correct minor Cryptocurrency warning string typo [tor-browser] * Bug 40429: Update Onboarding for 10.5 [tor-browser] * Bug 40455: Block or recover background requests after bootstrap [tor-browser] @@ -269,6 +270,7 @@ Tor Browser 10.5a11 -- February 23 2021 * Windows + OS X + Linux * Update Firefox to 78.8.0esr * Bug 40029: Create survey banner on about:tor for snowflake [torbutton] + * Bug 40209: Implement Basic Crypto Safety [tor-browser] * OS X + Linux * Update HTTPS Everywhere to 2021.1.27 * Bug 40212: Bump version of snowflake and webrtc [tor-browser-build]

1 0

[tor-browser-build/master] Bug 40323: Remove unused gomobile project
by boklm＠torproject.org 05 Jul '21

05 Jul '21

commit 90d65bdd8e311d0114e3347270e70ed007e409f5 Author: Georg Koppen <gk(a)torproject.org> Date: Mon Jul 5 08:43:52 2021 +0000 Bug 40323: Remove unused gomobile project --- ...BILE_TMPDIR-env-variable-is-defined-use-t.patch | 35 ---------------------- projects/gomobile/config | 33 -------------------- projects/goxexp/config | 19 ------------ projects/goximage/config | 28 ----------------- 4 files changed, 115 deletions(-) diff --git a/projects/gomobile/0001-If-the-GOMOBILE_TMPDIR-env-variable-is-defined-use-t.patch b/projects/gomobile/0001-If-the-GOMOBILE_TMPDIR-env-variable-is-defined-use-t.patch deleted file mode 100644 index 770b22a..0000000 --- a/projects/gomobile/0001-If-the-GOMOBILE_TMPDIR-env-variable-is-defined-use-t.patch +++ /dev/null @@ -1,35 +0,0 @@ -From 188307b6acd5003e82cb68872da9463f5f707515 Mon Sep 17 00:00:00 2001 -From: Nicolas Vigier <boklm(a)torproject.org> -Date: Thu, 27 Jun 2019 12:46:38 +0200 -Subject: [PATCH] If the GOMOBILE_TMPDIR env variable is defined, use that as - tmpdir - -Having the option to select a fixed tmpdir makes it possible to have -reproducible builds, as the build directory is embedded in the generated -executables. ---- - cmd/gomobile/env.go | 11 ++++++++--- - 1 file changed, 8 insertions(+), 3 deletions(-) - -diff --git a/cmd/gomobile/env.go b/cmd/gomobile/env.go -index 471b009..b97141b 100644 ---- a/cmd/gomobile/env.go -+++ b/cmd/gomobile/env.go -@@ -61,9 +61,14 @@ func buildEnvInit() (cleanup func(), err error) { - tmpdir = "$WORK" - cleanupFn = func() {} - } else { -- tmpdir, err = ioutil.TempDir("", "gomobile-work-") -- if err != nil { -- return nil, err -+ gomobile_tmpdir := os.Getenv("GOMOBILE_TMPDIR") -+ if gomobile_tmpdir != "" { -+ tmpdir = gomobile_tmpdir -+ } else { -+ tmpdir, err = ioutil.TempDir("", "gomobile-work-") -+ if err != nil { -+ return nil, err -+ } - } - } - if buildX { diff --git a/projects/gomobile/config b/projects/gomobile/config deleted file mode 100644 index 9dbfc29..0000000 --- a/projects/gomobile/config +++ /dev/null @@ -1,33 +0,0 @@ -# vim: filetype=yaml sw=2 -version: '[% c("abbrev") %]' -git_url: https://github.com/golang/mobile -git_hash: 92f3b9caf7ba8f4f9c10074225afcba0cba47a62 -filename: '[% project %]-[% c("version") %]-[% c("var/osname") %]-[% c("var/build_id") %].tar.gz' - -build: '[% c("projects/go/var/build_go_lib") %]' - -var: - container: - use_container: 1 - no_crosscompile: 1 - go_lib: golang.org/x/mobile - go_lib_deps: - - goximage - - goxexp - go_lib_install: - - golang.org/x/mobile/cmd/gobind - - golang.org/x/mobile/cmd/gomobile - build_go_lib_pre: | - [% pc(c('var/compiler'), 'var/setup', { compiler_tarfile => c('input_files_by_name/' _ c('var/compiler')) }) %] - -input_files: - - project: container-image - - name: go - project: go - - name: goximage - project: goximage - - name: goxexp - project: goxexp - - name: '[% c("var/compiler") %]' - project: '[% c("var/compiler") %]' - - filename: 0001-If-the-GOMOBILE_TMPDIR-env-variable-is-defined-use-t.patch diff --git a/projects/goxexp/config b/projects/goxexp/config deleted file mode 100644 index c81a65f..0000000 --- a/projects/goxexp/config +++ /dev/null @@ -1,19 +0,0 @@ -# vim: filetype=yaml sw=2 -version: '[% c("abbrev") %]' -git_url: https://github.com/golang/exp -git_hash: a1d7652674e8f269b17d9be90d3c4c1d0e8830e8 -filename: '[% project %]-[% c("version") %]-[% c("var/osname") %]-[% c("var/build_id") %].tar.gz' - -build: '[% c("projects/go/var/build_go_lib") %]' - -var: - container: - use_container: 1 - no_crosscompile: 1 - go_lib: golang.org/x/exp - go_lib_install: [] - -input_files: - - project: container-image - - name: go - project: go diff --git a/projects/goximage/config b/projects/goximage/config deleted file mode 100644 index 308a1ba..0000000 --- a/projects/goximage/config +++ /dev/null @@ -1,28 +0,0 @@ -# vim: filetype=yaml sw=2 -version: '[% c("abbrev") %]' -git_url: https://github.com/golang/image -git_hash: 0694c2d4d067f97ebef574d63a763ee8ab559da7 -filename: '[% project %]-[% c("version") %]-[% c("var/osname") %]-[% c("var/build_id") %].tar.gz' - -build: '[% c("projects/go/var/build_go_lib") %]' - -var: - container: - use_container: 1 - no_crosscompile: 1 - go_lib: golang.org/x/image - go_lib_install: - - golang.org/x/image/webp - - golang.org/x/image/bmp - - golang.org/x/image/draw - - golang.org/x/image/font - - golang.org/x/image/math/fixed - - golang.org/x/image/math/f32 - - golang.org/x/image/math/f64 - - golang.org/x/image/vp8 - - golang.org/x/image/vp8l - -input_files: - - project: container-image - - name: go - project: go

1 0

[tor-browser-build/master] Pick up fix for rbm#28396
by gk＠torproject.org 05 Jul '21

05 Jul '21

commit abdc64436e011c67fe1c501c65ab1cd1c6010411 Author: Georg Koppen <gk(a)torproject.org> Date: Mon Jul 5 07:51:38 2021 +0000 Pick up fix for rbm#28396 --- rbm | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/rbm b/rbm index c700693..adb7dca 160000 --- a/rbm +++ b/rbm @@ -1 +1 @@ -Subproject commit c700693be807efa2a1f944798a49edf021087cdf +Subproject commit adb7dcabb13b4345d2c4a9a1ef229105cf0215b9

1 0

[rbm/master] Merge remote-tracking branch 'gitlab/merge-requests/23'
by gk＠torproject.org 05 Jul '21

05 Jul '21

commit adb7dcabb13b4345d2c4a9a1ef229105cf0215b9 Merge: c700693 8238f07 Author: Georg Koppen <gk(a)torproject.org> Date: Sun Jul 4 20:29:37 2021 +0000 Merge remote-tracking branch 'gitlab/merge-requests/23' doc/rbm_config.asc | 7 +++++-- lib/RBM.pm | 19 +++++++------------ lib/RBM/DefaultConfig.pm | 13 +++++++++++-- 3 files changed, 23 insertions(+), 16 deletions(-)

1 0

[rbm/master] Bug 28396: Create tmp files in rbm_tmp_dir instead of tmp_dir
by gk＠torproject.org 05 Jul '21

05 Jul '21

commit 8238f07edf404b82047fb09b76262e9a674ab146 Author: Nicolas Vigier <boklm(a)torproject.org> Date: Thu Jun 4 20:38:30 2020 +0200 Bug 28396: Create tmp files in rbm_tmp_dir instead of tmp_dir rbm_tmp_dir is a directory inside tmp_dir that is automatically removed when rbm exits. We also fix an issue in urlget when used within the exec script of an input file. In this case the input_files_id was depending on the value of tmp_dir because it is used in urlget. We fix that be setting getting_input_files_id when computing input_files ids, so that urlget can avoid using tmp_dir in this case. --- doc/rbm_config.asc | 7 +++++-- lib/RBM.pm | 19 +++++++------------ lib/RBM/DefaultConfig.pm | 13 +++++++++++-- 3 files changed, 23 insertions(+), 16 deletions(-) diff --git a/doc/rbm_config.asc b/doc/rbm_config.asc index 4c65a73..09776e4 100644 --- a/doc/rbm_config.asc +++ b/doc/rbm_config.asc @@ -223,8 +223,11 @@ input_files_id:: filename to trigger a rebuild when any of its input files is changed. This identifier is based on: the +input_file_id+ option of an input file if it is present, the +filename+ for an input - file of type +project+, and the +filename+ and the sha256sum of - the file for any other type of input file. + file of type +project+, the value of +exec+ for an input file + of type +exec+, and the +filename+ and the sha256sum of the file + for any other type of input file. In the case of an input file + of type +exec+, the value of +exec+ is computed with +getting_id+ + set to true. input_files_paths:: The value of this option is an array of all the paths of input diff --git a/lib/RBM.pm b/lib/RBM.pm index d2aeab2..52b90ed 100644 --- a/lib/RBM.pm +++ b/lib/RBM.pm @@ -270,17 +270,11 @@ sub exit_error { exit (exists $_[1] ? $_[1] : 1); } -sub get_tmp_dir { - my ($project, $options) = @_; - my $tmp_dir = project_config($project, 'tmp_dir', $options); - make_path($tmp_dir); - return $tmp_dir; -} - sub set_git_gpg_wrapper { my ($project) = @_; my $w = project_config($project, 'gpg_wrapper'); - my (undef, $tmp) = File::Temp::tempfile(DIR => get_tmp_dir($project)); + my (undef, $tmp) = File::Temp::tempfile( + DIR => project_config($project, 'rbm_tmp_dir')); path($tmp)->spew_utf8($w); chmod 0700, $tmp; system('git', 'config', 'gpg.program', $tmp) == 0 @@ -342,7 +336,7 @@ sub git_tag_sign_id { sub file_sign_id { my ($project, $options) = @_; my (undef, $gpg_wrapper) = File::Temp::tempfile(DIR => - get_tmp_dir($project, $options)); + project_config($project, 'rbm_tmp_dir', $options)); path($gpg_wrapper)->spew_utf8(project_config($project, 'gpg_wrapper', $options)); chmod 0700, $gpg_wrapper; my ($stdout, $stderr, $success, $exit_code) = @@ -576,7 +570,7 @@ sub maketar { || exit_error 'Error running git archive.'; if (project_config($project, 'git_submodule', $options)) { my $tmpdir = File::Temp->newdir( - get_tmp_dir($project, $options) . '/rbm-XXXXX'); + project_config($project, 'rbm_tmp_dir', $options) . '/rbm-XXXXX'); my ($stdout, $stderr, $success, $exit_code) = capture_exec('git', 'checkout', $commit_hash); exit_error "Cannot checkout $commit_hash: $stderr" unless $success; @@ -760,7 +754,8 @@ sub input_file_id { return $t->('input_file_id') if $input_file->{input_file_id}; return $input_file->{project} . ':' . $filename if $input_file->{project}; return $filename . ':' . $t->('sha256sum') if $input_file->{sha256sum}; - return $filename . ':' . sha256_hex($t->('exec', { norec => { output_dir => '/out' } })) + my $opts = { norec => { output_dir => '/out', getting_id => 1, }}; + return $filename . ':' . sha256_hex($t->('exec', $opts)) if $input_file->{exec}; return input_file_id_hash($fname, $filename); } @@ -1029,7 +1024,7 @@ sub build_run { valid_project($project); $options = { %$options, build_id => Data::UUID->new->create_str }; my $old_cwd = getcwd; - my $tmpdir = File::Temp->newdir(get_tmp_dir($project, $options) + my $tmpdir = File::Temp->newdir(project_config($project, 'rbm_tmp_dir', $options) . '/rbm-XXXXX'); my $srcdir = $tmpdir->dirname; my @cfiles; diff --git a/lib/RBM/DefaultConfig.pm b/lib/RBM/DefaultConfig.pm index c19d160..370f755 100644 --- a/lib/RBM/DefaultConfig.pm +++ b/lib/RBM/DefaultConfig.pm @@ -14,6 +14,7 @@ use RBM; use Cwd qw(getcwd); use IO::CaptureOutput qw(capture_exec); use File::Temp; +use File::Path qw(make_path); sub lsb_release { my ($project, $options) = @_; @@ -89,8 +90,9 @@ sub rbm_tmp_dir { my ($project, $options) = @_; CORE::state $rbm_tmp_dir; return $rbm_tmp_dir->dirname if $rbm_tmp_dir; - my $tmp_dir = RBM::get_tmp_dir($project, $options) + my $tmp_dir = RBM::project_config($project, 'tmp_dir', $options) || RBM::exit_error('No tmp_dir specified'); + make_path($tmp_dir); $rbm_tmp_dir = File::Temp->newdir(TEMPLATE => 'rbm-XXXXXX', DIR => $tmp_dir); return $rbm_tmp_dir->dirname; @@ -397,7 +399,14 @@ OPT_END urlget => <<URLGET, #!/bin/sh set -e -tmpfile="\$(mktemp -p [% shell_quote(c("tmp_dir")) %])" +[% + IF c("getting_id"); + SET rbm_tmp_dir = '/tmp'; + ELSE; + SET rbm_tmp_dir = c("rbm_tmp_dir"); + END; + -%] +tmpfile="\$(mktemp -p [% shell_quote(rbm_tmp_dir) %])" wget -O"\$tmpfile" [% shell_quote(c("URL")) %] mv -f "\$tmpfile" [% shell_quote(dest_dir _ "/" _ c("filename")) %] URLGET

1 0

[tor-browser-build/master] Bug 40312: Update components for mozilla90: fenix part
by sysrqb＠torproject.org 02 Jul '21

02 Jul '21

1 0

[tor-browser-build/master] Bug 40314: Add commands to check for needed toolchain updates
by sysrqb＠torproject.org 02 Jul '21

02 Jul '21

commit 7b518eaf06e16537fd8447f0a0cf0fc42efa1c98 Author: Nicolas Vigier <boklm(a)torproject.org> Date: Wed Jun 23 17:43:07 2021 +0200 Bug 40314: Add commands to check for needed toolchain updates The following commands can be used to check needed toolchain updates to build Firefox for Linux, Windows or macOS: make list_toolchain_updates-firefox-linux make list_toolchain_updates-firefox-windows make list_toolchain_updates-firefox-macos --- Makefile | 9 ++ projects/firefox/config | 10 ++ projects/firefox/list_toolchain_updates_checks | 194 +++++++++++++++++++++++++ projects/macosx-toolchain/config | 6 +- 4 files changed, 216 insertions(+), 3 deletions(-) diff --git a/Makefile b/Makefile index 94010c1..42ac282 100644 --- a/Makefile +++ b/Makefile @@ -204,6 +204,15 @@ dmg2mar-alpha: submodule-update list_toolchain_updates-fenix: submodule-update $(rbm) build fenix --step list_toolchain_updates --target nightly --target torbrowser-android-armv7 +list_toolchain_updates-firefox-linux: submodule-update + $(rbm) build firefox --step list_toolchain_updates --target nightly --target torbrowser-linux-x86_64 + +list_toolchain_updates-firefox-windows: submodule-update + $(rbm) build firefox --step list_toolchain_updates --target nightly --target torbrowser-windows-x86_64 + +list_toolchain_updates-firefox-macos: submodule-update + $(rbm) build firefox --step list_toolchain_updates --target nightly --target torbrowser-osx-x86_64 + list_toolchain_updates-android-components: submodule-update $(rbm) build android-components --step list_toolchain_updates --target nightly --target torbrowser-android-armv7 diff --git a/projects/firefox/config b/projects/firefox/config index e5ba431..f99ecef 100644 --- a/projects/firefox/config +++ b/projects/firefox/config @@ -39,6 +39,16 @@ steps: nightly: version: '[% c("abbrev") %]' + list_toolchain_updates: + git_url: https://github.com/mozilla/gecko-dev.git + # < 91.0a1 + git_hash: f351e19360729b351bfc7c1386d6e4ca4ea676e2 + tag_gpg_id: 0 + input_files: [] + var: + container: + use_container: 0 + targets: release: var: diff --git a/projects/firefox/list_toolchain_updates_checks b/projects/firefox/list_toolchain_updates_checks new file mode 100644 index 0000000..6c8b88e --- /dev/null +++ b/projects/firefox/list_toolchain_updates_checks @@ -0,0 +1,194 @@ +#!/bin/bash + +# rust +[% IF c("var/linux"); + SET toolchain_alias='linux64-rust'; + ELSIF c("var/windows"); + SET toolchain_alias='mingw32-rust'; + ELSIF c("var/osx"); + SET toolchain_alias='linux64-rust-macos'; + END; %] +read -d '' p << 'EOF' || true +my $d = YAML::XS::LoadFile('taskcluster/ci/toolchain/rust.yml'); +foreach my $t (keys %$d) { + if ($d->{$t}{run}{'toolchain-alias'} eq '[% toolchain_alias %]') { + my $channel; + foreach my $arg (@{$d->{$t}{run}{arguments}}) { + if ($arg eq '--channel') { + $channel = 1; + next; + } + if ($channel) { + print $arg; + exit; + } + } + } +} +EOF +needed=$(perl -MYAML::XS -e "$p") +current='[% pc("rust", "version") %]' +check_update_needed rust "$needed" "$current" + +# cbindgen +read -d '' p << 'EOF' || true +if (m/^\\s*cbindgen_min_version\\s*=\\s*Version\$"([^"]+)"\$/) { + print $1; + exit; +} +EOF +needed=$(cat build/moz.configure/bindgen.configure | perl -ne "$p") +current='[% pc("cbindgen", "version") %]' +check_update_needed cbindgen "$needed" "$current" + + +# nasm +read -d '' p << 'EOF' || true +if (m/^\\s*MODERN_NASM_VERSION\\s*=\\s*LooseVersion\$"([^"]+)"\$/) { + print $1; + exit; +} +EOF +needed=$(cat python/mozboot/mozboot/base.py | perl -ne "$p") +current='2.14' +check_update_needed nasm "$needed" "$current" + + +# clang +[% IF c("var/linux"); + SET toolchain_alias='linux64-clang'; + ELSIF c("var/windows"); + SET toolchain_alias='linux64-clang-mingw-x64'; + ELSIF c("var/osx"); + SET toolchain_alias='macosx64-clang'; + END; %] +read -d '' p << 'EOF' || true +my $d = YAML::XS::LoadFile('taskcluster/ci/toolchain/clang.yml'); +my $clang_toolchain; +foreach my $t (keys %$d) { + if ($d->{$t}{run}{'toolchain-alias'} eq '[% toolchain_alias %]') { + foreach my $fetch (@{$d->{$t}{fetches}{fetch}}) { + $clang_toolchain = $fetch if $fetch =~ m/^clang-.*/; + } + last; + } +} + +if (!$clang_toolchain) { + print STDERR "Error: could not find clang toolchain"; + exit 1; +} + +my $fetch = YAML::XS::LoadFile('taskcluster/ci/fetch/toolchains.yml'); +print $fetch->{$clang_toolchain}{fetch}{revision}; +EOF +needed=$(perl -MYAML::XS -e "$p") +current='[% pc("llvm-project", "git_hash") %]' +check_update_needed clang "$needed" "$current" + + +# node +read -d '' p << 'EOF' || true +if (m/^\\s*NODE_MIN_VERSION\\s*=\\s*StrictVersion\$"([^"]+)"\$/) { + print $1; + exit; +} +EOF +needed=$(cat python/mozbuild/mozbuild/nodeutil.py | perl -ne "$p") +current='[% pc("node", "version") %]' +check_update_needed node "$needed" "$current" + + +# python +read -d '' p << 'EOF' || true +if (m/find_python3_executable\\(min_version\\s*=\\s*"([^"]+)"/) { + print $1; + exit; +} +EOF +needed=$(cat build/moz.configure/init.configure | perl -ne "$p") +current=3.6.0 +check_update_needed python "$needed" "$current" + + +[% IF c("var/osx") %] +# macosx-sdk +read -d '' p << 'EOF' || true +my $d = YAML::XS::LoadFile('taskcluster/ci/toolchain/clang.yml'); +my $clang_toolchain; +foreach my $t (keys %$d) { + if ($d->{$t}{run}{'toolchain-alias'} eq 'macosx64-clang') { + foreach my $toolchain (@{$d->{$t}{fetches}{toolchain}}) { + if ($toolchain =~ m/^macosx64-sdk-(.+)$/) { + print $1; + exit; + } + } + last; + } +} +EOF +needed=$(perl -MYAML::XS -e "$p") +current='[% pc("macosx-toolchain", "version") %]' +check_update_needed macos-sdk "$needed" "$current" + +# End of macOS checks +[% END -%] + + +[% IF c("var/windows") %] +# mingw-w64 +read -d '' p << 'EOF' || true +my $d = YAML::XS::LoadFile('taskcluster/ci/fetch/toolchains.yml'); +print $d->{'mingw-w64'}{fetch}{revision}; +EOF +needed=$(perl -MYAML::XS -e "$p") +current='[% pc("mingw-w64", "git_hash") %]' +check_update_needed mingw-w64 "$needed" "$current" + + +# llvm-mingw +read -d '' p << 'EOF' || true +my $d = YAML::XS::LoadFile('taskcluster/ci/fetch/toolchains.yml'); +print $d->{'llvm-mingw'}{fetch}{revision}; +EOF +needed=$(perl -MYAML::XS -e "$p") +current='[% pc("llvm-mingw", "git_hash") %]' +check_update_needed llvm-mingw "$needed" "$current" + + +# fxc2 +read -d '' p << 'EOF' || true +my $d = YAML::XS::LoadFile('taskcluster/ci/fetch/toolchains.yml'); +print $d->{fxc2}{fetch}{revision}; +EOF +needed=$(perl -MYAML::XS -e "$p") +current='[% pc("fxc2", "git_hash") %]' +check_update_needed fxc2 "$needed" "$current" + +# End of Windows checks +[% END -%] + + +[% IF c("var/rlbox") %] +# wasi-sdk +read -d '' p << 'EOF' || true +my $d = YAML::XS::LoadFile('taskcluster/ci/fetch/toolchains.yml'); +print $d->{'wasi-sdk'}{fetch}{revision}; +EOF +needed=$(perl -MYAML::XS -e "$p") +current='[% pc("wasi-sysroot", "git_hash") %]' +check_update_needed wasi-sdk "$needed" "$current" + + +# lucetc +read -d '' p << 'EOF' || true +my $d = YAML::XS::LoadFile('taskcluster/ci/fetch/toolchains.yml'); +print $d->{'lucetc-source'}{fetch}{revision}; +EOF +needed=$(perl -MYAML::XS -e "$p") +current='[% pc("lucetc", "git_hash") %]' +check_update_needed lucetc "$needed" "$current" + +# End RLBox +[% END -%] diff --git a/projects/macosx-toolchain/config b/projects/macosx-toolchain/config index 95f650b..5f9a109 100644 --- a/projects/macosx-toolchain/config +++ b/projects/macosx-toolchain/config @@ -1,6 +1,6 @@ # vim: filetype=yaml sw=2 -filename: '[% project %]-[% c("version") %]-[% c("var/build_id") %].tar.gz' -version: 10.11-1 +filename: '[% project %]-[% c("version") %]-1-[% c("var/build_id") %].tar.gz' +version: 10.11 var: container: use_container: 1 @@ -29,7 +29,7 @@ input_files: # Instructions on how to create the SDK tarball can be found at: # build/macosx/cross-mozconfig.common - name: SDK - URL: https://people.torproject.org/~gk/mirrors/sources/MacOSX10.11.sdk.tar.bz2 + URL: 'https://people.torproject.org/~gk/mirrors/sources/MacOSX[% c("version") %].sdk.tar.bz2' sha256sum: d11e410d757d023be66d2fe7eaa85a1d232da3ac04f177eff3d8b8275cd9ffca - name: clang-source project: clang-source

1 0

[tor-browser-build/master] Bug 40321: Check glean_parser version needed by application-services
by sysrqb＠torproject.org 02 Jul '21

02 Jul '21

commit 12d27baf5b08382af73746ed33829ef36d20fe31 Author: Nicolas Vigier <boklm(a)torproject.org> Date: Tue Jun 29 18:51:41 2021 +0200 Bug 40321: Check glean_parser version needed by application-services --- projects/application-services/config | 15 +++++++++++++ .../list_toolchain_updates_checks | 25 +++++++++++----------- 2 files changed, 28 insertions(+), 12 deletions(-) diff --git a/projects/application-services/config b/projects/application-services/config index 93f8f5c..c76afe1 100644 --- a/projects/application-services/config +++ b/projects/application-services/config @@ -99,6 +99,21 @@ steps: var: container: use_container: 0 + get_android_components_version: | + #!/bin/bash + read -d '' p << 'EOF' || true + if (m/^\\s*android_components_version\\s=\\s'([^']*)'/) { + print $1; + exit; + } + EOF + perl -ne "$p" < build.gradle + android_components_version: '[% exec(c("var/get_android_components_version")) %]' + glean_version: '[% pc("android-components", "var/glean_version", { git_hash => "v" _ c("var/android_components_version") }) %]' + input_files: + - name: glean + project: glean + pkg_type: src get_gradle_dependencies_list: filename: 'gradle-dependencies-list-[% c("version") %].txt' diff --git a/projects/application-services/list_toolchain_updates_checks b/projects/application-services/list_toolchain_updates_checks index b028d10..f80eda8 100644 --- a/projects/application-services/list_toolchain_updates_checks +++ b/projects/application-services/list_toolchain_updates_checks @@ -36,6 +36,19 @@ current=21 check_update_needed minSdkVersion "$needed" "$current" +# glean_parser +read -d '' p << 'EOF' || true +if (m/^\\s*"glean_parser==([^"]+)",/) { + print $1; + exit; +} +EOF +tar xf $rootdir/[% c('input_files_by_name/glean') %] +needed=$(cat glean-[% c("var/glean_version") %]/glean-core/python/setup.py | perl -ne "$p") +current='[% c("var/glean_parser") %]' +check_update_needed glean_parser "$needed" "$current" + + # gradle read -d '' p << 'EOF' || true if (m|distributionUrl=https\\\\://services.gradle.org/distributions/gradle-(.*)…) { @@ -83,15 +96,3 @@ needed=$(cat build.gradle | perl -ne "$p") current='4.0.1' check_update_needed android-gradle-plugin "$needed" "$current" - -# android-components -read -d '' p << 'EOF' || true -if (m/^\\s*android_components_version\\s=\\s'([^']*)'/) { - print $1; - exit; -} -EOF -needed=$(cat build.gradle | perl -ne "$p") -current=71.0.0 -check_update_needed android-components "$needed" "$current" -

1 0

[tor-browser-build/master] Bug 40312: Update components for mozilla90: GeckoView part
by sysrqb＠torproject.org 02 Jul '21

02 Jul '21

commit caf6a072f38d5c359e62151d62ebf7d09023e715 Author: Nicolas Vigier <boklm(a)torproject.org> Date: Fri Jun 18 12:48:27 2021 +0200 Bug 40312: Update components for mozilla90: GeckoView part --- projects/geckoview/config | 8 ++++---- projects/llvm-project/config | 4 ++-- projects/rust/config | 4 ++-- rbm.conf | 2 ++ 4 files changed, 10 insertions(+), 8 deletions(-) diff --git a/projects/geckoview/config b/projects/geckoview/config index c46901e..f3abddb 100644 --- a/projects/geckoview/config +++ b/projects/geckoview/config @@ -8,7 +8,7 @@ git_submodule: 1 gpg_keyring: torbutton.gpg var: - geckoview_version: 89.0 + geckoview_version: 90.0b12 torbrowser_branch: 10.5 copyright_year: '[% exec("git show -s --format=%ci").remove("-.*") %]' deps: @@ -138,9 +138,9 @@ steps: - torbrowser-android-x86_64 list_toolchain_updates: - git_url: https://github.com/mozilla/gecko-dev.git - # 90.0b9 - git_hash: 92485800ccb404788bfd215e59c3850b314d3905 + #git_url: https://github.com/mozilla/gecko-dev.git + # 90.0b12 + #git_hash: 5e8ffbe1bf6d448cb235cb0a64a56646a6537b22 tag_gpg_id: 0 input_files: [] var: diff --git a/projects/llvm-project/config b/projects/llvm-project/config index c6fa2d8..f901ecf 100644 --- a/projects/llvm-project/config +++ b/projects/llvm-project/config @@ -1,5 +1,5 @@ # vim: filetype=yaml sw=2 -version: 11.0.1 -git_hash: 43ff75f2c3feef64f9d73328230d34dac8832a91 +version: 12.0.0 +git_hash: d28af7c654d8db0b68c175db5ce212d74fb5e9bc git_url: https://github.com/llvm/llvm-project filename: '[% project %]-[% c("version") %]-[% c("var/build_id") %].tar.gz' diff --git a/projects/rust/config b/projects/rust/config index 4060488..b6e22d7 100644 --- a/projects/rust/config +++ b/projects/rust/config @@ -11,8 +11,8 @@ var: targets: android: var: - current_version: 1.51.0 - previous_version: 1.50.0 + current_version: 1.52.0 + previous_version: 1.51.0 arch_deps: - libssl-dev - pkg-config diff --git a/rbm.conf b/rbm.conf index 3a7cc8e..b9ec6e5 100644 --- a/rbm.conf +++ b/rbm.conf @@ -335,6 +335,8 @@ targets: deps: - build-essential - python + - python3 + - python3-distutils - automake - libtool - zip

1 0

[tor-browser-build/master] Bug 40312: Update components for mozilla90: glean part
by sysrqb＠torproject.org 02 Jul '21

02 Jul '21

commit 4736dad832fe34144bc504c846033265ad77d535 Author: Nicolas Vigier <boklm(a)torproject.org> Date: Tue Jun 29 18:56:58 2021 +0200 Bug 40312: Update components for mozilla90: glean part --- Makefile | 2 +- projects/glean/config | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/Makefile b/Makefile index 94010c1..a3393fc 100644 --- a/Makefile +++ b/Makefile @@ -214,7 +214,7 @@ list_toolchain_updates-geckoview: submodule-update $(rbm) build geckoview --step list_toolchain_updates --target nightly --target torbrowser-android-armv7 create_glean_deps_tarball: submodule-update - $(rbm)build glean --step create_glean_deps_tarball --target alpha --target torbrowser-android-armv7 + $(rbm) build glean --step create_glean_deps_tarball --target alpha --target torbrowser-android-armv7 create_glean_deps_tarball-with_torsocks: submodule-update $(rbm) build glean --step create_glean_deps_tarball --target alpha --target torbrowser-android-armv7 --target with_torsocks diff --git a/projects/glean/config b/projects/glean/config index 6fd6ce2..577199f 100644 --- a/projects/glean/config +++ b/projects/glean/config @@ -11,7 +11,7 @@ src: | steps: create_glean_deps_tarball: git_url: '' - version: 2.2.0 + version: 3.2.0 filename: 'glean-wheels-[% c("version") %].tar.xz' build_log: '-' var:

1 0