From c30fb9d2f42a6d9988f9894c3f80e2e7632b5d8f Mon Sep 17 00:00:00 2001
From: Daniel Baumann <daniel.baumann@open-infrastructure.net>
Date: Sat, 9 Feb 2019 13:16:11 +0100
Subject: Replacing archive signing key handling for progress-linux by install
 the progress-linux package.

Signed-off-by: Daniel Baumann <daniel.baumann@open-infrastructure.net>
---
 share/scripts/debconf | 59 ++++++---------------------------------------------
 1 file changed, 7 insertions(+), 52 deletions(-)

(limited to 'share/scripts/debconf')

diff --git a/share/scripts/debconf b/share/scripts/debconf
index c202832..2c26ffa 100755
--- a/share/scripts/debconf
+++ b/share/scripts/debconf
@@ -253,6 +253,12 @@ Debootstrap ()
 		INCLUDE="${INCLUDE},apt-transport-https,ca-certificates"
 	fi
 
+	case "${MODE}" in
+		progress-linux)
+			INCLUDE="${INCLUDE},progress-linux,gnupg"
+			;;
+	esac
+
 	mkdir -p "$(dirname ${DIRECTORY})"
 	debootstrap --verbose --arch=${ARCHITECTURE} --components=${PARENT_ARCHIVE_AREAS} \
 		--exclude=${EXCLUDE} --include=${INCLUDE} ${PARENT_DISTRIBUTION} "${DIRECTORY}" ${PARENT_MIRROR}
@@ -332,58 +338,7 @@ EOF
 					;;
 			esac
 
-			# Import archive keys
-			KEYS="project/pgp/archive-key-${DIST}.asc"
-
-			for KEY in ${KEYS}
-			do
-				KEY_NAME="$(basename ${KEY})"
-				echo "P: Fetching archive-key ${KEY_NAME}..."
-
-				wget -q "${MIRROR}/${KEY}" -O "${DIRECTORY}/key.asc"
-				wget -q "${MIRROR}/${KEY}.gpg" -O "${DIRECTORY}/key.asc.gpg"
-
-				if [ -e /usr/bin/gpgv ]
-				then
-					if [ -e /usr/share/keyrings/debian-keyring.gpg ] || [ -e /usr/share/keyrings/debian-maintainers.gpg ]
-					then
-						KEY_VALID=""
-
-						for KEYRING in /usr/share/keyrings/debian-keyring.gpg /usr/share/keyrings/debian-maintainers.gpg
-						do
-							if [ -e "${KEYRING}" ]
-							then
-								echo -n "I: Verifying archive-key ${KEY_NAME} against $(basename ${KEYRING} .gpg | sed -e 's|-keyring||') keyring..."
-
-								# FIXME: doesn't work anymore when the template eventually be run with 'set -e'
-								/usr/bin/gpgv --quiet --keyring ${KEYRING} "${DIRECTORY}/key.asc.gpg" "${DIRECTORY}/key.asc" > /dev/null 2>&1 && KEY_VALID="true" && break
-							fi
-						done
-
-						case "${KEY_VALID}" in
-							true)
-								echo " successful."
-								;;
-
-							*)
-								echo " failed."
-								return 1
-								;;
-						esac
-					else
-						echo "W: Skipping archive-key ${KEY_NAME} verification, debian-keyring not available..."
-					fi
-				else
-					echo "W: Skipping archive-key ${KEY_NAME} verification, gpgv not available..."
-				fi
-
-				echo "P: Importing archive-key ${KEY_NAME}..."
-
-				Chroot "${DIRECTORY}" "apt-key add key.asc"
-				rm -f "${DIRECTORY}/key.asc"
-				rm -f "${DIRECTORY}/key.asc.gpg"
-			done
-
+			Chroot "${DIRECTORY}" "apt-key add /usr/share/progress-linux/pgp-keys/apt.progress-linux.org.gpg"
 			Chroot "${DIRECTORY}" "apt-get update"
 			;;
 	esac
-- 
cgit v1.2.3