From 95d45cade26104fded40edc8fd2e5f3c9601c60d Mon Sep 17 00:00:00 2001
From: Daniel Baumann <daniel.baumann@progress-linux.org>
Date: Fri, 13 Sep 2019 21:52:01 +0200
Subject: Using signed-by in sources.list instead of symlinking keyring into
 apt keyring.

Signed-off-by: Daniel Baumann <daniel.baumann@progress-linux.org>
---
 debian/progress-linux.postinst | 16 +---------------
 debian/progress-linux.postrm   |  7 -------
 2 files changed, 1 insertion(+), 22 deletions(-)

diff --git a/debian/progress-linux.postinst b/debian/progress-linux.postinst
index ba72cc8..4750342 100755
--- a/debian/progress-linux.postinst
+++ b/debian/progress-linux.postinst
@@ -31,17 +31,6 @@ Remove_apt_preferences ()
 	rm -f "/etc/apt/preferences.d/${PROJECT}.pref"
 }
 
-Install_apt_keys ()
-{
-	rm -f "/etc/apt/trusted.gpg.d/${PROJECT}.gpg"
-	ln -s "/usr/share/${PROJECT}/pgp-keys/apt.${DOMAIN}.gpg" "/etc/apt/trusted.gpg.d/${PROJECT}.gpg"
-}
-
-Remove_apt_keys ()
-{
-	rm -f "/etc/apt/trusted.gpg.d/${PROJECT}.gpg"
-}
-
 Configure_apt_sources ()
 {
 	ARCHIVE="${1}"
@@ -57,7 +46,7 @@ Configure_apt_sources ()
 	esac
 
 cat >> "/etc/apt/sources.list.d/${PROJECT}.list" << EOF
-deb ${PACKAGES} ${ARCHIVE} ${AREAS}
+deb [signed-by=/usr/share/progress-linux/pgp-keys/apt.progress-linux.org.gpg] ${PACKAGES} ${ARCHIVE} ${AREAS}
 EOF
 }
 
@@ -147,7 +136,6 @@ case "${1}" in
 
 				Remove_apt_sources
 				Remove_apt_preferences
-				Remove_apt_keys
 
 				Remove_ssh_known_hosts
 
@@ -160,7 +148,6 @@ case "${1}" in
 		then
 			Install_apt_sources
 			Install_apt_preferences
-			Install_apt_keys
 
 			for ARCHIVE in ${ARCHIVES}
 			do
@@ -170,7 +157,6 @@ case "${1}" in
 		else
 			Remove_apt_sources
 			Remove_apt_preferences
-			Remove_apt_keys
 		fi
 
 		# openssh-server
diff --git a/debian/progress-linux.postrm b/debian/progress-linux.postrm
index 391291d..38f85e8 100755
--- a/debian/progress-linux.postrm
+++ b/debian/progress-linux.postrm
@@ -17,12 +17,6 @@ Remove_apt_preferences ()
 	rm -f "/etc/apt/preferences.d/${PROJECT}.pref"
 }
 
-Remove_apt_keys ()
-{
-	# apt keys
-	rm -f "/etc/apt/trusted.gpg.d/${PROJECT}.gpg"
-}
-
 Remove_ssh_known_hosts ()
 {
 	if [ ! -e /etc/ssh/ssh_known_hosts ]
@@ -49,7 +43,6 @@ case "${1}" in
 		# apt
 		Remove_apt_sources
 		Remove_apt_preferences
-		Remove_apt_keys
 
 		# openssh-server
 		Remove_ssh_known_hosts
-- 
cgit v1.2.3