From fd38aa5bd293cefecc8962dcc75357bcdb6060f1 Mon Sep 17 00:00:00 2001
From: Patrick McDermott <patrick.mcdermott@libiquity.com>
Date: Sun, 23 Jun 2019 13:06:38 -0400
Subject: libsigsegv 2.12-1

Individual commits lost:

	e09d864 changelog: Release libsigsegv 2.12-1
	9444115 release: New script (copied from gcc-8)
	3295988 copyright: Update
	2049433 libsigsegv.2: Use oh-shlibdeps
	74a1035 libsigsegv-dev: Remove static library
	abc2b1d source.mk: Rewrite/update
	8ba20bb keyring.gpg: Exclude from Git
	a5a1378 control: Update Maintainer
	83037f3 changelog: New upstream version
---
(limited to 'source.mk')

diff --git a/source.mk b/source.mk
index f527bbe..abcd3a1 100644
--- a/source.mk
+++ b/source.mk
@@ -1,18 +1,23 @@
-upstream_archive = libsigsegv-$(OPK_SOURCE_VERSION_UPSTREAM).tar.gz
-upstream_url = http://ftp.gnu.org/pub/gnu/libsigsegv/$(upstream_archive)
-source_archive = ../libsigsegv-$(OPK_SOURCE_VERSION_UPSTREAM).orig.tar.gz
-keys = F059B1D1
+upstream_archive = $(OPK_SOURCE)-$(OPK_SOURCE_VERSION_UPSTREAM).tar.gz
+upstream_url = http://ftp.gnu.org/pub/gnu/$(OPK_SOURCE)/$(upstream_archive)
+source_archive = ../$(OPK_SOURCE)-$(OPK_SOURCE_VERSION_UPSTREAM).orig.tar.gz
+
+gpg = GNUPGHOME=gnupghome/ gpg --no-default-keyring --keyring ../keyring.gpg
+keys = \
+	'68D9 4D8A AEEA D48A E7DC  5B90 4F49 4A94 2E46 16C2'
 
 $(source_archive):
-	wget '$(upstream_url)'
-	set -e; if gpg --version >/dev/null 2>&1; then \
-		wget '$(upstream_url).sig'; \
-		[ -e ../keyring.gpg ] || \
-			gpg --keyring ../keyring.gpg --no-default-keyring \
-				--recv-keys $(keys) || true; \
-		gpg --verify --keyring ../keyring.gpg \
-			'$(upstream_archive).sig'; \
+	wget -c '$(upstream_url)' '$(upstream_url).sig'
+	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).sig'; then \
+		rm -Rf gnupghome/; \
+		exit 1; \
 	fi
+	rm -Rf gnupghome/
 	mv '$(upstream_archive)' '$(source_archive)'
 
 source: $(source_archive)
--
cgit v0.9.1