Commit ce5e5246 authored by Tails developers's avatar Tails developers

Import changes from the IUK repository's bugfix/handle-website-CA-change branch.

This commit will need to be reverted once a tails-iuk is released, packaged
and uploaded to a sensible APT suite.
parent e055c138
--- a/usr/share/perl5/Tails/IUK.pm
+++ b/usr/share/perl5/Tails/IUK.pm
@@ -255,6 +255,7 @@ method _build_squashfs_diff {
run_as_root(
"rsync", "--archive", "--quiet", "--delete-after", "--acls",
+ "--checksum",
sprintf("%s/", dir($new_squashfs_mount)),
sprintf("%s/", dir($union)),
);
--- a/usr/share/perl5/Tails/IUK/UpgradeDescriptionFile/Download.pm
+++ b/usr/share/perl5/Tails/IUK/UpgradeDescriptionFile/Download.pm
@@ -105,7 +105,7 @@ method _build_curl_opts {
}
else {
my $cafile = $ENV{HTTPS_CA_FILE};
- $cafile //= '/etc/ssl/certs/UTN_USERFirst_Hardware_Root_CA.pem';
+ $cafile //= '/usr/local/etc/ssl/certs/tails.boum.org-CA.pem';
push @opts, CURLOPT_SSL_VERIFYHOST, 2;
push @opts, CURLOPT_SSL_VERIFYPEER, 1;
push @opts, CURLOPT_CAINFO, $cafile;
Markdown is supported
0% or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment