[pkgsrc/trunk]: pkgsrc/security/netpgpverify netpgpverify: update to 20201101

[wiz <wiz%pkgsrc.org@localhost>]

details:   https://anonhg.NetBSD.org/pkgsrc/rev/992a3910e405
branches:  trunk
changeset: 441315:992a3910e405
user:      wiz <wiz%pkgsrc.org@localhost>
date:      Sun Nov 01 11:28:35 2020 +0000

description:
netpgpverify: update to 20201101

Merge:
absorb issuer fingerprint (RFC4880bis 5.2.3.28) in libverify.c
from jhigh from src/

While here, fix build with RELRO and a pkglint warning.

Bump version to 20201101.

diffstat:

 security/netpgpverify/Makefile          |  4 ++--
 security/netpgpverify/files/Makefile.in |  4 ++--
 security/netpgpverify/files/libverify.c |  7 +++++++
 security/netpgpverify/files/verify.h    |  4 ++--
 4 files changed, 13 insertions(+), 6 deletions(-)

diffs (81 lines):

diff -r 5377461e878a -r 992a3910e405 security/netpgpverify/Makefile
--- a/security/netpgpverify/Makefile    Sun Nov 01 10:58:54 2020 +0000
+++ b/security/netpgpverify/Makefile    Sun Nov 01 11:28:35 2020 +0000
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.21 2020/01/18 23:35:10 rillig Exp $
+# $NetBSD: Makefile,v 1.22 2020/11/01 11:28:35 wiz Exp $
 
 DISTNAME=              netpgpverify-${VERSION}
 CATEGORIES=            security
@@ -20,6 +20,6 @@
 VERSION!=      ${AWK} '/\#define.*NETPGP_VERIFY_H_/ {print $$3}' ${FILESDIR}/verify.h
 
 do-extract:
-       @${CP} -R ${FILESDIR} ${WRKSRC}
+       ${CP} -R ${FILESDIR} ${WRKSRC}
 
 .include "../../mk/bsd.pkg.mk"
diff -r 5377461e878a -r 992a3910e405 security/netpgpverify/files/Makefile.in
--- a/security/netpgpverify/files/Makefile.in   Sun Nov 01 10:58:54 2020 +0000
+++ b/security/netpgpverify/files/Makefile.in   Sun Nov 01 11:28:35 2020 +0000
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile.in,v 1.8 2016/06/30 21:19:59 agc Exp $
+# $NetBSD: Makefile.in,v 1.9 2020/11/01 11:28:35 wiz Exp $
 
 PROG=netpgpverify
 
@@ -16,7 +16,7 @@
 all: ${PROG}
 
 ${PROG}: ${OBJS}
-       ${CC} ${OBJS} -o ${PROG}
+       ${CC} ${LDFLAGS} ${CFLAGS} ${OBJS} -o ${PROG}
 
 install:
        install -c -s ${PROG} ${DESTDIR}${PREFIX}/bin
diff -r 5377461e878a -r 992a3910e405 security/netpgpverify/files/libverify.c
--- a/security/netpgpverify/files/libverify.c   Sun Nov 01 10:58:54 2020 +0000
+++ b/security/netpgpverify/files/libverify.c   Sun Nov 01 11:28:35 2020 +0000
@@ -151,6 +151,8 @@
        char                    *features;
        char                    *why_revoked;
        uint8_t                 *revoke_fingerprint;
+       uint8_t                 *issuer_fingerprint;
+       uint8_t                  ifver;
        uint8_t                  revoke_alg;
        uint8_t                  revoke_sensitive;
        uint8_t                  trustsig;
@@ -925,6 +927,7 @@
 #define SUBPKT_FEATURES                        30
 #define SUBPKT_SIGNATURE_TARGET                31
 #define SUBPKT_EMBEDDED_SIGNATURE      32
+#define SUBPKT_ISSUER_FINGERPRINT      33
 
 #define UNCOMPRESSED                   0
 #define ZIP_COMPRESSION                        1
@@ -1180,6 +1183,10 @@
                        sigpkt->sig.revoked = *p++ + 1;
                        sigpkt->sig.why_revoked = (char *)(void *)p;
                        break;
+               case SUBPKT_ISSUER_FINGERPRINT:
+                       sigpkt->sig.ifver = *p;
+                       sigpkt->sig.issuer_fingerprint = &p[1];
+                       break;
                default:
                        printf("Ignoring unusual/reserved signature subpacket %d\n", subpkt.tag);
                        break;
diff -r 5377461e878a -r 992a3910e405 security/netpgpverify/files/verify.h
--- a/security/netpgpverify/files/verify.h      Sun Nov 01 10:58:54 2020 +0000
+++ b/security/netpgpverify/files/verify.h      Sun Nov 01 11:28:35 2020 +0000
@@ -23,9 +23,9 @@
  * THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
  */
 #ifndef NETPGP_VERIFY_H_
-#define NETPGP_VERIFY_H_       20200504
+#define NETPGP_VERIFY_H_       20201101
 
-#define NETPGPVERIFY_VERSION   "netpgpverify portable 20200504"
+#define NETPGPVERIFY_VERSION   "netpgpverify portable 20201101"
 
 #include <sys/types.h>