aplinfo: use sequioa for key ring generation

The sq CLI tool's UX is such a fresh breath of air compared to gpg...

Signed-off-by: Thomas Lamprecht <t.lamprecht@proxmox.com>

diff --git a/aplinfo/Makefile b/aplinfo/Makefile
index 0350e120c5643fcbc5e6fc7e1e47d8e1af35bfcf..40c28e1482e0e9cd509916f89d060008d1964933 100644 (file)
--- a/aplinfo/Makefile
+++ b/aplinfo/Makefile
@@ -19,12 +19,10 @@ update:
        wget http://download.proxmox.com/images/aplinfo-pve-7.dat -O aplinfo.dat.tmp
        mv aplinfo.dat.tmp aplinfo.dat
 
-%.gpg: %.pubkey
-       gpg --dearmor -o $@ $<
-
-trustedkeys.gpg: ${TRUSTED_KEYS:.pubkey=.gpg}
-       cat $^ > $@
+trustedkeys.gpg: ${TRUSTED_KEYS}
+       sq keyring join -o $@.tmp *.pubkey proxmox-release-bookworm.gpg
+       mv $@.tmp $@
 
 .PHONY: clean
 clean:
-       rm -rf *~ aplinfo.dat.gz aplinfo.dat.asc tempgpg *.gpg
+       rm -rf *~ aplinfo.dat.gz aplinfo.dat.asc trustedkeys.gpg

diff --git a/debian/control b/debian/control
index 7ee4c085d725cf6096498d66f853dd4f38100e69..7035f633f4692f1567fc61969347073c9afda43b 100644 (file)
--- a/debian/control
+++ b/debian/control
@@ -25,6 +25,7 @@ Build-Depends: debhelper (>= 12~),
                pve-doc-generator (>= 7.2-3),
                pve-eslint (>= 7.28.0-1),
                qemu-server (>= 6.0-15),
+               sq,
                unzip,
 Maintainer: Proxmox Support Team <support@proxmox.com>