From 038dc9d53b3d3f9e1aec54a5613fd2edf905aa8b Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Stefan=20B=C3=BChler?= Date: Sun, 5 Jan 2025 15:29:42 +0100 Subject: [PATCH] trixie apt requires armored key files to use the ".asc"-extension --- refresh-obs-keys.sh | 10 +++++----- single-keys/{corretto.key => corretto.asc} | 0 ...nkins-lighttpd.net.key => jenkins-lighttpd.net.asc} | 0 single-keys/{jenkins.io.key => jenkins.io.asc} | 0 single-keys/{jitsi.key => jitsi.asc} | 0 .../{obs-home-stbuehler.key => obs-home-stbuehler.asc} | 0 single-keys/{obs-tools.key => obs-tools.asc} | 0 single-keys/{rus-cert.key => rus-cert.asc} | 0 single-keys/{signal.org.key => signal.org.asc} | 0 .../{zrepl.cschwarz.com.key => zrepl.cschwarz.com.asc} | 0 sources.list.d/corretto.sources | 2 +- sources.list.d/jenkins.io.sources | 2 +- sources.list.d/jitsi.sources | 2 +- sources.list.d/lighttpd-utils-12-bookworm.sources | 2 +- sources.list.d/lighttpd-utils-13-trixie.sources | 2 +- sources.list.d/lighttpd1.4.x-12-bookworm.sources | 2 +- sources.list.d/lighttpd1.4.x-13-trixie.sources | 2 +- sources.list.d/lighttpd2-12-bookworm-nightlies.sources | 8 ++++---- sources.list.d/lighttpd2-12-bookworm.sources | 4 ++-- sources.list.d/lighttpd2-13-trixie-nightlies.sources | 8 ++++---- sources.list.d/lighttpd2-13-trixie.sources | 4 ++-- sources.list.d/obs-home-stbuehler-12-bookworm.sources | 2 +- sources.list.d/obs-home-stbuehler-13-trixie.sources | 2 +- ...s-home-stbuehler-lighttpd-utils-12-bookworm.sources | 2 +- ...obs-home-stbuehler-lighttpd-utils-13-trixie.sources | 2 +- .../obs-home-stbuehler-monitoring-12-bookworm.sources | 2 +- .../obs-home-stbuehler-monitoring-13-trixie.sources | 2 +- sources.list.d/obs-tools-debian-testing.sources | 2 +- sources.list.d/rus-cert.sources | 2 +- sources.list.d/signal-xenial.sources | 2 +- sources.list.d/zrepl.cschwarz.com-bullseye.sources | 2 +- 31 files changed, 34 insertions(+), 34 deletions(-) rename single-keys/{corretto.key => corretto.asc} (100%) rename single-keys/{jenkins-lighttpd.net.key => jenkins-lighttpd.net.asc} (100%) rename single-keys/{jenkins.io.key => jenkins.io.asc} (100%) rename single-keys/{jitsi.key => jitsi.asc} (100%) rename single-keys/{obs-home-stbuehler.key => obs-home-stbuehler.asc} (100%) rename single-keys/{obs-tools.key => obs-tools.asc} (100%) rename single-keys/{rus-cert.key => rus-cert.asc} (100%) rename single-keys/{signal.org.key => signal.org.asc} (100%) rename single-keys/{zrepl.cschwarz.com.key => zrepl.cschwarz.com.asc} (100%) diff --git a/refresh-obs-keys.sh b/refresh-obs-keys.sh index a17bf47..b9f0825 100755 --- a/refresh-obs-keys.sh +++ b/refresh-obs-keys.sh @@ -16,11 +16,11 @@ obs_get() { local target="$2" echo "Fetching key for ${proj}" - osc signkey --notravers "${proj}" > "public.key" + osc signkey --notravers "${proj}" > "public.asc" - mv "public.key" "${target}" + mv "public.asc" "${target}" } -obs_get "home:stbuehler" "${keydir}/obs-home-stbuehler.key" -obs_get "openSUSE:Tools" "${keydir}/obs-tools.key" -# obs_get "server:http" "${keydir}/obs-server-http.key" +obs_get "home:stbuehler" "${keydir}/obs-home-stbuehler.asc" +obs_get "openSUSE:Tools" "${keydir}/obs-tools.asc" +# obs_get "server:http" "${keydir}/obs-server-http.asc" diff --git a/single-keys/corretto.key b/single-keys/corretto.asc similarity index 100% rename from single-keys/corretto.key rename to single-keys/corretto.asc diff --git a/single-keys/jenkins-lighttpd.net.key b/single-keys/jenkins-lighttpd.net.asc similarity index 100% rename from single-keys/jenkins-lighttpd.net.key rename to single-keys/jenkins-lighttpd.net.asc diff --git a/single-keys/jenkins.io.key b/single-keys/jenkins.io.asc similarity index 100% rename from single-keys/jenkins.io.key rename to single-keys/jenkins.io.asc diff --git a/single-keys/jitsi.key b/single-keys/jitsi.asc similarity index 100% rename from single-keys/jitsi.key rename to single-keys/jitsi.asc diff --git a/single-keys/obs-home-stbuehler.key b/single-keys/obs-home-stbuehler.asc similarity index 100% rename from single-keys/obs-home-stbuehler.key rename to single-keys/obs-home-stbuehler.asc diff --git a/single-keys/obs-tools.key b/single-keys/obs-tools.asc similarity index 100% rename from single-keys/obs-tools.key rename to single-keys/obs-tools.asc diff --git a/single-keys/rus-cert.key b/single-keys/rus-cert.asc similarity index 100% rename from single-keys/rus-cert.key rename to single-keys/rus-cert.asc diff --git a/single-keys/signal.org.key b/single-keys/signal.org.asc similarity index 100% rename from single-keys/signal.org.key rename to single-keys/signal.org.asc diff --git a/single-keys/zrepl.cschwarz.com.key b/single-keys/zrepl.cschwarz.com.asc similarity index 100% rename from single-keys/zrepl.cschwarz.com.key rename to single-keys/zrepl.cschwarz.com.asc diff --git a/sources.list.d/corretto.sources b/sources.list.d/corretto.sources index 64fc73c..90c1c89 100644 --- a/sources.list.d/corretto.sources +++ b/sources.list.d/corretto.sources @@ -2,4 +2,4 @@ Types: deb URIs: https://apt.corretto.aws Suites: stable Components: main -Signed-By: /etc/apt/single-keys/corretto.key +Signed-By: /etc/apt/single-keys/corretto.asc diff --git a/sources.list.d/jenkins.io.sources b/sources.list.d/jenkins.io.sources index 3bb2b18..18dd9ea 100644 --- a/sources.list.d/jenkins.io.sources +++ b/sources.list.d/jenkins.io.sources @@ -1,4 +1,4 @@ Types: deb URIs: https://pkg.jenkins.io/debian Suites: binary/ -Signed-By: /etc/apt/single-keys/jenkins.io.key +Signed-By: /etc/apt/single-keys/jenkins.io.asc diff --git a/sources.list.d/jitsi.sources b/sources.list.d/jitsi.sources index 903bbf7..1d3890f 100644 --- a/sources.list.d/jitsi.sources +++ b/sources.list.d/jitsi.sources @@ -1,4 +1,4 @@ Types: deb URIs: https://download.jitsi.org Suites: stable/ -Signed-By: /etc/apt/single-keys/jitsi.key +Signed-By: /etc/apt/single-keys/jitsi.asc diff --git a/sources.list.d/lighttpd-utils-12-bookworm.sources b/sources.list.d/lighttpd-utils-12-bookworm.sources index 4dabac7..1d7d59e 100644 --- a/sources.list.d/lighttpd-utils-12-bookworm.sources +++ b/sources.list.d/lighttpd-utils-12-bookworm.sources @@ -2,5 +2,5 @@ Types: deb URIs: https://debian.lighttpd.net/lighttpd-utils Suites: bookworm Components: main -Signed-By: /etc/apt/single-keys/jenkins-lighttpd.net.key +Signed-By: /etc/apt/single-keys/jenkins-lighttpd.net.asc Architectures-Remove: i386 diff --git a/sources.list.d/lighttpd-utils-13-trixie.sources b/sources.list.d/lighttpd-utils-13-trixie.sources index 6d085fc..606bdba 100644 --- a/sources.list.d/lighttpd-utils-13-trixie.sources +++ b/sources.list.d/lighttpd-utils-13-trixie.sources @@ -2,5 +2,5 @@ Types: deb URIs: https://debian.lighttpd.net/lighttpd-utils Suites: trixie Components: main -Signed-By: /etc/apt/single-keys/jenkins-lighttpd.net.key +Signed-By: /etc/apt/single-keys/jenkins-lighttpd.net.asc Architectures-Remove: i386 diff --git a/sources.list.d/lighttpd1.4.x-12-bookworm.sources b/sources.list.d/lighttpd1.4.x-12-bookworm.sources index d8835a7..ed8a93d 100644 --- a/sources.list.d/lighttpd1.4.x-12-bookworm.sources +++ b/sources.list.d/lighttpd1.4.x-12-bookworm.sources @@ -2,5 +2,5 @@ Types: deb URIs: https://debian.lighttpd.net/lighttpd1.4 Suites: bookworm Components: main -Signed-By: /etc/apt/single-keys/jenkins-lighttpd.net.key +Signed-By: /etc/apt/single-keys/jenkins-lighttpd.net.asc Architectures-Remove: i386 diff --git a/sources.list.d/lighttpd1.4.x-13-trixie.sources b/sources.list.d/lighttpd1.4.x-13-trixie.sources index 3ee0380..a5ada6c 100644 --- a/sources.list.d/lighttpd1.4.x-13-trixie.sources +++ b/sources.list.d/lighttpd1.4.x-13-trixie.sources @@ -2,5 +2,5 @@ Types: deb URIs: https://debian.lighttpd.net/lighttpd1.4 Suites: trixie Components: main -Signed-By: /etc/apt/single-keys/jenkins-lighttpd.net.key +Signed-By: /etc/apt/single-keys/jenkins-lighttpd.net.asc Architectures-Remove: i386 diff --git a/sources.list.d/lighttpd2-12-bookworm-nightlies.sources b/sources.list.d/lighttpd2-12-bookworm-nightlies.sources index 45caa8d..6d062b1 100644 --- a/sources.list.d/lighttpd2-12-bookworm-nightlies.sources +++ b/sources.list.d/lighttpd2-12-bookworm-nightlies.sources @@ -2,21 +2,21 @@ Types: deb URIs: https://debian.lighttpd.net/lighttpd2-nightlies Suites: bookworm Components: main -Signed-By: /etc/apt/single-keys/jenkins-lighttpd.net.key +Signed-By: /etc/apt/single-keys/jenkins-lighttpd.net.asc Architectures-Remove: i386 Types: deb URIs: https://debian.lighttpd.net/lighttpd2 Suites: bookworm Components: main -Signed-By: /etc/apt/single-keys/jenkins-lighttpd.net.key +Signed-By: /etc/apt/single-keys/jenkins-lighttpd.net.asc Architectures-Remove: i386 Types: deb URIs: https://debian.lighttpd.net/lighttpd-utils-nightlies Suites: bookworm Components: main -Signed-By: /etc/apt/single-keys/jenkins-lighttpd.net.key +Signed-By: /etc/apt/single-keys/jenkins-lighttpd.net.asc Enabled: no Architectures-Remove: i386 @@ -24,5 +24,5 @@ Types: deb URIs: https://debian.lighttpd.net/lighttpd-utils Suites: bookworm Components: main -Signed-By: /etc/apt/single-keys/jenkins-lighttpd.net.key +Signed-By: /etc/apt/single-keys/jenkins-lighttpd.net.asc Architectures-Remove: i386 diff --git a/sources.list.d/lighttpd2-12-bookworm.sources b/sources.list.d/lighttpd2-12-bookworm.sources index e6ace6d..a069357 100644 --- a/sources.list.d/lighttpd2-12-bookworm.sources +++ b/sources.list.d/lighttpd2-12-bookworm.sources @@ -2,12 +2,12 @@ Types: deb URIs: https://debian.lighttpd.net/lighttpd2 Suites: bookworm Components: main -Signed-By: /etc/apt/single-keys/jenkins-lighttpd.net.key +Signed-By: /etc/apt/single-keys/jenkins-lighttpd.net.asc Architectures-Remove: i386 Types: deb URIs: https://debian.lighttpd.net/lighttpd-utils Suites: bookworm Components: main -Signed-By: /etc/apt/single-keys/jenkins-lighttpd.net.key +Signed-By: /etc/apt/single-keys/jenkins-lighttpd.net.asc Architectures-Remove: i386 diff --git a/sources.list.d/lighttpd2-13-trixie-nightlies.sources b/sources.list.d/lighttpd2-13-trixie-nightlies.sources index 71073be..4e9960c 100644 --- a/sources.list.d/lighttpd2-13-trixie-nightlies.sources +++ b/sources.list.d/lighttpd2-13-trixie-nightlies.sources @@ -2,21 +2,21 @@ Types: deb URIs: https://debian.lighttpd.net/lighttpd2-nightlies Suites: trixie Components: main -Signed-By: /etc/apt/single-keys/jenkins-lighttpd.net.key +Signed-By: /etc/apt/single-keys/jenkins-lighttpd.net.asc Architectures-Remove: i386 Types: deb URIs: https://debian.lighttpd.net/lighttpd2 Suites: trixie Components: main -Signed-By: /etc/apt/single-keys/jenkins-lighttpd.net.key +Signed-By: /etc/apt/single-keys/jenkins-lighttpd.net.asc Architectures-Remove: i386 Types: deb URIs: https://debian.lighttpd.net/lighttpd-utils-nightlies Suites: trixie Components: main -Signed-By: /etc/apt/single-keys/jenkins-lighttpd.net.key +Signed-By: /etc/apt/single-keys/jenkins-lighttpd.net.asc Enabled: no Architectures-Remove: i386 @@ -24,5 +24,5 @@ Types: deb URIs: https://debian.lighttpd.net/lighttpd-utils Suites: trixie Components: main -Signed-By: /etc/apt/single-keys/jenkins-lighttpd.net.key +Signed-By: /etc/apt/single-keys/jenkins-lighttpd.net.asc Architectures-Remove: i386 diff --git a/sources.list.d/lighttpd2-13-trixie.sources b/sources.list.d/lighttpd2-13-trixie.sources index 8d2cfd2..6856c4f 100644 --- a/sources.list.d/lighttpd2-13-trixie.sources +++ b/sources.list.d/lighttpd2-13-trixie.sources @@ -2,12 +2,12 @@ Types: deb URIs: https://debian.lighttpd.net/lighttpd2 Suites: trixie Components: main -Signed-By: /etc/apt/single-keys/jenkins-lighttpd.net.key +Signed-By: /etc/apt/single-keys/jenkins-lighttpd.net.asc Architectures-Remove: i386 Types: deb URIs: https://debian.lighttpd.net/lighttpd-utils Suites: trixie Components: main -Signed-By: /etc/apt/single-keys/jenkins-lighttpd.net.key +Signed-By: /etc/apt/single-keys/jenkins-lighttpd.net.asc Architectures-Remove: i386 diff --git a/sources.list.d/obs-home-stbuehler-12-bookworm.sources b/sources.list.d/obs-home-stbuehler-12-bookworm.sources index 9a100a2..0df011d 100644 --- a/sources.list.d/obs-home-stbuehler-12-bookworm.sources +++ b/sources.list.d/obs-home-stbuehler-12-bookworm.sources @@ -1,5 +1,5 @@ Types: deb URIs: https://download.opensuse.org/repositories/home:/stbuehler/Debian_12 Suites: ./ -Signed-By: /etc/apt/single-keys/obs-home-stbuehler.key +Signed-By: /etc/apt/single-keys/obs-home-stbuehler.asc Architectures-Remove: i386 diff --git a/sources.list.d/obs-home-stbuehler-13-trixie.sources b/sources.list.d/obs-home-stbuehler-13-trixie.sources index 449064d..1ab3a3b 100644 --- a/sources.list.d/obs-home-stbuehler-13-trixie.sources +++ b/sources.list.d/obs-home-stbuehler-13-trixie.sources @@ -1,5 +1,5 @@ Types: deb URIs: https://download.opensuse.org/repositories/home:/stbuehler/Debian_13 Suites: ./ -Signed-By: /etc/apt/single-keys/obs-home-stbuehler.key +Signed-By: /etc/apt/single-keys/obs-home-stbuehler.asc Architectures-Remove: i386 diff --git a/sources.list.d/obs-home-stbuehler-lighttpd-utils-12-bookworm.sources b/sources.list.d/obs-home-stbuehler-lighttpd-utils-12-bookworm.sources index 36e9cd5..d8aa3d0 100644 --- a/sources.list.d/obs-home-stbuehler-lighttpd-utils-12-bookworm.sources +++ b/sources.list.d/obs-home-stbuehler-lighttpd-utils-12-bookworm.sources @@ -1,5 +1,5 @@ Types: deb URIS: https://download.opensuse.org/repositories/home:/stbuehler:/lighttpd-utils/Debian_12 Suites: ./ -Signed-By: /etc/apt/single-keys/obs-home-stbuehler.key +Signed-By: /etc/apt/single-keys/obs-home-stbuehler.asc Architectures-Remove: i386 diff --git a/sources.list.d/obs-home-stbuehler-lighttpd-utils-13-trixie.sources b/sources.list.d/obs-home-stbuehler-lighttpd-utils-13-trixie.sources index 81a2ca4..95bd582 100644 --- a/sources.list.d/obs-home-stbuehler-lighttpd-utils-13-trixie.sources +++ b/sources.list.d/obs-home-stbuehler-lighttpd-utils-13-trixie.sources @@ -1,5 +1,5 @@ Types: deb URIS: https://download.opensuse.org/repositories/home:/stbuehler:/lighttpd-utils/Debian_13 Suites: ./ -Signed-By: /etc/apt/single-keys/obs-home-stbuehler.key +Signed-By: /etc/apt/single-keys/obs-home-stbuehler.asc Architectures-Remove: i386 diff --git a/sources.list.d/obs-home-stbuehler-monitoring-12-bookworm.sources b/sources.list.d/obs-home-stbuehler-monitoring-12-bookworm.sources index ee86686..826b1d8 100644 --- a/sources.list.d/obs-home-stbuehler-monitoring-12-bookworm.sources +++ b/sources.list.d/obs-home-stbuehler-monitoring-12-bookworm.sources @@ -1,5 +1,5 @@ Types: deb URIs: https://download.opensuse.org/repositories/home:/stbuehler:/monitoring/Debian_12 Suites: ./ -Signed-By: /etc/apt/single-keys/obs-home-stbuehler.key +Signed-By: /etc/apt/single-keys/obs-home-stbuehler.asc Architectures-Remove: i386 diff --git a/sources.list.d/obs-home-stbuehler-monitoring-13-trixie.sources b/sources.list.d/obs-home-stbuehler-monitoring-13-trixie.sources index d811a82..d673f08 100644 --- a/sources.list.d/obs-home-stbuehler-monitoring-13-trixie.sources +++ b/sources.list.d/obs-home-stbuehler-monitoring-13-trixie.sources @@ -1,5 +1,5 @@ Types: deb URIs: https://download.opensuse.org/repositories/home:/stbuehler:/monitoring/Debian_13 Suites: ./ -Signed-By: /etc/apt/single-keys/obs-home-stbuehler.key +Signed-By: /etc/apt/single-keys/obs-home-stbuehler.asc Architectures-Remove: i386 diff --git a/sources.list.d/obs-tools-debian-testing.sources b/sources.list.d/obs-tools-debian-testing.sources index 5c7e3cc..e2e8ed0 100644 --- a/sources.list.d/obs-tools-debian-testing.sources +++ b/sources.list.d/obs-tools-debian-testing.sources @@ -1,4 +1,4 @@ Types: deb URIs: https://download.opensuse.org/repositories/openSUSE:/Tools/Debian_Testing Suites: ./ -Signed-By: /etc/apt/single-keys/obs-tools.key +Signed-By: /etc/apt/single-keys/obs-tools.asc diff --git a/sources.list.d/rus-cert.sources b/sources.list.d/rus-cert.sources index c58de40..e0e5e1e 100644 --- a/sources.list.d/rus-cert.sources +++ b/sources.list.d/rus-cert.sources @@ -2,4 +2,4 @@ Types: deb deb-src URIs: https://deb.cert.uni-stuttgart.de/debian Suites: stable Components: main -Signed-By: /etc/apt/single-keys/rus-cert.key +Signed-By: /etc/apt/single-keys/rus-cert.asc diff --git a/sources.list.d/signal-xenial.sources b/sources.list.d/signal-xenial.sources index 80d6c62..33a99b7 100644 --- a/sources.list.d/signal-xenial.sources +++ b/sources.list.d/signal-xenial.sources @@ -3,4 +3,4 @@ URIs: https://updates.signal.org/desktop/apt Suites: xenial Components: main Architectures: amd64 -Signed-By: /etc/apt/single-keys/signal.org.key +Signed-By: /etc/apt/single-keys/signal.org.asc diff --git a/sources.list.d/zrepl.cschwarz.com-bullseye.sources b/sources.list.d/zrepl.cschwarz.com-bullseye.sources index bb45ba5..ea8d69f 100644 --- a/sources.list.d/zrepl.cschwarz.com-bullseye.sources +++ b/sources.list.d/zrepl.cschwarz.com-bullseye.sources @@ -4,4 +4,4 @@ URIs: https://zrepl.cschwarz.com/apt/debian Suites: bullseye Components: main Architectures: amd64 -Signed-By: /etc/apt/single-keys/zrepl.cschwarz.com.key +Signed-By: /etc/apt/single-keys/zrepl.cschwarz.com.asc