March 2023 - tbb-commits - lists.torproject.org

[Git][tpo/applications/tor-browser][base-browser-102.9.0esr-12.5-1] 12 commits: Bug 13379: Allow using NSS to sign and verify MAR signatures
by Pier Angelo Vendrame (＠pierov) 20 Mar '23

20 Mar '23

Pier Angelo Vendrame pushed to branch base-browser-102.9.0esr-12.5-1 at The Tor Project / Applications / Tor Browser Commits: 9a95e213 by Kathy Brade at 2023-03-20T18:38:16+01:00 Bug 13379: Allow using NSS to sign and verify MAR signatures Allow using NSS on all platforms for checking MAR signatures (instead of using OS-native APIs, the default on Mac OS and Windows). So that the NSS and NSPR libraries the updater depends on can be found at runtime, we add the firefox directory to the shared library search path on macOS. On Linux, rpath is used to solve that problem, but that approach won't work on macOS because the updater executable is copied during the update process to a location that can vary. - - - - - 136c2813 by Pier Angelo Vendrame at 2023-03-20T18:38:25+01:00 fixup! Bug 13379: Allow using NSS to sign and verify MAR signatures Bug 41668: Port some updater patches to Base Browser Use a configure-time flag to force using NSS for MARs signatures. - - - - - 72aa9358 by Pier Angelo Vendrame at 2023-03-20T18:38:25+01:00 fixup! Bug 13379: Allow using NSS to sign and verify MAR signatures Bug 41668: Port some updater patches to Base Browser Avoid using -rpath on macOS. - - - - - 038b55d2 by Pier Angelo Vendrame at 2023-03-20T18:38:26+01:00 fixup! Base Browser's .mozconfigs. Bug 41668: Port some updater patches to Base Browser - - - - - 7ae822c3 by Pier Angelo Vendrame at 2023-03-20T18:38:26+01:00 fixup! Base Browser's .mozconfigs. Bug 41677: Fix updater settings for Android - - - - - da0f77aa by Pier Angelo Vendrame at 2023-03-20T18:38:26+01:00 fixup! Firefox preference overrides. Bug 41668: Port some updater patches to Base Browser Do not change app.update.auto in firefox.js, but add it to 001. - - - - - b5f2300a by Kathy Brade at 2023-03-20T18:38:27+01:00 Bug 4234: Use the Firefox Update Process for Base Browser. Windows: disable "runas" code path in updater (15201). Windows: avoid writing to the registry (16236). Also includes fixes for tickets 13047, 13301, 13356, 13594, 15406, 16014, 16909, 24476, and 25909. Also fix bug 27221: purge the startup cache if the Base Browser version changed (even if the Firefox version and build ID did not change), e.g., after a minor Base Browser update. Also fix 32616: Disable GetSecureOutputDirectoryPath() functionality. Bug 26048: potentially confusing "restart to update" message Within the update doorhanger, remove the misleading message that mentions that windows will be restored after an update is applied, and replace the "Restart and Restore" button label with an existing "Restart to update Tor Browser" string. Bug 28885: notify users that update is downloading Add a "Downloading Base Browser update" item which appears in the hamburger (app) menu while the update service is downloading a MAR file. Before this change, the browser did not indicate to the user that an update was in progress, which is especially confusing in Tor Browser because downloads often take some time. If the user clicks on the new menu item, the about dialog is opened to allow the user to see download progress. As part of this fix, the update service was changed to always show update-related messages in the hamburger menu, even if the update was started in the foreground via the about dialog or via the "Check for Tor Browser Update" toolbar menu item. This change is consistent with the Tor Browser goal of making sure users are informed about the update process. Removed #28885 parts of this patch which have been uplifted to Firefox. - - - - - e359ab23 by Pier Angelo Vendrame at 2023-03-20T18:38:27+01:00 fixup! Bug 4234: Use the Firefox Update Process for Base Browser. Bug 41647: Clean up our {TOR,BASE}_BROWSER(_VERSION)? macros Changed TOR_BROWSER_VERSION with BASE_BROWSER_VERSION. - - - - - ef8cc25a by Pier Angelo Vendrame at 2023-03-20T18:38:28+01:00 fixup! Bug 4234: Use the Firefox Update Process for Base Browser. Bug 41668: Port some updater patches to Base Browser Move the check on the update package version to this other commit. - - - - - 2ae0ca1c by Pier Angelo Vendrame at 2023-03-20T18:38:28+01:00 fixup! Bug 4234: Use the Firefox Update Process for Base Browser. Bug 41668: Port some updater patches to Base Browser Rename TOR_BROWSER_UPDATE to BASE_BROWSER_UPDATE. Also, do not change app.update.auto in firefox.js, but add it to 001. - - - - - 9640ba6e by Pier Angelo Vendrame at 2023-03-20T18:38:28+01:00 fixup! Bug 4234: Use the Firefox Update Process for Base Browser. Bug 41668: Port some updater patches to Base Browser Changes that will need to remain when actually cherry-picking to base-browser, because they contain name fixes, for example. Or, for UpdateService.jsm, they need to stay because they make the patch more understandable. - - - - - 9b61b6f0 by Pier Angelo Vendrame at 2023-03-20T18:38:29+01:00 fixup! Bug 4234: Use the Firefox Update Process for Base Browser. Bug 41668: Port some updater patches to Base Browser Remove Tor Browser-only additions to make the updater patches usable with Base Browser. This commit should be reverted, and become a commit on its own, to further adapt the updater to Tor Browser needs. - - - - - 30 changed files: - browser/app/Makefile.in - browser/app/profile/001-base-profile.js - browser/app/profile/firefox.js - browser/base/content/aboutDialog-appUpdater.js - browser/base/content/aboutDialog.js - browser/base/moz.build - browser/components/BrowserContentHandler.jsm - browser/components/customizableui/content/panelUI.inc.xhtml - browser/components/preferences/main.js - browser/config/mozconfigs/base-browser - browser/config/mozconfigs/base-browser-android - browser/confvars.sh - browser/installer/Makefile.in - browser/installer/package-manifest.in - build/application.ini.in - build/moz.configure/init.configure - build/moz.configure/update-programs.configure - devtools/client/aboutdebugging/src/actions/runtimes.js - modules/libmar/tool/mar.c - modules/libmar/tool/moz.build - modules/libmar/verify/moz.build - mozconfig-linux-x86_64-dev - toolkit/modules/AppConstants.jsm - toolkit/modules/UpdateUtils.jsm - toolkit/modules/moz.build - toolkit/mozapps/extensions/AddonManager.jsm - toolkit/mozapps/extensions/test/browser/head.js - toolkit/mozapps/extensions/test/xpcshell/head_addons.js - toolkit/mozapps/update/UpdateService.jsm - toolkit/mozapps/update/UpdateServiceStub.jsm The diff was not included because it is too large. View it on GitLab: https://gitlab.torproject.org/tpo/applications/tor-browser/-/compare/9c1dd5… -- View it on GitLab: https://gitlab.torproject.org/tpo/applications/tor-browser/-/compare/9c1dd5… You're receiving this email because of your account on gitlab.torproject.org.

