From: Tobias Brunner <tobias@strongswan.org>
Date: Wed, 13 Aug 2025 11:54:01 +0000 (+0200)
Subject: testing: Use new recommended approach to install key for custom apt repository
X-Git-Tag: 6.0.3dr1~1^2~18
X-Git-Url: http://git.ipfire.org/?a=commitdiff_plain;h=a418666f59bb46d6b5d554563417f848113209e5;p=thirdparty%2Fstrongswan.git

testing: Use new recommended approach to install key for custom apt repository

apt-key add is deprecated (and not available in trixie) as it makes the
available for all sources.  The recommended approach makes the key very
specifically available for just our repository.
---

diff --git a/testing/scripts/build-baseimage b/testing/scripts/build-baseimage
index edb1588c46..ce8bdc6900 100755
--- a/testing/scripts/build-baseimage
+++ b/testing/scripts/build-baseimage
@@ -125,13 +125,13 @@ EOF
 execute_chroot "locale-gen"
 
 log_action "Downloading signing key for custom apt repo"
-execute_chroot "wget -q $BASEIMGEXTKEY -O /tmp/key"
+execute_chroot "wget -q $BASEIMGEXTKEY -O /tmp/strongswan.key"
 log_action "Installing signing key for custom apt repo"
-execute_chroot "apt-key add /tmp/key"
+execute_chroot "mv /tmp/strongswan.key /etc/apt/keyrings/"
 
 log_action "Enabling custom apt repo"
 cat > $LOOPDIR/etc/apt/sources.list.d/strongswan.list << EOF
-deb $BASEIMGEXTREPO $BASEIMGSUITE main
+deb [signed-by=/etc/apt/keyrings/strongswan.key] $BASEIMGEXTREPO $BASEIMGSUITE main
 EOF
 log_status $?