Update gnupg to 1.0.2. NetBSD changes had been mailed to author and

have been integrated.
Relevant Changes:
* Fixed expiration handling of encryption keys.
* Add an experimental feature to do unattended key generation.
* The user is now asked for the reason of revocation as required by
  the new OpenPGP draft.
* There is a ~/.gnupg/random_seed file now which saves the state of
  the internal RNG and increases system performance somewhat.  This
  way the full entropy source is only used in cases were it is really
  required. Use the option --no-random-seed-file to disable this
  feature.
* New options --ignore-time-conflict and --lock-never.
* Encryption is now much faster: About 2 times for 1k bit keys and 8
  times for 4k keys.
* New encryption keys are generated in a way which allows a much
  faster decryption.
* New command --export-secret-subkeys which outputs the _primary_
  key with it's secret parts deleted.  This is useful for automated
  decryption/signature creation as it allows to keep the real secret
  primary key offline and thereby protecting the key certificates and
  allowing to create revocations for the subkeys.  See the FAQ for a
  procedure to install such secret keys.
* Keygeneration now writes to the first writeable keyring or as
  default to the one in the homedirectory.  Prior versions ignored all
  --keyring options.
* New option --command-fd to take user input from a file descriptor;
  to be used with --status-fd by software which uses GnuPG as a
  backend.
* There is a new status PROGRESS which is used to show progress during
  key generation.
* Support for the new MDC encryption packets.  To create them either
  --force-mdc must be use or cipher algorithm with a blocksize other
  than 64 bits is to be used.  --openpgp currently disables MDC
  packets entirely.  This option should not yet be used.
* New option --no-auto-key-retrieve to disable retrieving of a missing
  public key from a keyerver, when a keyerver has been set.
* Danish, Esperanto, Japanese, Dutch, and Swedish translations

6 files changed, 17 insertions, 56 deletions

diff --git a/security/gnupg/Makefile b/security/gnupg/Makefile
index e6f3a835e38..a5cbc297905 100644
--- a/security/gnupg/Makefile
+++ b/security/gnupg/Makefile
@@ -1,8 +1,8 @@
-# $NetBSD: Makefile,v 1.7 2000/03/02 08:21:31 wiz Exp $
+# $NetBSD: Makefile,v 1.8 2000/07/15 11:24:27 wiz Exp $
 # FreeBSD Id: Makefile,v 1.20 1997/08/27 13:06:01 ache Exp
 #
 
-DISTNAME=	gnupg-1.0.1
+DISTNAME=	gnupg-1.0.2
 CATEGORIES=	security
 MASTER_SITES=	ftp://ftp.gnupg.org/pub/gcrypt/gnupg/
 DISTFILES=	${DISTNAME}${EXTRACT_SUFX} gpg.1.gz
diff --git a/security/gnupg/files/md5 b/security/gnupg/files/md5
index ed0c1cfef74..208ff6110a7 100644
--- a/security/gnupg/files/md5
+++ b/security/gnupg/files/md5
@@ -1,4 +1,4 @@
-$NetBSD: md5,v 1.4 2000/03/02 08:21:32 wiz Exp $
+$NetBSD: md5,v 1.5 2000/07/15 11:24:28 wiz Exp $
 
-MD5 (gnupg-1.0.1.tar.gz) = 14ce577afd03d56cba5d8ee59b9580ed
+MD5 (gnupg-1.0.2.tar.gz) = f445c34652042b1c0cd8c2683bcf6a05
 MD5 (gpg.1.gz) = c68de2894a22e42746b50f268af4f369
diff --git a/security/gnupg/files/patch-sum b/security/gnupg/files/patch-sum
index b1422d8c294..1104f5cf44a 100644
--- a/security/gnupg/files/patch-sum
+++ b/security/gnupg/files/patch-sum
@@ -1,4 +1,3 @@
-$NetBSD: patch-sum,v 1.5 2000/06/23 14:32:10 dmcmahill Exp $
+$NetBSD: patch-sum,v 1.6 2000/07/15 11:24:28 wiz Exp $
 
