release: Default to gpg2 to avoid SHA1 signatures

Fixes #457

diff --git a/Makefile b/Makefile
index 69512d8d8743a0bc7a6d82d5b32c8d4c773b2a13..4993f34c21c47d6ba5c660a6a658e47f5f1f725d 100644 (file)
--- 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 de18984da50efb621346d80b82fc6c38dd4be126..782ea969b10d87b9a9274cea96c98a72a01c5b95 100644 (file)
--- 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