[src/trunk]: src/crypto/external/bsd/netpgp/dist/src/netpgpverify Update netp...

[agc <agc%NetBSD.org@localhost>]

details:   https://anonhg.NetBSD.org/src/rev/c7bf5bd82bbe
branches:  trunk
changeset: 345925:c7bf5bd82bbe
user:      agc <agc%NetBSD.org@localhost>
date:      Wed Jun 15 16:51:46 2016 +0000

description:
Update netpgpverify to 20160616:

+ Bring over change from pkgsrc to add version.asc signature verification
to complement the noversion.asc cleartext signatures

+ Update version to 20160616

diffstat:

 crypto/external/bsd/netpgp/dist/src/netpgpverify/Makefile.bsd |   4 ++-
 crypto/external/bsd/netpgp/dist/src/netpgpverify/Makefile.in  |   4 ++-
 crypto/external/bsd/netpgp/dist/src/netpgpverify/verify.h     |   4 +-
 crypto/external/bsd/netpgp/dist/src/netpgpverify/version.asc  |  15 +++++++++++
 4 files changed, 23 insertions(+), 4 deletions(-)

diffs (69 lines):

diff -r 045fe61b9e5c -r c7bf5bd82bbe crypto/external/bsd/netpgp/dist/src/netpgpverify/Makefile.bsd
--- a/crypto/external/bsd/netpgp/dist/src/netpgpverify/Makefile.bsd     Wed Jun 15 15:47:50 2016 +0000
+++ b/crypto/external/bsd/netpgp/dist/src/netpgpverify/Makefile.bsd     Wed Jun 15 16:51:46 2016 +0000
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile.bsd,v 1.5 2016/06/14 20:47:08 agc Exp $
+# $NetBSD: Makefile.bsd,v 1.6 2016/06/15 16:51:46 agc Exp $
 
 PROG=netpgpverify
 
@@ -43,5 +43,7 @@
        rm -f 1keytest.gpg
        @echo "testing signing with a subkey"
        ./chk.sh -k joyent-pubring.gpg digest-20121220.tgz
+       @echo "testing signatures with version"
+       ./${PROG} -k pubring.gpg version.asc
        @echo "testing signatures with no version"
        ./${PROG} -k pubring.gpg noversion.asc
diff -r 045fe61b9e5c -r c7bf5bd82bbe crypto/external/bsd/netpgp/dist/src/netpgpverify/Makefile.in
--- a/crypto/external/bsd/netpgp/dist/src/netpgpverify/Makefile.in      Wed Jun 15 15:47:50 2016 +0000
+++ b/crypto/external/bsd/netpgp/dist/src/netpgpverify/Makefile.in      Wed Jun 15 16:51:46 2016 +0000
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile.in,v 1.9 2016/06/14 20:47:08 agc Exp $
+# $NetBSD: Makefile.in,v 1.10 2016/06/15 16:51:46 agc Exp $
 
 PROG=netpgpverify
 
@@ -43,6 +43,8 @@
        rm -f 1keytest.gpg
        @echo "testing signing with a subkey"
        ./chk.sh -k joyent-pubring.gpg digest-20121220.tgz
+       @echo "testing signatures with version"
+       ./${PROG} -k pubring.gpg version.asc
        @echo "testing signatures with no version"
        ./${PROG} -k pubring.gpg noversion.asc
 
diff -r 045fe61b9e5c -r c7bf5bd82bbe crypto/external/bsd/netpgp/dist/src/netpgpverify/verify.h
--- a/crypto/external/bsd/netpgp/dist/src/netpgpverify/verify.h Wed Jun 15 15:47:50 2016 +0000
+++ b/crypto/external/bsd/netpgp/dist/src/netpgpverify/verify.h Wed Jun 15 16:51:46 2016 +0000
@@ -23,9 +23,9 @@
  * THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
  */
 #ifndef NETPGP_VERIFY_H_
-#define NETPGP_VERIFY_H_       20160615
+#define NETPGP_VERIFY_H_       20160616
 
-#define NETPGPVERIFY_VERSION   "netpgpverify portable 20160615"
+#define NETPGPVERIFY_VERSION   "netpgpverify portable 20160616"
 
 #include <sys/types.h>
 
diff -r 045fe61b9e5c -r c7bf5bd82bbe crypto/external/bsd/netpgp/dist/src/netpgpverify/version.asc
--- /dev/null   Thu Jan 01 00:00:00 1970 +0000
+++ b/crypto/external/bsd/netpgp/dist/src/netpgpverify/version.asc      Wed Jun 15 16:51:46 2016 +0000
@@ -0,0 +1,15 @@
+-----BEGIN PGP SIGNED MESSAGE-----
+Hash: SHA1
+
+bar
+-----BEGIN PGP SIGNATURE-----
+Version: GnuPG v1
+
+iQEcBAEBAgAGBQJXYOg1AAoJEBto3PzAWWgjN7wIALbMScFoVnkE47+Hj1aLclRL
+9Mb9bKWkPi9iq1SybDEeiK6G9hLXSm2ZbygHNoAwFVlMIxkV2lRKqLfquatW9GH/
+9W2LkKa3wYpHH84Uj2/3Atu7564+IvcvDVkuxp4oHiz4X3i4CvIOf6qPuPHC5fAb
+xmjRLJRh71pJ8zBdtLQV3hnzjuUk5qZvKt109/WARQL5lL5jGIe504TnzHEBSgNa
+Ez1vxN2RngVh4QhDApx05EYfmZnBChXalCCh+noo6gpjUN/xhfq/KkLWrLaRWIL6
+IHBS3MgqDP6ToaJ7R2w1hytCoKlbXGyJGsUn29QBoQBwWGGM3Z5pbFBPcmBx/mg=
+=KXon
+-----END PGP SIGNATURE-----