[Author Prev][Author Next][Thread Prev][Thread Next][Author Index][Thread Index]

[tor-commits] [Git][tpo/applications/tor-browser-build][main] Bug 40811: Make it easier to test the updater

Title: GitLab

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

Commits:

  • 7968b10a
    by Pier Angelo Vendrame at 2023-04-17T17:04:05+02:00 
    Bug 40811: Make it easier to test the updater

This commit adds a config variable to override the URL for the updater.
When it is defined, a user-provided certificate will replace the
default public keys used to sign nightly builds.

3 changed files:

Changes:

  • .gitignore
    ... ... @@ -14,3 +14,7 @@
    14 14 
     /release
    15 15 
     /alpha
    16 16 
     /nightly
    17 
    +
    18 
    +# This file is used to test the updater, and whoever is interested in doing so,
    19 
    +# should provide their file.
    20 
    +/projects/firefox/marsigner.der

  • projects/firefox/build
    ... ... @@ -92,7 +92,10 @@ fi
    92 92 
       popd
    93 93 
     [% END %]
    94 94
    95 
    -[% IF c("var/nightly") && ! c("var/mullvad-browser") -%]
    95 
    +[% IF c("var/override_updater_url") -%]
    96 
    +  sed -i 's|^URL="" c("var/override_updater_url") %]|' build/application.ini.in
    97 
    +  cp $rootdir/marsigner.der toolkit/mozapps/update/updater/nightly_aurora_level3_secondary.der
    98 
    +[% ELSIF c("var/nightly") && ! c("var/mullvad-browser") -%]
    96 99 
       # Set update url for nightly (#33402 / #40033)
    97 100 
       sed -i 's|^URL="" c("var/nightly_updates_publish_dir") %]/%CHANNEL%/%BUILD_TARGET%/%VERSION%/ALL|' build/application.ini.in
    98 101 
     [% END -%]

  • projects/firefox/config
    ... ... @@ -30,6 +30,12 @@ var:
    30 30 
         - pkg-config
    31 31 
       has_l10n: '[% !c("var/testbuild") && c("var/locales").size %]'
    32 32
    33 
    +  # Uncomment this if you want to test the updater. You will need to provide a
    34 
    +  # marsigner.der in this directory, too. It will be used as a replacement for
    35 
    +  # the nightly builds keys only. So, using this option for alphas and releases
    36 
    +  # will not work (the browser will fail with a key/signature mismatch).
    37 
    +  # override_updater_url: 'https://tb-build-05.torproject.org/~you/update_3/%CHANNEL%/%BUILD_TARGET%/%VERSION%/ALL'
    38 
    +
    33 39 
       rezip: |
    34 40 
         rezip_tmpdir=$(mktemp -d)
    35 41 
         mkdir -p "$rezip_tmpdir/z"
    ... ... @@ -199,6 +205,8 @@ input_files:
    199 205 
         name: translation-tor-browser
    200 206 
         pkg_type: tor-browser
    201 207 
         enable: '[% c("var/tor-browser") && c("var/has_l10n") %]'
    208 
    +  - filename: marsigner.der
    209 
    +    enable: '[% c("var/override_updater_url") %]'
    202 210 
       - filename: namecoin-torbutton.patch
    203 211 
         enable: '[% c("var/namecoin") %]'
    204 212 
         # TorButton patch authored by Arthur Edelstein, from https://github.com/arthuredelstein/torbutton/ branch 2.1.10-namecoin

    • —
    View it on GitLab.
    You're receiving this email because of your account on gitlab.torproject.org. Manage all notifications · Help 

    _______________________________________________
tor-commits mailing list
tor-commits@xxxxxxxxxxxxxxxxxxxx
https://lists.torproject.org/cgi-bin/mailman/listinfo/tor-commits