Hi! On Thu, 2025-04-24 at 13:16:02 +0200, Guillem Jover wrote: > On Tue, 2025-03-18 at 07:28:11 +0100, Sebastian Krzyszkowiak wrote: > > PureOS is currently carrying this as its only patch to dpkg package. > > Moving it upstream would make things so much more convenient, so I'm > > putting it here for your consideration :-) > > Thanks! I queued this some patch some weeks ago on my local next/main > branch, and will definitely be included in 1.23.x (once that opens up), > but I'm pondering whether to perhaps include it in 1.22.x before that, > due to the freeze (although this should be pretty safe, but…).
In the end I added this in 1.22.19, so this has been already part of Debian trixie for a while. For 1.23.x I'd like to switch dpkg globally to use .pgp as extension for OpenPGP artifacts, so I prepared the following MR for PureOS upstream: https://source.puri.sm/pureos/core/pureos-archive-keyring/-/merge_requests/1 It would be nice if that could be merged and released, so that I could then apply something like the attached patch. Thanks, Guillem
From d3e020992e529dd36d360b1ccf9e4c1cf9672666 Mon Sep 17 00:00:00 2001 From: Guillem Jover <[email protected]> Date: Wed, 30 Jul 2025 01:15:43 +0200 Subject: [PATCH] Dpkg::Vendor::PureOS: Use .pgp keyrings instead of .gpg ones FIXME: Version of upstream package unknown, waiting on https://source.puri.sm/pureos/core/pureos-archive-keyring/-/merge_requests/1 --- debian/control | 2 ++ scripts/Dpkg/Vendor/PureOS.pm | 6 +++--- 2 files changed, 5 insertions(+), 3 deletions(-) diff --git a/debian/control b/debian/control index 48bdc750d..af0e4056b 100644 --- a/debian/control +++ b/debian/control @@ -146,6 +146,7 @@ Breaks: # Require .pgp extensions debian-keyring (<< 2025.04.25~), devuan-keyring (<< 2025.07.29~), + pureos-archive-keyring (<< 202?.??.??~), # Uses new sq features, w/o requiring a hard dependency on sq. sq (<< 0.40.0~), # Uses new sqv features, w/o requiring a hard dependency on sqv. @@ -207,6 +208,7 @@ Breaks: # Require .pgp extensions debian-keyring (<< 2025.04.25~), devuan-keyring (<< 2025.07.29~), + pureos-archive-keyring (<< 202?.??.??~), # Uses the private Dpkg::Shlibs::SymbolFile module with no API stability # guarantees! Which obviously broke with 1.19.0. pkg-kde-tools (<< 0.15.28~), diff --git a/scripts/Dpkg/Vendor/PureOS.pm b/scripts/Dpkg/Vendor/PureOS.pm index a492a4724..96d5af6bc 100644 --- a/scripts/Dpkg/Vendor/PureOS.pm +++ b/scripts/Dpkg/Vendor/PureOS.pm @@ -61,13 +61,13 @@ sub run_hook { return $self->run_hook('package-keyrings', @params); } elsif ($hook eq 'package-keyrings') { return ($self->SUPER::run_hook($hook), - '/usr/share/keyrings/pureos-archive-keyring.gpg'); + '/usr/share/keyrings/pureos-archive-keyring.pgp'); } elsif ($hook eq 'archive-keyrings') { return ($self->SUPER::run_hook($hook), - '/usr/share/keyrings/pureos-archive-keyring.gpg'); + '/usr/share/keyrings/pureos-archive-keyring.pgp'); } elsif ($hook eq 'archive-keyrings-historic') { return ($self->SUPER::run_hook($hook), - '/usr/share/keyrings/pureos-archive-removed-keys.gpg'); + '/usr/share/keyrings/pureos-archive-removed-keys.pgp'); } else { return $self->SUPER::run_hook($hook, @params); } -- 2.50.0
