Devuan bug report logs - #902
devuan-keyring: Archive keys not installed below /etc/apt/trusted.gpg.d

Full log

🔗 View this message in rfc822 format

X-Loop: owner@bugs.devuan.org
Subject: bug#902: devuan-keyring: Archive keys not installed below /etc/apt/trusted.gpg.d
Reply-To: Mark Hindley <mark@hindley.org.uk>, 902@bugs.devuan.org
Resent-From: Mark Hindley <mark@hindley.org.uk>
Resent-To: devuan-bugs@lists.dyne.org
Resent-CC: Devuan Developers <devuan-dev@lists.dyne.org>
X-Loop: owner@bugs.devuan.org
Resent-Date: Sat, 09 Aug 2025 17:06:01 +0000
Resent-Message-ID: <handler.902.B902.17547590738585@bugs.devuan.org>
Resent-Sender: owner@bugs.devuan.org
X-Devuan-PR-Message: followup 902
X-Devuan-PR-Package: devuan-keyring
X-Devuan-PR-Keywords: 
References: <175471541405.7365.13707578174712627271.reportbug@basecamp> <175471541405.7365.13707578174712627271.reportbug@basecamp>
X-Devuan-PR-Source: devuan-keyring
Received: via spool by 902-submit@bugs.devuan.org id=B902.17547590738585
          (code B ref 902); Sat, 09 Aug 2025 17:06:01 +0000
Received: (at 902) by bugs.devuan.org; 9 Aug 2025 17:04:33 +0000
Delivered-To: bugs@devuan.org
Received: from email.devuan.org [2a01:4f9:fff1:13::5fd9:f9e4]
	by doc.devuan.org with IMAP (fetchmail-6.4.16)
	for <debbugs@localhost> (single-drop); Sat, 09 Aug 2025 17:04:33 +0000 (UTC)
Received: from email.devuan.org
	by email.devuan.org with LMTP
	id TbO2KJx/l2jTFQAAmSBk0A
	(envelope-from <mark@hindley.org.uk>)
	for <bugs@devuan.org>; Sat, 09 Aug 2025 17:04:28 +0000
Received: by email.devuan.org (Postfix, from userid 109)
	id 747B172D; Sat,  9 Aug 2025 17:04:28 +0000 (UTC)
X-Spam-Checker-Version: SpamAssassin 3.4.6 (2021-04-09) on email.devuan.org
X-Spam-Level: 
X-Spam-Status: No, score=0.4 required=5.0 tests=RDNS_DYNAMIC,SPF_PASS,
	T_SCC_BODY_TEXT_LINE autolearn=no autolearn_force=no version=3.4.6
Received-SPF: Pass (mailfrom) identity=mailfrom; client-ip=193.36.131.86; helo=mx.hindley.org.uk; envelope-from=mark@hindley.org.uk; receiver=<UNKNOWN> 
Received: from mx.hindley.org.uk (193-36-131-86.cfwn.uk [193.36.131.86])
	by email.devuan.org (Postfix) with ESMTPS id D75774A2
	for <902@bugs.devuan.org>; Sat,  9 Aug 2025 17:04:26 +0000 (UTC)
Received: from hindley.org.uk (apollo.hindleynet [192.168.1.3])
	by mx.hindley.org.uk (Postfix) with SMTP id 9CF32B9;
	Sat,  9 Aug 2025 18:04:25 +0100 (BST)
Received: (nullmailer pid 6042 invoked by uid 1000);
	Sat, 09 Aug 2025 17:04:22 -0000
Date: Sat, 9 Aug 2025 18:04:22 +0100
From: Mark Hindley <mark@hindley.org.uk>
To: Olaf Meeuwissen <paddy-hack@member.fsf.org>, 902@bugs.devuan.org
Cc: bbonev@devuan.org
Message-ID: <aJd_lq00FM-IJqPL@hindley.org.uk>
MIME-Version: 1.0
Content-Type: text/plain; charset=us-ascii
Content-Disposition: inline
In-Reply-To: <175471541405.7365.13707578174712627271.reportbug@basecamp>

Olaf,

Thanks for this.

