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

[tor-browser] branch tor-browser-91.10.0esr-11.5-1 updated: fixup! Bug 31286: Implementation of bridge, proxy, and firewall settings in about:preferences#connection
by gitolite role 06 Jul '22

06 Jul '22

This is an automated email from the git hooks/post-receive script. richard pushed a commit to branch tor-browser-91.10.0esr-11.5-1 in repository tor-browser. The following commit(s) were added to refs/heads/tor-browser-91.10.0esr-11.5-1 by this push: new 5b768d43132a4 fixup! Bug 31286: Implementation of bridge, proxy, and firewall settings in about:preferences#connection 5b768d43132a4 is described below commit 5b768d43132a4876ef93d51b50140e8cd2968c7f Author: Pier Angelo Vendrame <pierov(a)torproject.org> AuthorDate: Tue Jul 5 19:35:09 2022 +0200 fixup! Bug 31286: Implementation of bridge, proxy, and firewall settings in about:preferences#connection Bug 41044: Added another workaround for modal sizes --- .../torpreferences/content/builtinBridgeDialog.jsm | 4 ++++ .../content/connectionSettingsDialog.jsm | 4 ++++ .../torpreferences/content/torPreferences.css | 21 +++++++++++++++++++-- 3 files changed, 27 insertions(+), 2 deletions(-) diff --git a/browser/components/torpreferences/content/builtinBridgeDialog.jsm b/browser/components/torpreferences/content/builtinBridgeDialog.jsm index 948ddb6b6de10..5b5e1560cd466 100644 --- a/browser/components/torpreferences/content/builtinBridgeDialog.jsm +++ b/browser/components/torpreferences/content/builtinBridgeDialog.jsm @@ -92,6 +92,10 @@ class BuiltinBridgeDialog { "tab" ); }); + + // Hack: see the CSS + this._dialog.style.minWidth = '0'; + this._dialog.style.minHeight = '0'; } init(window, aDialog) { diff --git a/browser/components/torpreferences/content/connectionSettingsDialog.jsm b/browser/components/torpreferences/content/connectionSettingsDialog.jsm index abc177c43f884..41b9565780dcc 100644 --- a/browser/components/torpreferences/content/connectionSettingsDialog.jsm +++ b/browser/components/torpreferences/content/connectionSettingsDialog.jsm @@ -214,6 +214,10 @@ class ConnectionSettingsDialog { this._dialog.addEventListener("dialogaccept", e => { this._applySettings(); }); + + // Hack: see the CSS + this._dialog.style.minWidth = '0'; + this._dialog.style.minHeight = '0'; } // callback when proxy is toggled diff --git a/browser/components/torpreferences/content/torPreferences.css b/browser/components/torpreferences/content/torPreferences.css index 19fd5f9a92312..8782e68ce5fcc 100644 --- a/browser/components/torpreferences/content/torPreferences.css +++ b/browser/components/torpreferences/content/torPreferences.css @@ -490,6 +490,22 @@ dialog#torPreferences-requestBridge-dialog > hbox { } /* Builtin bridge dialog */ +#torPreferences-builtinBridge-dialog { + /* Hack: ask XUL to load with a lot of space, then we will remove the minimum + sizes after we populate the string. Users with high resolutions should see a + big dialog, but with all the needed buttons, users with small resolutions + should see scrollbars. + Known problems: + 1) the hack works only if a window is *already* small: if it is big, and then + it is resized, the dialog will not shrink; + 2) horizontal scrollbars are never added. + The proper solution for this will be loading the localized string with + Mozilla's way. + See also https://gitlab.torproject.org/tpo/applications/tor-browser/-/issues/41044 */ + min-width: 700px; + min-height: 550px; +} + #torPreferences-builtinBridge-header { margin: 8px 0 10px 0; } @@ -500,7 +516,6 @@ dialog#torPreferences-requestBridge-dialog > hbox { #torPreferences-builtinBridge-typeSelection { margin-bottom: 16px; - min-height: 14em; /* Hack: make room for at least 4 lines of content for 3 types + 2 for spacing */ } #torPreferences-builtinBridge-typeSelection radio label { @@ -533,7 +548,9 @@ groupbox#torPreferences-bridges-group textarea { /* Connection settings dialog */ #torPreferences-connection-dialog { - min-height: 400px; + /* Hack: like the built-in dialog */ + min-width: 700px; + min-height: 550px; } #torPreferences-connection-header { -- 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