Update netpgpverify, and libnetpgpverify, to 20150203

+ portability fixes to make netpgpverify build on freebsd 10.1 with WARNS=5

+ fixed an oversight in the testit.sh script

6 files changed, 31 insertions, 24 deletions

diff --git a/security/netpgpverify/files/bzlib.c b/security/netpgpverify/files/bzlib.c
index e0a0d58a144..a492eb60426 100644
--- a/security/netpgpverify/files/bzlib.c
+++ b/security/netpgpverify/files/bzlib.c
@@ -1,4 +1,4 @@
-/*	$NetBSD: bzlib.c,v 1.3 2014/12/04 20:08:47 agc Exp $	*/
+/*	$NetBSD: bzlib.c,v 1.4 2015/02/03 21:13:17 agc Exp $	*/
 
 
 /*-------------------------------------------------------------*/
@@ -35,7 +35,7 @@
 #include "bzlib_private.h"
 
 
-/*	$NetBSD: bzlib.c,v 1.3 2014/12/04 20:08:47 agc Exp $	*/
+/*	$NetBSD: bzlib.c,v 1.4 2015/02/03 21:13:17 agc Exp $	*/
 
 
 /*-------------------------------------------------------------*/
@@ -930,7 +930,7 @@ BZFILE * bzopen_or_bzdopen
    int    smallMode     = 0;
    int    nUnused       = 0; 
 
