regen patches and plist, and bump need_version.

This commit is contained in:
fgsch 2002-04-23 06:38:48 +00:00
parent 95fbc17278
commit 61308fcf13
19 changed files with 91 additions and 74 deletions

View File

@ -1,11 +1,11 @@
# $OpenBSD: Makefile,v 1.27 2001/09/28 06:02:15 pvalchev Exp $
# $OpenBSD: Makefile,v 1.28 2002/04/23 06:38:48 fgsch Exp $
COMMENT= "Pretty Good Privacy 5.0i (world wide use)"
DISTNAME= pgp50i-unix-src
PKGNAME= pgp-5.0i
CATEGORIES= security
NEED_VERSION= 1.406
NEED_VERSION= 1.524
MASTER_SITES= ftp://ftp.no.pgpi.com/pub/pgp/5.0/unix/ \
ftp://ftp.at.pgpi.com/pub/pgpi/5.0/unix/ \
ftp://ftp.cz.pgpi.com/pub/pgpi/5.0/unix/ \

View File

@ -1,11 +0,0 @@
--- apps/pgp/pgp.c.orig Sat Feb 7 16:54:56 1998
+++ apps/pgp/pgp.c Tue Jan 26 00:48:55 1999
@@ -1094,7 +1094,7 @@
invoked_type = PGPkeys;
break;
- case 'p':
+ case '5':
invoked_type = PGPraw;
break;

View File

@ -1,17 +0,0 @@
# $OpenBSD: patch-ak,v 1.1.1.1 1999/02/05 05:05:19 fgsch Exp $
#
# This patch is benign when not using RSAREF and is required when using
# RSAREF to get pgp5 to link. Without the patch pgp5 fails to link
# as NN_ModExp is defined in two libraries.
#
--- config.h.in.~1~ Sat Feb 7 11:54:56 1998
+++ config.h.in Tue Feb 2 22:54:29 1999
@@ -69,7 +69,7 @@
#endif
#ifndef USE_MPI_LIB
-#define USE_MPI_LIB 1
+#define USE_MPI_LIB 0
#endif
/*The licensing level to include. 1 is Freeware, 2 is Beta, 3 is Full*/

View File

