September 2020 - tbb-commits - lists.torproject.org

[tor-browser/tor-browser-81.0b9-10.0-1] fixup! Bug 31740: Remove some unnecessary RemoteSettings instances
by gk＠torproject.org 17 Sep '20

17 Sep '20

commit 7f647b0fc5312b64e5b78291691bb0f6c156dc5d Author: Alex Catarineu <acat(a)torproject.org> Date: Wed Sep 16 19:52:45 2020 +0200 fixup! Bug 31740: Remove some unnecessary RemoteSettings instances addons.json is not used anymore with v3 blocklisting enabled, so we don't add it while we are at it. Closes tor-browser#40128. --- services/settings/dumps/blocklists/moz.build | 7 ++++++- 1 file changed, 6 insertions(+), 1 deletion(-) diff --git a/services/settings/dumps/blocklists/moz.build b/services/settings/dumps/blocklists/moz.build index 3ba9ba4980a8..dd0bad30f19a 100644 --- a/services/settings/dumps/blocklists/moz.build +++ b/services/settings/dumps/blocklists/moz.build @@ -8,9 +8,14 @@ with Files('**'): BUG_COMPONENT = ('Toolkit', 'Blocklist Implementation') # The addons blocklist is also in mobile/android/installer/package-manifest.in -FINAL_TARGET_FILES.defaults.settings.blocklists += ['addons.json', +FINAL_TARGET_FILES.defaults.settings.blocklists += ['addons-bloomfilters.json', 'gfx.json', 'plugins.json'] +FINAL_TARGET_FILES.defaults.settings.blocklists['addons-bloomfilters'] += [ + 'addons-bloomfilters/addons-mlbf.bin', + 'addons-bloomfilters/addons-mlbf.bin.meta.json' +] + if CONFIG['MOZ_BUILD_APP'] == 'browser': DIST_SUBDIR = 'browser'

1 0

[tor-browser-build/master] Bug 40095: Better match the APK file for signing
by gk＠torproject.org 17 Sep '20

17 Sep '20

commit bd265ab3df66007a581eeb48b2468c7367955f72 Author: Georg Koppen <gk(a)torproject.org> Date: Thu Sep 17 07:11:54 2020 +0000 Bug 40095: Better match the APK file for signing --- projects/tor-browser/build.android | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/projects/tor-browser/build.android b/projects/tor-browser/build.android index e349d88..e451e98 100644 --- a/projects/tor-browser/build.android +++ b/projects/tor-browser/build.android @@ -2,7 +2,7 @@ [% c("var/set_default_env") -%] ext_dir=assets/extensions qa_apk=[% dest_dir %]/[% c('filename') %]/tor-browser-[% c("version") %]-[% c("var/osname") %]-multi-qa.apk -apk=$rootdir/fenix/app-[% c("var/abi") %]*.apk +apk=$rootdir/fenix/app-[% c("var/abi") %]-*.apk tar xavf $rootdir/[% c('input_files_by_name/fenix') %]

1 0

[tor-browser/tor-browser-78.3.0esr-10.0-2] fixup! Bug 31740: Remove some unnecessary RemoteSettings instances
by gk＠torproject.org 17 Sep '20

17 Sep '20

commit ceb6469f568880dca13d01fd2edf66828f3bbf54 Author: Alex Catarineu <acat(a)torproject.org> Date: Wed Sep 16 19:52:45 2020 +0200 fixup! Bug 31740: Remove some unnecessary RemoteSettings instances addons.json is not used anymore with v3 blocklisting enabled, so we don't add it while we are at it. Closes tor-browser#40128. --- services/settings/dumps/blocklists/moz.build | 7 ++++++- 1 file changed, 6 insertions(+), 1 deletion(-) diff --git a/services/settings/dumps/blocklists/moz.build b/services/settings/dumps/blocklists/moz.build index 3ba9ba4980a8..dd0bad30f19a 100644 --- a/services/settings/dumps/blocklists/moz.build +++ b/services/settings/dumps/blocklists/moz.build @@ -8,9 +8,14 @@ with Files('**'): BUG_COMPONENT = ('Toolkit', 'Blocklist Implementation') # The addons blocklist is also in mobile/android/installer/package-manifest.in -FINAL_TARGET_FILES.defaults.settings.blocklists += ['addons.json', +FINAL_TARGET_FILES.defaults.settings.blocklists += ['addons-bloomfilters.json', 'gfx.json', 'plugins.json'] +FINAL_TARGET_FILES.defaults.settings.blocklists['addons-bloomfilters'] += [ + 'addons-bloomfilters/addons-mlbf.bin', + 'addons-bloomfilters/addons-mlbf.bin.meta.json' +] + if CONFIG['MOZ_BUILD_APP'] == 'browser': DIST_SUBDIR = 'browser'

1 0

