Correct man page xrefs pgp(1) -> pgp5(1).

Import some patches (via FreeBSD), one of them concerning weak rnd number
generation.

10 files changed, 151 insertions, 5 deletions

diff --git a/security/pgp5/distinfo b/security/pgp5/distinfo
index 1f2bb91d43e..89bc74040d3 100644
--- a/security/pgp5/distinfo
+++ b/security/pgp5/distinfo
@@ -1,4 +1,4 @@
-$NetBSD: distinfo,v 1.4 2002/03/14 12:33:08 wiz Exp $
+$NetBSD: distinfo,v 1.5 2002/08/25 15:18:41 mjl Exp $
 
 SHA1 (pgp50i-unix-src.tar.gz) = b740afe0bf557deedb53604274997cb2bbecac33
 Size (pgp50i-unix-src.tar.gz) = 927363 bytes
@@ -12,5 +12,13 @@ SHA1 (patch-ag) = 47f80a3df4c2f375ce273c90422d452bacdb1806
 SHA1 (patch-ah) = 5f6289b1b3d9d4d3741febea61b709caebdaa704
 SHA1 (patch-ai) = abaf43318b95d608693022144b565f7172a9bcfb
 SHA1 (patch-aj) = 0ac8a7d056fb025bf2a516ac2a09edbabe718da7
-SHA1 (patch-ak) = 040e87126861547573df47cae04265369fcd9033
+SHA1 (patch-ak) = 8d6ce1cef0981243b696395d6179fb9d11a005a5
 SHA1 (patch-al) = a1e384466d0d401a2cf3c08d41838d15500f262a
+SHA1 (patch-ba) = 614fdf50d63f1912bf472d1900212663a88e3b8b
+SHA1 (patch-bb) = 801310f6d79473867ab61f39007726d7d0996b92
+SHA1 (patch-bc) = 68dcf639c83a3d814000e4cc6bc319c232fca8f8
+SHA1 (patch-bd) = b60868455f693ac16e779dd6aa269378f362518c
+SHA1 (patch-be) = 4daab97793052a1d44ae39ac9766fc1948b01182
+SHA1 (patch-bf) = e942fc19adf55474ae839c4baba92e46ed618d0b
+SHA1 (patch-bg) = 9fe1e716cd7ea19b1b171fc8097ed638a95e3d82
+SHA1 (patch-bh) = 3725da941b7c1e8ad4c5394d78cd6ce2639ee74e
diff --git a/security/pgp5/patches/patch-ak b/security/pgp5/patches/patch-ak
index 6807ca60c97..46ef2610146 100644
--- a/security/pgp5/patches/patch-ak
+++ b/security/pgp5/patches/patch-ak
@@ -1,8 +1,14 @@
-$NetBSD: patch-ak,v 1.2 1999/12/12 08:37:49 rh Exp $
+$NetBSD: patch-ak,v 1.3 2002/08/25 15:18:42 mjl Exp $
 
 --- man/pgp.cfg.5.orig	Sat Feb  7 20:54:57 1998
-+++ man/pgp.cfg.5	Sun Dec 12 09:36:55 1999
-@@ -16,7 +16,7 @@
++++ man/pgp.cfg.5	Sun Aug 25 16:37:03 2002
+@@ -11,12 +11,12 @@
+ .TH PGP 5.0 "JULY 1997 (v5.0)" PGP "User Manual"
+ .SH NAME
+ pgp.cfg \- Format of the configuration file used by
+-.BR pgp (1).
++.BR pgp5 (1).
+ .SH DESCRIPTION
  The default location for this file is ~/.pgp.  You may specify another
  location by setting the environment variable
  .IR PGPPATH .
@@ -11,3 +17,15 @@ $NetBSD: patch-ak,v 1.2 1999/12/12 08:37:49 rh Exp $
  All PGP applications accept these options as command-line arguments,
  as well.  Command line arguments always override the configuration
  file.  Options are specified with a double-dash (--) or plus (+),
