tbb-commits November 2019

tbb-commits@lists.torproject.org

3 participants
130 discussions

[rbm/master] Bug 27265: fix output_dir value in sub-projects
by gk＠torproject.org 28 Nov '19

28 Nov '19

commit 03d53fcb0444fe9d752719bfbb62e3658d15d26d Author: Nicolas Vigier <boklm(a)torproject.org> Date: Wed Aug 22 12:34:40 2018 +0200 Bug 27265: fix output_dir value in sub-projects In the build_pkg call in input_files, we were setting the output_dir option to the project's directory, causing this directory to be incorrectly used as the output directory in some cases. But there is no need to set output_dir at this point, so we can just remove it. We also introduce a new feature allowing to set options for the current project but not for the child projects listed in `input_files`. By default the options are applied recursively to all projects. If some options are defined under `norec/` then they are only applied on the current project. We use this feature in two places where we were setting the output_dir, which removes the need to reset it in two places. At the same time, we fix the `urlget()` call in input_files which was incorrectly ignoring options. --- doc/rbm_input_files.asc | 45 +++++++++++++++++++++++++++++++++++++++++++++ doc/rbm_templates.asc | 10 ++++++++++ lib/RBM.pm | 29 ++++++++++++++--------------- 3 files changed, 69 insertions(+), 15 deletions(-) diff --git a/doc/rbm_input_files.asc b/doc/rbm_input_files.asc index d56f125..de47638 100644 --- a/doc/rbm_input_files.asc +++ b/doc/rbm_input_files.asc @@ -143,6 +143,51 @@ array can be a string. In that case the string is the name of the option containing the file descriptor hash. This can be useful when you are using the same file in multiple projects. + +INHERITANCE OF PROJECTS OPTIONS +------------------------------- + +When defining a file of type +project+, the options defined in the ++input_files+ entry are transmitted to the child project. If this +project is also using other projects in its +input_files+ then the +options from the first +input_files+ entry are inherited. + +In this example, both project B and C are getting the definition of ++option1+: +---- +projects/A/config: + input_files: + - project: B + option1: value1 + +projects/B/config: + input_files: + - project: C + +projects/C/config: + input_files: [] +---- + +In some cases you might want to define options that only apply to the +first level of child projects. To do that you can define the options +under +norec+. In this example, only project B is getting the definition +of +option1+: +---- +projects/A/config: + input_files: + - project: B + norec: + option1: value1 + +projects/B/config: + input_files: + - project: C + +projects/C/config: + input_files: [] +---- + + EXAMPLES -------- diff --git a/doc/rbm_templates.asc b/doc/rbm_templates.asc index d34f3b2..2f72c94 100644 --- a/doc/rbm_templates.asc +++ b/doc/rbm_templates.asc @@ -69,6 +69,16 @@ c:: - 'as_array' : if set to 1, then return all matching results as an array reference, instead of only the first one. + - 'norec' : + this option is useful in the cases where the value of + an option depends on the input files of the current + project, for example to compute a hash based on the + input files. In +norec+ you can define options that + will apply to the current project, but will not be + applied on the child projects defined in the + +input_files+ section. For more details, you can read + the "Inheritance of projects options" section in + link:rbm_input_files.html[rbm_input_files(7)]. pc:: This variable is a function reference. It is the same as +c+, diff --git a/lib/RBM.pm b/lib/RBM.pm index 9659f16..4db951a 100644 --- a/lib/RBM.pm +++ b/lib/RBM.pm @@ -220,8 +220,8 @@ sub project_config { goto FINISH unless @$name; my $opt_save = $config->{opt}; $config->{opt} = { %{$config->{opt}}, %$options } if $options; - $res = config($project, $name, $options, ['opt'], ['run'], - ['projects', $project], ['local'], [], + $res = config($project, $name, $options, ['opt', 'norec'], ['opt'], + ['run'], ['projects', $project], ['local'], [], ['system'], ['default']); if (!$options->{no_tmpl} && defined($res) && !ref $res && !notmpl(confkey_str($name), $project)) { @@ -747,7 +747,7 @@ 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', { output_dir => '/out' })) + return $filename . ':' . sha256_hex($t->('exec', { norec => { output_dir => '/out' } })) if $input_file->{exec}; return input_file_id_hash($fname, $filename); } @@ -774,6 +774,7 @@ sub input_files { my $getfnames_noname = 0; my $input_files_id = ''; $options = {$options ? %$options : ()}; + $options->{norec} = {}; my $input_files = project_config($project, 'input_files', $options); goto RETURN_RES unless $input_files; my $proj_dir = rbm_path(project_config($project, 'projects_dir', $options)); @@ -789,8 +790,7 @@ sub input_files { next unless $input_file; my $t = sub { project_config($project, $_[0], {$options ? %$options : (), - %$input_file, output_dir => $src_dir, - $_[1] ? %{$_[1]} : ()}); + %$input_file, $_[1] ? %{$_[1]} : ()}); }; if ($input_file->{enable} && !$t->('enable')) { next; @@ -849,11 +849,10 @@ sub input_files { if ($input_file->{project}) { $proj_out_dir = rbm_path(project_step_config($t->('project'), 'output_dir', { %$options, step => $t->('pkg_type'), - origin_project => $project, - output_dir => undef, %$input_file })); + origin_project => $project, %$input_file })); } else { $proj_out_dir = rbm_path(project_config($project, 'output_dir', - { %$input_file, output_dir => undef })); + { %$options, %$input_file })); } create_dir($proj_out_dir); my $url = $t->('URL'); @@ -871,7 +870,7 @@ sub input_files { if ($t->('content')) { path("$proj_out_dir/$name")->spew_utf8($t->('content')); } elsif ($t->('URL')) { - urlget($project, {%$input_file, filename => $name}, 1); + urlget($project, {%$options, %$input_file, filename => $name}, 1); } elsif ($t->('exec')) { my $exec_script = project_config($project, 'exec', { $options ? %$options : (), %$input_file }); @@ -885,8 +884,8 @@ sub input_files { my $run_save = $config->{run}; $config->{run} = { target => $input_file->{target} }; $config->{run}{target} //= $run_save->{target}; - build_pkg($p, {%$options, origin_project => $project, %$input_file, - output_dir => $proj_out_dir}); + build_pkg($p, {%$options, origin_project => $project, + %$input_file}); $config->{run} = $run_save; print "Finished build of project $p - $name\n"; } else { @@ -940,8 +939,8 @@ sub input_files { } foreach my $s ($sig_file ? () : @$sig_ext) { if ($url) { - my $f = { %$input_file, 'override.URL' => "$url.$s", - filename => "$name.$s" }; + my $f = { %$options, %$input_file, + 'override.URL' => "$url.$s", filename => "$name.$s" }; if (urlget($project, $f, 0)) { $sig_file = "$fname.$s"; last; @@ -1039,7 +1038,7 @@ sub build_run { } my $o = { %$options, - output_dir => $remote_tmp_dst, + norec => { output_dir => $remote_tmp_dst }, }; foreach my $s (@scripts) { $build_script{$s} = project_config($project, $s, $o); @@ -1163,7 +1162,7 @@ sub publish { if (!$publish_src_dir) { $publish_src_dir = File::Temp->newdir(get_tmp_dir($project) . '/rbm-XXXXXX'); - build_pkg($project, {output_dir => $publish_src_dir}); + build_pkg($project, { norec => { output_dir => $publish_src_dir } }); } build_run($project, 'publish', { build_srcdir => $publish_src_dir }); }

1 0

[rbm/master] Bug 27265: add an error when we fail to download/create a file
by gk＠torproject.org 28 Nov '19

28 Nov '19

commit ef4df05a484c746f33e361eb8d82d5fb85009c14 Author: Nicolas Vigier <boklm(a)torproject.org> Date: Wed Aug 22 12:24:23 2018 +0200 Bug 27265: add an error when we fail to download/create a file --- lib/RBM.pm | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/lib/RBM.pm b/lib/RBM.pm index 087ebe3..9659f16 100644 --- a/lib/RBM.pm +++ b/lib/RBM.pm @@ -893,8 +893,9 @@ sub input_files { dd $input_file; exit_error "Missing file $name"; } + ($fname) = file_in_dir($name, $src_dir, $proj_out_dir); + exit_error "Error getting file $name" unless $fname; } - ($fname) = file_in_dir($name, $src_dir, $proj_out_dir); if ($action eq 'input_files_id') { $input_files_id .= input_file_id($input_file, $t, $fname, $name); $input_files_id .= "\n";

1 0

[tor-browser-build/maint-9.0] Pick up new bridge for Android (#32606)
by gk＠torproject.org 28 Nov '19

28 Nov '19

commit 9b96257a1720851159372ab03cdbd2726b21e55b Author: Georg Koppen <gk(a)torproject.org> Date: Thu Nov 28 07:48:47 2019 +0000 Pick up new bridge for Android (#32606) --- projects/tor-android-service/config | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/projects/tor-android-service/config b/projects/tor-android-service/config index 1ca2cac..d63b778 100644 --- a/projects/tor-android-service/config +++ b/projects/tor-android-service/config @@ -1,7 +1,7 @@ # vim: filetype=yaml sw=2 version: '[% c("abbrev") %]' filename: '[% project %]-[% c("version") %]-[% c("var/build_id") %]' -git_hash: 50d01b1fbc6e776d0b39f42f644137dd25a92c7a +git_hash: 3d3de669452f563f3f7b58f57f757f7a7cdae621 git_url: https://git.torproject.org/tor-android-service.git git_submodule: 1

1 0

[tor-browser-build/master] Pick up new bridge for Android (#32606)
by gk＠torproject.org 28 Nov '19

28 Nov '19

commit 8d61174e8400449388260b18876d9f189d3a2152 Author: Georg Koppen <gk(a)torproject.org> Date: Thu Nov 28 07:45:42 2019 +0000 Pick up new bridge for Android (#32606) --- projects/tor-android-service/config | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/projects/tor-android-service/config b/projects/tor-android-service/config index 492a3e1..4611757 100644 --- a/projects/tor-android-service/config +++ b/projects/tor-android-service/config @@ -1,7 +1,7 @@ # vim: filetype=yaml sw=2 version: '[% c("abbrev") %]' filename: '[% project %]-[% c("version") %]-[% c("var/build_id") %]' -git_hash: e9bbdc6fb25af47ccaf3bace0162125d94812072 +git_hash: 3d3de669452f563f3f7b58f57f757f7a7cdae621 git_url: https://git.torproject.org/tor-android-service.git git_submodule: 1

1 0

[tor-android-service/master] Add new default bridge at Georgetown University.
by gk＠torproject.org 28 Nov '19

28 Nov '19

commit 3d3de669452f563f3f7b58f57f757f7a7cdae621 Author: Philipp Winter <phw(a)nymity.ch> Date: Wed Nov 27 16:29:01 2019 -0800 Add new default bridge at Georgetown University. This commit fixes <https://bugs.torproject.org/32606>. --- service/src/main/assets/common/bridges.txt | 1 + 1 file changed, 1 insertion(+) diff --git a/service/src/main/assets/common/bridges.txt b/service/src/main/assets/common/bridges.txt index 89b6404..02a3926 100644 --- a/service/src/main/assets/common/bridges.txt +++ b/service/src/main/assets/common/bridges.txt @@ -10,4 +10,5 @@ obfs4 144.217.20.138:80 FB70B257C162BF1038CA669D568D76F5B7F0BABB cert=vYIV5Mgrgh obfs4 193.11.166.194:27015 2D82C2E354D531A68469ADF7F878FA6060C6BACA cert=4TLQPJrTSaDffMK7Nbao6LC7G9OW/NHkUwIdjLSS3KYf0Nv4/nQiiI8dY2TcsQx01NniOg iat-mode=0 obfs4 193.11.166.194:27020 86AC7B8D430DAC4117E9F42C9EAED18133863AAF cert=0LDeJH4JzMDtkJJrFphJCiPqKx7loozKN7VNfuukMGfHO0Z8OGdzHVkhVAOfo1mUdv9cMg iat-mode=0 obfs4 193.11.166.194:27025 1AE2C08904527FEA90C4C4F8C1083EA59FBC6FAF cert=ItvYZzW5tn6v3G4UnQa6Qz04Npro6e81AP70YujmK/KXwDFPTs3aHXcHp4n8Vt6w/bv8cA iat-mode=0 +obfs4 209.148.46.65:443 74FAD13168806246602538555B5521A0383A1875 cert=ssH+9rP8dG2NLDN2XuFw63hIO/9MNNinLmxQDpVa+7kTOa9/m+tGWT1SmSYpQ9uTBGa6Hw iat-mode=0 meek_lite 0.0.2.0:2 97700DFE9F483596DDA6264C4D7DF7641E1E39CE url=https://meek.azureedge.net/ front=ajax.aspnetcdn.com

1 0

[tor-browser-build/maint-9.0] Add new default bridge at Georgetown University.
by gk＠torproject.org 28 Nov '19

28 Nov '19

commit d8033881110e0717ef5c9d4e2265b0b8c79d9b7d Author: Philipp Winter <phw(a)nymity.ch> Date: Wed Nov 27 16:23:34 2019 -0800 Add new default bridge at Georgetown University. This commit fixes <https://bugs.torproject.org/32606>. --- projects/tor-browser/Bundle-Data/PTConfigs/bridge_prefs.js | 1 + 1 file changed, 1 insertion(+) diff --git a/projects/tor-browser/Bundle-Data/PTConfigs/bridge_prefs.js b/projects/tor-browser/Bundle-Data/PTConfigs/bridge_prefs.js index aa464d6..fae920a 100644 --- a/projects/tor-browser/Bundle-Data/PTConfigs/bridge_prefs.js +++ b/projects/tor-browser/Bundle-Data/PTConfigs/bridge_prefs.js @@ -15,6 +15,7 @@ pref("extensions.torlauncher.default_bridge.obfs4.10", "obfs4 144.217.20.138:80 pref("extensions.torlauncher.default_bridge.obfs4.11", "obfs4 193.11.166.194:27015 2D82C2E354D531A68469ADF7F878FA6060C6BACA cert=4TLQPJrTSaDffMK7Nbao6LC7G9OW/NHkUwIdjLSS3KYf0Nv4/nQiiI8dY2TcsQx01NniOg iat-mode=0"); pref("extensions.torlauncher.default_bridge.obfs4.12", "obfs4 193.11.166.194:27020 86AC7B8D430DAC4117E9F42C9EAED18133863AAF cert=0LDeJH4JzMDtkJJrFphJCiPqKx7loozKN7VNfuukMGfHO0Z8OGdzHVkhVAOfo1mUdv9cMg iat-mode=0"); pref("extensions.torlauncher.default_bridge.obfs4.13", "obfs4 193.11.166.194:27025 1AE2C08904527FEA90C4C4F8C1083EA59FBC6FAF cert=ItvYZzW5tn6v3G4UnQa6Qz04Npro6e81AP70YujmK/KXwDFPTs3aHXcHp4n8Vt6w/bv8cA iat-mode=0"); +pref("extensions.torlauncher.default_bridge.obfs4.14", "obfs4 209.148.46.65:443 74FAD13168806246602538555B5521A0383A1875 cert=ssH+9rP8dG2NLDN2XuFw63hIO/9MNNinLmxQDpVa+7kTOa9/m+tGWT1SmSYpQ9uTBGa6Hw iat-mode=0"); pref("extensions.torlauncher.default_bridge.meek-azure.1", "meek_lite 0.0.2.0:2 97700DFE9F483596DDA6264C4D7DF7641E1E39CE url=https://meek.azureedge.net/ front=ajax.aspnetcdn.com");

1 0

[tor-browser-build/master] Add new default bridge at Georgetown University.
by gk＠torproject.org 28 Nov '19

28 Nov '19

commit b7c78701ed87062a5daa6a8d634da98873ad10dd Author: Philipp Winter <phw(a)nymity.ch> Date: Wed Nov 27 16:23:34 2019 -0800 Add new default bridge at Georgetown University. This commit fixes <https://bugs.torproject.org/32606>. --- projects/tor-browser/Bundle-Data/PTConfigs/bridge_prefs.js | 1 + 1 file changed, 1 insertion(+) diff --git a/projects/tor-browser/Bundle-Data/PTConfigs/bridge_prefs.js b/projects/tor-browser/Bundle-Data/PTConfigs/bridge_prefs.js index aa464d6..fae920a 100644 --- a/projects/tor-browser/Bundle-Data/PTConfigs/bridge_prefs.js +++ b/projects/tor-browser/Bundle-Data/PTConfigs/bridge_prefs.js @@ -15,6 +15,7 @@ pref("extensions.torlauncher.default_bridge.obfs4.10", "obfs4 144.217.20.138:80 pref("extensions.torlauncher.default_bridge.obfs4.11", "obfs4 193.11.166.194:27015 2D82C2E354D531A68469ADF7F878FA6060C6BACA cert=4TLQPJrTSaDffMK7Nbao6LC7G9OW/NHkUwIdjLSS3KYf0Nv4/nQiiI8dY2TcsQx01NniOg iat-mode=0"); pref("extensions.torlauncher.default_bridge.obfs4.12", "obfs4 193.11.166.194:27020 86AC7B8D430DAC4117E9F42C9EAED18133863AAF cert=0LDeJH4JzMDtkJJrFphJCiPqKx7loozKN7VNfuukMGfHO0Z8OGdzHVkhVAOfo1mUdv9cMg iat-mode=0"); pref("extensions.torlauncher.default_bridge.obfs4.13", "obfs4 193.11.166.194:27025 1AE2C08904527FEA90C4C4F8C1083EA59FBC6FAF cert=ItvYZzW5tn6v3G4UnQa6Qz04Npro6e81AP70YujmK/KXwDFPTs3aHXcHp4n8Vt6w/bv8cA iat-mode=0"); +pref("extensions.torlauncher.default_bridge.obfs4.14", "obfs4 209.148.46.65:443 74FAD13168806246602538555B5521A0383A1875 cert=ssH+9rP8dG2NLDN2XuFw63hIO/9MNNinLmxQDpVa+7kTOa9/m+tGWT1SmSYpQ9uTBGa6Hw iat-mode=0"); pref("extensions.torlauncher.default_bridge.meek-azure.1", "meek_lite 0.0.2.0:2 97700DFE9F483596DDA6264C4D7DF7641E1E39CE url=https://meek.azureedge.net/ front=ajax.aspnetcdn.com");

1 0

[tor-browser-build/maint-9.0] Prepare build2
by gk＠torproject.org 27 Nov '19

27 Nov '19

commit e671308fc5b74507aa2435f0b8601fa8b84c0b95 Author: Georg Koppen <gk(a)torproject.org> Date: Wed Nov 27 19:50:03 2019 +0000 Prepare build2 --- projects/tor-browser/Bundle-Data/Docs/ChangeLog.txt | 2 ++ rbm.conf | 2 +- 2 files 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 8b9c8f0..38cfd3f 100644 --- a/projects/tor-browser/Bundle-Data/Docs/ChangeLog.txt +++ b/projects/tor-browser/Bundle-Data/Docs/ChangeLog.txt @@ -13,6 +13,8 @@ Tor Browser 9.0.2 -- December 3 2019 * Windows * Bug 31989: Backport backout of old mingw-gcc patch * Bug 32616: Disable GetSecureOutputDirectoryPath() functionality + * Android + * Bug 32365: Localization is broken in Tor Browser 9 on Android * Build System * All Platforms * Bug 32413: Bump Go version to 1.12.13 diff --git a/rbm.conf b/rbm.conf index f5da4c7..de42014 100644 --- a/rbm.conf +++ b/rbm.conf @@ -25,7 +25,7 @@ buildconf: var: torbrowser_version: '9.0.2' - torbrowser_build: 'build1' + torbrowser_build: 'build2' torbrowser_incremental_from: - 9.0.1 project_name: tor-browser

1 0

[tor-browser-build/master] Bug 32505: Enable library validation on macOS
by gk＠torproject.org 27 Nov '19

27 Nov '19

commit e01d78d95fa019b9418e17ac03b3b26e655d6cd9 Author: Georg Koppen <gk(a)torproject.org> Date: Wed Nov 27 11:28:31 2019 +0000 Bug 32505: Enable library validation on macOS --- tools/signing/alpha.entitlements.xml | 3 --- 1 file changed, 3 deletions(-) diff --git a/tools/signing/alpha.entitlements.xml b/tools/signing/alpha.entitlements.xml index 3097c05..3062b9d 100644 --- a/tools/signing/alpha.entitlements.xml +++ b/tools/signing/alpha.entitlements.xml @@ -20,9 +20,6 @@  <key>com.apple.security.cs.disable-executable-page-protection</key><false/> -  - <key>com.apple.security.cs.disable-library-validation</key><true/> -  <key>com.apple.security.cs.allow-dyld-environment-variables</key><true/>

1 0

[tor-browser-build/maint-9.0] Bug 32365: Package multi-locale apk in a new way
by gk＠torproject.org 27 Nov '19

27 Nov '19

commit 54091ab8d4a431458105d2be5346ac5232fea265 Author: Matthew Finkel <sysrqb(a)torproject.org> Date: Fri Nov 8 01:47:32 2019 +0000 Bug 32365: Package multi-locale apk in a new way --- projects/firefox/build | 4 ++++ 1 file changed, 4 insertions(+) diff --git a/projects/firefox/build b/projects/firefox/build index 456aa07..6b42d74 100644 --- a/projects/firefox/build +++ b/projects/firefox/build @@ -115,7 +115,11 @@ rm -f js/src/configure cp /var/tmp/dist/tba-translation/[% lang %]/torbrowser_strings.dtd /var/tmp/dist/locales/[% lang %]/mobile/android/base/ ./mach build chrome-[% lang %]; [% END %] + # Include localization for all available locales. + # mk is excluded above because Mozilla does not provide mk localization. + # mk is included here because we may have localization for torbutton. export MOZ_CHROME_MULTILOCALE='[% tmpl(c('var/locales').join(' ')) %]' + ./mach android assemble-app AB_CD=multi ./mach package # Copy the result over and return. There is nothing more to do for mobile. cp obj-*/dist/*unsigned-unaligned.apk [% dest_dir _ '/' _ c('filename') %]/tor-browser-unsigned-unaligned.apk

1 0

2024

2023

2022

2021

2020

2019

2018

2017

2016

2015

2014

tbb-commits November 2019