- tbb-commits - lists.torproject.org

[rbm/master] Bug 33993: Check type of target, target_prepend, target_append
by gk＠torproject.org 27 Apr '20

27 Apr '20

commit 5f8c0ac72abfa72cc80d2ff24627c3e3f8db963f Author: Nicolas Vigier <boklm(a)torproject.org> Date: Sat Apr 25 12:46:22 2020 +0200 Bug 33993: Check type of target, target_prepend, target_append Exit with an error message if target, target_prepend or target_append defined in input_files is not an array. --- lib/RBM.pm | 11 ++++++++--- 1 file changed, 8 insertions(+), 3 deletions(-) diff --git a/lib/RBM.pm b/lib/RBM.pm index 375648f..7cc9e24 100644 --- a/lib/RBM.pm +++ b/lib/RBM.pm @@ -811,19 +811,24 @@ sub input_files { if ($input_file->{target} || $input_file->{target_append} || $input_file->{target_prepend}) { $input_file = { %$input_file }; - if (ref $input_file->{target} eq 'ARRAY') { + foreach my $t (qw/target target_append target_prepend/) { + if ($input_file->{$t} && ref $input_file->{$t} ne 'ARRAY') { + exit_error("$t should be an ARRAY:\n" . pp($input_file)); + } + } + if ($input_file->{target}) { $input_file->{target} = process_template_opt($project, $input_file->{target}, $options); } else { $input_file->{target} = $config->{run}{target}; } - if (ref $input_file->{target_prepend} eq 'ARRAY') { + if ($input_file->{target_prepend}) { $input_file->{target} = [ @{ process_template_opt($project, $input_file->{target_prepend}, $options) }, @{$input_file->{target}} ]; } - if (ref $input_file->{target_append} eq 'ARRAY') { + if ($input_file->{target_append}) { $input_file->{target} = [ @{$input_file->{target}}, @{ process_template_opt($project, $input_file->{target_append},

1 0

[tor-browser-build/master] Bug 33987: Make var/build_id_txt work in non-build steps
by gk＠torproject.org 27 Apr '20

27 Apr '20

commit 32e6bcd3b6db11313be8bfdce475555bbf72138b Author: Nicolas Vigier <boklm(a)torproject.org> Date: Fri Apr 24 15:40:53 2020 +0200 Bug 33987: Make var/build_id_txt work in non-build steps --- rbm.conf | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/rbm.conf b/rbm.conf index 94f9fcc..819a257 100644 --- a/rbm.conf +++ b/rbm.conf @@ -47,7 +47,8 @@ var: [% END -%] input_files: [% c("input_files_id") %] build: - [% c("build", { filename => 'f', output_dir => '/out', norec => {} }) %] + [% SET step = c("step") -%] + [% c(step, { filename => 'f', output_dir => '/out', norec => {} }) %] container: dir: '[% c("rbm_tmp_dir") %]/rbm-containers/[% sha256(c("build_id")) %]' user: rbm

1 0

[tor-browser-build/master] Bump rbm commit to pick up fix for #33990
by gk＠torproject.org 27 Apr '20

27 Apr '20

commit 824287778856704d2b97ba871d9d5ed4c6bd9e04 Author: Georg Koppen <gk(a)torproject.org> Date: Mon Apr 27 11:20:14 2020 +0000 Bump rbm commit to pick up fix for #33990 --- rbm | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/rbm b/rbm index e4f12ab..18b396f 160000 --- a/rbm +++ b/rbm @@ -1 +1 @@ -Subproject commit e4f12abe9ed81050994b5345c21b988005259396 +Subproject commit 18b396fb08ee9ee9311de7b8224197282f0935fe

1 0

[tor-browser-build/master] Merge remote-tracking branch 'boklm/bug_33987'
by gk＠torproject.org 27 Apr '20

27 Apr '20

commit 07e75fab2a78626ed3c6ec1a593754785119e1cf Merge: 8242877 32e6bcd Author: Georg Koppen <gk(a)torproject.org> Date: Mon Apr 27 11:21:10 2020 +0000 Merge remote-tracking branch 'boklm/bug_33987' rbm.conf | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-)

1 0

[rbm/master] Bug 33990: Initialize step in non-build commands
by gk＠torproject.org 27 Apr '20

27 Apr '20

commit 18b396fb08ee9ee9311de7b8224197282f0935fe Author: Nicolas Vigier <boklm(a)torproject.org> Date: Fri Apr 24 16:01:23 2020 +0200 Bug 33990: Initialize step in non-build commands When using the build command, step gets initialized to 'build'. However this was not done in some of the other non-build commands where the value of step was left to rbm_init. --- rbm | 7 +++++-- 1 file changed, 5 insertions(+), 2 deletions(-) diff --git a/rbm b/rbm index 5d6417b..6b31185 100755 --- a/rbm +++ b/rbm @@ -109,6 +109,9 @@ sub set_options { } RBM::load_system_config(@_); RBM::load_local_config(@_); + if (!defined $val{step} && @_) { + $RBM::config->{step} = RBM::project_config($_[0], 'pkg_type'); + } return $RBM::config->{run}{args} = \@_; } @@ -172,9 +175,9 @@ sub build_script { my $script_name = shift; usageexit($_[0]) unless @_ >= 2; my $cmd = shift; - my $args = set_options(@_); + my $args = set_options("--step=$script_name", @_); usageexit($cmd) unless @$args == 1; - $script_name = $RBM::config->{step} if $RBM::config->{step} ne 'rbm_init'; + $script_name = $RBM::config->{step}; RBM::build_pkg($args->[0], { pkg_type => $script_name }); }

1 0

[tor-browser-build/master] Bug 33802: Remove obsolete --enabled-secure-api
by boklm＠torproject.org 19 Apr '20

19 Apr '20

commit f9eef9924b8e748d436fd27b15cf0c2617b44249 Author: Georg Koppen <gk(a)torproject.org> Date: Fri Apr 3 07:03:49 2020 +0000 Bug 33802: Remove obsolete --enabled-secure-api --- projects/mingw-w64-clang/build | 1 - projects/mingw-w64/build | 2 +- 2 files changed, 1 insertion(+), 2 deletions(-) diff --git a/projects/mingw-w64-clang/build b/projects/mingw-w64-clang/build index fa059da..302975d 100644 --- a/projects/mingw-w64-clang/build +++ b/projects/mingw-w64-clang/build @@ -72,7 +72,6 @@ cd mingw-w64-headers mkdir build && cd build ../configure --host=[% c("arch") %]-w64-mingw32 \ --enable-sdk=all \ - --enable-secure-api \ --enable-idl \ --with-default-msvcrt=ucrt \ --with-default-win32-winnt=$default_win32_winnt \ diff --git a/projects/mingw-w64/build b/projects/mingw-w64/build index 9e504ba..c5fcda6 100644 --- a/projects/mingw-w64/build +++ b/projects/mingw-w64/build @@ -15,7 +15,7 @@ mkdir -p builddir/mingw-w64/mingw-w64-headers32 cd builddir/mingw-w64/mingw-w64-headers32 /var/tmp/build/[% project %]-[% c("version") %]/mingw-w64-headers/configure \ --prefix=$distdir/[% c("arch") %]-w64-mingw32 --host=[% c("arch") %]-w64-mingw32 \ - --enable-sdk=all --enable-secure-api --enable-idl + --enable-sdk=all --enable-idl make install cd /var/tmp/build

1 0

[tor-browser-build/master] Merge remote-tracking branch 'gk/bug_33802'
by boklm＠torproject.org 19 Apr '20

19 Apr '20

commit 6b60066bddd5d93442fc2d4fe553b779dcf8a045 Merge: 49319fa f9eef99 Author: Nicolas Vigier <boklm(a)torproject.org> Date: Sun Apr 19 15:55:32 2020 +0200 Merge remote-tracking branch 'gk/bug_33802' projects/mingw-w64-clang/build | 1 - projects/mingw-w64/build | 2 +- 2 files changed, 1 insertion(+), 2 deletions(-)

1 0

[tor-browser-bundle-testsuite/master] Bug 33926: Add a LICENSE file ("3-clause BSD" license)
by gk＠torproject.org 17 Apr '20

17 Apr '20

commit 2357de09b5e66dddf749a4fec042940abcafabca Author: Nicolas Vigier <boklm(a)torproject.org> Date: Fri Apr 17 15:16:11 2020 +0200 Bug 33926: Add a LICENSE file ("3-clause BSD" license) --- LICENSE | 29 +++++++++++++++++++++++++++++ 1 file changed, 29 insertions(+) diff --git a/LICENSE b/LICENSE new file mode 100644 index 0000000..a8acdf3 --- /dev/null +++ b/LICENSE @@ -0,0 +1,29 @@ +Copyright (c) 2020, The Tor Project, Inc. + +Redistribution and use in source and binary forms, with or without +modification, are permitted provided that the following conditions are +met: + + * Redistributions of source code must retain the above copyright +notice, this list of conditions and the following disclaimer. + + * Redistributions in binary form must reproduce the above +copyright notice, this list of conditions and the following disclaimer +in the documentation and/or other materials provided with the +distribution. + + * Neither the names of the copyright owners nor the names of its +contributors may be used to endorse or promote products derived from +this software without specific prior written permission. + +THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS +"AS IS" AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT +LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR +A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT +OWNER OR CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL, +SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT +LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, +DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY +THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT +(INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE +OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.

1 0

[tor-browser-build/master] Bug 32038: Add a LICENSE file
by gk＠torproject.org 17 Apr '20

17 Apr '20

commit 49319fa1afea0f0f0e2ce16b7d61da95f39c79b2 Author: Nicolas Vigier <boklm(a)torproject.org> Date: Tue Mar 31 20:28:27 2020 +0200 Bug 32038: Add a LICENSE file --- LICENSE | 37 +++++++++++++++++++++++++++++++++++++ 1 file changed, 37 insertions(+) diff --git a/LICENSE b/LICENSE new file mode 100644 index 0000000..ee29ae2 --- /dev/null +++ b/LICENSE @@ -0,0 +1,37 @@ +This file contains the license for the build recipes and tools used in +the Tor Browser development process, that are included in this repository. + +For the license of specific components included in Tor Browser, see +directory projects/tor-browser/Bundle-Data/Docs/Licenses. + +=============================================================================== + +Copyright (c) 2020, The Tor Project, Inc. + +Redistribution and use in source and binary forms, with or without +modification, are permitted provided that the following conditions are +met: + + * Redistributions of source code must retain the above copyright +notice, this list of conditions and the following disclaimer. + + * Redistributions in binary form must reproduce the above +copyright notice, this list of conditions and the following disclaimer +in the documentation and/or other materials provided with the +distribution. + + * Neither the names of the copyright owners nor the names of its +contributors may be used to endorse or promote products derived from +this software without specific prior written permission. + +THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS +"AS IS" AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT +LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR +A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT +OWNER OR CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL, +SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT +LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, +DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY +THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT +(INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE +OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.

1 0

[tor-browser-build/master] Bug 32788: Specify version for test builds
by gk＠torproject.org 17 Apr '20

17 Apr '20

commit 3310abeac20111775407177fb95f4ede3d50251c Author: Georg Koppen <gk(a)torproject.org> Date: Fri Apr 17 06:46:29 2020 +0000 Bug 32788: Specify version for test builds With our switch to including a date into our nightly build versioning (#25009) testing patches with test builds got harder. The firefox part has to be rebuilt every day now as it includes the version number, even if no code changes occurred. That slows down testing of patches significantly. We hardcode "testing" as the test build version number to fix that and use "20010101010101" for the build date. Thanks to boklm for help. --- projects/firefox/get-moz-build-date | 4 ++++ rbm.conf | 11 ++++++++++- 2 files changed, 14 insertions(+), 1 deletion(-) diff --git a/projects/firefox/get-moz-build-date b/projects/firefox/get-moz-build-date index e6989ff..a43f2f7 100755 --- a/projects/firefox/get-moz-build-date +++ b/projects/firefox/get-moz-build-date @@ -8,6 +8,10 @@ my ($year, $version) = @ARGV; my $date; if ($version =~ m/^tbb-nightly\.([^\.]+)\.([^\.]+)\.([^\.]+)$/) { $date = sprintf("%d%02d%02d010101", $1, $2, $3); +} elsif ($version eq 'testbuild') { + # There is no need for an increasing build date in test builds. Just hardcode + # it. + $date = 20010101010101; } else { my @v = split(/[\.ab]/, $version); push @v, '0' if @v < 4; diff --git a/rbm.conf b/rbm.conf index cd17da9..94f9fcc 100644 --- a/rbm.conf +++ b/rbm.conf @@ -151,7 +151,16 @@ targets: var: nightly: 1 channel: nightly - torbrowser_version: '[% ENV.TORBROWSER_NIGHTLY_VERSION ? ENV.TORBROWSER_NIGHTLY_VERSION : c("var_p/nightly_torbrowser_version") %]' + torbrowser_version: | + [% + IF ENV.TORBROWSER_NIGHTLY_VERSION; + GET ENV.TORBROWSER_NIGHTLY_VERSION; + ELSIF c("var/testbuild"); + GET "testbuild"; + ELSE; + GET c("var_p/nightly_torbrowser_version"); + END; + -%] # For nightly builds, we support updates for a limited set of locales mar_locales: - de

1 0