From bd157d792842fc15b9d3a9ef07b26b47cf24f0c2 Mon Sep 17 00:00:00 2001
From: Ian Jackson <iwj@xenproject.org>
Date: Tue, 9 Feb 2021 16:05:17 +0000
Subject: [PATCH] Debian mirror: Disable timestamp verification for
 snapshot.d.o

This is kind of duplicative of the logic in preseed_backports_packages
but I don't want to mess with that now.

Signed-off-by: Ian Jackson <iwj@xenproject.org>
---
 Osstest.pm        |  2 ++
 Osstest/Debian.pm | 16 ++++++++++++++++
 2 files changed, 18 insertions(+)

diff --git a/Osstest.pm b/Osstest.pm
index 809194f..7776ba8 100644
--- a/Osstest.pm
+++ b/Osstest.pm
@@ -246,6 +246,8 @@ sub readglobalconfig () {
     $c{DefaultBranch} ||= 'xen-unstable';
 
     $c{DebianMirrorHost} ||= 'ftp.debian.org' if $c{DebianMirrorProxy};
+    $c{DebianMirrorAllowExpiredReleaseRegexp} //=
+      qr{^\Qhttp://snapshot.debian.org/};
 
     $c{EmailStdHeaders} ||= <<'END';
 Content-Type: text/plain; charset="UTF-8"
diff --git a/Osstest/Debian.pm b/Osstest/Debian.pm
index dee52b3..d6e0b59 100644
--- a/Osstest/Debian.pm
+++ b/Osstest/Debian.pm
@@ -972,6 +972,22 @@ END
     preseed_hook_command($ho, 'late_command', $sfx,
 			 debian_dhcp_rofs_fix($ho, '/target'));
 
+    my $murl = debian_mirror_url($ho);
+    if ($murl =~ m/$c{DebianMirrorAllowExpiredReleaseRegexp}/) {
+	# Inspired by
+	#  https://stackoverflow.com/questions/25039317/is-there-any-setting-in-the-preseed-file-to-ignore-the-release-valid-until-opt/51396935#51396935
+	# In some sense a workaround for the lack of a better way,
+	#  https://bugs.debian.org/cgi-bin/bugreport.cgi?bug=771699
+	preseed_hook_installscript($ho, $sfx,
+            '/usr/lib/apt-setup/generators/', '02IgnoreValidUntil', <<'END');
+#!/bin/sh
+set -ex
+d=/target/etc/apt/apt.conf.d/
+mkdir -p $d
+echo 'Acquire::Check-Valid-Until "false";' >$d/02IgnoreValidUntil
+END
+    }
+
     my ($mhost, $mpath) = debian_mirror_host_path($ho);
 
     my $preseed = <<"END";
-- 
2.39.5