1 0

[Git][tpo/applications/tor-browser-build][main] 2 commits: Bug 40763: Add support for signing multiple browsers in tools/signing/nightly
by boklm (＠boklm) 20 Mar '23

20 Mar '23

boklm pushed to branch main at The Tor Project / Applications / tor-browser-build Commits: 38099794 by Nicolas Vigier at 2023-03-20T17:29:45+01:00 Bug 40763: Add support for signing multiple browsers in tools/signing/nightly - - - - - 3f0b4c83 by Nicolas Vigier at 2023-03-20T17:29:46+01:00 Bug 40807: Add config for basebrowser nightly signing - - - - - 3 changed files: - tools/signing/nightly/config.yml - tools/signing/nightly/create-nightly-mar-signing-key - tools/signing/nightly/sign-nightly Changes: ===================================== tools/signing/nightly/config.yml ===================================== @@ -3,15 +3,22 @@ martools_version: 9.0.2 martools_url: https://archive.torproject.org/tor-package-archive/torbrowser/ martools_gpg_keyring: keyring/torbrowser.gpg builds_url: /srv/tbb-nightlies-master.torproject.org/htdocs/nightly-builds/tor-browser-builds -builds_url_auth_basic_username: tor-guest -builds_url_auth_basic_password: tor-guest -publish_dirs: +torbrowser: + publish_dirs: - nightly-linux-x86_64 - nightly-linux-i686 - nightly-windows-x86_64 - nightly-windows-i686 - nightly-macos -nss_db_dir: nssdb + nss_db_dir: nssdb +basebrowser: + publish_dirs: + - basebrowser-nightly-linux-x86_64 + - basebrowser-nightly-linux-i686 + - basebrowser-nightly-windows-x86_64 + - basebrowser-nightly-windows-i686 + - basebrowser-nightly-macos + nss_db_dir: nssdb-basebrowser-1 nss_certname: nightly-marsigner gpg_keyring: keyring/torbrowser-nightly.gpg rsync_dest: /srv/tbb-nightlies-master.torproject.org/htdocs/nightly-updates/ ===================================== tools/signing/nightly/create-nightly-mar-signing-key ===================================== @@ -1,6 +1,13 @@ #!/bin/bash set -e -nssdb="$(dirname "$0")/nssdb" +if test "$#" -ne 2; then + echo "Usage: $0 <nssdb-dir> <Browser Name>" >&2 + echo >&2 + echo "Example: $0 nssdb-basebrowser 'Base Browser'" >&2 + exit 1 +fi +nssdb="$(dirname "$0")/$1" +BrowserName="$2" if test -d $nssdb then echo "Error: $nssdb already exists" >&2 @@ -9,5 +16,5 @@ fi mkdir -p $nssdb chmod 700 $nssdb certutil -d $nssdb -N --empty-password -certutil -d $nssdb -S -x -g 4096 -Z SHA384 -n nightly-marsigner -s "CN=Tor Browser Nightly MAR signing key" -t,, +certutil -d $nssdb -S -x -g 4096 -Z SHA384 -n nightly-marsigner -s "CN=$BrowserName Nightly MAR signing key" -t,, certutil -d $nssdb -L -r -n nightly-marsigner -o $nssdb/nightly-marsigner.der ===================================== tools/signing/nightly/sign-nightly ===================================== @@ -33,13 +33,22 @@ exit_error "Missing config file: $FindBin::Bin/config.yml" my $config = LoadFile("$FindBin::Bin/config.yml"); my $topdir = "$FindBin::Bin/../../.."; +exit_error "Usage: sign-nightly <project>" unless @ARGV == 1; +my $project = $ARGV[0]; + +sub get_config { + my ($name) = @_; + return $config->{$project}{$name} if defined $config->{$project}{$name}; + return $config->{$name}; +} + { no warnings 'redefine'; sub LWP::UserAgent::get_basic_credentials { - if ($config->{builds_url_auth_basic_username} - && $config->{builds_url_auth_basic_password}) { - return ( $config->{builds_url_auth_basic_username}, - $config->{builds_url_auth_basic_password} ); + if (get_config('builds_url_auth_basic_username') + && get_config('builds_url_auth_basic_password')) { + return ( get_config('builds_url_auth_basic_username'), + get_config('builds_url_auth_basic_password') ); } return (); } @@ -51,7 +60,7 @@ sub print_time { } END { - print_time "Exiting sign-nightly (pid: $$)\n"; + print_time "Exiting sign-nightly (pid: $$, project: $project)\n" if $project; } sub run_alone { @@ -71,10 +80,8 @@ END { } sub get_tmpdir { - my ($config) = @_; - return File::Temp->newdir($config->{tmp_dir} ? - (DIR => $config->{tmp_dir}) - : ()); + my $tmp_dir = get_config('tmp_dir'); + return File::Temp->newdir($tmp_dir ? (DIR => $tmp_dir) : ()); } sub basedir_path { @@ -83,15 +90,16 @@ sub basedir_path { } sub get_last_build_version { - my ($config, $publish_dir) = @_; + my ($publish_dir) = @_; my $today = 'tbb-nightly.' . DateTime->now->ymd('.'); my @last_days; for my $i (1..5) { my $dt = DateTime->now - DateTime::Duration->new(days => $i); push @last_days, 'tbb-nightly.' . $dt->ymd('.'); } + my $builds_url = get_config('builds_url'); for my $version ($today, @last_days) { - my $url = "$config->{builds_url}/$version/$publish_dir/sha256sums-unsigned-build.incrementals.txt"; + my $url = "$builds_url/$version/$publish_dir/sha256sums-unsigned-build.incrementals.txt"; if ($url =~ m|^/|) { return $version if -f $url; } else { @@ -115,10 +123,10 @@ sub set_current_version { } sub get_new_version { - my ($config, $publish_dir) = @_; + my ($publish_dir) = @_; my $today = 'tbb-nightly.' . DateTime->now->ymd('.'); my $current_ver = get_current_version($publish_dir); - my $last_ver = get_last_build_version($config, $publish_dir); + my $last_ver = get_last_build_version($publish_dir); return $last_ver unless defined($current_ver); return undef if $current_ver eq $today; return undef unless defined($last_ver); @@ -147,13 +155,13 @@ sub get_file_sha256sum { } sub fetch_version { - my ($config, $publish_dir, $version) = @_; - my $tmpdir = get_tmpdir($config); - my $urldir = "$config->{builds_url}/$version/$publish_dir"; + my ($publish_dir, $version) = @_; + my $tmpdir = get_tmpdir(); + my $urldir = get_config('builds_url') . "/$version/$publish_dir"; my $destdir = "$topdir/nightly/$publish_dir/$version"; return if -d $destdir; - my $gpg_keyring = basedir_path($config->{gpg_keyring}, $topdir); + my $gpg_keyring = basedir_path(get_config('gpg_keyring'), $topdir); for my $file (qw/sha256sums-unsigned-build.txt sha256sums-unsigned-build.incrementals.txt/) { my $url = "$urldir/$file"; exit_error "Error getting $url" @@ -184,17 +192,17 @@ sub fetch_version { } sub setup_martools { - my ($config) = @_; - my $martools_dir = "$FindBin::Bin/mar-tools-$config->{martools_version}"; + my $martools_dir = "$FindBin::Bin/mar-tools-" . get_config('martools_version'); if (! -d $martools_dir) { my $file = "mar-tools-linux64.zip"; - my $url = "$config->{martools_url}/$config->{martools_version}/$file"; - my $tmpdir = get_tmpdir($config); + my $url = join('/', get_config('martools_url'), + get_config('martools_version'), $file); + my $tmpdir = get_tmpdir(); exit_error "Error downloading $url" unless getstore($url, "$tmpdir/$file") == 200; exit_error "Error downloading $url.asc" unless getstore("$url.asc", "$tmpdir/$file.asc") == 200; - my $gpg_keyring = basedir_path($config->{martools_gpg_keyring}, $topdir); + my $gpg_keyring = basedir_path(get_config('martools_gpg_keyring'), $topdir); exit_error "Error checking gpg signature for $url" if system('gpg', '--no-default-keyring', '--keyring', $gpg_keyring, '--verify', "$tmpdir/$file.asc", @@ -212,14 +220,14 @@ sub setup_martools { } sub sign_version { - my ($config, $publish_dir, $version) = @_; - setup_martools($config); - my $nss_db_dir = basedir_path($config->{nss_db_dir}, $FindBin::Bin); + my ($publish_dir, $version) = @_; + setup_martools(); + my $nss_db_dir = basedir_path(get_config('nss_db_dir'), $FindBin::Bin); for my $marfile (path("$topdir/nightly/$publish_dir/$version")->children(qr/\.mar$/)) { print "Signing $marfile\n"; exit_error "Error signing $marfile" unless system('signmar', '-d', $nss_db_dir, '-n', - $config->{nss_certname}, '-s', $marfile, + get_config('nss_certname'), '-s', $marfile, "$marfile-signed") == 0; move("$marfile-signed", $marfile); } @@ -232,7 +240,7 @@ sub get_buildinfos { } sub update_responses { - my ($config, $publish_dir, $version) = @_; + my ($publish_dir, $version) = @_; my $ur_config = LoadFile("$FindBin::Bin/update-responses-base-config.yml"); $ur_config->{download}{mars_url} .= "/$publish_dir"; $ur_config->{releases_dir} = "$topdir/nightly/$publish_dir"; @@ -253,7 +261,7 @@ sub update_responses { } sub remove_oldversions { - my ($config, $publish_dir, $version) = @_; + my ($publish_dir, $version) = @_; for my $dir (path("$topdir/nightly/$publish_dir")->children) { my ($filename) = fileparse($dir); next if $filename eq $version; @@ -262,27 +270,27 @@ sub remove_oldversions { } sub sync_dest { - my ($config) = @_; exit_error "Error running rsync" if system('rsync', '-aH', '--delete-after', - "$topdir/nightly/", "$config->{rsync_dest}/"); - if ($config->{post_rsync_cmd}) { - exit_error "Error running $config->{post_rsync_cmd}" - if system($config->{post_rsync_cmd}); + "$topdir/nightly/", get_config('rsync_dest') . '/'); + my $post_rsync_cmd = get_config('post_rsync_cmd'); + if ($post_rsync_cmd) { + exit_error "Error running $post_rsync_cmd" + if system($post_rsync_cmd); } } -print_time "Starting sign-nightly (pid: $$)\n"; +print_time "Starting sign-nightly (pid: $$, project: $project)\n"; run_alone; my $some_updates = 0; -foreach my $publish_dir (@{$config->{publish_dirs}}) { - my $new_version = get_new_version($config, $publish_dir); +foreach my $publish_dir (@{get_config('publish_dirs')}) { + my $new_version = get_new_version($publish_dir); next unless $new_version; - fetch_version($config, $publish_dir, $new_version); - sign_version($config, $publish_dir, $new_version); - update_responses($config, $publish_dir, $new_version); + fetch_version($publish_dir, $new_version); + sign_version($publish_dir, $new_version); + update_responses($publish_dir, $new_version); set_current_version($publish_dir, $new_version); - remove_oldversions($config, $publish_dir, $new_version); + remove_oldversions($publish_dir, $new_version); $some_updates = 1; } -sync_dest($config) if $some_updates; +sync_dest() if $some_updates; View it on GitLab: https://gitlab.torproject.org/tpo/applications/tor-browser-build/-/compare/… -- View it on GitLab: https://gitlab.torproject.org/tpo/applications/tor-browser-build/-/compare/… You're receiving this email because of your account on gitlab.torproject.org.

