Import of pkgsrc-2013Q2

security/pgp5/DESCR

@@ -0,0 +1,7 @@
+PGP (Pretty Good Privacy) is a public key encryption package to protect
+E-mail and data files.  It lets you communicate securely with people
+you've never met, with no secure channels needed for prior exchange of
+keys.  It's well featured and fast, with sophisticated key management,
+digital signatures, data compression, and good ergonomic design.
+
+This is PGP 5.x which understands both RSA and DSS/Diffie-Hellman keys.

security/pgp5/MESSAGE

@@ -0,0 +1,24 @@
+===========================================================================
+$NetBSD: MESSAGE,v 1.3 2004/01/02 00:07:58 grant Exp $
+
+There are a number of large changes from the 2.6.2 distribution.  Most
+notable is that the command line has changed substantially.  See
+the pgp5(1) man page for a discussion of how to use the new command
+line.
+
+Also, to allow easy interoperation with older versions on the same
+system, a number of filename changes have been made:
+
+	~/.pgp/pubring.pgp	is now ~/.pgp/pubring.pkr
+	~/.pgp/secring.pgp	is now ~/.pgp/secring.skr
+	~/.pgp/config.txt	is now ~/.pgp/pgp.cfg
+	~/.pgp/language.txt	is now ~/.pgp/language50.txt
+
+The application will NOT automatically migrate these files for you; if
+you wish to retain your existing keyrings and configuration files, you
+should copy them yourself.  Note that copying language.txt to
+language50.txt is a decidedly bad idea.  Also note that language50.txt
+is entirely optional; US English is the only language it contains at
+this time.
+
+===========================================================================

security/pgp5/Makefile

@@ -0,0 +1,37 @@
+# $NetBSD: Makefile,v 1.40 2013/05/31 12:41:57 wiz Exp $
+#
+
+DISTNAME=	pgp50i-unix-src
+PKGNAME=	pgp5-5.0i
+PKGREVISION=	2
+CATEGORIES=	security
+MASTER_SITES=	ftp://ftp.pgpi.com/pub/pgp/5.0/unix/ \
+		ftp://ftp.au.pgpi.com/pub/pgp/5.0/unix/
+
+MAINTAINER=	pkgsrc-users@NetBSD.org
+HOMEPAGE=	http://www.pgpi.org/
+COMMENT=	Public-key encryption and digital signature utilities (v5)
+# use of IDEA as crypto function
+LICENSE=	idea-license
+
+MAKE_JOBS_SAFE=		no
+
+USE_TOOLS+=	perl
+
+CONFLICTS=	pgraf-[0-9]*  	# Both have a `pgps' executable
+
+WRKSRC=		${WRKDIR}/pgp50i/src
+CRYPTO=		YES
+GNU_CONFIGURE=	YES
+
+PGPLIB=	${PREFIX}/share/pgp5
+
+INSTALLATION_DIRS=	bin ${PGPLIB}
+
+post-patch:
+	${MV} ${WRKSRC}/man/pgp.1 ${WRKSRC}/man/pgp5.1
+
+post-install:
+	${INSTALL_DATA} ${WRKSRC}/language50.txt ${DESTDIR}${PGPLIB}
+
+.include "../../mk/bsd.pkg.mk"

security/pgp5/PLIST

@@ -0,0 +1,20 @@
+@comment $NetBSD: PLIST,v 1.3 2009/06/14 18:13:35 joerg Exp $
+bin/pgp5
+bin/pgp_old
+bin/pgpe
+bin/pgpk
+bin/pgps
+bin/pgpv
+lib/libbn.a
+lib/libpgp.a
+lib/libpgptty.a
+lib/libsimple.a
+man/man1/pgp5.1
+man/man1/pgpe.1
+man/man1/pgpk.1
+man/man1/pgps.1
+man/man1/pgpv.1
+man/man5/pgp.cfg.5
+man/man7/pgp-integration.7
+man/man7/pgp-intro.7
+share/pgp5/language50.txt

security/pgp5/distinfo

