From: Michael Howe <michael@michaelhowe.org>
Date: Sat, 24 Jan 2026 18:52:59 +0000 (+0000)
Subject: Remove trust packets from generated keyrings
X-Git-Tag: 2026.02.16~5
X-Git-Url: https://git.michaelhowe.org/gitweb/?a=commitdiff_plain;h=ea4fe9910e930a6b12b7ddddd677bfcd48a41453;p=packages%2Fm%2Fmh-archive-keyring.git

Remove trust packets from generated keyrings

See Debian's f2f98681acd119a7c0cf33ea7398752c6f36aafb - they might make
it unreproducible as they may change between GnuPG versions.
---

diff --git a/Makefile b/Makefile
index 8c7fb32..65e1f60 100644
--- a/Makefile
+++ b/Makefile
@@ -7,6 +7,13 @@ build: keyrings/mh-archive-keyring.gpg $(TRUSTED-LIST)
 
 keyrings/mh-archive-keyring.gpg: active-keys/index
 	jetring-build -I $@ active-keys
+	gpg ${GPG_OPTIONS} --no-keyring --import-options import-export --import < $@ > $@.tmp
+	mv -f $@.tmp $@
+
+keyrings/mh-archive-removed-keys.gpg: removed-keys/index
+	jetring-build -I $@ removed-keys
+	gpg ${GPG_OPTIONS} --no-keyring --import-options import-export --import < $@ > $@.tmp
+	mv -f $@.tmp $@
 
 $(TRUSTED-LIST) :: trusted.gpg/mh-archive-%.gpg : active-keys/add-% active-keys/index
 	mkdir -p $(TMPRING) trusted.gpg