1 0

[Git][tpo/applications/tor-browser-bundle-testsuite][main] Bug 40073: Create incrementals for base-browser nightly builds
by boklm (＠boklm) 20 Mar '23

20 Mar '23

boklm pushed to branch main at The Tor Project / Applications / tor-browser-bundle-testsuite Commits: 2190cfc8 by Nicolas Vigier at 2023-03-20T15:53:59+01:00 Bug 40073: Create incrementals for base-browser nightly builds - - - - - 1 changed file: - TBBTestSuite/TestSuite/TorBrowserBuild.pm Changes: ===================================== TBBTestSuite/TestSuite/TorBrowserBuild.pm ===================================== @@ -194,6 +194,13 @@ sub set_tests { ], publish_dir => 'basebrowser-nightly-linux-x86_64', }, + { + name => 'basebrowser-incrementals-nightly-linux-x86_64', + descr => 'create incrementals for base-browser nightly linux-x86_64', + type => 'make_incrementals', + publish_dir => 'basebrowser-nightly-linux-x86_64', + projectname => 'basebrowser', + }, { name => 'basebrowser-nightly-linux-i686', descr => 'build base-browser nightly linux-i686', @@ -207,6 +214,13 @@ sub set_tests { ], publish_dir => 'basebrowser-nightly-linux-i686', }, + { + name => 'basebrowser-incrementals-nightly-linux-i686', + descr => 'create incrementals for base-browser nightly linux-i686', + type => 'make_incrementals', + publish_dir => 'basebrowser-nightly-linux-i686', + projectname => 'basebrowser', + }, { name => 'basebrowser-nightly-windows-i686', descr => 'build base-browser nightly windows-i686', @@ -220,6 +234,13 @@ sub set_tests { ], publish_dir => 'basebrowser-nightly-windows-i686', }, + { + name => 'basebrowser-incrementals-nightly-windows-i686', + descr => 'create incrementals for base-browser nightly windows-i686', + type => 'make_incrementals', + publish_dir => 'basebrowser-nightly-windows-i686', + projectname => 'basebrowser', + }, { name => 'basebrowser-nightly-windows-x86_64', descr => 'build base-browser nightly windows-x86_64', @@ -233,6 +254,13 @@ sub set_tests { ], publish_dir => 'basebrowser-nightly-windows-x86_64', }, + { + name => 'basebrowser-incrementals-nightly-windows-x86_64', + descr => 'create incrementals for base-browser nightly windows-x86_64', + type => 'make_incrementals', + publish_dir => 'basebrowser-nightly-windows-x86_64', + projectname => 'basebrowser', + }, { name => 'basebrowser-nightly-macos', descr => 'build base-browser nightly macos', @@ -246,6 +274,13 @@ sub set_tests { ], publish_dir => 'basebrowser-nightly-macos', }, + { + name => 'basebrowser-incrementals-nightly-macos', + descr => 'create incrementals for base-browser nightly macos (universal)', + type => 'make_incrementals', + publish_dir => 'basebrowser-nightly-macos', + projectname => 'basebrowser', + }, ]; } View it on GitLab: https://gitlab.torproject.org/tpo/applications/tor-browser-bundle-testsuite… -- View it on GitLab: https://gitlab.torproject.org/tpo/applications/tor-browser-bundle-testsuite… You're receiving this email because of your account on gitlab.torproject.org.