@@ -0,0 +1,28 @@
+$NetBSD: distinfo,v 1.9 2011/11/26 17:20:27 joerg Exp $
+
+SHA1 (pgp50i-unix-src.tar.gz) = b740afe0bf557deedb53604274997cb2bbecac33
+RMD160 (pgp50i-unix-src.tar.gz) = 8400bef0e3a4452e1c89373c070a11dce71572f4
+Size (pgp50i-unix-src.tar.gz) = 927363 bytes
+SHA1 (patch-aa) = 2d8bd22762b130ce0178c937f5c352c7442a2bed
+SHA1 (patch-ab) = 7b0f4a59a1a68be4b02009ec8e0eb8cc5aa9a880
+SHA1 (patch-ac) = 18908d3b5203cd10a85f06b2c58be3d76f838cc8
+SHA1 (patch-ad) = 101bf4a58513c0a7a9cdf365512e5053a360ea43
+SHA1 (patch-ae) = bef5d721a4733dc3124271aef51bc49bfa98e201
+SHA1 (patch-af) = 56a8404f3e5d42c5bb8ff80c2eb3900f8dca56be
+SHA1 (patch-ag) = 47f80a3df4c2f375ce273c90422d452bacdb1806
+SHA1 (patch-ah) = 5f6289b1b3d9d4d3741febea61b709caebdaa704
+SHA1 (patch-ai) = abaf43318b95d608693022144b565f7172a9bcfb
+SHA1 (patch-aj) = 0ac8a7d056fb025bf2a516ac2a09edbabe718da7
+SHA1 (patch-ak) = 8d6ce1cef0981243b696395d6179fb9d11a005a5
+SHA1 (patch-al) = a1e384466d0d401a2cf3c08d41838d15500f262a
+SHA1 (patch-am) = 4f36d9e86c0d9f78b7465d7affc7c44b46656067
+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
+SHA1 (patch-bi) = 17274af8773ad006b7f0aad1e734d16449f5166e
+SHA1 (patch-lib_pgp_keys_pgpRngRead.c) = e506fd5cf5684206fa62b023d0ab29ea7098207a

security/pgp5/patches/patch-aa

@@ -0,0 +1,15 @@
+$NetBSD: patch-aa,v 1.1.1.1 1998/12/31 14:25:30 frueauf Exp $
+
+--- config.h.in.orig	Sat Feb  7 20:54:56 1998
++++ config.h.in	Thu Dec 31 14:28:22 1998
+@@ -79,6 +79,10 @@
+ #define PGP_FREEWARE 1
+ #endif
+ 
++#if defined(__NetBSD__)
++#define unix 1
++#endif
++
+ /* Define "UNIX" if we are on UNIX and "UNIX" is not already defined */
+ #if defined(unix) || defined(__unix) || defined (__unix__)
+ #ifndef UNIX

security/pgp5/patches/patch-ab

@@ -0,0 +1,27 @@
+$NetBSD: patch-ab,v 1.5 2002/03/14 12:33:00 wiz Exp $
+
+--- apps/pgp/Makefile.in.orig	Sat Feb  7 20:54:56 1998
++++ apps/pgp/Makefile.in
+@@ -7,5 +7,5 @@
+ #
+ 
+-PROG = pgp
++PROG = pgp5
+ INSTALLPROGS = $(PROG)
+ 
+@@ -22,10 +22,10 @@
+ install:: $(PROG)
+ 	(						\
+-	    $(INSTALL) -m 755 pgp $(DESTDIR)$(bindir);	\
++	    $(INSTALL) -m 755 pgp5 $(DESTDIR)$(bindir);	\
+ 	    cd $(DESTDIR)$(bindir);			\
+ 	    $(RM) pgpe pgps pgpv pgp_old;		\
+-	    $(LN_S) pgp pgpe;				\
+-	    $(LN_S) pgp pgps;				\
+-	    $(LN_S) pgp pgpv;				\
+-	    $(LN_S) pgp pgp_old				\
++	    $(LN_S) pgp5 pgpe;				\
++	    $(LN_S) pgp5 pgps;				\
++	    $(LN_S) pgp5 pgpv;				\
++	    $(LN_S) pgp5 pgp_old			\
+ 	)

security/pgp5/patches/patch-ac

@@ -0,0 +1,10 @@
+$NetBSD: patch-ac,v 1.1.1.1 1998/12/31 14:25:30 frueauf Exp $
+
+--- make-mkhdrs.pl-orig	Sat Aug  9 23:45:34 1997
++++ make-mkhdrs.pl	Thu Dec 31 14:17:58 1998
+@@ -1,4 +1,4 @@
+-#!/usr/bin/perl
++#!/usr/bin/env perl
+ #
+ # make-mkhdrs - Creates a batch file from the Makefile.in files which
+ # sets up the header file directories for Windows 95.

security/pgp5/patches/patch-ad

