Update to 1.0.4. Changes since 1.0.3:

* Fixed a serious bug which could lead to false signature verification
  results when more than one signature is fed to gpg.  This is the
  primary reason for releasing this version.
* New utility gpgv which is a stripped down version of gpg to
  be used to verify signatures against a list of trusted keys.
* Rijndael (AES) is now supported and listed with top preference.
* --with-colons now works with --print-md[s].

Based on an update provided by Mipam <mipam@ibb.net>.

7 files changed, 24 insertions, 42 deletions

diff --git a/security/gnupg/Makefile b/security/gnupg/Makefile
index 8d46cae2cf4..f4f78b8e468 100644
--- a/security/gnupg/Makefile
+++ b/security/gnupg/Makefile
@@ -1,8 +1,8 @@
-# $NetBSD: Makefile,v 1.16 2000/10/11 09:57:45 itojun Exp $
+# $NetBSD: Makefile,v 1.17 2000/11/10 02:35:02 wiz Exp $
 # FreeBSD Id: Makefile,v 1.20 1997/08/27 13:06:01 ache Exp
 #
 
-DISTNAME=	gnupg-1.0.3
+DISTNAME=	gnupg-1.0.4
 CATEGORIES=	security
 MASTER_SITES=	ftp://ftp.gnupg.org/pub/gcrypt/gnupg/
 
@@ -14,6 +14,7 @@ DEPENDS+=	gettext>=0.10.35nb1:../../devel/gettext
 CRYPTO=		yes
 GNU_CONFIGURE=	yes
 USE_GMAKE=	yes
+USE_LIBINTL=	yes
 
 .include "../../mk/bsd.prefs.mk"
 
diff --git a/security/gnupg/files/md5 b/security/gnupg/files/md5
index 9e5487cf911..a9a22ad6f91 100644
--- a/security/gnupg/files/md5
+++ b/security/gnupg/files/md5
@@ -1,3 +1,3 @@
-$NetBSD: md5,v 1.7 2000/10/11 09:57:30 itojun Exp $
+$NetBSD: md5,v 1.8 2000/11/10 02:35:02 wiz Exp $
 
-MD5 (gnupg-1.0.3.tar.gz) = ef42c679df7a555e23ebe3c8d14a9124
+MD5 (gnupg-1.0.4.tar.gz) = bef2267bfe9b74a00906a78db34437f9
diff --git a/security/gnupg/files/patch-sum b/security/gnupg/files/patch-sum
index 26ad656023e..247bacadd0c 100644
--- a/security/gnupg/files/patch-sum
+++ b/security/gnupg/files/patch-sum
@@ -1,4 +1,3 @@
-$NetBSD: patch-sum,v 1.7 2000/07/17 23:44:52 wiz Exp $
+$NetBSD: patch-sum,v 1.8 2000/11/10 02:35:02 wiz Exp $
 
-MD5 (patch-ab) = 4b9377133925d01079dda5a9e03c4073
-MD5 (patch-ac) = cd030f36bad8071cd44956096655a346
+MD5 (patch-aa) = 4fe53ce94604cb81a997dfe571550308
diff --git a/security/gnupg/patches/patch-aa b/security/gnupg/patches/patch-aa
new file mode 100644
index 00000000000..b3d05cd7553
--- /dev/null
+++ b/security/gnupg/patches/patch-aa
@@ -0,0 +1,14 @@
+$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 1e6eb1ef0da..00000000000
--- a/security/gnupg/patches/patch-ab
+++ /dev/null
@@ -1,15 +0,0 @@
-$NetBSD: patch-ab,v 1.8 2000/07/15 11:24:28 wiz Exp $
-
-For Solaris, make DATADIRNAME share.
-
---- 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
--		   DATADIRNAME=lib
-+		   DATADIRNAME=share
- fi
- rm -f conftest*
- 		INSTOBJEXT=.mo
diff --git a/security/gnupg/patches/patch-ac b/security/gnupg/patches/patch-ac
deleted file mode 100644
index 2f9675dc690..00000000000
--- a/security/gnupg/patches/patch-ac
+++ /dev/null
@@ -1,19 +0,0 @@
-$NetBSD: patch-ac,v 1.6 2000/07/17 23:44:53 wiz Exp $
-
---- mpi/config.links.orig	Tue Mar 21 10:24:45 2000
-+++ mpi/config.links	Mon Jul 17 14:30:59 2000
-@@ -171,7 +171,13 @@
- 	cat  $srcdir/mpi/m68k/syntax.h	    >>./mpi/asm-syntax.h
- 	path="m68k/mc68020 m68k"
- 	;;
--
-+    powerpc*-*-netbsd*)
-+	echo '/* configured NetBSD on powerpc */' >>./mpi/asm-syntax.h
-+	echo '#define ELF_SYNTAX'                 >>./mpi/asm-syntax.h
-+	cat   $srcdir/mpi/powerpc32/syntax.h      >>./mpi/asm-syntax.h
-+	mpi_sflags="-Wa,-mppc"
-+	path="powerpc32"
-+	;;
-     powerpc*-*-linux*)
- 	echo '/* configured for powerpc/ELF */' >>./mpi/asm-syntax.h
- 	echo '#define ELF_SYNTAX'               >>./mpi/asm-syntax.h
diff --git a/security/gnupg/pkg/PLIST b/security/gnupg/pkg/PLIST
index 06876393ea9..acad1e7ee60 100644
--- a/security/gnupg/pkg/PLIST
+++ b/security/gnupg/pkg/PLIST
@@ -1,9 +1,11 @@
-@comment $NetBSD: PLIST,v 1.6 2000/10/11 09:57:31 itojun Exp $
+@comment $NetBSD: PLIST,v 1.7 2000/11/10 02:35:03 wiz Exp $
 bin/gpg
+bin/gpgv
 lib/gnupg/rndegd
 lib/gnupg/rndunix
 lib/gnupg/tiger
 man/man1/gpg.1
+man/man1/gpgv.1
 share/gnupg/FAQ
 share/gnupg/faq.html
 share/gnupg/options.skel