Pier Angelo Vendrame pushed to branch main at The Tor Project / Applications / tor-browser-build

Commits: bcfb6be0 by Pier Angelo Vendrame at 2023-09-20T17:44:17+02:00 Bug 40956: Allow testing the updater in the relase and alpha channel.

When override_updater_url is set we used to copy marsigner.der as the nightly secondary key. With this commit, we check if we are building a release or an alpha, and in case we replace the secondary release key.

Also, this commit adds a Makefile target to create incrementals and update response configuration that uses the unsigned files.

- - - - -

6 changed files:

- Makefile - projects/firefox/build - projects/firefox/config - projects/release/config - projects/release/link_old_mar_filenames - projects/release/update_responses_config.yml

Changes:

===================================== Makefile ===================================== @@ -187,6 +187,12 @@ torbrowser-incrementals-release: submodule-update tools/update-responses/gen_incrementals release $(rbm) build release --step hash_incrementals --target release --target torbrowser

+torbrowser-incrementals-release-unsigned: submodule-update + $(rbm) build release --step update_responses_config --target release --target unsigned_releases_dir --target torbrowser + $(rbm) build release --step link_old_mar_filenames --target release --target unsigned_releases_dir --target torbrowser + NO_CODESIGNATURE=1 tools/update-responses/gen_incrementals release + $(rbm) build release --step hash_incrementals --target release --target torbrowser + torbrowser-incrementals-alpha: submodule-update $(rbm) build release --step update_responses_config --target alpha --target create_unsigned_incrementals --target torbrowser tools/update-responses/download_missing_versions alpha @@ -194,6 +200,12 @@ torbrowser-incrementals-alpha: submodule-update tools/update-responses/gen_incrementals alpha $(rbm) build release --step hash_incrementals --target alpha --target torbrowser

+torbrowser-incrementals-alpha-unsigned: submodule-update + $(rbm) build release --step update_responses_config --target alpha --target unsigned_releases_dir --target torbrowser + $(rbm) build release --step link_old_mar_filenames --target alpha --target unsigned_releases_dir --target torbrowser + NO_CODESIGNATURE=1 tools/update-responses/gen_incrementals alpha + $(rbm) build release --step hash_incrementals --target alpha --target torbrowser + torbrowser-incrementals-nightly: submodule-update $(rbm) build release --step update_responses_config --target nightly --target torbrowser NO_CODESIGNATURE=1 tools/update-responses/gen_incrementals nightly @@ -507,6 +519,12 @@ mullvadbrowser-incrementals-release: submodule-update tools/update-responses/gen_incrementals release $(rbm) build release --step hash_incrementals --target release --target mullvadbrowser

+mullvadbrowser-incrementals-release-unsigned: submodule-update + $(rbm) build release --step update_responses_config --target release --target unsigned_releases_dir --target mullvadbrowser + $(rbm) build release --step link_old_mar_filenames --target release --target unsigned_releases_dir --target mullvadbrowser + NO_CODESIGNATURE=1 tools/update-responses/gen_incrementals release + $(rbm) build release --step hash_incrementals --target release --target mullvadbrowser + mullvadbrowser-incrementals-alpha: submodule-update $(rbm) build release --step update_responses_config --target alpha --target create_unsigned_incrementals --target mullvadbrowser tools/update-responses/download_missing_versions alpha @@ -514,6 +532,12 @@ mullvadbrowser-incrementals-alpha: submodule-update tools/update-responses/gen_incrementals alpha $(rbm) build release --step hash_incrementals --target alpha --target mullvadbrowser

+mullvadbrowser-incrementals-alpha-unsigned: submodule-update + $(rbm) build release --step update_responses_config --target alpha --target unsigned_releases_dir --target mullvadbrowser + $(rbm) build release --step link_old_mar_filenames --target alpha --target unsigned_releases_dir --target mullvadbrowser + NO_CODESIGNATURE=1 tools/update-responses/gen_incrementals alpha + $(rbm) build release --step hash_incrementals --target alpha --target torbrowser + mullvadbrowser-incrementals-nightly: submodule-update $(rbm) build release --step update_responses_config --target nightly --target mullvadbrowser NO_CODESIGNATURE=1 tools/update-responses/gen_incrementals nightly

===================================== projects/firefox/build ===================================== @@ -91,7 +91,11 @@ MOZCONFIG_EOF [% END -%]

[% IF c("var/override_updater_url") -%] - cp $rootdir/marsigner.der toolkit/mozapps/update/updater/nightly_aurora_level3_secondary.der + [% IF c("var/release") || c("var/alpha") -%] + cp $rootdir/marsigner.der toolkit/mozapps/update/updater/release_secondary.der + [% ELSIF c("var/nightly") -%] + cp $rootdir/marsigner.der toolkit/mozapps/update/updater/nightly_aurora_level3_secondary.der + [% END -%] [% END -%]

export MACH_BUILD_PYTHON_NATIVE_PACKAGE_SOURCE=system

===================================== projects/firefox/config ===================================== @@ -35,9 +35,8 @@ var: updater_url: 'https://aus1.torproject.org/torbrowser/update_3/'

# Uncomment this if you want to test the updater. You will need to provide a - # marsigner.der in this directory, too. It will be used as a replacement for - # the nightly builds keys only. So, using this option for alphas and releases - # will not work (the browser will fail with a key/signature mismatch). + # marsigner.der in this directory, too. It will replace either the release + # key, or the nightly key, depending on the channel you are building. # override_updater_url: 'https://tb-build-05.torproject.org/~you/update_3/'

rezip: |

===================================== projects/release/config ===================================== @@ -133,6 +133,10 @@ targets: var: create_unsigned_incrementals: 1

+ unsigned_releases_dir: + var: + unsigned_releases_dir: 1 + input_files:

# Release

===================================== projects/release/link_old_mar_filenames ===================================== @@ -3,7 +3,7 @@ # This script is for #40933: # Fix generating incrementals between 12.5.x and 13.0 [% FOREACH version = c("var/torbrowser_incremental_from") %] - cd [% shell_quote(path(dest_dir)) %]/signed/[% version %] + cd [% shell_quote(path(dest_dir)) %]/[% IF c("var/unsigned_releases_dir") %]un[% END %]signed/[% version %] test -e [% c("var/project-name") %]-linux-i686-[% version %]_ALL.mar || \ ln -s [% c("var/project-name") %]-linux32-[% version %]_ALL.mar \ [% c("var/project-name") %]-linux-i686-[% version %]_ALL.mar

===================================== projects/release/update_responses_config.yml ===================================== @@ -3,7 +3,7 @@ tmp_dir: '[% c("tmp_dir") %]' create_downloads_json: 1 appname_marfile: '[% c("var/project-name") %]' appname_bundle: '[% c("var/project-name") %]' -releases_dir: [% path(c('output_dir')) %][% IF ! c("var/nightly") %]/signed[% END %] +releases_dir: [% path(c('output_dir')) %][% IF ! c("var/nightly") %]/[% IF c("var/unsigned_releases_dir") -%]un[% END %]signed[% END %] download: gpg_keyring: ../../keyring/torbrowser.gpg archive_url: 'https://archive.torproject.org/tor-package-archive/%5B% c("var/projectname") %]'

View it on GitLab: https://gitlab.torproject.org/tpo/applications/tor-browser-build/-/commit/bc...