Update to 1.0.5, provided by Mark White in private mail.

Some pkg related changes by me.
Changes since 1.0.4:
* WARNING: The semantics of --verify have changed to address a
  problem with detached signature detection. --verify now ignores
  signed material given on stdin unless this is requested by using
  a "-" as the name for the file with the signed material.  Please
  check all your detached signature handling applications and make
  sure that they don't pipe the signed material to stdin without
  using a filename together with "-" on the the command line.

* WARNING: Corrected hash calculation for input data larger than
  512M - it was just wrong, so you might notice bad signature in
  some very big files.  It may be wise to keep an old copy of
  GnuPG around.

* Secret keys are no longer imported unless you use the new option
  --allow-secret-key-import.  This is a kludge and future versions will
  handle it in another way.

* New command "showpref" in the --edit-key menu to show an easier
  to understand preference listing.

* There is now the notation of a primary user ID.  For example, it
  is printed with a signature verification as the first user ID;
  revoked user IDs are not printed there anymore.  In general the
  primary user ID is the one with the latest self-signature.

* New --charset=utf-8 to bypass all internal conversions.

* Large File Support (LFS) is now working.

* New options: --ignore-crc-error, --no-sig-create-check,
  --no-sig-cache, --fixed_list_mode, --no-expensive-trust-checks,
  --enable-special-filenames and --use-agent.  See man page.

* New command --pipemode, which can be used to run gpg as a
  co-process.  Currently only the verification of detached
  signatures are working.  See doc/DETAILS.

* Rewritten key selection code so that GnuPG can better cope with
  multiple subkeys, expire dates and so.  The drawback is that it
  is slower.

* A whole lot of bug fixes.

* The verification status of self-signatures are now cached. To
  increase the speed of key list operations for existing keys you
  can do the following in your GnuPG homedir (~/.gnupg):
     $ cp pubring.gpg pubring.gpg.save && $ gpg --export-all >x && \
      rm pubring.gpg && gpg --import x
  Only v4 keys (i.e not the old RSA keys) benefit from this caching.

* New translations: Estonian, Turkish.

5 files changed, 30 insertions, 65 deletions

diff --git a/security/gnupg/Makefile b/security/gnupg/Makefile
index 510db299cca..5b0eb4b6dfc 100644
--- a/security/gnupg/Makefile
+++ b/security/gnupg/Makefile
@@ -1,18 +1,12 @@
-# $NetBSD: Makefile,v 1.24 2001/03/31 11:14:30 zuntum Exp $
-# FreeBSD Id: Makefile,v 1.20 1997/08/27 13:06:01 ache Exp
+# $NetBSD: Makefile,v 1.25 2001/05/14 13:40:04 wiz Exp $
 #
 
-DISTNAME=	gnupg-1.0.4
-PKGNAME=	${DISTNAME}nb3
+DISTNAME=	gnupg-1.0.5
 CATEGORIES=	security
 MASTER_SITES=	ftp://ftp.gnupg.org/pub/gcrypt/gnupg/
 # don't remove this -- we may add idea.c to it below
 DISTFILES=	${DISTNAME}${EXTRACT_SUFX}
 
-PATCHFILES=	gnupg-1.0.4.security-patch1.diff
-PATCH_SITES=	ftp://ftp.gnupg.org/pub/gcrypt/gnupg/
-PATCH_DIST_STRIP=	-p1
-
 MAINTAINER=	wiz@netbsd.org
 HOMEPAGE=	http://www.gnupg.org/
 COMMENT=	Privacy Guard, a public-Key encryption and digital signature utility
@@ -26,6 +20,8 @@ USE_LIBINTL=	yes
 
 EXTRACT_ONLY=	${DISTNAME}${EXTRACT_SUFX}
 
+INFO_FILES=	gpg.info gpgv.info
+
 .include "../../mk/bsd.prefs.mk"
 
 BUILD_DEFS+=	USE_IDEA
diff --git a/security/gnupg/distinfo b/security/gnupg/distinfo
index 25771d5b2b6..9c87a6c76e6 100644
--- a/security/gnupg/distinfo
+++ b/security/gnupg/distinfo
@@ -1,10 +1,6 @@
-$NetBSD: distinfo,v 1.2 2001/04/19 15:40:31 agc Exp $
+$NetBSD: distinfo,v 1.3 2001/05/14 13:40:04 wiz Exp $
 
-SHA1 (gnupg-1.0.4.tar.gz) = 7940d42ddf4e992152232b837e25f6b462622df5
-Size (gnupg-1.0.4.tar.gz) = 1725642 bytes
+SHA1 (gnupg-1.0.5.tar.gz) = e30358cae1e1f7aece84b6808b1366f12a1ff527
+Size (gnupg-1.0.5.tar.gz) = 1962455 bytes
 SHA1 (idea.c) = 1cbae164674dfb9da624e088fe7d66d7c0d4f17e
 Size (idea.c) = 15450 bytes
