From 6ef3b0b66dee4b29592cff07a7bddbbb300fc503 Mon Sep 17 00:00:00 2001 From: Michael Prokop Date: Thu, 24 Apr 2025 09:21:18 +0200 Subject: [PATCH] MT#62249 Update apt-key check for new signing keys for Debian/trixie We gained new archive signing keys for Debian 13/trixie, also see https://lists.debian.org/debian-devel-announce/2025/04/msg00001.html Quoting from there: | pub rsa4096 2025-03-30 [SC] [expires: 2035-03-28] | 04B54C3CDCA79751B16BC6B5225629DF75B188BD | uid Debian Archive Automatic Signing Key (13/trixie) | sub rsa4096 2025-03-30 [S] [expires: 2035-03-28] | B8E5F13176D2A7A75220028078DBA3BC47EF2265 | | pub rsa4096 2025-03-30 [SC] [expires: 2035-03-28] | 5E04A1E3223A19A20706E20F9904613D4CCE68C6 | uid Debian Security Archive Automatic Signing Key (13/trixie) | sub rsa4096 2025-03-30 [S] [expires: 2035-03-28] | 89C87ACEA5DD6B8E6A7068808E9F831205B4BA95 | | Both keys are signed by two FTP masters and the current archive signing | keys for Debian 12/bookworm. | | The keys are already available from | | URL: https://ftp-master.debian.org/keys/archive-key-13.asc | SHA256: 6f1d277429dd7ffedcc6f8688a7ad9a458859b1139ffa026d1eeaadcbffb0da7 | | URL: https://ftp-master.debian.org/keys/archive-key-13-security.asc | SHA256: 844c07d242db37f283afab9d5531270a0550841e90f9f1a9c3bd599722b808b7 Fixes: | not ok 49 - Command: /usr/share/ngcp-system-tests/check-apt-keyrings: exit-status: Expected 1 to be numerically eq 0 | not ok 50 - Command: /usr/share/ngcp-system-tests/check-apt-keyrings: stdout: Expected "object: *bytes.Reader" to have patterns ["OK"] the missing elements were ["OK"] FTR: | root@spce:~# /usr/share/ngcp-system-tests/check-apt-keyrings | Error: Unexpected file '/etc/apt/trusted.gpg.d/debian-archive-trixie-automatic.asc' inside '/etc/apt/trusted.gpg.d' | root@spce:~# /usr/share/ngcp-system-tests/check-apt-keyrings | Error: Unexpected file '/etc/apt/trusted.gpg.d/debian-archive-trixie-security-automatic.asc' inside '/etc/apt/trusted.gpg.d' | root@spce:~# /usr/share/ngcp-system-tests/check-apt-keyrings | Error: Unexpected file '/etc/apt/trusted.gpg.d/debian-archive-trixie-stable.asc' inside '/etc/apt/trusted.gpg.d' Change-Id: I7f3d2a3c0d8ca61f2a86d922317c2351e8fb1940 (cherry picked from commit da12b9a2341627dab9fc485af4cb325e440a187b) (cherry picked from commit 13360ce841f961990c85a39d94914c43c746a3b4) --- helper/check-apt-keyrings | 5 +++++ 1 file changed, 5 insertions(+) diff --git a/helper/check-apt-keyrings b/helper/check-apt-keyrings index 64d3633..214c8da 100755 --- a/helper/check-apt-keyrings +++ b/helper/check-apt-keyrings @@ -42,6 +42,8 @@ apt_trusted_dir="/${apt_etc_dir=}"/"${apt_etc_trusted_parts}" for file in "${apt_trusted_dir}"/* ; do test -f "${file}" || continue case "$(basename "${file}")" in + debian-archive-trixie-automatic.asc|debian-archive-trixie-security-automatic.asc|debian-archive-trixie-stable.asc) + ;; debian-archive-bookworm-automatic.asc|debian-archive-bookworm-security-automatic.asc|debian-archive-bookworm-stable.asc) ;; debian-archive-bullseye-automatic.asc|debian-archive-bullseye-security-automatic.asc|debian-archive-bullseye-stable.asc) @@ -103,6 +105,9 @@ fb260ce8521a2faa4937d98a29a5347807e10614b97d510fbabe5480c803bda9 debian-archive 9c854992fc6c423efe8622c3c326a66e73268995ecbe8f685129063206a18043 debian-archive-buster-automatic.asc 4cf886d6df0fc1c185ce9fb085d1cd8d678bc460e6267d80a833d7ea507a0fbd debian-archive-buster-security-automatic.asc ca9bd1a0b3743495ae45693c6d4e54abadcffb242d72df15eda5b28e4ff385fa debian-archive-buster-stable.asc +4d097bb93f83d731f475c5b92a0c2fcf108cfce1d4932792fca72d00b48d198b debian-archive-trixie-stable.asc +6f1d277429dd7ffedcc6f8688a7ad9a458859b1139ffa026d1eeaadcbffb0da7 debian-archive-trixie-automatic.asc +844c07d242db37f283afab9d5531270a0550841e90f9f1a9c3bd599722b808b7 debian-archive-trixie-security-automatic.asc 88d92e09810a13b5e749839bca89029fbbe73cca261a3a26712a560cc7b50e47 sipwise-archive-2015.gpg b64656d5f8fa0a636d46084bda74e16cef502d3d48e8ed101c6386ad8bbcacef sipwise-autobuilder-2011.gpg 06cd0ec90ce6fe35917debde9976e6ccf24350e6db492ab7b1baab450a58b9af sipwise-mr10.5.gpg