@@ -0,0 +1,10 @@
+$NetBSD: patch-ad,v 1.1.1.1 1998/12/31 14:25:30 frueauf Exp $
+
+--- mklang.pl-orig	Sat Aug  9 23:45:37 1997
++++ mklang.pl	Thu Dec 31 14:17:31 1998
+@@ -1,4 +1,4 @@
+-#!/usr/bin/perl
++#!/usr/bin/env perl
+ #
+ #This could probably be sed, but I'm feeling lazy.
+ #

security/pgp5/patches/patch-ae

@@ -0,0 +1,11 @@
+$NetBSD: patch-ae,v 1.3 2002/03/14 12:33:00 wiz Exp $
+
+--- man/Makefile.in.orig	Sat Feb  7 20:54:57 1998
++++ man/Makefile.in
+@@ -7,5 +7,5 @@
+ #
+ 
+-MAN1=pgp.1 pgpe.1 pgpk.1 pgps.1 pgpv.1
++MAN1=pgp5.1 pgpe.1 pgpk.1 pgps.1 pgpv.1
+ MAN5=pgp.cfg.5
+ MAN7=pgp-integration.7 pgp-intro.7

security/pgp5/patches/patch-af

@@ -0,0 +1,55 @@
+$NetBSD: patch-af,v 1.5 2002/03/14 12:26:46 wiz Exp $
+
+--- man/pgp.1.orig	Sat Feb  7 21:08:26 1998
++++ man/pgp.1
+@@ -1,4 +1,4 @@
+ .\"
+-.\" pgp.1
++.\" pgp5.1
+ .\"
+ .\" Copyright (C) 1997 Pretty Good Privacy, Inc.  All rights reserved.
+@@ -7,9 +7,9 @@
+ .\"
+ .\" Process this file with
+-.\" groff -man -Tascii pgp.1
++.\" groff -man -Tascii pgp5.1
+ .\"
+-.TH PGP 1 "JULY 1997 (v5.0)" PGP "User Manual"
++.TH PGP5 1 "JULY 1997 (v5.0)" PGP "User Manual"
+ .SH NAME
+-PGP \- A suite of tools for encrypting, decrypting and verifying
++PGP5 \- A suite of tools for encrypting, decrypting and verifying
+ messages.
+ .SH DESCRIPTION
+@@ -18,5 +18,5 @@
+ 
+ .RS
+-.BR pgp (1)
++.BR pgp5 (1)
+ is the main cryptographic engine of the PGP package.  However,
+ invoking it as itself merely prints a usage summary.
+@@ -24,14 +24,14 @@
+ .BR pgpe (1)
+ is executed to encrypt, or encrypt and sign, files.  It is a link to
+-.BR pgp (1).
++.BR pgp5 (1).
+ 
+ .BR pgps (1)
+ is executed to only sign files.  It is a link to
+-.BR pgp (1).
++.BR pgp5 (1).
+ 
+ .BR pgpv (1)
+ is executed to only verify or decrypt signed or encrypted files.  It
+ is a link to
+-.BR pgp (1).
++.BR pgp5 (1).
+ 
+ .BR pgpk (1)
+@@ -168,5 +168,5 @@
+ for an operation.
+ 
+-.B pgp --version
++.B pgp5 --version
+ doesn't work.  Use
+ .B pgpk --version

security/pgp5/patches/patch-ag

