tlsrpt-reporter: apply patch for fetcher issue when no db exists

The fetcher would then error out and not return the proper protocol
version to the reportd instance, causing an error message.

This is annoying, because I want to match success in the test.

(cherry picked from commit 35e471ad45)
This commit is contained in:
Martin Weinelt
2025-06-20 14:55:12 +02:00
parent 8f9e3ed788
commit 89a6f77a0e
2 changed files with 10 additions and 0 deletions

View File

@@ -31,6 +31,7 @@
machine.wait_for_file("/run/tlsrpt/collectd.sock")
machine.wait_until_succeeds("journalctl -o cat -u tlsrpt-collectd | grep -Pq 'Database .* setup finished'")
machine.wait_until_succeeds("journalctl -o cat -u tlsrpt-reportd | grep -Pq 'Database .* setup finished'")
machine.wait_until_succeeds("journalctl -o cat -u tlsrpt-reportd | grep -Pq 'Fetcher .* finished'")
# Enabling postfix should put sendmail as the sendmail setting
machine.succeed("grep -q sendmail_script=sendmail /etc/tlsrpt/reportd.cfg")

View File

@@ -5,6 +5,7 @@
installShellFiles,
python3,
fetchFromGitHub,
fetchpatch,
nixosTests,
}:
@@ -25,6 +26,14 @@ python3.pkgs.buildPythonApplication rec {
hash = "sha256-IH8hJX9l+YonqOuszcMome4mjdIaedgGNIptxTyH1ng=";
};
patches = [
(fetchpatch {
# https://github.com/sys4/tlsrpt-reporter/issues/43
url = "https://github.com/sys4/tlsrpt-reporter/commit/32d00c13508dd7f9695b77e253e88c88dc838fbd.patch";
hash = "sha256-RUNF86RkTu6DLv6/7eaY//fFB8kGzmZxQ70kdNpLxj8=";
})
];
nativeBuildInputs = [
asciidoctor
automake