Correct wrong detection of /dev/random in GnuPG 1.0.7 on NetBSD.

Bumped PKGREVISION to 1, changed PLIST accordingly and added 2 patches
for configure and configure.ac. Patches were sent to gnupg-bugs@gnu.org.
Thomas Klausner approved.

5 files changed, 47 insertions, 4 deletions

diff --git a/security/gnupg/Makefile b/security/gnupg/Makefile
index 4b86afa3d60..3dd44b887d5 100644
--- a/security/gnupg/Makefile
+++ b/security/gnupg/Makefile
@@ -1,7 +1,8 @@
-# $NetBSD: Makefile,v 1.31 2002/05/07 18:48:46 wiz Exp $
+# $NetBSD: Makefile,v 1.32 2002/07/18 20:44:52 heinz Exp $
 #
 
 DISTNAME=	gnupg-1.0.7
+PKGREVISION=	1
 CATEGORIES=	security
 MASTER_SITES=	ftp://ftp.gnupg.org/pub/gcrypt/gnupg/
 # don't remove this -- we may add idea.c to it below
diff --git a/security/gnupg/PLIST b/security/gnupg/PLIST
index 2ab812a61e8..a0699516806 100644
--- a/security/gnupg/PLIST
+++ b/security/gnupg/PLIST
@@ -1,4 +1,4 @@
-@comment $NetBSD: PLIST,v 1.3 2002/05/07 18:48:46 wiz Exp $
+@comment $NetBSD: PLIST,v 1.4 2002/07/18 20:44:52 heinz Exp $
 bin/gpg
 bin/gpgkeys_mailto
 bin/gpgsplit
@@ -8,7 +8,7 @@ info/gpgv.info
 @exec ${INSTALL_INFO} --info-dir=%D/info %D/info/gpgv.info
 ${IDEA}lib/gnupg/idea
 lib/gnupg/rndegd
-lib/gnupg/rndlinux
+lib/gnupg/rndunix
 lib/gnupg/tiger
 man/man1/gpg.1
 man/man1/gpgv.1
diff --git a/security/gnupg/distinfo b/security/gnupg/distinfo
index a81e8e0cf70..c9bcfd9e59b 100644
--- a/security/gnupg/distinfo
+++ b/security/gnupg/distinfo
@@ -1,4 +1,4 @@
-$NetBSD: distinfo,v 1.8 2002/05/07 18:48:46 wiz Exp $
+$NetBSD: distinfo,v 1.9 2002/07/18 20:44:52 heinz Exp $
 
 SHA1 (gnupg-1.0.7.tar.gz) = 46da038c60143fa49abae2fae6fcbd0f58f7a46e
 Size (gnupg-1.0.7.tar.gz) = 2399025 bytes
@@ -7,3 +7,5 @@ Size (idea.c.20010605) = 15480 bytes
 SHA1 (patch-aa) = fffd3e55792bb27df002bacbc5d8bf9096d5dd64
 SHA1 (patch-ab) = ce3b5ff0331e51ca6cd11b969e8df3719ca5d547
 SHA1 (patch-ac) = 9e3d0c6a7b828e52f5a773591f87e4a9072ad698
+SHA1 (patch-ad) = 55ca924c9aefe9eeca44b301ac523e7ebb2514e9
+SHA1 (patch-ae) = ff58490a6505e333f776efa7cafaa269c4833597
diff --git a/security/gnupg/patches/patch-ad b/security/gnupg/patches/patch-ad
new file mode 100644
index 00000000000..2f9d074ae55
--- /dev/null
+++ b/security/gnupg/patches/patch-ad
@@ -0,0 +1,20 @@
+$NetBSD: patch-ad,v 1.1 2002/07/18 20:44:53 heinz Exp $
+
+--- configure.orig	Mon Apr 29 16:59:16 2002
++++ configure
+@@ -3928,8 +3928,14 @@
+ NAME_OF_DEV_RANDOM="/dev/random"
+ NAME_OF_DEV_URANDOM="/dev/urandom"
+ case "${target}" in
+-    *-openbsd* | *-netbsd*)
++    *-openbsd*)
+         NAME_OF_DEV_RANDOM="/dev/srandom"
++        NAME_OF_DEV_URANDOM="/dev/urandom"
++        DYNLINK_MOD_CFLAGS="-shared -rdynamic $CFLAGS_PIC -Wl,-Bshareable -Wl,-x"
++        ;;
++
++    *-netbsd*)
++        NAME_OF_DEV_RANDOM="/dev/random"
+         NAME_OF_DEV_URANDOM="/dev/urandom"
+         DYNLINK_MOD_CFLAGS="-shared -rdynamic $CFLAGS_PIC -Wl,-Bshareable -Wl,-x"
+         ;;
diff --git a/security/gnupg/patches/patch-ae b/security/gnupg/patches/patch-ae
new file mode 100644
index 00000000000..63da4075511
--- /dev/null
+++ b/security/gnupg/patches/patch-ae
@@ -0,0 +1,20 @@
+$NetBSD: patch-ae,v 1.1 2002/07/18 20:44:53 heinz Exp $
+
+--- configure.ac.orig	Mon Apr 29 16:56:08 2002
++++ configure.ac
+@@ -325,8 +325,14 @@
+ NAME_OF_DEV_RANDOM="/dev/random"
+ NAME_OF_DEV_URANDOM="/dev/urandom"
+ case "${target}" in
+-    *-openbsd* | *-netbsd*)
++    *-openbsd*)
+         NAME_OF_DEV_RANDOM="/dev/srandom"
++        NAME_OF_DEV_URANDOM="/dev/urandom"
++        DYNLINK_MOD_CFLAGS="-shared -rdynamic $CFLAGS_PIC -Wl,-Bshareable -Wl,-x"
++        ;;
++
++    *-netbsd*)
++        NAME_OF_DEV_RANDOM="/dev/random"
+         NAME_OF_DEV_URANDOM="/dev/urandom"
+         DYNLINK_MOD_CFLAGS="-shared -rdynamic $CFLAGS_PIC -Wl,-Bshareable -Wl,-x"
+         ;;