1 0

[Git][tpo/applications/tor-browser][base-browser-102.9.0esr-12.5-1] Bug 41682: Add base-browser nightly mar signing key
by boklm (＠boklm) 20 Mar '23

20 Mar '23

boklm pushed to branch base-browser-102.9.0esr-12.5-1 at The Tor Project / Applications / Tor Browser Commits: 9c1dd51f by Nicolas Vigier at 2023-03-20T15:32:52+01:00 Bug 41682: Add base-browser nightly mar signing key - - - - - 2 changed files: - toolkit/mozapps/update/updater/nightly_aurora_level3_primary.der - toolkit/mozapps/update/updater/nightly_aurora_level3_secondary.der Changes: ===================================== toolkit/mozapps/update/updater/nightly_aurora_level3_primary.der ===================================== Binary files a/toolkit/mozapps/update/updater/nightly_aurora_level3_primary.der and b/toolkit/mozapps/update/updater/nightly_aurora_level3_primary.der differ ===================================== toolkit/mozapps/update/updater/nightly_aurora_level3_secondary.der ===================================== Binary files a/toolkit/mozapps/update/updater/nightly_aurora_level3_secondary.der and b/toolkit/mozapps/update/updater/nightly_aurora_level3_secondary.der differ View it on GitLab: https://gitlab.torproject.org/tpo/applications/tor-browser/-/commit/9c1dd51… -- View it on GitLab: https://gitlab.torproject.org/tpo/applications/tor-browser/-/commit/9c1dd51… You're receiving this email because of your account on gitlab.torproject.org.

1 0

[Git][tpo/applications/tor-browser-build][main] Bug 40817: Add basebrowser-incrementals-nightly makefile target
by boklm (＠boklm) 20 Mar '23

20 Mar '23

boklm pushed to branch main at The Tor Project / Applications / tor-browser-build Commits: e13d27af by Nicolas Vigier at 2023-03-20T15:47:25+01:00 Bug 40817: Add basebrowser-incrementals-nightly makefile target - - - - - 1 changed file: - Makefile Changes: ===================================== Makefile ===================================== @@ -396,6 +396,11 @@ basebrowser-testbuild-macos-aarch64: submodule-update basebrowser-testbuild-src: submodule-update $(rbm) build release --target testbuild --target browser-src-testbuild --target basebrowser +basebrowser-incrementals-nightly: submodule-update + $(rbm) build release --step update_responses_config --target nightly --target basebrowser + NO_CODESIGNATURE=1 tools/update-responses/gen_incrementals nightly + $(rbm) build release --step hash_incrementals --target nightly --target basebrowser + ########################### # Privacy Browser Targets # View it on GitLab: https://gitlab.torproject.org/tpo/applications/tor-browser-build/-/commit/e… -- View it on GitLab: https://gitlab.torproject.org/tpo/applications/tor-browser-build/-/commit/e… You're receiving this email because of your account on gitlab.torproject.org.

1 0

[Git][tpo/applications/tor-browser] Pushed new tag tor-browser-102.9.0esr-12.5-1-build2
by Richard Pospesel (＠richard) 20 Mar '23