-SHA1 (gnupg-1.0.4.security-patch1.diff) = 900d761c542ec5519291d8ca1badc6f64c9c1b16
-Size (gnupg-1.0.4.security-patch1.diff) = 4635 bytes
-SHA1 (patch-aa) = 4d721c30ec57e6c10461b76e55cef96ae414f847
-SHA1 (patch-ab) = 1814fb785638525c57067e4bc9dcf1ffa6ad4784
diff --git a/security/gnupg/patches/patch-aa b/security/gnupg/patches/patch-aa
deleted file mode 100644
index b3d05cd7553..00000000000
--- a/security/gnupg/patches/patch-aa
+++ /dev/null
@@ -1,14 +0,0 @@
-$NetBSD: patch-aa,v 1.4 2000/11/10 02:35:03 wiz Exp $
-
---- configure.orig	Tue Oct 17 15:39:41 2000
-+++ configure
-@@ -3797,7 +3797,8 @@
-   cat conftest.$ac_ext >&5
-   rm -rf conftest*
-   CATOBJEXT=.mo
--		   DATADIRNAME=lib
-+# For Solaris, make DATADIRNAME share.
-+		   DATADIRNAME=share
- fi
- rm -f conftest*
- 		INSTOBJEXT=.mo
diff --git a/security/gnupg/patches/patch-ab b/security/gnupg/patches/patch-ab
deleted file mode 100644
index 716b51db516..00000000000
--- a/security/gnupg/patches/patch-ab
+++ /dev/null
@@ -1,21 +0,0 @@
-$NetBSD: patch-ab,v 1.10 2000/11/12 14:28:48 wiz Exp $
-
---- cipher/twofish.c.orig	Fri Apr 14 19:34:26 2000
-+++ cipher/twofish.c	Sun Nov 12 15:05:28 2000
-@@ -1004,3 +1004,6 @@
- }
- 
- 
-+#ifdef IS_MODULE
-+static
-+#endif
-@@ -1034,6 +1037,9 @@
-  *		  version = interface version of the function/pointer
-  *			    (currently this is 1 for all functions)
-  */
-+#ifdef IS_MODULE
-+static
-+#endif
- void *
- gnupgext_enum_func ( int what, int *sequence, int *class, int *vers )
- {
diff --git a/security/gnupg/pkg/PLIST b/security/gnupg/pkg/PLIST
index 974af4dbf88..89825807151 100644
--- a/security/gnupg/pkg/PLIST
+++ b/security/gnupg/pkg/PLIST
@@ -1,6 +1,12 @@
-@comment $NetBSD: PLIST,v 1.8 2001/01/29 11:53:03 wiz Exp $
+@comment $NetBSD: PLIST,v 1.9 2001/05/14 13:40:05 wiz Exp $
 bin/gpg
 bin/gpgv
+@unexec install-info --delete --info-dir=%D/info %D/info/gpg.info
+@unexec install-info --delete --info-dir=%D/info %D/info/gpgv.info
+info/gpg.info
+info/gpgv.info
+@exec install-info --info-dir=%D/info %D/info/gpg.info
+@exec install-info --info-dir=%D/info %D/info/gpgv.info
 ${IDEA}lib/gnupg/idea
 lib/gnupg/rndegd
 lib/gnupg/rndunix
@@ -10,19 +16,21 @@ man/man1/gpgv.1
 share/gnupg/FAQ
 share/gnupg/faq.html
 share/gnupg/options.skel
-share/locale/da/LC_MESSAGES/gnupg.mo
-share/locale/de/LC_MESSAGES/gnupg.mo
-share/locale/eo/LC_MESSAGES/gnupg.mo
-share/locale/es_ES/LC_MESSAGES/gnupg.mo
-share/locale/fr/LC_MESSAGES/gnupg.mo
-share/locale/id/LC_MESSAGES/gnupg.mo
-share/locale/it/LC_MESSAGES/gnupg.mo
-share/locale/ja/LC_MESSAGES/gnupg.mo
-share/locale/nl/LC_MESSAGES/gnupg.mo
-share/locale/pl/LC_MESSAGES/gnupg.mo
-share/locale/pt_BR/LC_MESSAGES/gnupg.mo
-share/locale/pt_PT/LC_MESSAGES/gnupg.mo
-share/locale/ru/LC_MESSAGES/gnupg.mo
-share/locale/sv/LC_MESSAGES/gnupg.mo
+${PKGLOCALEDIR}/locale/da/LC_MESSAGES/gnupg.mo
+${PKGLOCALEDIR}/locale/de/LC_MESSAGES/gnupg.mo
+${PKGLOCALEDIR}/locale/eo/LC_MESSAGES/gnupg.mo
+${PKGLOCALEDIR}/locale/es_ES/LC_MESSAGES/gnupg.mo
+${PKGLOCALEDIR}/locale/et/LC_MESSAGES/gnupg.mo
+${PKGLOCALEDIR}/locale/fr/LC_MESSAGES/gnupg.mo
+${PKGLOCALEDIR}/locale/id/LC_MESSAGES/gnupg.mo
+${PKGLOCALEDIR}/locale/it/LC_MESSAGES/gnupg.mo
+${PKGLOCALEDIR}/locale/ja/LC_MESSAGES/gnupg.mo
+${PKGLOCALEDIR}/locale/nl/LC_MESSAGES/gnupg.mo
+${PKGLOCALEDIR}/locale/pl/LC_MESSAGES/gnupg.mo
+${PKGLOCALEDIR}/locale/pt_BR/LC_MESSAGES/gnupg.mo
+${PKGLOCALEDIR}/locale/pt_PT/LC_MESSAGES/gnupg.mo
+${PKGLOCALEDIR}/locale/ru/LC_MESSAGES/gnupg.mo
+${PKGLOCALEDIR}/locale/sv/LC_MESSAGES/gnupg.mo
+${PKGLOCALEDIR}/locale/tr/LC_MESSAGES/gnupg.mo
 @dirrm share/gnupg
 @dirrm lib/gnupg