@ -1,7 +1,8 @@
$OpenBSD: patch-apps_pgp_Makefile_in,v 1.1 2002/04/23 06:38:48 fgsch Exp $
--- apps/pgp/Makefile.in.orig Sat Feb 7 16:54:56 1998
+++ apps/pgp/Makefile.in Sat Jan 23 01:54:35 1999
+++ apps/pgp/Makefile.in Tue Apr 23 03:06:28 2002
@@ -6,7 +6,7 @@
# $Id: patch-aa,v 1.1.1.1 1999/02/05 05:05:19 fgsch Exp $
# $Id: patch-apps_pgp_Makefile_in,v 1.1 2002/04/23 06:38:48 fgsch Exp $
#
-PROG = pgp
@ -9,7 +10,7 @@
INSTALLPROGS = $(PROG)
COMMON=../common
@@ -21,11 +21,11 @@
@@ -21,11 +21,11 @@ all:: $(PROG)
install:: $(PROG)
( \

View File

@ -0,0 +1,12 @@
$OpenBSD: patch-apps_pgp_pgp_c,v 1.1 2002/04/23 06:38:48 fgsch Exp $
--- apps/pgp/pgp.c.orig Sat Feb 7 16:54:56 1998
+++ apps/pgp/pgp.c Tue Apr 23 03:06:28 2002
@@ -1094,7 +1094,7 @@ static PGPInvokedType getInvokedType(cha
invoked_type = PGPkeys;
break;
- case 'p':
+ case '5':
invoked_type = PGPraw;
break;

View File

@ -0,0 +1,17 @@
$OpenBSD: patch-config_h_in,v 1.1 2002/04/23 06:38:48 fgsch Exp $
This patch is benign when not using RSAREF and is required when using
RSAREF to get pgp5 to link. Without the patch pgp5 fails to link
as NN_ModExp is defined in two libraries.
--- config.h.in.orig Sat Feb 7 16:54:56 1998
+++ config.h.in Tue Apr 23 03:06:29 2002
@@ -69,7 +69,7 @@
#endif
#ifndef USE_MPI_LIB
-#define USE_MPI_LIB 1
+#define USE_MPI_LIB 0
#endif
/*The licensing level to include. 1 is Freeware, 2 is Beta, 3 is Full*/

View File

@ -1,3 +1,4 @@
$OpenBSD: patch-lib_pgp_helper_pgpMem_c,v 1.1 2002/04/23 06:38:48 fgsch Exp $
$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
@ -22,8 +23,8 @@ 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
--- lib/pgp/helper/pgpMem.c.orig Sun Aug 10 21:05:32 1997
+++ lib/pgp/helper/pgpMem.c Tue Apr 23 03:06:29 2002
@@ -19,6 +19,20 @@
#include "pgpDebug.h"
#include "pgpLeaks.h"
@ -45,7 +46,7 @@ PPS. Maybe 'long long' should also be in the union (e.g. for Solaris 2).
/* Fills allocated/deallocated memory with 0xDD's */
#ifndef DEBUG_FILL_MEM
#define DEBUG_FILL_MEM DEBUG
@@ -69,11 +83,11 @@
@@ -69,11 +83,11 @@ struct MemHeader
};
#define UserPtrToMemHeader(userPtr) \
@ -60,7 +61,7 @@ PPS. Maybe 'long long' should also be in the union (e.g. for Solaris 2).
/*
* Defines the sequence of tail magic bytes. We want every byte to be
@@ -269,7 +283,7 @@
@@ -269,7 +283,7 @@ pgpMemSetTailMagic(
MemHeader * header)
{
#if DEBUG_MEM_TAIL_MAGIC
@ -69,7 +70,7 @@ PPS. Maybe 'long long' should also be in the union (e.g. for Solaris 2).
int i;
for (i = 0; i < DEBUG_MEM_TAIL_MAGIC; i++)
@@ -287,8 +301,9 @@
@@ -287,8 +301,9 @@ PGP_INTERNAL_ALLOC(
MemHeader * header;
void * userPtr;
@ -80,7 +81,7 @@ PPS. Maybe 'long long' should also be in the union (e.g. for Solaris 2).
return NULL;
MaybeFillMem(header, FullBlockSize(size));
@@ -352,7 +367,7 @@
@@ -352,7 +367,7 @@ pgpRealloc(
if (newHeader == NULL)
return PGPERR_NOMEM;
pgpCopyMemory((void *)oldHeader, (void *)newHeader,

View File

@ -1,6 +1,7 @@
--- lib/pgp/random/pgpRndPool.c.orig Sat Aug 9 23:45:13 1997
+++ lib/pgp/random/pgpRndPool.c Sun Jul 18 22:59:19 1999
@@ -296,7 +296,7 @@
$OpenBSD: patch-lib_pgp_random_pgpRndPool_c,v 1.1 2002/04/23 06:38:48 fgsch Exp $
--- lib/pgp/random/pgpRndPool.c.orig Sat Aug 9 18:45:13 1997
+++ lib/pgp/random/pgpRndPool.c Tue Apr 23 03:06:29 2002
@@ -296,7 +296,7 @@ struct PgpRandomContext const pgpRandomP
* #define UMULH_32(r,a,b) (r) = 0
*/
#ifndef UMULH_32

View File

@ -1,6 +1,7 @@
$OpenBSD: patch-lib_pgp_utils_pgpFileType_c,v 1.1 2002/04/23 06:38:48 fgsch Exp $
--- lib/pgp/utils/pgpFileType.c.orig Sat Aug 9 18:44:33 1997
+++ lib/pgp/utils/pgpFileType.c Fri Apr 30 02:47:14 1999
@@ -185,7 +185,7 @@
+++ lib/pgp/utils/pgpFileType.c Tue Apr 23 03:06:29 2002
@@ -185,7 +185,7 @@ int
pgpFileTypeBinary(char const *lang, byte const *buf, unsigned len)
{
unsigned highlimit;

View File

@ -1,5 +1,6 @@
--- lib/ttyui/pgpUserIO.c.orig Wed May 24 08:27:17 2000
+++ lib/ttyui/pgpUserIO.c Wed May 24 08:28:52 2000
$OpenBSD: patch-lib_ttyui_pgpUserIO_c,v 1.1 2002/04/23 06:38:48 fgsch Exp $
--- lib/ttyui/pgpUserIO.c.orig Sat Feb 7 16:54:57 1998
+++ lib/ttyui/pgpUserIO.c Tue Apr 23 03:06:29 2002
@@ -1321,7 +1321,7 @@ pgpDevRandomAccum(int fd, unsigned count
pgpAssert(fd >= 0);

View File

@ -1,7 +1,8 @@
$OpenBSD: patch-man_Makefile_in,v 1.1 2002/04/23 06:38:48 fgsch Exp $
--- man/Makefile.in.orig Sat Feb 7 16:54:57 1998
+++ man/Makefile.in Mon Jan 25 23:33:58 1999
+++ man/Makefile.in Tue Apr 23 03:06:28 2002
@@ -6,7 +6,7 @@
# $Id: patch-ac,v 1.1.1.1 1999/02/05 05:05:19 fgsch Exp $
# $Id: patch-man_Makefile_in,v 1.1 2002/04/23 06:38:48 fgsch Exp $
#
-MAN1=pgp.1 pgpe.1 pgpk.1 pgps.1 pgpv.1

View File

@ -1,6 +1,7 @@
$OpenBSD: patch-man_pgp-integration_7,v 1.1 2002/04/23 06:38:48 fgsch Exp $
--- man/pgp-integration.7.orig Sat Feb 7 17:08:45 1998
+++ man/pgp-integration.7 Tue Jan 26 11:11:48 1999
@@ -272,7 +272,7 @@
+++ man/pgp-integration.7 Tue Apr 23 03:06:28 2002
@@ -272,7 +272,7 @@ documentation, which details how to pass
command line, including the public and private keyrings your
application wishes to use.
.SH "SEE ALSO"

View File

@ -1,5 +1,6 @@
$OpenBSD: patch-man_pgp_1,v 1.1 2002/04/23 06:38:48 fgsch Exp $
--- man/pgp.1.orig Sat Feb 7 17:08:26 1998
+++ man/pgp.1 Mon Jan 25 23:59:40 1999
+++ man/pgp.1 Tue Apr 23 03:06:28 2002
@@ -1,5 +1,5 @@
.\"
-.\" pgp.1
@ -7,7 +8,10 @@
.\"
.\" Copyright (C) 1997 Pretty Good Privacy, Inc. All rights reserved.
.\"
@@ -11,28 +11,28 @@
@@ -8,31 +8,31 @@
.\" Process this file with
.\" groff -man -Tascii pgp.1
.\"
-.TH PGP 1 "JULY 1997 (v5.0)" PGP "User Manual"
+.TH PGP5 1 "JULY 1997 (v5.0)" PGP "User Manual"
.SH NAME
@ -42,7 +46,7 @@
.BR pgpk (1)
is the key management application, which is used to generate,
@@ -167,7 +167,7 @@
@@ -167,7 +167,7 @@ file, or only the first file is named on
There is currently no way to specify just a secret or public keyring
for an operation.

View File

@ -1,5 +1,6 @@
$OpenBSD: patch-man_pgp_cfg_5,v 1.1 2002/04/23 06:38:48 fgsch Exp $
--- man/pgp.cfg.5.orig Sat Feb 7 16:54:57 1998
+++ man/pgp.cfg.5 Tue Jan 26 00:09:25 1999
+++ man/pgp.cfg.5 Tue Apr 23 03:06:28 2002
@@ -11,7 +11,7 @@
.TH PGP 5.0 "JULY 1997 (v5.0)" PGP "User Manual"
.SH NAME
@ -9,7 +10,7 @@
.SH DESCRIPTION
The default location for this file is ~/.pgp. You may specify another
location by setting the environment variable
@@ -125,9 +125,9 @@
@@ -125,9 +125,9 @@ decrypt such messages. The default is o
.SH BUGS
See

View File

@ -1,6 +1,7 @@
$OpenBSD: patch-man_pgpe_1,v 1.1 2002/04/23 06:38:48 fgsch Exp $
--- man/pgpe.1.orig Sat Feb 7 16:54:57 1998
+++ man/pgpe.1 Tue Jan 26 00:18:12 1999
@@ -108,10 +108,10 @@
+++ man/pgpe.1 Tue Apr 23 03:06:28 2002
@@ -108,10 +108,10 @@ for further details.
.SH BUGS
.RS
See

View File

@ -1,6 +1,7 @@
$OpenBSD: patch-man_pgpk_1,v 1.1 2002/04/23 06:38:48 fgsch Exp $
--- man/pgpk.1.orig Sat Feb 7 16:54:57 1998
+++ man/pgpk.1 Tue Jan 26 00:19:31 1999
@@ -242,10 +242,10 @@
+++ man/pgpk.1 Tue Apr 23 03:06:28 2002
@@ -242,10 +242,10 @@ for further details.
.SH BUGS
.RS
See

View File

@ -1,6 +1,7 @@
$OpenBSD: patch-man_pgps_1,v 1.1 2002/04/23 06:38:48 fgsch Exp $
--- man/pgps.1.orig Sat Feb 7 16:54:57 1998
+++ man/pgps.1 Tue Jan 26 00:23:11 1999
@@ -96,10 +96,10 @@
+++ man/pgps.1 Tue Apr 23 03:06:28 2002
@@ -96,10 +96,10 @@ for further details.
.SH BUGS
.RS
See

View File

@ -1,6 +1,7 @@
$OpenBSD: patch-man_pgpv_1,v 1.1 2002/04/23 06:38:48 fgsch Exp $
--- man/pgpv.1.orig Sat Feb 7 16:54:57 1998
+++ man/pgpv.1 Tue Jan 26 00:24:08 1999
@@ -71,10 +71,10 @@
+++ man/pgpv.1 Tue Apr 23 03:06:28 2002
@@ -71,10 +71,10 @@ for further details.
.SH BUGS
.RS
See

View File

@ -1,23 +1,23 @@
@comment $OpenBSD: PLIST,v 1.3 2000/06/11 01:50:22 fgsch Exp $
@comment $OpenBSD: PLIST,v 1.4 2002/04/23 06:38:48 fgsch Exp $
@option no-default-conflict
@pkgcfl pgp-5.*
bin/pgp5
bin/pgp_old
bin/pgpe
bin/pgpk
bin/pgps
bin/pgpv
bin/pgp_old
bin/pgpk
man/man1/pgp5.1
man/man1/pgpe.1
man/man1/pgps.1
man/man1/pgpv.1
man/man1/pgpk.1
man/man5/pgp.cfg.5
man/man7/pgp-intro.7
man/man7/pgp-integration.7
lib/libbn.a
lib/libpgp.a
lib/libpgptty.a
lib/libsimple.a
lib/pgp5/language50.txt
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
@dirrm lib/pgp5