20 Mar '23

Richard Pospesel pushed new tag tor-browser-102.9.0esr-12.5-1-build2 at The Tor Project / Applications / Tor Browser -- View it on GitLab: https://gitlab.torproject.org/tpo/applications/tor-browser/-/tree/tor-brows… You're receiving this email because of your account on gitlab.torproject.org.

1 0

[Git][tpo/applications/tor-browser][tor-browser-102.9.0esr-12.5-1] 4 commits: fixup! Bug 4234: Use the Firefox Update Process for Tor Browser.
by Pier Angelo Vendrame (＠pierov) 20 Mar '23

20 Mar '23

Pier Angelo Vendrame pushed to branch tor-browser-102.9.0esr-12.5-1 at The Tor Project / Applications / Tor Browser Commits: 9eac9235 by Pier Angelo Vendrame at 2023-03-20T14:38:14+01:00 fixup! Bug 4234: Use the Firefox Update Process for Tor Browser. Bug 41668: Port some updater patches to Base Browser Changes that will need to remain when actually cherry-picking to base-browser, because they contain name fixes, for example. Or, for UpdateService.jsm, they need to stay because they make the patch more understandable. - - - - - cfc8f07d by Pier Angelo Vendrame at 2023-03-20T14:38:23+01:00 fixup! Bug 4234: Use the Firefox Update Process for Tor Browser. Bug 41668: Port some updater patches to Base Browser Remove Tor Browser-only additions to make the updater patches usable with Base Browser. This commit should be reverted, and become a commit on its own, to further adapt the updater to Tor Browser needs. - - - - - 648dd29f by Pier Angelo Vendrame at 2023-03-20T14:38:24+01:00 Bug 41668: Tweaks to the Base Browser updater for Tor Browser This commit was once part of "Bug 4234: Use the Firefox Update Process for Tor Browser.". However, some parts of it were not needed for Base Browser and some derivative browsers. Therefore, we extracted from that commit the parts for Tor Browser legacy, and we add them back to the patch set with this commit. - - - - - e5e872d6 by Kathy Brade at 2023-03-20T14:38:24+01:00 Bug 12647: Support symlinks in the updater. - - - - - 11 changed files: - browser/components/BrowserContentHandler.jsm - build/moz.configure/init.configure - toolkit/modules/UpdateUtils.jsm - toolkit/mozapps/extensions/AddonManager.jsm - toolkit/mozapps/update/UpdateService.jsm - toolkit/mozapps/update/UpdateServiceStub.jsm - toolkit/mozapps/update/common/updatehelper.cpp - toolkit/xre/nsAppRunner.cpp - toolkit/xre/nsUpdateDriver.cpp - toolkit/xre/nsXREDirProvider.cpp - tools/update-packaging/make_incremental_update.sh Changes: ===================================== browser/components/BrowserContentHandler.jsm ===================================== @@ -37,7 +37,7 @@ XPCOMUtils.defineLazyGetter(this, "gSystemPrincipal", () => ); XPCOMUtils.defineLazyGlobalGetters(this, [URL]); -const kTBSavedVersionPref = +const FORK_VERSION_PREF = "browser.startup.homepage_override.torbrowser.version"; // One-time startup homepage override configurations @@ -103,8 +103,8 @@ const OVERRIDE_NEW_BUILD_ID = 3; * Returns: * OVERRIDE_NEW_PROFILE if this is the first run with a new profile. * OVERRIDE_NEW_MSTONE if this is the first run with a build with a different - * Gecko milestone or Tor Browser version (i.e. right - * after an upgrade). + * Gecko milestone or fork version (i.e. right after an + * upgrade). * OVERRIDE_NEW_BUILD_ID if this is the first run with a new build ID of the * same Gecko milestone (i.e. after a nightly upgrade). * OVERRIDE_NONE otherwise. @@ -121,7 +121,7 @@ function needHomepageOverride(prefb) { var mstone = Services.appinfo.platformVersion; - var savedTBVersion = prefb.getCharPref(kTBSavedVersionPref, null); + var savedForkVersion = prefb.getCharPref(FORK_VERSION_PREF, null); var savedBuildID = prefb.getCharPref( "browser.startup.homepage_override.buildID", @@ -144,20 +144,13 @@ function needHomepageOverride(prefb) { prefb.setCharPref("browser.startup.homepage_override.mstone", mstone); prefb.setCharPref("browser.startup.homepage_override.buildID", buildID); - prefb.setCharPref(kTBSavedVersionPref, AppConstants.BASE_BROWSER_VERSION); - - // After an upgrade from an older release of Tor Browser (<= 5.5a1), the - // savedmstone will be undefined because those releases included the - // value "ignore" for the browser.startup.homepage_override.mstone pref. - // To correctly detect an upgrade vs. a new profile, we check for the - // presence of the "app.update.postupdate" pref. - let updated = prefb.prefHasUserValue("app.update.postupdate"); - return savedmstone || updated ? OVERRIDE_NEW_MSTONE : OVERRIDE_NEW_PROFILE; + prefb.setCharPref(FORK_VERSION_PREF, AppConstants.BASE_BROWSER_VERSION); + return savedmstone ? OVERRIDE_NEW_MSTONE : OVERRIDE_NEW_PROFILE; } - if (AppConstants.BASE_BROWSER_VERSION != savedTBVersion) { + if (AppConstants.BASE_BROWSER_VERSION != savedForkVersion) { prefb.setCharPref("browser.startup.homepage_override.buildID", buildID); - prefb.setCharPref(kTBSavedVersionPref, AppConstants.BASE_BROWSER_VERSION); + prefb.setCharPref(FORK_VERSION_PREF, AppConstants.BASE_BROWSER_VERSION); return OVERRIDE_NEW_MSTONE; } @@ -689,8 +682,8 @@ nsBrowserContentHandler.prototype = { "unknown" ); - // We do the same for the Tor Browser version. - let old_tbversion = prefb.getCharPref(kTBSavedVersionPref, null); + // We do the same for the fork version. + let old_forkVersion = prefb.getCharPref(FORK_VERSION_PREF, null); override = needHomepageOverride(prefb); if (override != OVERRIDE_NONE) { @@ -728,7 +721,7 @@ nsBrowserContentHandler.prototype = { "startup.homepage_override_url" ); let update = UpdateManager.readyUpdate; - let old_version = old_tbversion ? old_tbversion : old_mstone; + let old_version = old_forkVersion ? old_forkVersion : old_mstone; if ( update && Services.vc.compare(update.appVersion, old_version) > 0 @@ -740,8 +733,8 @@ nsBrowserContentHandler.prototype = { overridePage = overridePage.replace("%OLD_VERSION%", old_mstone); overridePage = overridePage.replace( - "%OLD_TOR_BROWSER_VERSION%", - old_tbversion + "%OLD_BASE_BROWSER_VERSION%", + old_forkVersion ); if (overridePage && AppConstants.BASE_BROWSER_UPDATE) { prefb.setCharPref("torbrowser.post_update.url", overridePage); ===================================== build/moz.configure/init.configure ===================================== @@ -954,10 +954,10 @@ def version_path(path): return path -# set RELEASE_OR_BETA and NIGHTLY_BUILD variables depending on the cycle we're in -# The logic works like this: -# - if we have "a1" in GRE_MILESTONE, we're building Nightly (define NIGHTLY_BUILD) -# - otherwise, we're building Release/Beta (define RELEASE_OR_BETA) +# Firefox looks for "a" or "a1" in the milestone to detect whether nightly +# features should be enabled. We do not want them, because we want our nightly +# builds to be as close as possible to actual releases. +# So we set always is_release_or_beta to True. @depends(build_environment, build_project, version_path, "--help") @imports(_from="__builtin__", _import="open") @imports("os") @@ -1001,10 +1001,8 @@ def milestone(build_env, build_project, version_path, _): is_nightly = is_release_or_beta = is_early_beta_or_earlier = None - if "a1" in milestone: - is_nightly = True - else: - is_release_or_beta = True + # Do not enable extra nightly features + is_release_or_beta = True major_version = milestone.split(".")[0] m = re.search(r"([ab]\d+)", milestone) ===================================== toolkit/modules/UpdateUtils.jsm ===================================== @@ -167,8 +167,8 @@ var UpdateUtils = { * downloads and installs updates. This corresponds to whether or not the user * has selected "Automatically install updates" in about:preferences. * - * On Windows (except in Tor Browser), this setting is shared across all profiles - * for the installation + * On Windows (except in Base Browser and derivatives), this setting is shared + * across all profiles for the installation * and is read asynchronously from the file. On other operating systems, this * setting is stored in a pref and is thus a per-profile setting. * @@ -184,8 +184,8 @@ var UpdateUtils = { * updates" and "Check for updates but let you choose to install them" options * in about:preferences. * - * On Windows (except in Tor Browser), this setting is shared across all profiles - * for the installation + * On Windows (except in Base Browser and derivatives), this setting is shared + * across all profiles for the installation * and is written asynchronously to the file. On other operating systems, this * setting is stored in a pref and is thus a per-profile setting. * ===================================== toolkit/mozapps/extensions/AddonManager.jsm ===================================== @@ -40,7 +40,7 @@ const PREF_EM_STRICT_COMPATIBILITY = "extensions.strictCompatibility"; const PREF_EM_CHECK_UPDATE_SECURITY = "extensions.checkUpdateSecurity"; const PREF_SYS_ADDON_UPDATE_ENABLED = "extensions.systemAddon.update.enabled"; const PREF_REMOTESETTINGS_DISABLED = "extensions.remoteSettings.disabled"; -const PREF_EM_LAST_TORBROWSER_VERSION = "extensions.lastTorBrowserVersion"; +const PREF_EM_LAST_FORK_VERSION = "extensions.lastTorBrowserVersion"; const PREF_MIN_WEBEXT_PLATFORM_VERSION = "extensions.webExtensionsMinPlatformVersion"; @@ -645,26 +645,19 @@ var AddonManagerInternal = { ); } - // To ensure that extension and plugin code gets a chance to run - // after each browser update, set appChanged = true when the - // Tor Browser version has changed even if the Mozilla app - // version has not changed. - let tbChanged = undefined; - try { - tbChanged = - AppConstants.BASE_BROWSER_VERSION !== - Services.prefs.getCharPref(PREF_EM_LAST_TORBROWSER_VERSION); - } catch (e) {} - if (tbChanged !== false) { - // Because PREF_EM_LAST_TORBROWSER_VERSION was not present in older - // versions of Tor Browser, an app change is indicated when tbChanged - // is undefined or true. + // To ensure that extension and plugin code gets a chance to run after + // each browser update, set appChanged = true when BASE_BROWSER_VERSION + // has changed even if the Mozilla app version has not changed. + const forkChanged = AppConstants.BASE_BROWSER_VERSION !== + Services.prefs.getCharPref(PREF_EM_LAST_FORK_VERSION, ""); + if (forkChanged) { + // appChanged could be undefined (in case of a new profile) if (appChanged === false) { appChanged = true; } Services.prefs.setCharPref( - PREF_EM_LAST_TORBROWSER_VERSION, + PREF_EM_LAST_FORK_VERSION, AppConstants.BASE_BROWSER_VERSION ); } ===================================== toolkit/mozapps/update/UpdateService.jsm ===================================== @@ -1587,33 +1587,32 @@ function handleUpdateFailure(update, errorCode) { ); cancelations++; Services.prefs.setIntPref(PREF_APP_UPDATE_CANCELATIONS, cancelations); - if (AppConstants.platform == "macosx") { - if (AppConstants.BASE_BROWSER_UPDATE) { - cleanupActiveUpdates(); + if (AppConstants.platform == "macosx" && AppConstants.BASE_BROWSER_UPDATE) { + cleanupActiveUpdates(); + update.statusText = gUpdateBundle.GetStringFromName("elevationFailure"); + } else if (AppConstants.platform == "macosx") { + let osxCancelations = Services.prefs.getIntPref( + PREF_APP_UPDATE_CANCELATIONS_OSX, + 0 + ); + osxCancelations++; + Services.prefs.setIntPref( + PREF_APP_UPDATE_CANCELATIONS_OSX, + osxCancelations + ); + let maxCancels = Services.prefs.getIntPref( + PREF_APP_UPDATE_CANCELATIONS_OSX_MAX, + DEFAULT_CANCELATIONS_OSX_MAX + ); + // Prevent the preference from setting a value greater than 5. + maxCancels = Math.min(maxCancels, 5); + if (osxCancelations >= maxCancels) { + cleanupReadyUpdate(); } else { - let osxCancelations = Services.prefs.getIntPref( - PREF_APP_UPDATE_CANCELATIONS_OSX, - 0 - ); - osxCancelations++; - Services.prefs.setIntPref( - PREF_APP_UPDATE_CANCELATIONS_OSX, - osxCancelations + writeStatusFile( + getReadyUpdateDir(), + (update.state = STATE_PENDING_ELEVATE) ); - let maxCancels = Services.prefs.getIntPref( - PREF_APP_UPDATE_CANCELATIONS_OSX_MAX, - DEFAULT_CANCELATIONS_OSX_MAX - ); - // Prevent the preference from setting a value greater than 5. - maxCancels = Math.min(maxCancels, 5); - if (osxCancelations >= maxCancels) { - cleanupReadyUpdate(); - } else { - writeStatusFile( - getReadyUpdateDir(), - (update.state = STATE_PENDING_ELEVATE) - ); - } } update.statusText = gUpdateBundle.GetStringFromName("elevationFailure"); } else { ===================================== toolkit/mozapps/update/UpdateServiceStub.jsm ===================================== @@ -80,8 +80,9 @@ function UpdateServiceStub() { // contains the status file's path // We may need to migrate update data - // In Tor Browser we skip this because we do not use an update agent and we - // do not want to store any data outside of the browser installation directory. + // In Base Browser and derivatives, we skip this because we do not use an + // update agent and we do not want to store any data outside of the browser + // installation directory. // For more info, see https://bugzilla.mozilla.org/show_bug.cgi?id=1458314 if ( AppConstants.platform == "win" && ===================================== toolkit/mozapps/update/common/updatehelper.cpp ===================================== @@ -68,8 +68,8 @@ BOOL PathGetSiblingFilePath(LPWSTR destinationBuffer, LPCWSTR siblingFilePath, BOOL GetSecureOutputDirectoryPath(LPWSTR outBuf) { #ifdef BASE_BROWSER_UPDATE // This function is used to support the maintenance service and elevated - // updates and is therefore not called by Tor Browser's updater. We stub - // it out to avoid any chance that the Tor Browser updater will create + // updates and is therefore not called by Base Browser's updater. We stub + // it out to avoid any chance that the Base Browser updater will create // files under C:\Program Files (x86)\ or a similar location. return FALSE; #else ===================================== toolkit/xre/nsAppRunner.cpp ===================================== @@ -3657,9 +3657,9 @@ static bool CheckCompatibility(nsIFile* aProfileDir, const nsCString& aVersion, nsAutoCString buf; - nsAutoCString tbVersion(BASE_BROWSER_VERSION_QUOTED); + nsAutoCString forkVersion(BASE_BROWSER_VERSION_QUOTED); rv = parser.GetString("Compatibility", "LastTorBrowserVersion", buf); - if (NS_FAILED(rv) || !tbVersion.Equals(buf)) return false; + if (NS_FAILED(rv) || !forkVersion.Equals(buf)) return false; rv = parser.GetString("Compatibility", "LastOSABI", buf); if (NS_FAILED(rv) || !aOSABI.Equals(buf)) return false; @@ -3746,11 +3746,11 @@ static void WriteVersion(nsIFile* aProfileDir, const nsCString& aVersion, PR_Write(fd, kHeader, sizeof(kHeader) - 1); PR_Write(fd, aVersion.get(), aVersion.Length()); - nsAutoCString tbVersion(BASE_BROWSER_VERSION_QUOTED); - static const char kTorBrowserVersionHeader[] = + nsAutoCString forkVersion(BASE_BROWSER_VERSION_QUOTED); + static const char kForkVersionHeader[] = NS_LINEBREAK "LastTorBrowserVersion="; - PR_Write(fd, kTorBrowserVersionHeader, sizeof(kTorBrowserVersionHeader) - 1); - PR_Write(fd, tbVersion.get(), tbVersion.Length()); + PR_Write(fd, kForkVersionHeader, sizeof(kForkVersionHeader) - 1); + PR_Write(fd, forkVersion.get(), forkVersion.Length()); static const char kOSABIHeader[] = NS_LINEBREAK "LastOSABI="; PR_Write(fd, kOSABIHeader, sizeof(kOSABIHeader) - 1); ===================================== toolkit/xre/nsUpdateDriver.cpp ===================================== @@ -87,7 +87,7 @@ static void UpdateDriverSetupMacCommandLine(int& argc, char**& argv, // result from it, so we can't just dispatch and return, we have to wait // until the dispatched operation actually completes. So we also set up a // monitor to signal us when that happens, and block until then. - Monitor monitor("nsUpdateDriver SetupMacCommandLine"); + Monitor monitor MOZ_UNANNOTATED("nsUpdateDriver SetupMacCommandLine"); nsresult rv = NS_DispatchToMainThread(NS_NewRunnableFunction( "UpdateDriverSetupMacCommandLine", ===================================== toolkit/xre/nsXREDirProvider.cpp ===================================== @@ -1213,20 +1213,27 @@ nsresult nsXREDirProvider::GetUpdateRootDir(nsIFile** aResult, NS_ENSURE_SUCCESS(rv, rv); #if defined(BASE_BROWSER_UPDATE) - // For Tor Browser, we store update history, etc. within the UpdateInfo - // directory under the user data directory. - rv = GetTorBrowserUserDataDir(getter_AddRefs(updRoot)); + nsCOMPtr<nsIFile> dataDir; + // For Base Browser and derivatives, we store update history, etc. within the + // UpdateInfo directory under the user data directory. +# if defined(ANDROID) +# error "The Base Browser updater is not supported on Android." +# else + rv = GetUserDataDirectoryHome(getter_AddRefs(dataDir), false); + NS_ENSURE_SUCCESS(rv, rv); + rv = dataDir->GetParent(getter_AddRefs(updRoot)); NS_ENSURE_SUCCESS(rv, rv); +# endif rv = updRoot->AppendNative("UpdateInfo"_ns); NS_ENSURE_SUCCESS(rv, rv); + # if defined(XP_MACOSX) - // Since the TorBrowser-Data directory may be shared among different - // installations of the application, embed the app path in the update dir - // so that the update history is partitioned. This is much less likely to - // be an issue on Linux or Windows because the Tor Browser packages for - // those platforms include a "container" folder that provides partitioning - // by default, and we do not support use of a shared, OS-recommended area - // for user data on those platforms. + // Since the data directory may be shared among different installations of the + // application, embed the app path in the update dir so that the update + // history is partitioned. This is much less likely to be an issue on Linux or + // Windows, because our packages for those platforms include a "container" + // folder that provides partitioning by default, and we do not support use of + // a shared, OS-recommended area for user data on those platforms. nsAutoString appPath; rv = appFile->GetPath(appPath); NS_ENSURE_SUCCESS(rv, rv); ===================================== tools/update-packaging/make_incremental_update.sh ===================================== @@ -79,7 +79,7 @@ if [ $# = 0 ]; then fi # Firefox uses requested_forced_updates='Contents/MacOS/firefox Contents/Resources/defaults/pref/channel-prefs.js' -# - 'Contents/MacOS/firefox' is required for Bugzilla 770996 but in Tor Browser we do not need that fix. +# - 'Contents/MacOS/firefox' is required for Bugzilla 770996 but Base Browser and derivatives do not need that fix. # - 'Contents/Resources/defaults/pref/channel-prefs.js' is required for 1804303 to avoid a failed code signing signature # check on macOS aarch64; it is unlikely that users will run into this issue but there's no harm in including it requested_forced_updates="Contents/Resources/defaults/pref/channel-prefs.js" View it on GitLab: https://gitlab.torproject.org/tpo/applications/tor-browser/-/compare/d41e60… -- View it on GitLab: https://gitlab.torproject.org/tpo/applications/tor-browser/-/compare/d41e60… You're receiving this email because of your account on gitlab.torproject.org.

