Macintosh-SW
/
tenfourfox
mirror of https://github.com/classilla/tenfourfox.git
1
0
Fork 0
Code Issues Projects Releases Wiki Activity

#618: change 104fx scripts to ESR78

This commit is contained in:
Cameron Kaiser 2020-08-24 21:24:13 -07:00
parent da10af1b07
commit 3a4915434f
2 changed files with 5 additions and 7 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

8
104fx_import_esr60_stspreload.pl → 104fx_import_esr78_stspreload.pl
View File

@ -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 <stdint.h>
EOF
# let's have a little paranoia.
while(<W>) {
while(<>) {
if (/^const PRTime gPreloadListExpirationTime = INT64_C/) {
print;
$got_time = 1;
@ -41,7 +39,7 @@ class nsSTSPreload
static const nsSTSPreload kSTSPreloadList[] = {
EOF
while(<W>) {
while(<>) {
chomp;
last if (/%%/);
($host, $subd, $crap) = split(/, /, $_, 3);

4
104fx_upcerts.sh
View File

@ -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