I propose the attached changes which

 - restore installation of keys in /etc/apt/trusted.gpg
 - change the keys to ascii armoured (as Debian already does)
 - handles the renamed conffiles.

Boian,

Any comments?

Mark

diff --git a/Makefile b/Makefile
index 391fa64..35b5fe8 100644
--- a/Makefile
+++ b/Makefile
@@ -8,10 +8,13 @@ INDIVIDUAL_KEYS := $(wildcard public_keys/individual/*.pgp)
 ARCHIVE_KEYS := $(wildcard public_keys/archive/*.pgp)
 REMOVED_KEYS := $(wildcard public_keys/removed/*.pgp)
 
-all: keyrings/devuan-archive-keyring.pgp keyrings/devuan-keyring.pgp keyrings/devuan-removed-keys.pgp
+all: keyrings/devuan-archive-keyring.pgp keyrings/devuan-keyring.pgp keyrings/devuan-removed-keys.pgp $(patsubst %.pgp,%.asc,$(ARCHIVE_KEYS))
 
 .DELETE_ON_ERROR:
 
+%.asc : %.pgp
+	gpg --armor --export --no-default-keyring --keyring $< > $@
+
 keyrings/gnupg:
 	install -m700 -d $@
 
@@ -49,6 +52,6 @@ refresh: | keyrings/gnupg
 	done
 
 clean:
-	rm -fr keyrings
+	rm -fr keyrings public_keys/archive/*.asc
 
 .PHONY: clean refresh
diff --git a/debian/changelog b/debian/changelog
index 5fb94a8..a851aba 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,3 +1,10 @@
+devuan-keyring (2025.08.09) unstable; urgency=medium
+
+  * Restore installation of keys (now ascii armoured, as Debian) in
+    /etc/apt/trusted.gpg.d. (Closes: #902)
+
+ -- Mark Hindley <mark@hindley.org.uk>  Sat, 09 Aug 2025 14:58:32 +0100
+
 devuan-keyring (2025.07.30) unstable; urgency=medium
 
   [ Boian Bonev ]
diff --git a/debian/install b/debian/install
index 92b5554..17299a5 100644
--- a/debian/install
+++ b/debian/install
@@ -1,2 +1,3 @@
 keyrings/devuan-*.pgp /usr/share/keyrings
 keyrings/devuan-*.gpg /usr/share/keyrings
+public_keys/archive/*.asc /etc/apt/trusted.gpg.d
diff --git a/debian/maintscript b/debian/maintscript
new file mode 100644
index 0000000..34172df
--- /dev/null
+++ b/debian/maintscript
@@ -0,0 +1,7 @@
+mv_conffile /etc/apt/trusted.gpg.d/devuan-keyring-2016-archive.gpg /etc/apt/trusted.gpg.d/devuan-keyring-2016-archive.asc 2025-08-09
+mv_conffile /etc/apt/trusted.gpg.d/devuan-keyring-2022-archive.gpg /etc/apt/trusted.gpg.d/devuan-keyring-2022-archive.asc 2025-08-09
+mv_conffile /etc/apt/trusted.gpg.d/devuan-keyring-amprolla-2022-archive.gpg /etc/apt/trusted.gpg.d/devuan-keyring-amprolla-2022-archive.asc 2025-08-09
+mv_conffile /etc/apt/trusted.gpg.d/devuan-keyring-daedalus-archive.gpg /etc/apt/trusted.gpg.d/devuan-keyring-daedalus-archive.asc 2025-08-09
+mv_conffile /etc/apt/trusted.gpg.d/devuan-keyring-dak-2025-archive.gpg /etc/apt/trusted.gpg.d/devuan-keyring-dak-2025-archive.asc 2025-08-09
+mv_conffile /etc/apt/trusted.gpg.d/devuan-keyring-excalibur-archive.gpg /etc/apt/trusted.gpg.d/devuan-keyring-excalibur-archive.asc
+mv_conffile /etc/apt/trusted.gpg.d/devuan-keyring-freia-archive.gpg /etc/apt/trusted.gpg.d/devuan-keyring-freia-archive.asc

Send a report that this bug log contains spam.