1 0

[Git][tpo/applications/tor-browser-build][main] Bug 40813: Enable updater for basebrowser nightly
by boklm (＠boklm) 20 Mar '23

20 Mar '23

boklm pushed to branch main at The Tor Project / Applications / tor-browser-build Commits: 2e2a5d9f by Nicolas Vigier at 2023-03-20T11:20:23+01:00 Bug 40813: Enable updater for basebrowser nightly - - - - - 2 changed files: - projects/firefox/mozconfig - rbm.conf Changes: ===================================== projects/firefox/mozconfig ===================================== @@ -66,6 +66,9 @@ [% END -%] [% END -%] +ac_add_options --[% IF c("var/updater_enabled") %]enable[% ELSE %]disable[% END %]-updater +ac_add_options --[% IF c("var/updater_enabled") %]enable[% ELSE %]disable[% END %]-base-browser-update + mk_add_options MOZ_PARALLEL_BUILD=[% c("num_procs") %] export MOZ_INCLUDE_SOURCE_INFO=1 ===================================== rbm.conf ===================================== @@ -238,7 +238,7 @@ targets: projectname: basebrowser Project_Name: 'Base Browser' ProjectName: BaseBrowser - updater_enabled: 0 + updater_enabled: '[% c("var/nightly") %]' privacybrowser: var: View it on GitLab: https://gitlab.torproject.org/tpo/applications/tor-browser-build/-/commit/2… -- View it on GitLab: https://gitlab.torproject.org/tpo/applications/tor-browser-build/-/commit/2… You're receiving this email because of your account on gitlab.torproject.org.