@@ -0,0 +1,91 @@
+$NetBSD: patch-ag,v 1.1 1999/01/05 14:31:01 frueauf Exp $
+
+From Julian Coleman <J.D.Coleman@newcastle.ac.uk> posted to
+netbsd-bugs@netbsd.org:
+
+The memory alignment strategy for PGP 5.0i causes bus errors on NetBSD/Sparc
+because 8 byte variables are not aligned on an 8 byte boundary.
+
+In src/lib/pgp/helper/pgpMem.c:PGP_INTERNAL_ALLOC(), a header is added to
+all malloc()'ed memory and the pointer returned is incremented by the size
+of the header.  However, there are no constraints to see if this increment
+is correctly aligned.
+
+The problem might also occur on other OS's running on the Sparc.  A patch
+is appended (based on one used for the Chimera web browser).
+
+J
+
+PS.  The exact problem is that 'off_t' is an 8 byte value, but the header
+length is only a mulitple of 4.  Pgpe crashes at pgpFileMod.c:333, when it
+tries to modify 'context->filesize'.
+
+PPS.  Maybe 'long long' should also be in the union (e.g. for Solaris 2).
+
+--- lib/pgp/helper/pgpMem.c.orig	Mon Aug 11 02:05:32 1997
++++ lib/pgp/helper/pgpMem.c	Tue Jan  5 15:03:27 1999
+@@ -19,6 +19,20 @@
+ #include "pgpDebug.h"
+ #include "pgpLeaks.h"
+ 
++/*
++ * Make sure any memory chunks are correctly aligned.
++ * This can be forced by defining ALIGNSIZE (in bytes).
++ */
++#ifndef ALIGNSIZE
++typedef struct Alignment
++{
++  union { int a; char *b; size_t c; off_t d; long e; } Align;
++} Alignment;
++#define MEMALIGN(x) ((x / sizeof(Alignment) + 1) * sizeof(Alignment))
++#else
++#define MEMALIGN(x) ((x / ALIGNSIZE + 1) * ALIGNSIZE)
++#endif
++
+ /* Fills allocated/deallocated memory with 0xDD's */
+ #ifndef DEBUG_FILL_MEM
+ #define DEBUG_FILL_MEM			DEBUG
+@@ -69,11 +83,11 @@
+ };
+ 
+ #define UserPtrToMemHeader(userPtr)		\
+-		((MemHeader *)((char *)(userPtr) - sizeof(MemHeader)))
++		((MemHeader *)((char *)(userPtr) - MEMALIGN(sizeof(MemHeader))))
+ #define MemHeaderToUserPtr(hdrPtr)		\
+- 	((void *)((char *)(hdrPtr) + sizeof(MemHeader)))
++ 	((void *)((char *)(hdrPtr) + MEMALIGN(sizeof(MemHeader))))
+ #define FullBlockSize(userSize)			\
+-		(sizeof(MemHeader) + (userSize) + DEBUG_MEM_TAIL_MAGIC)
++		(MEMALIGN(sizeof(MemHeader)) + (userSize) + DEBUG_MEM_TAIL_MAGIC)
+ 
+ /*
+ * Defines the sequence of tail magic bytes. We want every byte to be
+@@ -269,7 +283,7 @@
+ 	MemHeader *	header)
+ {
+ #if DEBUG_MEM_TAIL_MAGIC
+-	char *		tailMagic = (char *)header + sizeof(MemHeader) + header->size;
++	char *		tailMagic = (char *)header + MEMALIGN(sizeof(MemHeader)) + header->size;
+ 	int			i;
+ 	
+ 	for (i = 0; i < DEBUG_MEM_TAIL_MAGIC; i++)
+@@ -287,8 +301,9 @@
+ 	MemHeader *		header;
+ 	void *			userPtr;
+ 	
++	size += (MEMALIGN(sizeof(MemHeader)) - (sizeof(MemHeader)));
+ 	header = (MemHeader *)pgpPlatformAlloc(FullBlockSize(size));
+-if (header == NULL)
++	if (header == NULL)
+ 		return NULL;
+ 
+ 	MaybeFillMem(header, FullBlockSize(size));
+@@ -352,7 +367,7 @@
+ 		if (newHeader == NULL)
+ 			return PGPERR_NOMEM;
+ 		pgpCopyMemory((void *)oldHeader, (void *)newHeader,
+-					sizeof(MemHeader) + oldSize);
++					MEMALIGN(sizeof(MemHeader)) + oldSize);
+ 		MaybeFillMem(oldHeader, FullBlockSize(oldSize));
+ 		pgpPlatformFree(oldHeader);
+ 	}

security/pgp5/patches/patch-ah

@@ -0,0 +1,13 @@
+$NetBSD: patch-ah,v 1.1 1999/04/12 22:19:03 mjl Exp $
+
+--- lib/pgp/utils/pgpFileType.c.orig	Tue Apr 13 00:01:40 1999
++++ lib/pgp/utils/pgpFileType.c	Tue Apr 13 00:02:14 1999
+@@ -185,7 +185,7 @@
+ pgpFileTypeBinary(char const *lang, byte const *buf, unsigned len)
+ 	{
+ 			unsigned highlimit;
+-			char c;
++			unsigned char c;
+ 
+ 			if (!len)
+ 				 return 1;		/* empty file or error, not a text file */

security/pgp5/patches/patch-ai

@@ -0,0 +1,12 @@
+$NetBSD: patch-ai,v 1.1 1999/04/12 22:19:03 mjl Exp $
+
+--- apps/pgp/pgp.c.orig	Tue Apr 13 00:04:28 1999
++++ apps/pgp/pgp.c	Tue Apr 13 00:05:23 1999
+@@ -1095,6 +1095,7 @@
+ 				break;
+ 					
+ 			case 'p':
++			case '5':
+ 				invoked_type = PGPraw;
+ 				break;
+ 					

