From: Roy Marples <roy@marples.name>
Date: Tue, 25 Feb 2025 11:54:01 +0000 (+0000)
Subject: release: Default to gpg2 to avoid SHA1 signatures
X-Git-Url: http://git.ipfire.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=refs%2Fheads%2Fdhcpcd-9;p=thirdparty%2Fdhcpcd.git

release: Default to gpg2 to avoid SHA1 signatures

Fixes #457
---

diff --git a/Makefile b/Makefile
index 69512d8d..4993f34c 100644
--- a/Makefile
+++ b/Makefile
@@ -70,7 +70,7 @@ distinfo: dist
 	${SHA256} ${DISTFILE} >${DISTINFO}
 	wc -c <${DISTFILE} \
 		| xargs printf 'Size   (${DISTFILE}) = %s\n' >>${DISTINFO}
-	${PGP} --armour --detach-sign ${DISTFILE}
+	${PGP} --sign --armour --detach ${DISTFILE}
 	chmod 644 ${DISTSIGN}
 	ls -l ${DISTFILE} ${DISTINFO} ${DISTSIGN}
 
diff --git a/Makefile.inc b/Makefile.inc
index de18984d..782ea969 100644
--- a/Makefile.inc
+++ b/Makefile.inc
@@ -15,12 +15,10 @@ LINT?=		lint
 SED?=		sed
 HOST_SH?=	/bin/sh
 
-# This isn't very portable, but I generaly make releases from DragonFlyBSD
+# This isn't very portable, but I generaly make releases from NetBSD
 SHA256?=	sha256
-PGP?=		gpg
-# old NetBSD defs
-#SHA256?=		cksum -a SHA256
-#PGP?=		netpgp
+# Force gpg2 to avoid SHA1 signatures from gpg1
+PGP?=		gpg2
 
 SCRIPT=		${LIBEXECDIR}/dhcpcd-run-hooks
 HOOKDIR=	${LIBEXECDIR}/dhcpcd-hooks