ui: backup restore: rework to leverage more viewcontroller and cleanup

[pve-manager.git] / aplinfo / Makefile

diff --git a/aplinfo/Makefile b/aplinfo/Makefile
index 4b33bf1d877d8111a8b062a272bb99ab1acc88a8..0350e120c5643fcbc5e6fc7e1e47d8e1af35bfcf 100644 (file)
--- a/aplinfo/Makefile
+++ b/aplinfo/Makefile
@@ -2,8 +2,8 @@
 DOCDIR=/usr/share/doc/pve-manager/
 
 TRUSTED_KEYS=                          \
-       proxmox-release-5.x.pubkey      \
        proxmox-release-6.x.pubkey      \
+       proxmox-release-bullseye.pubkey \
        release@turnkeylinux.com.pubkey
 
 all:
@@ -16,29 +16,15 @@ install: aplinfo.dat trustedkeys.gpg
 .PHONY: update
 update:
        rm -f aplinfo.dat
-       wget http://download.proxmox.com/images/aplinfo-pve-6.dat -O aplinfo.dat.tmp
+       wget http://download.proxmox.com/images/aplinfo-pve-7.dat -O aplinfo.dat.tmp
        mv aplinfo.dat.tmp aplinfo.dat
 
-# Default list of GPG keys allowed to sign aplinfo, generated with:
-# gpg --import-options show-only --import trustedkeys.gpg
-# pub   rsa4096 2016-08-29 [SC] [expires: 2026-08-27]
-#       359E95965E2C3D643159CD300D9A1950E2EF0603
-# uid                      Proxmox Virtual Environment 5.x Release Key <proxmox-release@proxmox.com>
-#
-# pub   rsa4096 2018-11-19 [SC] [expires: 2028-11-16]
-#       353479F83781D7F8ED5F5AC57BF2812E8A6E88E0
-# uid                      Proxmox Virtual Environment 6.x Release Key <proxmox-release@proxmox.com>
-#
-# pub   rsa2048 2008-08-15 [SC] [expires: 2023-08-12]
-#       694CFF26795A29BAE07B4EB585C25E95A16EB94D
-# uid                      Turnkey Linux Release Key <release@turnkeylinux.com>
-trustedkeys.gpg: ${TRUSTED_KEYS}
-       rm -Rf tempgpg
-       mkdir tempgpg
-       chmod 700 tempgpg
-       gpg --fingerprint --batch --no-tty --homedir tempgpg --import ${TRUSTED_KEYS}
-       gpg --batch --no-tty --homedir tempgpg --export > trustedkeys.gpg
+%.gpg: %.pubkey
+       gpg --dearmor -o $@ $<
+
+trustedkeys.gpg: ${TRUSTED_KEYS:.pubkey=.gpg}
+       cat $^ > $@
 
 .PHONY: clean
 clean:
-       rm -rf *~ aplinfo.dat.gz aplinfo.dat.asc tempgpg
+       rm -rf *~ aplinfo.dat.gz aplinfo.dat.asc tempgpg *.gpg