- tor-commits - lists.torproject.org

[tor] branch main updated: fix easy typos
by gitolite role 05 Jul '22

05 Jul '22

This is an automated email from the git hooks/post-receive script. arma pushed a commit to branch main in repository tor. The following commit(s) were added to refs/heads/main by this push: new 834745929a fix easy typos 834745929a is described below commit 834745929a0b78aed84e1d5465db40c2fef759b3 Author: Roger Dingledine <arma(a)torproject.org> AuthorDate: Tue Jul 5 15:18:29 2022 -0400 fix easy typos --- src/core/or/dos.c | 2 +- src/feature/stats/rephist.c | 4 ++-- 2 files changed, 3 insertions(+), 3 deletions(-) diff --git a/src/core/or/dos.c b/src/core/or/dos.c index 2eb5782481..6dd3c50051 100644 --- a/src/core/or/dos.c +++ b/src/core/or/dos.c @@ -534,7 +534,7 @@ conn_update_on_close(conn_client_stats_t *stats, const tor_addr_t *addr) { /* Extra super duper safety. Going below 0 means an underflow which could * lead to most likely a false positive. In theory, this should never happen - * but lets be extra safe. */ + * but let's be extra safe. */ if (BUG(stats->concurrent_count == 0)) { return; } diff --git a/src/feature/stats/rephist.c b/src/feature/stats/rephist.c index 52bd94aba9..5738259262 100644 --- a/src/feature/stats/rephist.c +++ b/src/feature/stats/rephist.c @@ -2114,7 +2114,7 @@ static overload_onionskin_assessment_t overload_onionskin_assessment; /** * We combine ntorv3 and ntor into the same stat, so we must - * use this function to covert the cell type to a stat index. + * use this function to convert the cell type to a stat index. */ static inline uint16_t onionskin_type_to_stat(uint16_t type) @@ -2137,7 +2137,7 @@ onionskin_type_to_stat(uint16_t type) * the stats are reset back to 0 and the assessment time period updated. * * This is called when a ntor handshake is _requested_ because we want to avoid - * to have an assymetric situation where requested counter is reset to 0 but + * to have an asymmetric situation where requested counter is reset to 0 but * then a drop happens leading to the drop counter being incremented while the * requested counter is 0. */ static void -- To stop receiving notification emails like this one, please contact the administrator of this repository.

1 0

[builders/rbm] branch master updated: Bug 40042: Stop using `touch_arg` in `touch`
by gitolite role 04 Jul '22

04 Jul '22

This is an automated email from the git hooks/post-receive script. gk pushed a commit to branch master in repository builders/rbm. The following commit(s) were added to refs/heads/master by this push: new 98be5a6 Bug 40042: Stop using `touch_arg` in `touch` 98be5a6 is described below commit 98be5a6247850ecbdf9641a96b176a071dab2f5b Author: Nicolas Vigier <boklm(a)torproject.org> AuthorDate: Mon Jul 4 09:50:25 2022 +0200 Bug 40042: Stop using `touch_arg` in `touch` Instead we expect the argument to follow on the same line. --- doc/options_misc.asc | 3 +-- lib/RBM/DefaultConfig.pm | 8 +------- 2 files changed, 2 insertions(+), 9 deletions(-) diff --git a/doc/options_misc.asc b/doc/options_misc.asc index 084348d..124f05b 100644 --- a/doc/options_misc.asc +++ b/doc/options_misc.asc @@ -52,5 +52,4 @@ num_procs:: touch:: This option can be used to set the mtime of files to +timestamp+. - It takes a +touch_args+ argument which is the intended file to - touch. + It expects the file to touch as as argument following on the same line. diff --git a/lib/RBM/DefaultConfig.pm b/lib/RBM/DefaultConfig.pm index a638fc0..e28642f 100644 --- a/lib/RBM/DefaultConfig.pm +++ b/lib/RBM/DefaultConfig.pm @@ -475,13 +475,7 @@ ZIP_END #### #### #### - touch => <<TOUCH_END, -[% USE date -%] -touch -m -t [% date.format(c('timestamp'), format = '%Y%m%d%H%M') %] [% c('touch_args', { error_if_undef => 1 }) %] -TOUCH_END -#### -#### -#### + touch => "[% USE date %]touch -m -t [% date.format(c('timestamp'), format = '%Y%m%d%H%M') %]", arch => \&get_arch, input_files_by_name => sub { RBM::input_files('getfnames', @_); }, input_files_id => sub { RBM::input_files('input_files_id', @_); }, -- To stop receiving notification emails like this one, please contact the administrator of this repository.

1 0

[builders/rbm] branch master updated: Add default values for several tor-browser-build options
by gitolite role 01 Jul '22

01 Jul '22

This is an automated email from the git hooks/post-receive script. gk pushed a commit to branch master in repository builders/rbm. The following commit(s) were added to refs/heads/master by this push: new a91d465 Add default values for several tor-browser-build options a91d465 is described below commit a91d4653cb5f66d86fd4d306c564161acfd6fa79 Author: Georg Koppen <gk(a)torproject.org> AuthorDate: Wed Jun 29 12:37:27 2022 +0000 Add default values for several tor-browser-build options This includes: compress_tar buildconf: num_procs (which is now just num_procs) ENV gpg_wrapper var: touch (which is now just touch) Closes: #40040. --- doc/options_misc.asc | 12 +++++++++++- doc/options_tar.asc | 7 ++++++- doc/rbm_config.asc | 3 ++- lib/RBM.pm | 7 ++++++- lib/RBM/DefaultConfig.pm | 35 +++++++++++++++++++++++++++++++++-- 5 files changed, 58 insertions(+), 6 deletions(-) diff --git a/doc/options_misc.asc b/doc/options_misc.asc index 5612df3..084348d 100644 --- a/doc/options_misc.asc +++ b/doc/options_misc.asc @@ -36,7 +36,7 @@ zip:: to create deterministic zip files. This option takes a +zip_src+ argument which is an array containing source files or directories, and a +zip_args+ arguments which is usually the destination zip - file, and optionaly other zip options. By default, GNU options + file, and optionally other zip options. By default, GNU options are used in find, but you can disable that with +gnu_utils+. install_package:: @@ -44,3 +44,13 @@ install_package:: package. The packages to be installed should be set in option +pkg_name+. It will use apt-get on Debian/Ubuntu, yum on Fedora, zypper on openSUSE and urpmi on Mageia/Mandriva. + +num_procs:: + This option allows to specify the number of CPUs used to + parallelize the build. By default it is set to whatever value + +nrpoc+ is returning on the build machine. + +touch:: + This option can be used to set the mtime of files to +timestamp+. + It takes a +touch_args+ argument which is the intended file to + touch. diff --git a/doc/options_tar.asc b/doc/options_tar.asc index b615dec..c21317f 100644 --- a/doc/options_tar.asc +++ b/doc/options_tar.asc @@ -22,7 +22,8 @@ git_submodule:: compress_tar:: If set, the tarball created will be compressed in the select - format. Possible values: xz, gz, bz2. + format. Possible values: xz, gz, bz2. The default is gz but it + can stay empty to disable compression. commit_gpg_id:: If set, the commit selected with +git_hash+ will have its @@ -64,3 +65,7 @@ gpg_bin:: gpg_args:: Optional gpg arguments. The default is empty. + +gpg_allow_expired_keys:: + Allowing expired keys to successfully verify e.g. signed git tags. + By default this is not allowed. diff --git a/doc/rbm_config.asc b/doc/rbm_config.asc index 46c1caf..dc045e2 100644 --- a/doc/rbm_config.asc +++ b/doc/rbm_config.asc @@ -191,7 +191,8 @@ ENV:: containing the environment variables that will be defined when rbm is starting. This is useful for defining variables that can affect how the templates are processed (for instance - the +TZ+ variable if dates are used). + the +TZ+ variable if dates are used). If this option is not + defined +TZ+ will be set to UTC and +LC_ALL+ to C. include::options_tar.asc[] diff --git a/lib/RBM.pm b/lib/RBM.pm index 88679f2..a92a04b 100644 --- a/lib/RBM.pm +++ b/lib/RBM.pm @@ -109,7 +109,12 @@ sub find_config_file { } sub set_default_env { - %ENV = (%ENV, %{$config->{ENV}}) if ref $config->{ENV} eq 'HASH'; + if (ref $config->{ENV} eq 'HASH') { + %ENV = (%ENV, %{$config->{ENV}}); + } else { + $ENV{TZ} = 'UTC'; + $ENV{LC_ALL} = 'C'; + } } sub rbm_path { diff --git a/lib/RBM/DefaultConfig.pm b/lib/RBM/DefaultConfig.pm index 109ca8d..a638fc0 100644 --- a/lib/RBM/DefaultConfig.pm +++ b/lib/RBM/DefaultConfig.pm @@ -102,6 +102,14 @@ our %default_config = ( sysconf_file => '/etc/rbm.conf', localconf_file=> 'rbm.local.conf', tmp_dir => '[% GET ENV.TMPDIR ? ENV.TMPDIR : "/tmp"; %]', + num_procs => sub { + return $ENV{RBM_NUM_PROCS} if $ENV{RBM_NUM_PROCS}; + CORE::state $nproc; + return $nproc if $nproc; + my ($stdout, $stderr, $success) = capture_exec('nproc'); + chomp $stdout; + return $nproc = $success ? $stdout : '4'; + }, rbm_tmp_dir => \&rbm_tmp_dir, projects_dir => 'projects', modules_dir => 'modules', @@ -140,12 +148,14 @@ our %default_config = ( return '946684800'; }, debug => 0, + compress_tar => 'gz', version => "[%- exit_error('No version specified for ' _ project); -%]", #### #### #### gpg_bin => 'gpg', gpg_args => '', + gpg_allow_expired_keys => 0, gpg_keyring_path => sub { my ($project, $options) = @_; my $gpg_keyring = RBM::project_config($project, 'gpg_keyring', $options); @@ -159,8 +169,11 @@ our %default_config = ( } RBM::exit_error("keyring file $gpg_keyring is missing") }, + # Make it possible for gpg_wrapper to allow git tag signed using an expired + # key. + # https://bugs.torproject.org/19737 gpg_wrapper => <<GPGEND, -#!/bin/sh +#!/bin/bash export LC_ALL=C [% IF c('gpg_keyring_path'); @@ -168,7 +181,18 @@ export LC_ALL=C _ ' --no-default-keyring --no-auto-check-trustdb --trust-model always'; END; -%] -exec [% c('gpg_bin') %] [% c('gpg_args') %] --with-fingerprint [% gpg_kr %] "\$@" +gpg_verify=0 +for opt in "\$@" +do + test "\$opt" = '--verify' && gpg_verify=1 +done +if [ \$gpg_verify = 1 ] +then + [% c('gpg_bin') %] [% c('gpg_args') %] --with-fingerprint [% gpg_kr %] "\$@"[% IF c('gpg_allow_expired_keys') %] | sed 's/^\\[GNUPG:\\] EXPKEYSIG /\\[GNUPG:\\] GOODSIG /'[% END %] + exit \${PIPESTATUS[0]} +else + exec [% c('gpg_bin') %] [% c('gpg_args') %] --with-fingerprint [% gpg_kr %] "\$@" +fi GPGEND #### #### @@ -450,6 +474,13 @@ find [% src.join(' ') %] | sort | \ ZIP_END #### #### +#### + touch => <<TOUCH_END, +[% USE date -%] +touch -m -t [% date.format(c('timestamp'), format = '%Y%m%d%H%M') %] [% c('touch_args', { error_if_undef => 1 }) %] +TOUCH_END +#### +#### #### arch => \&get_arch, input_files_by_name => sub { RBM::input_files('getfnames', @_); }, -- To stop receiving notification emails like this one, please contact the administrator of this repository.

1 0

[builders/rbm] branch master updated (d3bc044 -> ce18f12)
by gitolite role 01 Jul '22

01 Jul '22

This is an automated email from the git hooks/post-receive script. gk pushed a change to branch master in repository builders/rbm. from d3bc044 Bug 40039: Report project name when version is missing new 313f08f Bug 40027: Add support for rbm.module.conf files new 278411f Bug 40028: Load projects config from modules new 4713309 Bug 40028: Add support for input_files and template files in modules new 03ab77d Bug 40028: Add support for keyring directories in modules new 3f930c1 Bug 40028: Remove p variable from templates new ce18f12 Bug 40028: Add documentation for modules The 6 revisions listed above as "new" are entirely new to this repository and will be described in separate emails. The revisions listed as "add" were already present in the repository and have only been added to this reference. Summary of changes: doc/Makefile | 1 + doc/documentation.asc | 1 + doc/options_tar.asc | 7 +- doc/rbm_config.asc | 36 ++++++-- doc/rbm_input_files.asc | 6 +- doc/rbm_layout.asc | 80 +++++++++++------ doc/rbm_modules.asc | 54 ++++++++++++ doc/rbm_templates.asc | 4 - lib/RBM.pm | 99 +++++++++++++++++++--- lib/RBM/DefaultConfig.pm | 21 ++++- rbm | 1 + test.pl | 63 +++++++++++++- test/modules/module_1/projects/a/config | 1 + test/modules/module_1/projects/common/common_2.txt | 1 + test/modules/module_1/projects/common/common_3.txt | 1 + test/modules/module_1/projects/common/common_4.txt | 1 + test/modules/module_1/projects/m1_a/config | 3 + test/modules/module_1/projects/m1_a/m1_a-i.txt | 1 + test/modules/module_1/rbm.module.conf | 3 + test/modules/module_2/projects/common/common_4.txt | 1 + test/modules/module_2/rbm.module.conf | 2 + test/modules/module_3/projects/m3_a/config | 7 ++ test/modules/module_3/projects/m3_a/m3.txt | 1 + test/modules/module_3/rbm.module.conf | 2 + test/projects/a/config | 3 + test/projects/common/common_1.txt | 1 + test/projects/common/common_3.txt | 1 + 27 files changed, 336 insertions(+), 66 deletions(-) create mode 100644 doc/rbm_modules.asc create mode 100644 test/modules/module_1/projects/a/config create mode 100644 test/modules/module_1/projects/common/common_2.txt create mode 100644 test/modules/module_1/projects/common/common_3.txt create mode 100644 test/modules/module_1/projects/common/common_4.txt create mode 100644 test/modules/module_1/projects/m1_a/config create mode 100644 test/modules/module_1/projects/m1_a/m1_a-i.txt create mode 100644 test/modules/module_1/rbm.module.conf create mode 100644 test/modules/module_2/projects/common/common_4.txt create mode 100644 test/modules/module_2/rbm.module.conf create mode 100644 test/modules/module_3/projects/m3_a/config create mode 100644 test/modules/module_3/projects/m3_a/m3.txt create mode 100644 test/modules/module_3/rbm.module.conf create mode 100644 test/projects/common/common_1.txt create mode 100644 test/projects/common/common_3.txt -- To stop receiving notification emails like this one, please contact the administrator of this repository.

1 6

[builders/tor-browser-build] branch master updated (956803c -> cf3ebd9)
by gitolite role 30 Jun '22

30 Jun '22

This is an automated email from the git hooks/post-receive script. boklm pushed a change to branch master in repository builders/tor-browser-build. from 956803c Bug 40542: Move var/rezip from rbm.conf to projects/firefox/config new 71bb554 Bug: 40542: Remove unused faketime_patch for Windows new cf3ebd9 Bug 40542: Remove not needed faketime wrapper for macOS The 2 revisions listed above as "new" are entirely new to this repository and will be described in separate emails. The revisions listed as "add" were already present in the repository and have only been added to this reference. Summary of changes: projects/go/build | 7 +------ projects/go/config | 2 -- rbm.conf | 2 -- 3 files changed, 1 insertion(+), 10 deletions(-) -- To stop receiving notification emails like this one, please contact the administrator of this repository.

1 2

[tor] branch main updated: fix typo in comment
by gitolite role 30 Jun '22

30 Jun '22

This is an automated email from the git hooks/post-receive script. arma pushed a commit to branch main in repository tor. The following commit(s) were added to refs/heads/main by this push: new f181ad7c59 fix typo in comment f181ad7c59 is described below commit f181ad7c59da41840e58ab809550f29bdab9b14d Author: Roger Dingledine <arma(a)torproject.org> AuthorDate: Thu Jun 30 03:48:39 2022 -0400 fix typo in comment --- src/feature/hs/hs_client.c | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/src/feature/hs/hs_client.c b/src/feature/hs/hs_client.c index d08b518d94..bc304171ed 100644 --- a/src/feature/hs/hs_client.c +++ b/src/feature/hs/hs_client.c @@ -644,8 +644,8 @@ send_introduce1(origin_circuit_t *intro_circ, goto tran_err; } - /* Check if the rendevous circuit was setup WITHOUT congestion control but if - * it is enabled and the service supports it. This can happen, see + /* Check if the rendezvous circuit was setup WITHOUT congestion control, + * but if it is enabled and the service supports it. This can happen, see * setup_rendezvous_circ_congestion_control() and so close rendezvous circuit * so another one can be created. */ if (TO_CIRCUIT(rend_circ)->ccontrol == NULL && congestion_control_enabled() -- To stop receiving notification emails like this one, please contact the administrator of this repository.

1 0

[builders/tor-browser-build] branch master updated (0a89e14 -> 956803c)
by gitolite role 30 Jun '22

30 Jun '22

This is an automated email from the git hooks/post-receive script. gk pushed a change to branch master in repository builders/tor-browser-build. from 0a89e14 fixup! Bug 40506: Prepare alpha release 11.5a13 (Desktop+Android) new 88291b7 Bug 40542: Remove var/input_files_list from rbm.conf new 956803c Bug 40542: Move var/rezip from rbm.conf to projects/firefox/config The 2 revisions listed above as "new" are entirely new to this repository and will be described in separate emails. The revisions listed as "add" were already present in the repository and have only been added to this reference. Summary of changes: projects/firefox/config | 13 +++++++++++++ rbm.conf | 17 ----------------- 2 files changed, 13 insertions(+), 17 deletions(-) -- To stop receiving notification emails like this one, please contact the administrator of this repository.

1 2

[tor] branch main updated: typo fix in comment
by gitolite role 29 Jun '22

29 Jun '22

This is an automated email from the git hooks/post-receive script. arma pushed a commit to branch main in repository tor. The following commit(s) were added to refs/heads/main by this push: new 2b9d2055f0 typo fix in comment 2b9d2055f0 is described below commit 2b9d2055f0d5970e6c4c2c79b12306e5d9c3bea7 Author: Roger Dingledine <arma(a)torproject.org> AuthorDate: Wed Jun 29 15:43:08 2022 -0400 typo fix in comment --- src/feature/hs/hs_service.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/src/feature/hs/hs_service.c b/src/feature/hs/hs_service.c index ff34e5dc44..716386408a 100644 --- a/src/feature/hs/hs_service.c +++ b/src/feature/hs/hs_service.c @@ -2419,7 +2419,7 @@ should_remove_intro_point(hs_service_intro_point_t *ip, time_t now) goto end; } - /* Pass this point, even though we might be over the retry limit, we check + /* Past this point, even though we might be over the retry limit, we check * if a circuit (established or pending) exists. In that case, we should not * remove it because it might simply be valid and opened at the previous * scheduled event for the last retry. */ -- To stop receiving notification emails like this one, please contact the administrator of this repository.

1 0

[torspec] branch main updated: prop327: Change cell extension type value
by gitolite role 29 Jun '22

29 Jun '22

This is an automated email from the git hooks/post-receive script. dgoulet pushed a commit to branch main in repository torspec. The following commit(s) were added to refs/heads/main by this push: new bb7eba9 prop327: Change cell extension type value bb7eba9 is described below commit bb7eba9b76d79ae7a78e963bcf88a1bb2a292e6d Author: David Goulet <dgoulet(a)torproject.org> AuthorDate: Wed Jun 29 12:04:18 2022 -0400 prop327: Change cell extension type value Congestion control is 0x01 at this moment. Signed-off-by: David Goulet <dgoulet(a)torproject.org> --- proposals/327-pow-over-intro.txt | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/proposals/327-pow-over-intro.txt b/proposals/327-pow-over-intro.txt index 6bd89c4..0fb528f 100644 --- a/proposals/327-pow-over-intro.txt +++ b/proposals/327-pow-over-intro.txt @@ -278,7 +278,7 @@ Status: Draft We propose a new EXT_FIELD_TYPE value: - [01] -- PROOF_OF_WORK + [02] -- PROOF_OF_WORK The EXT_FIELD content format is: -- To stop receiving notification emails like this one, please contact the administrator of this repository.

1 0

[torspec] branch main updated: prop327: Missing field due to typo
by gitolite role 29 Jun '22

29 Jun '22

This is an automated email from the git hooks/post-receive script. dgoulet pushed a commit to branch main in repository torspec. The following commit(s) were added to refs/heads/main by this push: new d943f8a prop327: Missing field due to typo d943f8a is described below commit d943f8a3384c6479e2983078b936d2dd2d5630c4 Author: David Goulet <dgoulet(a)torproject.org> AuthorDate: Wed Jun 29 10:22:06 2022 -0400 prop327: Missing field due to typo Signed-off-by: David Goulet <dgoulet(a)torproject.org> --- proposals/327-pow-over-intro.txt | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/proposals/327-pow-over-intro.txt b/proposals/327-pow-over-intro.txt index fb58a7d..6bd89c4 100644 --- a/proposals/327-pow-over-intro.txt +++ b/proposals/327-pow-over-intro.txt @@ -207,7 +207,8 @@ Status: Draft This whole protocol starts with the service encoding the PoW parameters in the 'encrypted' (inner) part of the v3 descriptor. As follows: - "pow-params" SP type SP seed-b64 SP expiration-time NL + "pow-params" SP type SP seed-b64 SP suggested-effort + SP expiration-time NL [At most once] -- To stop receiving notification emails like this one, please contact the administrator of this repository.

1 0