[tor-browser/tor-browser-78.2.0esr-10.0-1] fixup! Bug 31740: Remove some unnecessary RemoteSettings instances
by gk＠torproject.org 17 Sep '20

17 Sep '20

commit 407f96829ec029942bf5e52b683dcf8c69bba225 Author: Alex Catarineu <acat(a)torproject.org> Date: Wed Sep 16 19:52:45 2020 +0200 fixup! Bug 31740: Remove some unnecessary RemoteSettings instances --- services/settings/dumps/blocklists/moz.build | 7 ++++++- 1 file changed, 6 insertions(+), 1 deletion(-) diff --git a/services/settings/dumps/blocklists/moz.build b/services/settings/dumps/blocklists/moz.build index 3ba9ba4980a8..dd0bad30f19a 100644 --- a/services/settings/dumps/blocklists/moz.build +++ b/services/settings/dumps/blocklists/moz.build @@ -8,9 +8,14 @@ with Files('**'): BUG_COMPONENT = ('Toolkit', 'Blocklist Implementation') # The addons blocklist is also in mobile/android/installer/package-manifest.in -FINAL_TARGET_FILES.defaults.settings.blocklists += ['addons.json', +FINAL_TARGET_FILES.defaults.settings.blocklists += ['addons-bloomfilters.json', 'gfx.json', 'plugins.json'] +FINAL_TARGET_FILES.defaults.settings.blocklists['addons-bloomfilters'] += [ + 'addons-bloomfilters/addons-mlbf.bin', + 'addons-bloomfilters/addons-mlbf.bin.meta.json' +] + if CONFIG['MOZ_BUILD_APP'] == 'browser': DIST_SUBDIR = 'browser'

1 0

[tor-browser-build/master] Pick up rbm fix for rbm#40004 and rbm#40003
by gk＠torproject.org 16 Sep '20

16 Sep '20

commit 3d671cceaa49badbbc975114e3a2fe942fdc4eda Author: Georg Koppen <gk(a)torproject.org> Date: Wed Sep 16 19:27:30 2020 +0000 Pick up rbm fix for rbm#40004 and rbm#40003 --- rbm | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/rbm b/rbm index ee2d60d..a32239d 160000 --- a/rbm +++ b/rbm @@ -1 +1 @@ -Subproject commit ee2d60d8274fe3b88454683eb11b1d76981b6c46 +Subproject commit a32239ddb1f465115cb4a8bb9f4b853c149506f3

1 0

[rbm/master] Bug 40004: Improve cache in project_config
by gk＠torproject.org 16 Sep '20

16 Sep '20

