From 3a4915434fbd643b03d3c33be01a39dc4fa49dee Mon Sep 17 00:00:00 2001 From: Cameron Kaiser Date: Mon, 24 Aug 2020 21:24:13 -0700 Subject: [PATCH] #618: change 104fx scripts to ESR78 --- ...sr60_stspreload.pl => 104fx_import_esr78_stspreload.pl | 8 +++----- 104fx_upcerts.sh | 4 ++-- 2 files changed, 5 insertions(+), 7 deletions(-) rename 104fx_import_esr60_stspreload.pl => 104fx_import_esr78_stspreload.pl (84%) diff --git a/104fx_import_esr60_stspreload.pl b/104fx_import_esr78_stspreload.pl similarity index 84% rename from 104fx_import_esr60_stspreload.pl rename to 104fx_import_esr78_stspreload.pl index a23dee431..90a372b4f 100755 --- a/104fx_import_esr60_stspreload.pl +++ b/104fx_import_esr78_stspreload.pl @@ -1,7 +1,5 @@ #!/usr/bin/perl -s -$source ||= "../esr60/security/manager/ssl/nsSTSPreloadList.inc"; -open(W, $source) || die("unable to open $source: $!\nspecify -source=/path ?\n"); print <<'EOF'; /* This Source Code Form is subject to the terms of the Mozilla Public * License, v. 2.0. If a copy of the MPL was not distributed with this @@ -12,13 +10,13 @@ print <<'EOF'; /* nsSiteSecurityService.cpp, you shouldn't be #including it. */ /*****************************************************************************/ -/* imported from ESR60 by TenFourFox conversion script */ +/* imported from ESR78 by TenFourFox conversion script */ #include EOF # let's have a little paranoia. -while() { +while(<>) { if (/^const PRTime gPreloadListExpirationTime = INT64_C/) { print; $got_time = 1; @@ -41,7 +39,7 @@ class nsSTSPreload static const nsSTSPreload kSTSPreloadList[] = { EOF -while() { +while(<>) { chomp; last if (/%%/); ($host, $subd, $crap) = split(/, /, $_, 3); diff --git a/104fx_upcerts.sh b/104fx_upcerts.sh index aff10014d..3221177ac 100755 --- a/104fx_upcerts.sh +++ b/104fx_upcerts.sh @@ -10,7 +10,7 @@ endif # if we update NSS, we need to remove that patch (TenFourFox issue 512). set verbose -set release_url=https://hg.mozilla.org/releases/mozilla-esr68/raw-file/tip/ +set release_url=https://hg.mozilla.org/releases/mozilla-esr78/raw-file/tip/ # self test to ensure certificates and encryption methods are correct curl ${release_url}/config/milestone.txt || exit @@ -18,6 +18,6 @@ curl ${release_url}/config/milestone.txt || exit curl ${release_url}/security/manager/ssl/StaticHPKPins.h > security/manager/ssl/StaticHPKPins.h curl ${release_url}/security/nss/lib/ckfw/builtins/certdata.txt > security/nss/lib/ckfw/builtins/certdata.txt curl ${release_url}/netwerk/dns/effective_tld_names.dat > netwerk/dns/effective_tld_names.dat -curl ${release_url}/security/manager/ssl/nsSTSPreloadList.inc | perl ./104fx_import_esr68_stspreload.pl > security/manager/ssl/nsSTSPreloadList.inc +curl ${release_url}/security/manager/ssl/nsSTSPreloadList.inc | perl ./104fx_import_esr78_stspreload.pl > security/manager/ssl/nsSTSPreloadList.inc perl ./104fx_import_shavar_cryptominers.pl > caps/shavar-blocklist.h