[tor-commits] [tor-browser-build/master] Bug 40138: Move nightly MAR signing key to tor-browser

[sysrqb at torproject.org]

commit 92bfe6fb27d8bb0464b199d3e757f382a8353624
Author: Georg Koppen <gk at torproject.org>
Date:   Sun Dec 6 12:38:24 2020 +0000

    Bug 40138: Move nightly MAR signing key to tor-browser
    
    While the addition is done in tor-browser#33803, here we just remove the
    key related things in tor-browser-build.
---
 projects/firefox/build                 |   3 ---
 projects/firefox/config                |   2 --
 projects/firefox/nightly-marsigner.der | Bin 1245 -> 0 bytes
 3 files changed, 5 deletions(-)

diff --git a/projects/firefox/build b/projects/firefox/build
index d8e6099..eb2a663 100644
--- a/projects/firefox/build
+++ b/projects/firefox/build
@@ -101,9 +101,6 @@ tar -C browser/extensions -xf $rootdir/[% c('input_files_by_name/tor-launcher')
 [% 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
   # Set update url for nightly (#33402 / #40033)
   sed -i 's|^URL=https://aus1\.torproject\.org/.*|URL=https://nightlies.tbb.torproject.org/nightly-updates/updates/nightly-[% c("var/osname") %]/%CHANNEL%/%BUILD_TARGET%/%VERSION%/%LOCALE%|' build/application.ini.in
 [% END -%]
diff --git a/projects/firefox/config b/projects/firefox/config
index a5e4cab..e3a883c 100644
--- a/projects/firefox/config
+++ b/projects/firefox/config
@@ -149,8 +149,6 @@ input_files:
     enable: '[% c("var/linux") %]'
   - project: tor-launcher
     name: tor-launcher
-  - 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
deleted file mode 100644
index a3a3077..0000000
Binary files a/projects/firefox/nightly-marsigner.der and /dev/null differ