Update netpgpverify and libnetpgpverify to 20160616

+ bring over joerg's printflike change from the netpgpverify
version in src/crypto

+ add a test for cleartext signatures with version information
to complement the one with no version information

security/netpgpverify/files/Makefile.bsd

@@ -1,4 +1,4 @@
-# $NetBSD: Makefile.bsd,v 1.9 2016/06/14 18:00:59 agc Exp $
+# $NetBSD: Makefile.bsd,v 1.10 2016/06/15 16:45:10 agc Exp $
 
 PROG=netpgpverify
 
@@ -43,5 +43,7 @@ tst:
 	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

security/netpgpverify/files/Makefile.in

@@ -1,4 +1,4 @@
-# $NetBSD: Makefile.in,v 1.5 2016/06/14 18:00:59 agc Exp $
+# $NetBSD: Makefile.in,v 1.6 2016/06/15 16:45:10 agc Exp $
 
 PROG=netpgpverify
 
@@ -43,6 +43,8 @@ tst:
 	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
 

security/netpgpverify/files/libverify.c

@@ -211,6 +211,7 @@ obuf_add_mem(obuf_t *obuf, const char *s, size_t len)
 }
 
 /* varargs-based printf to string */
+__printflike(2, 3)
 static bool
 obuf_printf(obuf_t *obuf, const char *fmt, ...)
 {

security/netpgpverify/files/verify.h

@@ -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>
 

security/netpgpverify/files/version.asc

@@ -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-----