#618: change 104fx scripts to ESR78
This commit is contained in:
parent
da10af1b07
commit
3a4915434f
|
@ -1,7 +1,5 @@
|
||||||
#!/usr/bin/perl -s
|
#!/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';
|
print <<'EOF';
|
||||||
/* This Source Code Form is subject to the terms of the Mozilla Public
|
/* 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
|
* 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. */
|
/* 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>
|
#include <stdint.h>
|
||||||
EOF
|
EOF
|
||||||
|
|
||||||
# let's have a little paranoia.
|
# let's have a little paranoia.
|
||||||
while(<W>) {
|
while(<>) {
|
||||||
if (/^const PRTime gPreloadListExpirationTime = INT64_C/) {
|
if (/^const PRTime gPreloadListExpirationTime = INT64_C/) {
|
||||||
print;
|
print;
|
||||||
$got_time = 1;
|
$got_time = 1;
|
||||||
|
@ -41,7 +39,7 @@ class nsSTSPreload
|
||||||
static const nsSTSPreload kSTSPreloadList[] = {
|
static const nsSTSPreload kSTSPreloadList[] = {
|
||||||
EOF
|
EOF
|
||||||
|
|
||||||
while(<W>) {
|
while(<>) {
|
||||||
chomp;
|
chomp;
|
||||||
last if (/%%/);
|
last if (/%%/);
|
||||||
($host, $subd, $crap) = split(/, /, $_, 3);
|
($host, $subd, $crap) = split(/, /, $_, 3);
|
|
@ -10,7 +10,7 @@ endif
|
||||||
# if we update NSS, we need to remove that patch (TenFourFox issue 512).
|
# if we update NSS, we need to remove that patch (TenFourFox issue 512).
|
||||||
|
|
||||||
set verbose
|
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
|
# self test to ensure certificates and encryption methods are correct
|
||||||
curl ${release_url}/config/milestone.txt || exit
|
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/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}/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}/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
|
perl ./104fx_import_shavar_cryptominers.pl > caps/shavar-blocklist.h
|
||||||
|
|
||||||
|
|
Loading…
Reference in New Issue