commit a32239ddb1f465115cb4a8bb9f4b853c149506f3 Author: Nicolas Vigier <boklm(a)torproject.org> Date: Mon Sep 14 15:40:10 2020 +0200 Bug 40004: Improve cache in project_config --- lib/RBM.pm | 18 +++++++----------- 1 file changed, 7 insertions(+), 11 deletions(-) diff --git a/lib/RBM.pm b/lib/RBM.pm index 6277de4..825502a 100644 --- a/lib/RBM.pm +++ b/lib/RBM.pm @@ -206,19 +206,16 @@ sub confkey_str { sub project_config { my ($project, $name, $options) = @_; - CORE::state $cache; + CORE::state %config_cache; my $res; my $error_if_undef = $options->{error_if_undef}; - my $cache_save = $cache; - if ($options) { - $options = {%$options, error_if_undef => 0}; - my %ignore_options = map { $_ => 1 } qw(error_if_undef step); - $cache = {} if grep { !$ignore_options{$_} } keys %$options; - } + $options = {%$options, error_if_undef => 0} if $options; + my $cache_id = pp($config->{run}) + . pp({ %{$config->{opt}}, $options ? %$options : () }); my $name_str = ref $name eq 'ARRAY' ? join '/', @$name : $name; my $step = $config->{step}; - if (exists $cache->{$project}{$step}{$name_str}) { - $res = $cache->{$project}{$step}{$name_str}; + if (exists $config_cache{$project}{$step}{$name_str}{$cache_id}) { + $res = $config_cache{$project}{$step}{$name_str}{$cache_id}; goto FINISH; } $name = [ split '/', $name ] unless ref $name eq 'ARRAY'; @@ -233,10 +230,9 @@ sub project_config { $res = process_template($project, $res, confkey_str($name) eq 'output_dir' ? '.' : undef); } - $cache->{$project}{$step}{$name_str} = $res; + $config_cache{$project}{$step}{$name_str}{$cache_id} = $res; $config->{opt} = $opt_save; FINISH: - $cache = $cache_save; if (!defined($res) && $error_if_undef) { my $msg = $error_if_undef eq '1' ? "Option " . confkey_str($name) . " is undefined"

1 0

[tor-browser-build/master] Bug 40094: Bring back torbrowser-android-* targets for Rust
by sysrqb＠torproject.org 16 Sep '20

16 Sep '20

commit e8ff6b182dcd9d721ec97473051bda48d36d822e Author: Georg Koppen <gk(a)torproject.org> Date: Wed Sep 16 16:54:21 2020 +0000 Bug 40094: Bring back torbrowser-android-* targets for Rust Apparently we can't just replace the torbrowser-android-* targets with android-* ones when including the Rust compilers for application-services. Thus, we revert that part of the patch for #40070. See: #40094 for more details. --- projects/application-services/config | 9 +++++---- 1 file changed, 5 insertions(+), 4 deletions(-) diff --git a/projects/application-services/config b/projects/application-services/config index 0560872..336de62 100644 --- a/projects/application-services/config +++ b/projects/application-services/config @@ -23,22 +23,23 @@ input_files: - project: container-image - project: '[% c("var/compiler") %]' name: '[% c("var/compiler") %]' + # We need the torbrowser-* targets for Rust, see: #40094. - project: fenix-rust name: rust-armv7 target_prepend: - - android-armv7 + - torbrowser-android-armv7 - project: fenix-rust name: rust-aarch64 target_prepend: - - android-aarch64 + - torbrowser-android-aarch64 - project: fenix-rust name: rust-x86 target_prepend: - - android-x86 + - torbrowser-android-x86 - project: fenix-rust name: rust-x86_64 target_prepend: - - android-x86_64 + - torbrowser-android-x86_64 - project: nss name: nss-armv7 target_prepend:

1 0

[tor-browser-build/master] Merge remote-tracking branch 'gkgl/bug_40094'
by sysrqb＠torproject.org 16 Sep '20

16 Sep '20

commit 6cbd373aad047d53032170be4a3da19a8c49ab8f Merge: 47e2748 e8ff6b1 Author: Matthew Finkel <sysrqb(a)torproject.org> Date: Wed Sep 16 17:15:21 2020 +0000 Merge remote-tracking branch 'gkgl/bug_40094' projects/application-services/config | 9 +++++---- 1 file changed, 5 insertions(+), 4 deletions(-)

1 0

[tor-browser-build/master] Minor ChangeLog fixups
by sysrqb＠torproject.org 16 Sep '20

16 Sep '20

commit 47e2748ac843e06ab7f38b0363f3df05cfbc993f Author: Matthew Finkel <sysrqb(a)torproject.org> Date: Wed Sep 16 15:31:39 2020 +0000 Minor ChangeLog fixups --- projects/tor-browser/Bundle-Data/Docs/ChangeLog.txt | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/projects/tor-browser/Bundle-Data/Docs/ChangeLog.txt b/projects/tor-browser/Bundle-Data/Docs/ChangeLog.txt index b0cdf08..c13d834 100644 --- a/projects/tor-browser/Bundle-Data/Docs/ChangeLog.txt +++ b/projects/tor-browser/Bundle-Data/Docs/ChangeLog.txt @@ -20,12 +20,12 @@ Tor Browser 10.0a7 -- September 14 2020 * Bug 40031: Add licenses for kcp-go and smux. [tor-browser-build] * Bug 40045: Fix complete .mar file creation for dmg2mar [tor-browser-build] * Bug 40065: Bump debootstrap-image ubuntu_version to 20.04.1 [tor-browser-build] - * Bug 40087: Deterministically add HTTPS Everywhere into omni.ja - * Bug 40090: NSIS 3.06.1 based builds are not reproducible anymore + * Bug 40087: Deterministically add HTTPS Everywhere into omni.ja [tor-browser-build] * Windows * Bug 40052: Bump NSIS to 3.06.1 [tor-browser-build] * Bug 40071: Be explicit about no SEH with mingw-w64 on 32bit systems [tor-browser-build] * Bug 40077: Don't pass --no-insert-timestamp when building Firefox [tor-browser-build] + * Bug 40090: NSIS 3.06.1 based builds are not reproducible anymore [tor-browser-build] Tor Browser 10.0a6 -- August 26 2020 * All Platforms

1 0

[tor-browser/tor-browser-78.2.0esr-10.0-1] fixup! Bug 10760: Integrate TorButton to TorBrowser core
by sysrqb＠torproject.org 15 Sep '20

15 Sep '20

commit 7b9d33cf056c87ed10023f2d60e2021e2b040b32 Author: Matthew Finkel <sysrqb(a)torproject.org> Date: Tue Sep 15 23:41:01 2020 +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 c18489972abe..4e67ee2ef26e 160000 --- a/toolkit/torproject/torbutton +++ b/toolkit/torproject/torbutton @@ -1 +1 @@ -Subproject commit c18489972abef8b449ad8b53356cda5e3aea601b +Subproject commit 4e67ee2ef26e28da0f02a0e43e22a61ee33c6d4d

1 0