source.mk: Rewrite and update

3 files changed, 15 insertions, 12 deletions

diff --git a/control b/control
index af49b58..041a22c 100644
--- a/control
+++ b/control
@@ -1,3 +1,3 @@
 Maintainer: Patrick McDermott <patrick.mcdermott@libiquity.com>
-Build-Depends: opkhelper-3.0, bin86
+Build-Depends: opkhelper-3.0, bin86, gpg, dirmngr,
 Homepage: https://www.joonet.de/lilo/
diff --git a/copyright b/copyright
index 8c707fd..81429e7 100644
--- a/copyright
+++ b/copyright
@@ -92,7 +92,7 @@ On this system, a copy of the GNU General Public License may be found at
 Distribution Packaging
 ======================
 
-Copyright (C) 2014, 2020  Patrick McDermott
+Copyright (C) 2014, 2019, 2020  Patrick McDermott
 
 This program is free software; you can redistribute it and/or modify
 it under the terms of the GNU General Public License as published by
diff --git a/source.mk b/source.mk
index 2408a4f..d6986d6 100644
--- a/source.mk
+++ b/source.mk
@@ -1,21 +1,24 @@
 upstream_archive = $(OPK_SOURCE)-$(OPK_SOURCE_VERSION_UPSTREAM).tar.gz
-upstream_url = http://lilo.alioth.debian.org/ftp/sources/$(upstream_archive)
+upstream_url = https://www.joonet.de/lilo/ftp/sources/$(upstream_archive)
 source_archive = ../$(OPK_SOURCE)-$(OPK_SOURCE_VERSION_UPSTREAM).orig.tar.gz
+
+gpg = GNUPGHOME=gnupghome/ gpg --no-default-keyring --keyring ../keyring.gpg
 keys = \
 	'5E78 7F8D B58F 02AF 5C63  C9DD 4A22 5464 1FE1 B08B' \
 	'46A6 2D7D 44A2 6FBE 10D7  EEE7 3139 3680 39A1 1092'
 
 $(source_archive):
-	wget -c '$(upstream_url)'
-	set -e; if gpg --version >/dev/null 2>&1; then \
-		wget -c '$(upstream_url).asc'; \
-		[ -e ../keyring.gpg ] || \
-			gpg --keyring ../keyring.gpg --no-default-keyring \
-				--recv-keys $(keys) || true; \
-		rm -f ../keyring.gpg~; \
-		gpg --verify --keyring ../keyring.gpg \
-			'$(upstream_archive).asc'; \
+	wget -c '$(upstream_url)' '$(upstream_url).asc'
+	install -m 0700 -d gnupghome/
+	[ -e ../keyring.gpg ] || \
+		$(gpg) --keyserver hkp://pool.sks-keyservers.net \
+			--recv-keys $(keys); \
+	rm -f ../keyring.gpg~; \
+	if ! $(gpg) --verify '$(upstream_archive).asc'; then \
+		rm -Rf gnupghome/; \
+		exit 1; \
 	fi
+	rm -Rf gnupghome/
 	mv '$(upstream_archive)' '$(source_archive)'
 
 source: $(source_archive)