CVS commit: pkgsrc/security/netpgpverify/files

["Alistair G. Crooks" <agc%netbsd.org@localhost>]

Module Name:    pkgsrc
Committed By:   agc
Date:           Wed Jun 15 16:45:10 UTC 2016

Modified Files:
        pkgsrc/security/netpgpverify/files: Makefile.bsd Makefile.in
            libverify.c verify.h
Added Files:
        pkgsrc/security/netpgpverify/files: version.asc

Log Message:
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


To generate a diff of this commit:
cvs rdiff -u -r1.9 -r1.10 pkgsrc/security/netpgpverify/files/Makefile.bsd
cvs rdiff -u -r1.5 -r1.6 pkgsrc/security/netpgpverify/files/Makefile.in
cvs rdiff -u -r1.15 -r1.16 pkgsrc/security/netpgpverify/files/libverify.c
cvs rdiff -u -r1.22 -r1.23 pkgsrc/security/netpgpverify/files/verify.h
cvs rdiff -u -r0 -r1.1 pkgsrc/security/netpgpverify/files/version.asc

Please note that diffs are not public domain; they are subject to the
copyright notices on the relevant files.

Modified files:

Index: pkgsrc/security/netpgpverify/files/Makefile.bsd
diff -u pkgsrc/security/netpgpverify/files/Makefile.bsd:1.9 pkgsrc/security/netpgpverify/files/Makefile.bsd:1.10
--- pkgsrc/security/netpgpverify/files/Makefile.bsd:1.9 Tue Jun 14 18:00:59 2016
+++ pkgsrc/security/netpgpverify/files/Makefile.bsd     Wed Jun 15 16:45:10 2016
@@ -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

Index: pkgsrc/security/netpgpverify/files/Makefile.in
diff -u pkgsrc/security/netpgpverify/files/Makefile.in:1.5 pkgsrc/security/netpgpverify/files/Makefile.in:1.6
--- pkgsrc/security/netpgpverify/files/Makefile.in:1.5  Tue Jun 14 18:00:59 2016
+++ pkgsrc/security/netpgpverify/files/Makefile.in      Wed Jun 15 16:45:10 2016
@@ -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
 

Index: pkgsrc/security/netpgpverify/files/libverify.c
diff -u pkgsrc/security/netpgpverify/files/libverify.c:1.15 pkgsrc/security/netpgpverify/files/libverify.c:1.16
--- pkgsrc/security/netpgpverify/files/libverify.c:1.15 Wed Jun 15 03:34:15 2016
+++ pkgsrc/security/netpgpverify/files/libverify.c      Wed Jun 15 16:45:10 2016
@@ -211,6 +211,7 @@ obuf_add_mem(obuf_t *obuf, const char *s
 }
 
 /* varargs-based printf to string */
+__printflike(2, 3)
 static bool
 obuf_printf(obuf_t *obuf, const char *fmt, ...)
 {

Index: pkgsrc/security/netpgpverify/files/verify.h
diff -u pkgsrc/security/netpgpverify/files/verify.h:1.22 pkgsrc/security/netpgpverify/files/verify.h:1.23
--- pkgsrc/security/netpgpverify/files/verify.h:1.22    Wed Jun 15 03:34:15 2016
+++ pkgsrc/security/netpgpverify/files/verify.h Wed Jun 15 16:45:10 2016
@@ -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>
 

Added files:

Index: pkgsrc/security/netpgpverify/files/version.asc
diff -u /dev/null pkgsrc/security/netpgpverify/files/version.asc:1.1
--- /dev/null   Wed Jun 15 16:45:10 2016
+++ pkgsrc/security/netpgpverify/files/version.asc      Wed Jun 15 16:45:10 2016
@@ -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-----