security/pgp5/patches/patch-aj

@@ -0,0 +1,14 @@
+$NetBSD: patch-aj,v 1.1 1999/05/25 23:27:03 mjl Exp $
+
+--- lib/pgp/include/pgpUsuals.h.orig	Wed May 26 00:58:50 1999
++++ lib/pgp/include/pgpUsuals.h	Wed May 26 00:59:46 1999
+@@ -50,8 +50,7 @@
+ */
+ #if ULONG_MAX > 0xfffffffful
+ #if ULONG_MAX == 0xfffffffffffffffful
+-typedef ulong bnword64;
+-#define BNWORD64 bnword64
++typedef ulong word64;
+ #define HAVE64 1
+ #endif
+ #endif

security/pgp5/patches/patch-ak

@@ -0,0 +1,31 @@
+$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 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 .
+-SH COMMAND-LINE SPECIFICATION
++.SH COMMAND-LINE SPECIFICATION
+ 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),

security/pgp5/patches/patch-al

@@ -0,0 +1,13 @@
+$NetBSD: patch-al,v 1.1 2002/03/14 12:32:40 wiz Exp $
+
+--- lib/pgp/random/pgpRndPool.c.orig	Sat Aug  9 23:45:13 1997
++++ lib/pgp/random/pgpRndPool.c
+@@ -296,7 +296,7 @@
+ * #define UMULH_32(r,a,b) (r) = 0
+ */
+ #ifndef UMULH_32
+-#if defined(__GNUC__) && defined(__i386__)
++#if defined(__GNUC__) && defined(__i386__) && 0
+ /* Inline asm goodies */
+ #define UMULH_32(r,a,b) __asm__("mull %2" : "=d"(r) : "%a"(a), "mr"(b) : "ax")
+ #elif HAVE64

security/pgp5/patches/patch-am

@@ -0,0 +1,13 @@
+$NetBSD: patch-am,v 1.1 2006/01/20 00:37:45 joerg Exp $
+
+--- lib/pgp/helper/pgpDebug.c.orig	2006-01-20 00:31:54.000000000 +0000
++++ lib/pgp/helper/pgpDebug.c
+@@ -191,7 +191,7 @@ pgpFormatVAStr(
+ 
+                 case 'c':  /* Single character */
+                 {
+-                    char            ch = va_arg(args, char);
++                    char            ch = va_arg(args, int);
+ 
+                     AppendChars(buffer, &bufferIndex, bufferSize,
+                                 canonicalizeNLs, &ch, 1);

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);
+     }

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;
+ 

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] "

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),

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),

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),

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),

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),

security/pgp5/patches/patch-bi

@@ -0,0 +1,13 @@
+$NetBSD: patch-bi,v 1.1 2003/09/29 23:31:49 mycroft Exp $
+
+--- apps/common/pgpFullLicense.c.orig	2003-09-29 23:27:07.000000000 +0000
++++ apps/common/pgpFullLicense.c	2003-09-29 23:26:50.000000000 +0000
+@@ -71,7 +71,7 @@
+ Software Product to a single hard disk, provided you keep the original\n\
+ solely for backup or archival purposes.  Such copy shall include PGP's\n\
+ copyright and other proprietary notices.  You may not copy the printed\n\
+-materials accompanying the Software Product. 
++materials accompanying the Software Product.\n\
+ \n\
+ 3.      UPGRADES AND SUPPORT.  If this Software Product is labeled as an\n\
+ upgrade or trade-up from a prior version of a PGP product that you were\n\

security/pgp5/patches/patch-lib_pgp_keys_pgpRngRead.c

@@ -0,0 +1,13 @@
+$NetBSD: patch-lib_pgp_keys_pgpRngRead.c,v 1.1 2011/11/26 17:20:28 joerg Exp $
+
+--- lib/pgp/keys/pgpRngRead.c.orig	2011-11-26 03:16:29.000000000 +0000
++++ lib/pgp/keys/pgpRngRead.c
+@@ -3368,7 +3368,7 @@ ringWrapObject (struct RingSet const *se
+ 	(void)obj;
+ 	(void)f;
+ 	return 0;
+-#elif defined(WRAP_SUB);
++#elif defined(WRAP_SUB)
+ 	/*
+ 	* Just wrap subkeys, we'll let old PGP complain about DSA keys.
+ 	* It can't handle subkeys as we have them now.