richard pushed to branch main at The Tor Project / Applications / tor-browser-build

Commits: 0f702b2f by Pier Angelo Vendrame at 2023-09-06T21:21:18+02:00 Bug 40149: Remove patching of nightly update URL

Use a new configuration option we recently introduced. Fixes also #40946, as we use the same option for testing purposes.

- - - - -

3 changed files:

- projects/firefox/build - projects/firefox/config - projects/firefox/mozconfig

Changes:

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

[% IF c("var/override_updater_url") -%] - sed -i 's|^URL=https://aus1%5C.torproject%5C.org/.*%7CURL=%5B% c("var/override_updater_url") %]|' build/application.ini.in cp $rootdir/marsigner.der toolkit/mozapps/update/updater/nightly_aurora_level3_secondary.der -[% ELSIF c("var/nightly") && ! c("var/mullvad-browser") -%] - # Set update url for nightly (#33402 / #40033) - sed -i 's|^URL=https://aus1%5C.torproject%5C.org/.*%7CURL=https://nightlies.tbb.torproject.... c("var/nightly_updates_publish_dir") %]/%CHANNEL%/%BUILD_TARGET%/%VERSION%/ALL|' build/application.ini.in [% END -%]

export MACH_BUILD_PYTHON_NATIVE_PACKAGE_SOURCE=system

===================================== projects/firefox/config ===================================== @@ -30,12 +30,15 @@ var: - yasm - pkg-config has_l10n: '[% !c("var/testbuild") && c("var/locales").size %]' + # For testing purposes use override_updater_url, as it will also override the + # certificate. + 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). - # override_updater_url: 'https://tb-build-05.torproject.org/~you/update_3/%CHANNEL%/%BUILD_TARGET%/%V...' + # override_updater_url: 'https://tb-build-05.torproject.org/~you/update_3/'

rezip: | rezip_tmpdir=$(mktemp -d) @@ -78,12 +81,15 @@ targets: nightly: git_hash: '[% c("var/project-name") %]-[% c("var/firefox_version") %]-[% c("var/browser_branch") %]' tag_gpg_id: 0 + var: + updater_url: 'https://nightlies.tbb.torproject.org/nightly-updates/updates/%5B% c("var/nightly_updates_publish_dir") %]'

mullvadbrowser: git_url: https://gitlab.torproject.org/tpo/applications/mullvad-browser.git var: branding_directory_prefix: 'mb' gitlab_project: https://gitlab.torproject.org/tpo/applications/mullvad-browser + updater_url: 'https://cdn.mullvad.net/browser/update_responses/update_1/'

linux-x86_64: var:

===================================== projects/firefox/mozconfig ===================================== @@ -71,6 +71,11 @@

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 +[% IF c("var/override_updater_url") -%] + ac_add_options --with-updater-url=[% c("var/override_updater_url") %] +[% ELSIF c("var/updater_url") -%] + ac_add_options --with-updater-url=[% c("var/updater_url") %] +[% END -%]

mk_add_options MOZ_PARALLEL_BUILD=[% c("num_procs") %]

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