-   __USE(blockSize100k);
+   USE_ARG(blockSize100k);
 
    if (mode == NULL) return NULL;
    while (*mode) {
@@ -1082,7 +1082,7 @@ const char * BZ_API(BZ2_bzerror) (BZFILE *b, int *errnum)
 /*-------------------------------------------------------------*/
 /*--- end                                           bzlib.c ---*/
 /*-------------------------------------------------------------*/
-/*	$NetBSD: bzlib.c,v 1.3 2014/12/04 20:08:47 agc Exp $	*/
+/*	$NetBSD: bzlib.c,v 1.4 2015/02/03 21:13:17 agc Exp $	*/
 
 
 /*-------------------------------------------------------------*/
@@ -1728,7 +1728,7 @@ Int32 BZ2_decompress ( DState* s )
 /*-------------------------------------------------------------*/
 /*--- end                                      decompress.c ---*/
 /*-------------------------------------------------------------*/
-/*	$NetBSD: bzlib.c,v 1.3 2014/12/04 20:08:47 agc Exp $	*/
+/*	$NetBSD: bzlib.c,v 1.4 2015/02/03 21:13:17 agc Exp $	*/
 
 
 /*-------------------------------------------------------------*/
@@ -1832,7 +1832,7 @@ UInt32 BZ2_crc32Table[256] = {
 /*-------------------------------------------------------------*/
 /*--- end                                        crctable.c ---*/
 /*-------------------------------------------------------------*/
-/*	$NetBSD: bzlib.c,v 1.3 2014/12/04 20:08:47 agc Exp $	*/
+/*	$NetBSD: bzlib.c,v 1.4 2015/02/03 21:13:17 agc Exp $	*/
 
 
 /*-------------------------------------------------------------*/
diff --git a/security/netpgpverify/files/bzlib_private.h b/security/netpgpverify/files/bzlib_private.h
index 815926d82c1..5c6c5a23a3f 100644
--- a/security/netpgpverify/files/bzlib_private.h
+++ b/security/netpgpverify/files/bzlib_private.h
@@ -1,4 +1,4 @@
-/*	$NetBSD: bzlib_private.h,v 1.2 2014/12/04 20:08:47 agc Exp $	*/
+/*	$NetBSD: bzlib_private.h,v 1.3 2015/02/03 21:13:17 agc Exp $	*/
 
 
 /*-------------------------------------------------------------*/
@@ -57,6 +57,10 @@ typedef unsigned short  UInt16;
 
 #ifndef BZ_NO_STDIO
 
+#ifndef __dead
+#define __dead
+#endif
+
 void BZ2_bz__AssertH__fail ( int errcode ) __dead;
 #define AssertH(cond,errcode) \
    { if (!(cond)) BZ2_bz__AssertH__fail ( errcode ); }
diff --git a/security/netpgpverify/files/libverify.c b/security/netpgpverify/files/libverify.c
index 42af6968ed4..ad0293a55be 100644
--- a/security/netpgpverify/files/libverify.c
+++ b/security/netpgpverify/files/libverify.c
@@ -2190,6 +2190,7 @@ getbignum(pgpv_bignum_t *bignum, bufgap_t *bg, char *buf, const char *header)
 {
 	uint32_t	 len;
 
+	USE_ARG(header);
 	(void) bufgap_getbin(bg, &len, sizeof(len));
 	len = pgp_ntoh32(len);
 	(void) bufgap_seek(bg, sizeof(len), BGFromHere, BGByte);
@@ -2248,6 +2249,7 @@ read_ssh_file(pgpv_t *pgp, pgpv_primarykey_t *primary, const char *fmt, ...)
 	int			 ok;
 	int			 cc;
 
+	USE_ARG(pgp);
 	memset(primary, 0x0, sizeof(*primary));
 	(void) memset(&bg, 0x0, sizeof(bg));
 	va_start(args, fmt);
@@ -2731,6 +2733,7 @@ pgpv_read_ssh_pubkeys(pgpv_t *pgp, const void *keyring, ssize_t size)
 {
 	pgpv_primarykey_t	primary;
 
+	USE_ARG(size);
 	if (pgp == NULL) {
 		return 0;
 	}
diff --git a/security/netpgpverify/files/testit.sh b/security/netpgpverify/files/testit.sh
index a17232e027c..b458303b6ec 100755
--- a/security/netpgpverify/files/testit.sh
+++ b/security/netpgpverify/files/testit.sh
@@ -1,7 +1,7 @@
 #! /bin/sh
 
 tmp=$(mktemp -d ../netpgpverify-test.XXXXXX)
-mkdir ${tmp}
+
 pax -rwpp . ${tmp}
 cat > ${tmp}/config.h <<EOF
 #ifndef CONFIG_H_
diff --git a/security/netpgpverify/files/verify.h b/security/netpgpverify/files/verify.h
index d84efe95da9..dbf7959140c 100644
--- a/security/netpgpverify/files/verify.h
+++ b/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_	20150115
+#define NETPGP_VERIFY_H_	20150203
 
-#define NETPGPVERIFY_VERSION	"netpgpverify portable 20150115"
+#define NETPGPVERIFY_VERSION	"netpgpverify portable 20150203"
 
 #include <sys/types.h>
 
diff --git a/security/netpgpverify/files/zlib.c b/security/netpgpverify/files/zlib.c
index 8d760dbd569..6db633f9f1e 100644
--- a/security/netpgpverify/files/zlib.c
+++ b/security/netpgpverify/files/zlib.c
@@ -1,4 +1,4 @@
-/*	$NetBSD: zlib.c,v 1.1 2013/03/16 07:32:35 agc Exp $	*/
+/*	$NetBSD: zlib.c,v 1.2 2015/02/03 21:13:17 agc Exp $	*/
 
 /* inflate.c -- zlib decompression
  * Copyright (C) 1995-2005 Mark Adler
@@ -272,7 +272,7 @@ int ZEXPORT inflateReset(z_streamp strm)
     struct inflate_state FAR *state;
 
     if (strm == Z_NULL || strm->state == Z_NULL) return Z_STREAM_ERROR;
-    state = (struct inflate_state FAR *)strm->state;
+    state = (struct inflate_state FAR *)(void *)strm->state;
     strm->total_in = strm->total_out = state->total = 0;
     strm->msg = Z_NULL;
     strm->adler = 1;        /* to support ill-conceived Java test suite */
@@ -296,7 +296,7 @@ int ZEXPORT inflatePrime(z_streamp strm, int bits, int value)
     struct inflate_state FAR *state;
 
     if (strm == Z_NULL || strm->state == Z_NULL) return Z_STREAM_ERROR;
-    state = (struct inflate_state FAR *)strm->state;
+    state = (struct inflate_state FAR *)(void *)strm->state;
     if (bits > 16 || state->bits + bits > 32) return Z_STREAM_ERROR;
     value &= (1L << bits) - 1;
     state->hold += value << state->bits;
@@ -322,7 +322,7 @@ int ZEXPORT inflateInit2_(z_streamp strm, int windowBits, const char *version, i
             ZALLOC(strm, 1, sizeof(struct inflate_state));
     if (state == Z_NULL) return Z_MEM_ERROR;
     Tracev((stderr, "inflate: allocated\n"));
-    strm->state = (struct internal_state FAR *)state;
+    strm->state = (struct internal_state FAR *)(void *)state;
     if (windowBits < 0) {
         state->wrap = 0;
         windowBits = -windowBits;
@@ -361,7 +361,7 @@ int ZEXPORT inflateInit_( z_streamp strm, const char *version, int stream_size)
 local void
 fixedtables(struct inflate_state FAR *state)
 {
-/*	$NetBSD: zlib.c,v 1.1 2013/03/16 07:32:35 agc Exp $	*/
+/*	$NetBSD: zlib.c,v 1.2 2015/02/03 21:13:17 agc Exp $	*/
 
     /* inffixed.h -- table for decoding fixed codes
      * Generated automatically by makefixed().
@@ -483,7 +483,7 @@ updatewindow(z_streamp strm, unsigned out)
     struct inflate_state FAR *state;
     unsigned copy, dist;
 
-    state = (struct inflate_state FAR *)strm->state;
+    state = (struct inflate_state FAR *)(void *)strm->state;
 
     /* if it hasn't been done already, allocate space for the window */
     if (state->window == Z_NULL) {
@@ -1141,7 +1141,7 @@ inflate_fast(z_streamp strm, unsigned start)
     unsigned char FAR *from;    /* where to copy match from */
 
     /* copy state to local variables */
-    state = (struct inflate_state FAR *)strm->state;
+    state = (struct inflate_state FAR *)(void *)strm->state;
     in = strm->next_in - OFF;
     last = in + (strm->avail_in - 5);
     out = strm->next_out - OFF;
@@ -1462,7 +1462,7 @@ inflate(z_streamp strm, int flush)
         return Z_STREAM_ERROR;
 #endif
 
-    state = (struct inflate_state FAR *)strm->state;
+    state = (struct inflate_state FAR *)(void *)strm->state;
     if (state->mode == TYPE) state->mode = TYPEDO;      /* skip check */
     LOAD();
     in = have;
@@ -2043,7 +2043,7 @@ inflateEnd(z_streamp strm)
     struct inflate_state FAR *state;
     if (strm == Z_NULL || strm->state == Z_NULL || strm->zfree == (free_func)0)
         return Z_STREAM_ERROR;
-    state = (struct inflate_state FAR *)strm->state;
+    state = (struct inflate_state FAR *)(void *)strm->state;
     if (state->window != Z_NULL) ZFREE(strm, state->window);
     ZFREE(strm, strm->state);
     strm->state = Z_NULL;
@@ -2059,7 +2059,7 @@ inflateSetDictionary(z_streamp strm, const Bytef *dictionary, uInt dictLength)
 
     /* check state */
     if (strm == Z_NULL || strm->state == Z_NULL) return Z_STREAM_ERROR;
-    state = (struct inflate_state FAR *)strm->state;
+    state = (struct inflate_state FAR *)(void *)strm->state;
     if (state->wrap != 0 && state->mode != DICT)
         return Z_STREAM_ERROR;
 
@@ -2098,7 +2098,7 @@ inflateGetHeader(z_streamp strm, gz_headerp head)
 
     /* check state */
     if (strm == Z_NULL || strm->state == Z_NULL) return Z_STREAM_ERROR;
-    state = (struct inflate_state FAR *)strm->state;
+    state = (struct inflate_state FAR *)(void *)strm->state;
     if ((state->wrap & 2) == 0) return Z_STREAM_ERROR;
 
     /* save header structure */
@@ -2149,7 +2149,7 @@ inflateSync(z_streamp strm)
 
     /* check parameters */
     if (strm == Z_NULL || strm->state == Z_NULL) return Z_STREAM_ERROR;
-    state = (struct inflate_state FAR *)strm->state;
+    state = (struct inflate_state FAR *)(void *)strm->state;
     if (strm->avail_in == 0 && state->bits < 8) return Z_BUF_ERROR;
 
     /* if first time, start search in bit buffer */
@@ -2196,7 +2196,7 @@ inflateSyncPoint(z_streamp strm)
     struct inflate_state FAR *state;
 
     if (strm == Z_NULL || strm->state == Z_NULL) return Z_STREAM_ERROR;
-    state = (struct inflate_state FAR *)strm->state;
+    state = (struct inflate_state FAR *)(void *)strm->state;
     return state->mode == STORED && state->bits == 0;
 }
 
@@ -2212,7 +2212,7 @@ inflateCopy(z_streamp dest, z_streamp source)
     if (dest == Z_NULL || source == Z_NULL || source->state == Z_NULL ||
         source->zalloc == (alloc_func)0 || source->zfree == (free_func)0)
         return Z_STREAM_ERROR;
-    state = (struct inflate_state FAR *)source->state;
+    state = (struct inflate_state FAR *)(void *)source->state;
 
     /* allocate space */
     copy = (struct inflate_state FAR *)