1 0

[Git][tpo/applications/tor-browser-update-responses][main] release: new version, 12.0.4
by Richard Pospesel (＠richard) 18 Mar '23

18 Mar '23

Richard Pospesel pushed to branch main at The Tor Project / Applications / Tor Browser update responses Commits: 6fda6459 by Richard Pospesel at 2023-03-18T11:06:52+00:00 release: new version, 12.0.4 - - - - - 30 changed files: - update_3/release/.htaccess - − update_3/release/12.0.2-12.0.3-linux32-ALL.xml - − update_3/release/12.0.2-12.0.3-linux64-ALL.xml - − update_3/release/12.0.2-12.0.3-macos-ALL.xml - − update_3/release/12.0.2-12.0.3-win32-ALL.xml - − update_3/release/12.0.2-12.0.3-win64-ALL.xml - + update_3/release/12.0.3-12.0.4-linux32-ALL.xml - + update_3/release/12.0.3-12.0.4-linux64-ALL.xml - + update_3/release/12.0.3-12.0.4-macos-ALL.xml - + update_3/release/12.0.3-12.0.4-win32-ALL.xml - + update_3/release/12.0.3-12.0.4-win64-ALL.xml - − update_3/release/12.0.3-linux32-ALL.xml - − update_3/release/12.0.3-linux64-ALL.xml - − update_3/release/12.0.3-macos-ALL.xml - − update_3/release/12.0.3-win32-ALL.xml - − update_3/release/12.0.3-win64-ALL.xml - + update_3/release/12.0.4-linux32-ALL.xml - + update_3/release/12.0.4-linux64-ALL.xml - + update_3/release/12.0.4-macos-ALL.xml - + update_3/release/12.0.4-win32-ALL.xml - + update_3/release/12.0.4-win64-ALL.xml - update_3/release/download-android-aarch64.json - update_3/release/download-android-armv7.json - update_3/release/download-android-x86.json - update_3/release/download-android-x86_64.json - update_3/release/download-linux-i686.json - update_3/release/download-linux-x86_64.json - update_3/release/download-macos.json - update_3/release/download-windows-i686.json - update_3/release/download-windows-x86_64.json The diff was not included because it is too large. View it on GitLab: https://gitlab.torproject.org/tpo/applications/tor-browser-update-responses… -- View it on GitLab: https://gitlab.torproject.org/tpo/applications/tor-browser-update-responses… You're receiving this email because of your account on gitlab.torproject.org.

1 0

[Git][tpo/applications/tor-browser-build] Pushed new tag tbb-12.0.4-build2
by Richard Pospesel (＠richard) 17 Mar '23

17 Mar '23

Richard Pospesel pushed new tag tbb-12.0.4-build2 at The Tor Project / Applications / tor-browser-build -- View it on GitLab: https://gitlab.torproject.org/tpo/applications/tor-browser-build/-/tree/tbb… You're receiving this email because of your account on gitlab.torproject.org.

1 0