+@@ -125,9 +125,9 @@
+ 
+ .SH BUGS
+ See
+-.BR pgp (1).
++.BR pgp5 (1).
+ .SH "SEE ALSO"
+-.BR pgp (1),
++.BR pgp5 (1),
+ .BR pgpe (1),
+ .BR pgpv (1),
+ .BR pgps (1),
diff --git a/security/pgp5/patches/patch-ba b/security/pgp5/patches/patch-ba
new file mode 100644
index 00000000000..43bf617517d
--- /dev/null
+++ b/security/pgp5/patches/patch-ba
@@ -0,0 +1,13 @@
+$NetBSD: patch-ba,v 1.1 2002/08/25 15:18:42 mjl Exp $
+
+--- lib/ttyui/pgpUserIO.c.orig	Sun Aug 25 16:19:00 2002
++++ lib/ttyui/pgpUserIO.c	Sun Aug 25 16:19:17 2002
+@@ -1321,7 +1321,7 @@
+     pgpAssert(fd >= 0);
+ 
+     for(i = 0; i <= count; ++i) {
+-	RandBuf = read(fd, &RandBuf, count);
++	read(fd, &RandBuf, count);
+ 	pgpRandomAddBytes(&pgpRandomPool, (byte *)&RandBuf, sizeof(RandBuf));
+ 	pgpRandPoolAddEntropy(256);
+     }
diff --git a/security/pgp5/patches/patch-bb b/security/pgp5/patches/patch-bb
new file mode 100644
index 00000000000..371952bbdb6
--- /dev/null
+++ b/security/pgp5/patches/patch-bb
@@ -0,0 +1,13 @@
+$NetBSD: patch-bb,v 1.1 2002/08/25 15:18:42 mjl Exp $
+
+--- apps/pgp/filter.c.orig	Sun Aug 25 16:16:35 2002
++++ apps/pgp/filter.c	Sun Aug 25 16:16:57 2002
+@@ -269,7 +269,7 @@
+     struct RingIterator *NameIter = NULL;
+     union RingObject *name;
+     Boolean OKToUse = FALSE, FoundName = FALSE;
+-    int len = 0;
++    size_t len = 0;
+     int trust;
+     char *TempNameString = NULL;
+ 
diff --git a/security/pgp5/patches/patch-bc b/security/pgp5/patches/patch-bc
new file mode 100644
index 00000000000..19516497dd7
--- /dev/null
+++ b/security/pgp5/patches/patch-bc
@@ -0,0 +1,13 @@
+$NetBSD: patch-bc,v 1.1 2002/08/25 15:18:42 mjl Exp $
+
+--- language50.txt.orig	Sun Aug 25 16:17:26 2002
++++ language50.txt	Sun Aug 25 16:18:06 2002
+@@ -879,7 +879,7 @@
+ trust of this key, first.\n
+ 
+ [RETRIEVING_URL]
+-us="Retreiving %s:/%s:%i%s\n"
++us="Retrieving %s://%s:%i%s\n"
+ 
+ [ADD_THESE_KEYS]
+ us="\nAdd these keys to your keyring? [Y/n] "
diff --git a/security/pgp5/patches/patch-bd b/security/pgp5/patches/patch-bd
new file mode 100644
index 00000000000..9081b134768
--- /dev/null
+++ b/security/pgp5/patches/patch-bd
@@ -0,0 +1,13 @@
+$NetBSD: patch-bd,v 1.1 2002/08/25 15:18:42 mjl Exp $
+
+--- man/pgp-integration.7.orig	Sun Aug 25 16:34:39 2002
++++ man/pgp-integration.7	Sun Aug 25 16:34:44 2002
+@@ -272,7 +272,7 @@
+ command line, including the public and private keyrings your
+ application wishes to use.
+ .SH "SEE ALSO"
+-.BR pgp (1),
++.BR pgp5 (1),
+ .BR pgpe (1),
+ .BR pgpv (1),
+ .BR pgps (1),
diff --git a/security/pgp5/patches/patch-be b/security/pgp5/patches/patch-be
new file mode 100644
index 00000000000..75757753aa2
--- /dev/null
+++ b/security/pgp5/patches/patch-be
@@ -0,0 +1,17 @@
+$NetBSD: patch-be,v 1.1 2002/08/25 15:18:43 mjl Exp $
+
+--- man/pgpe.1.orig	Sun Aug 25 16:38:11 2002
++++ man/pgpe.1	Sun Aug 25 16:38:26 2002
+@@ -108,10 +108,10 @@
+ .SH BUGS
+ .RS
+ See
+-.BR pgp (1).
++.BR pgp5 (1).
+ .BE
+ .SH "SEE ALSO"
+-.BR pgp (1),
++.BR pgp5 (1),
+ .BR pgpv (1),
+ .BR pgps (1),
+ .BR pgpk (1),
diff --git a/security/pgp5/patches/patch-bf b/security/pgp5/patches/patch-bf
new file mode 100644
index 00000000000..61b4ba821b6
--- /dev/null
+++ b/security/pgp5/patches/patch-bf
@@ -0,0 +1,17 @@
+$NetBSD: patch-bf,v 1.1 2002/08/25 15:18:43 mjl Exp $
+
+--- man/pgpk.1.orig	Sun Aug 25 16:39:27 2002
++++ man/pgpk.1	Sun Aug 25 16:39:41 2002
+@@ -242,10 +242,10 @@
+ .SH BUGS
+ .RS
+ See
+-.BR pgp (1).
++.BR pgp5 (1).
+ .BE
+ .SH "SEE ALSO"
+-.BR pgp (1),
++.BR pgp5 (1),
+ .BR pgpv (1),
+ .BR pgpe (1),
+ .BR pgps (1),
diff --git a/security/pgp5/patches/patch-bg b/security/pgp5/patches/patch-bg
new file mode 100644
index 00000000000..0e2db75ac8b
--- /dev/null
+++ b/security/pgp5/patches/patch-bg
@@ -0,0 +1,17 @@
+$NetBSD: patch-bg,v 1.1 2002/08/25 15:18:43 mjl Exp $
+
+--- man/pgpv.1.orig	Sun Aug 25 16:40:26 2002
++++ man/pgpv.1	Sun Aug 25 16:41:02 2002
+@@ -71,10 +71,10 @@
+ .SH BUGS
+ .RS
+ See
+-.BR pgp (1).
++.BR pgp5 (1).
+ .BE
+ .SH "SEE ALSO"
+-.BR pgp (1),
++.BR pgp5 (1),
+ .BR pgpv (1),
+ .BR pgpe (1),
+ .BR pgpk (1),
diff --git a/security/pgp5/patches/patch-bh b/security/pgp5/patches/patch-bh
new file mode 100644
index 00000000000..257f5702d51
--- /dev/null
+++ b/security/pgp5/patches/patch-bh
@@ -0,0 +1,17 @@
+$NetBSD: patch-bh,v 1.1 2002/08/25 15:18:43 mjl Exp $
+
+--- man/pgps.1.orig	Sun Aug 25 16:40:17 2002
++++ man/pgps.1	Sun Aug 25 16:40:53 2002
+@@ -96,10 +96,10 @@
+ .SH BUGS
+ .RS
+ See
+-.BR pgp (1).
++.BR pgp5 (1).
+ .BE
+ .SH "SEE ALSO"
+-.BR pgp (1),
++.BR pgp5 (1),
+ .BR pgpv (1),
+ .BR pgpe (1),
+ .BR pgpk (1),