-MD5 (patch-ab) = 18c96f718c73b44ca312c1a875164330
-MD5 (patch-ac) = d727203e6a48d22677b58a69af73bd78
+MD5 (patch-ab) = 4b9377133925d01079dda5a9e03c4073
diff --git a/security/gnupg/patches/patch-ab b/security/gnupg/patches/patch-ab
index 851dcaf8b98..1e6eb1ef0da 100644
--- a/security/gnupg/patches/patch-ab
+++ b/security/gnupg/patches/patch-ab
@@ -1,32 +1,10 @@
-$NetBSD: patch-ab,v 1.7 2000/06/23 14:32:11 dmcmahill Exp $
+$NetBSD: patch-ab,v 1.8 2000/07/15 11:24:28 wiz Exp $
 
-Make this work on NetBSD.
-For Solaris, make the DATADIRNAME share.
+For Solaris, make DATADIRNAME share.
 
---- ./configure.orig	Thu Dec 16 10:15:33 1999
-+++ ./configure	Thu Mar  2 01:50:58 2000
-@@ -1995,7 +1995,7 @@
-             CFLAGS_RDYNAMIC="-Wl,-E"
-             ;;
- 
--          openbsd* | freebsd2* | osf4* | irix* )
-+          openbsd* | freebsd2* | osf4* | irix* | netbsd* )
-             CFLAGS_RDYNAMIC=""
-             ;;
- 
-@@ -2043,6 +2043,11 @@
-         NAME_OF_DEV_URANDOM="/dev/urandom"
-         DYNLINK_MOD_CFLAGS="-shared -rdynamic -fpic -Wl,-Bshareable -Wl,-x"
-         ;;
-+    *-netbsd*)
-+        DYNLINK_MOD_CFLAGS="-shared -rdynamic -fPIC -Wl,-Bshareable -Wl,-x"
-+         NAME_OF_DEV_RANDOM="/dev/random"
-+         NAME_OF_DEV_URANDOM="/dev/urandom"
-+	;;
-     *)
-         NAME_OF_DEV_RANDOM="/dev/random"
-         NAME_OF_DEV_URANDOM="/dev/urandom"
-@@ -3441,7 +3446,7 @@
+--- configure.orig	Wed Jul 12 13:42:41 2000
++++ configure	Sat Jul 15 13:03:37 2000
+@@ -3728,7 +3728,7 @@
    cat conftest.$ac_ext >&5
    rm -rf conftest*
    CATOBJEXT=.mo
diff --git a/security/gnupg/patches/patch-ac b/security/gnupg/patches/patch-ac
deleted file mode 100644
index 1882e2580cb..00000000000
--- a/security/gnupg/patches/patch-ac
+++ /dev/null
@@ -1,21 +0,0 @@
-$NetBSD: patch-ac,v 1.4 2000/03/02 08:21:33 wiz Exp $
-
---- ./mpi/config.links.orig	Fri Dec 10 14:04:00 1999
-+++ ./mpi/config.links	Thu Mar  2 01:53:31 2000
-@@ -22,6 +22,16 @@
-        cat  $srcdir/mpi/i386/syntax.h	   >>./mpi/asm-syntax.h
-        path="i586 i386"
-        ;;
-+     i[34]86*-*-netbsd*)
-+       echo '#define ELF_SYNTAX' >>./mpi/asm-syntax.h
-+       cat  $srcdir/mpi/i386/syntax.h      >>./mpi/asm-syntax.h
-+       path="i386"
-+       ;;
-+     i[56]86*-*-netbsd* | pentium-*-netbsd* | pentiumpro-*-netbsd*)
-+       echo '#define ELF_SYNTAX' >>./mpi/asm-syntax.h
-+       cat  $srcdir/mpi/i386/syntax.h      >>./mpi/asm-syntax.h
-+       path="i586 i386"
-+       ;;
-     i[34]86*-*-bsdi4*)
-        echo '#define ELF_SYNTAX' >>./mpi/asm-syntax.h
-        cat  $srcdir/mpi/i386/syntax.h	 >>./mpi/asm-syntax.h
diff --git a/security/gnupg/pkg/PLIST b/security/gnupg/pkg/PLIST
index 500cd97feed..f18540c56ad 100644
--- a/security/gnupg/pkg/PLIST
+++ b/security/gnupg/pkg/PLIST
@@ -1,18 +1,23 @@
-@comment $NetBSD: PLIST,v 1.4 2000/05/19 23:13:53 wiz Exp $
+@comment $NetBSD: PLIST,v 1.5 2000/07/15 11:24:29 wiz Exp $
 bin/gpg
 lib/gnupg/rndegd
 lib/gnupg/rndunix
 lib/gnupg/tiger
 man/man1/gpg.1
 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
 @dirrm share/gnupg
 @dirrm lib/gnupg