Update netpgp to version 20090611.

Changes since 20090531:

+ only prompt for a passphrase on the secret key if there is a passphrase
  on the secret key

CHANGES 1.99.10 -> 1.99.11

+ address keys array from 0 with unsigned indices
+ print results to io->res stream - default to stderr, and set using
        netpgp_setvar(..., "results", filename)
+ __ops_keyid()'s third arg was always the size of the keyid array - no need
  to pass it
+ get rid of the excessive type-checking in packet-show-cast.h, which wasn't
  necessary, and fold all the show routines into packet-show.c
+ introduce a generic __ops_new() and use it for some structure allocation

CHANGES 1.99.9 -> 1.99.10

+ fix a bug in decryption whereby a bad passphrase would cause a segmentation
  violation
+ fix some regressions in key searching in the underlying find keys routines
+ add C++ declaration protection to the external interface in netpgp.h
+ split out the key management parts of netpgp(1) into netpgpkeys(1)

CHANGES 1.99.8 -> 1.99.9

+ make more use of __ops_io_t structure
+ addition of standalone, stripped-down netpgpverify utility
+ addition of test for --list-packets on an empty file
+ bring forward some simplifications from netpgpverify
        + some name changes
        + get rid of the increment and then decrement keycount around
          accumulated data ("it's to do with counting")
        + then use unsigned integers for the size and counts for the
          dynamic array of keys, and use the common dynamic array macros
          for keys in a keyring
        + if it's a union, let's use it as a union, not a struct
+ modified documentation to correct the --list-packets command (sorry, ver)
+ add a new directory structure for both the distribution and the
  reachover Makefiles. The autotest framework has been partially overhauled
  but more TLC is needed here.
+ add a --pass-fd=n option so that external programs can provide the
  passphrase on a file descriptor without going through the callback,
  requested by joerg

3 files changed, 11 insertions, 7 deletions

diff --git a/security/netpgp/Makefile b/security/netpgp/Makefile
index b6ff079dbdb..2b998c75115 100644
--- a/security/netpgp/Makefile
+++ b/security/netpgp/Makefile
@@ -1,6 +1,6 @@
-# $NetBSD: Makefile,v 1.3 2009/05/31 23:38:21 agc Exp $
+# $NetBSD: Makefile,v 1.4 2009/06/11 17:02:17 agc Exp $
 
-DISTNAME=		netpgp-20090531
+DISTNAME=		netpgp-20090611
 CATEGORIES=		security
 MASTER_SITES=		${MASTER_SITE_LOCAL}
 
diff --git a/security/netpgp/PLIST b/security/netpgp/PLIST
index 5d5a8b58e65..dab4768519b 100644
--- a/security/netpgp/PLIST
+++ b/security/netpgp/PLIST
@@ -1,6 +1,10 @@
-@comment $NetBSD: PLIST,v 1.1.1.1 2009/04/29 04:54:34 agc Exp $
+@comment $NetBSD: PLIST,v 1.2 2009/06/11 17:02:17 agc Exp $
 bin/netpgp
+bin/netpgpkeys
+bin/netpgpverify
 include/netpgp.h
 lib/libnetpgp.la
 man/man1/netpgp.1
+man/man1/netpgpkeys.1
+man/man1/netpgpverify.1
 man/man3/libnetpgp.3
diff --git a/security/netpgp/distinfo b/security/netpgp/distinfo
index 54f13ab5d0f..f7345f69fe5 100644
--- a/security/netpgp/distinfo
+++ b/security/netpgp/distinfo
@@ -1,5 +1,5 @@
-$NetBSD: distinfo,v 1.3 2009/05/31 23:38:21 agc Exp $
+$NetBSD: distinfo,v 1.4 2009/06/11 17:02:17 agc Exp $
 
-SHA1 (netpgp-20090531.tar.gz) = e231f512497837b8b422b2d8e63c9d673a3ec2ee
-RMD160 (netpgp-20090531.tar.gz) = 1697bd1794f9de0670a1ba0f50f5303c6b8149d9
-Size (netpgp-20090531.tar.gz) = 1431647 bytes
+SHA1 (netpgp-20090611.tar.gz) = e27ec76d280178486ac2a532b03bd6078e494b6d
+RMD160 (netpgp-20090611.tar.gz) = f12aa6918787a99476e673a15703b19237f8c2e2
+Size (netpgp-20090611.tar.gz) = 1597624 bytes