commit e6d2903efa95a88e24e846dd30f2f076fec45ca5 Author: Nicolas Vigier boklm@torproject.org Date: Thu Feb 20 18:42:37 2020 +0100
Bug 33403: Add nightly mar key --- projects/firefox/build | 6 ++++++ projects/firefox/config | 2 ++ projects/firefox/nightly-marsigner.der | Bin 0 -> 1245 bytes 3 files changed, 8 insertions(+)
diff --git a/projects/firefox/build b/projects/firefox/build index 800a0c4..8837cfc 100644 --- a/projects/firefox/build +++ b/projects/firefox/build @@ -108,6 +108,12 @@ fi popd [% END %]
+[% IF c("var/nightly") -%] + # Add nightly mar signing key (#33403) + cp $rootdir/nightly-marsigner.der toolkit/mozapps/update/updater/nightly_aurora_level3_primary.der + cp $rootdir/nightly-marsigner.der toolkit/mozapps/update/updater/nightly_aurora_level3_secondary.der +[% END -%] + rm -f configure rm -f js/src/configure
diff --git a/projects/firefox/config b/projects/firefox/config index 5d6c05d..13c9307 100644 --- a/projects/firefox/config +++ b/projects/firefox/config @@ -177,6 +177,8 @@ input_files: - project: tba-translation name: tba-translation enable: '[% c("var/android") %]' + - filename: nightly-marsigner.der + enable: '[% c("var/nightly") %]' - filename: namecoin-torbutton.patch enable: '[% c("var/namecoin") %]' # TorButton patch authored by Arthur Edelstein, from https://github.com/arthuredelstein/torbutton/ branch 2.1.10-namecoin diff --git a/projects/firefox/nightly-marsigner.der b/projects/firefox/nightly-marsigner.der new file mode 100644 index 0000000..a3a3077 Binary files /dev/null and b/projects/firefox/nightly-marsigner.der differ