From dc6448d1417761c84eea68a5bb5a578ac112f3b5 Mon Sep 17 00:00:00 2001
From: Daniel Baumann <daniel.baumann@open-infrastructure.net>
Date: Thu, 29 Aug 2024 11:20:02 +0200
Subject: Using signed-by for local apt sources.

Signed-off-by: Daniel Baumann <daniel.baumann@open-infrastructure.net>
---
 share/build-scripts/debconf                |  7 +------
 share/build-scripts/debconf.d/0003-debconf | 13 +++++++++++++
 2 files changed, 14 insertions(+), 6 deletions(-)

(limited to 'share/build-scripts')

diff --git a/share/build-scripts/debconf b/share/build-scripts/debconf
index 489808b..b739bac 100755
--- a/share/build-scripts/debconf
+++ b/share/build-scripts/debconf
@@ -693,12 +693,7 @@ EOF
 
 		if ls "${DEBCONF_TMPDIR}/apt"/*.key > /dev/null 2>&1
 		then
-			for KEY in "${DEBCONF_TMPDIR}/apt"/*.key
-			do
-				cp "${KEY}" "${DIRECTORY}"
-				Chroot "${DIRECTORY}" "apt-key add $(basename ${KEY})"
-				rm -f "${DIRECTORY}/$(basename ${KEY})"
-			done
+			cp "${DEBCONF_TMPDIR}/apt"/*.key "${DIRECTORY}/etc/apt/keyrings"
 		fi
 
 		if ls "${DEBCONF_TMPDIR}/apt"/*.pref > /dev/null 2>&1
diff --git a/share/build-scripts/debconf.d/0003-debconf b/share/build-scripts/debconf.d/0003-debconf
index bd171c1..305f159 100755
--- a/share/build-scripts/debconf.d/0003-debconf
+++ b/share/build-scripts/debconf.d/0003-debconf
@@ -701,6 +701,10 @@ EOF
 			KEY="${RET}"
 
 			wget -q "${KEY}" -O "${DEBCONF_TMPDIR}/apt/$(basename ${LIST} .sources).key"
+
+			SIGNED="/etc/apt/keyrings/$(basename ${LIST} .sources).key"
+		else
+			SIGNED=""
 		fi
 
 cat > "${DEBCONF_TMPDIR}/apt/${LIST}" << EOF
@@ -711,6 +715,15 @@ Components: ${AREAS}
 PDiffs: no
 EOF
 
+		if [ -n "${SIGNED}" ]
+		then
+
+cat >> "${DEBCONF_TMPDIR}/apt/${LIST}" << EOF
+Signed-By: ${SIGNED}
+EOF
+
+		fi
+
 		PREFERENCES_PACKAGE=""
 		PREFERENCES_PIN=""
 		PREFERENCES_PIN_PRIORITY=""
-- 
cgit v1.2.3