OpenPKG CVS Repository
http://cvs.openpkg.org/
____________________________________________________________________________
Server: cvs.openpkg.org Name: Ralf S. Engelschall
Root: /e/openpkg/cvs Email: [EMAIL PROTECTED]
Module: openpkg-src openpkg-web Date: 22-Jul-2003 15:49:14
Branch: HEAD Handle: 2003072214491202
Added files:
openpkg-src/pgp2 pgp2.patch
Modified files:
openpkg-src/pgp2 pgp2.spec
openpkg-web news.txt
Removed files:
openpkg-src/pgp2 keygen.patch system.patch
Log:
merge patches into one and use canonical patch file name
Summary:
Revision Changes Path
1.2 +0 -90 openpkg-src/pgp2/keygen.patch
1.1 +101 -0 openpkg-src/pgp2/pgp2.patch
1.21 +3 -5 openpkg-src/pgp2/pgp2.spec
1.2 +0 -11 openpkg-src/pgp2/system.patch
1.5722 +1 -0 openpkg-web/news.txt
____________________________________________________________________________
rm -f openpkg-src/pgp2/keygen.patch <<'@@ .'
Index: openpkg-src/pgp2/keygen.patch
============================================================================
[NO CHANGE SUMMARY BECAUSE FILE AS A WHOLE IS JUST REMOVED]
@@ .
patch -p0 <<'@@ .'
Index: openpkg-src/pgp2/pgp2.patch
============================================================================
$ cvs diff -u -r0 -r1.1 pgp2.patch
--- /dev/null 2003-07-22 15:49:14.000000000 +0200
+++ pgp2.patch 2003-07-22 15:49:14.000000000 +0200
@@ -0,0 +1,101 @@
+--- src/system.c.orig Tue Aug 27 12:53:39 2002
++++ src/system.c Tue Aug 27 12:53:38 2002
+@@ -344,7 +344,7 @@
+ #if (defined(MACH) || defined(SVR2) || defined(_BSD)) && !defined(NEXT) \
+ && !defined(AUX) && !defined(__MACHTEN__) || (defined(sun) && defined(i386))
+ int remove(name)
+-char *name;
++const char *name;
+ {
+ return unlink(name);
+ }
+--- src/mpilib.h.orig Tue Aug 29 05:03:30 1995
++++ src/mpilib.h Fri Oct 6 09:08:35 2000
+@@ -321,7 +321,15 @@
+ #endif /* mp_smul */
+
+ #define MIN_KEY_BITS 384
++#ifdef USA
+ #define MAX_KEY_BITS 2048
++#else /* USA */
++/*
++ * MAX_KEY_BITS changed from 2048 to 4096
++ * by Rich Wales <[EMAIL PROTECTED]>, 06oct2000
++ */
++#define MAX_KEY_BITS 4096
++#endif /* USA */
+
+ /* MAX_BIT_PRECISION is upper limit that assembly primitives can handle.
+ It must be less than 32704 bits, or 4088 bytes. It should be an
+--- src/randpool.h.orig Fri Jul 15 05:59:32 1994
++++ src/randpool.h Fri Oct 6 09:08:38 2000
+@@ -1,7 +1,15 @@
+ #include "usuals.h"
+
+ /* Set this to whatever you need (must be > 512) */
++#ifdef USA
+ #define RANDPOOLBITS 3072
++#else /* USA */
++/*
++ * RANDPOOLBITS changed from 3072 to 10240
++ * by Rich Wales <[EMAIL PROTECTED]>, 06oct2000
++ */
++#define RANDPOOLBITS 10240
++#endif /* USA */
+
+ void randPoolStir(void);
+ void randPoolAddBytes(byte const *buf, unsigned len);
+--- src/pgp.c.orig Wed Apr 24 10:34:19 1996
++++ src/pgp.c Fri Oct 6 09:09:59 2000
+@@ -101,6 +101,7 @@
+ Version 2.6.2i - 7 May 95
+ Version 2.6.3(i) - 18 Jan 96
+ Version 2.6.3(i)a - 4 Mar 96
++ Version 2.6.3(i)a+4K - 6 Oct 00 - [EMAIL PROTECTED]
+
+ */
+
+@@ -193,7 +194,7 @@
+ " Amiga 68000 version by Rob Knop <[EMAIL PROTECTED]>";
+ # endif
+ #else
+-static const char __DOSVer[] = "$VER: PGP 2.6.3ia (04.03.96)"
++static const char __DOSVer[] = "$VER: PGP 2.6.3ia+4K (06.10.00)"
+ # ifdef _M68020
+ " Amiga 68020 version by Peter Simons <[EMAIL PROTECTED]>";
+ # else
+@@ -205,10 +206,11 @@
+ /* Global filenames and system-wide file extensions... */
+ #ifdef USA
+ char rel_version[] = _LANG("2.6.3a"); /* release version */
+-#else
+-char rel_version[] = _LANG("2.6.3ia"); /* release version */
+-#endif
+ char rel_date[] = "1996-03-04"; /* release date */
++#else /* USA */
++char rel_version[] = _LANG("2.6.3ia+4K"); /* release version */
++char rel_date[] = "2000-10-06"; /* release date */
++#endif /* USA */
+ char PGP_EXTENSION[] = ".pgp";
+ char ASC_EXTENSION[] = ".asc";
+ char SIG_EXTENSION[] = ".sig";
+@@ -390,13 +392,15 @@
+ #ifdef USA
+ fputs(LANG(signon_legalese), stderr);
+ #endif
+- fputs(
+ #ifdef USA
++ fputs(
+ LANG("Export of this software may be restricted by the U.S. government.\n"),
+-#else
+-LANG("International version - not for use in the USA. Does not use RSAREF.\n"),
+-#endif
++ /*
++ * Non-RSAREF warning removed (now that RSA patent has expired)
++ * by Rich Wales <[EMAIL PROTECTED]>, 06oct2000
++ */
+ stderr);
++#endif
+
+ get_timestamp((byte *) & tstamp); /* timestamp points to tstamp */
+ fprintf(pgpout, LANG("Current time: %s\n"), ctdate(&tstamp));
@@ .
patch -p0 <<'@@ .'
Index: openpkg-src/pgp2/pgp2.spec
============================================================================
$ cvs diff -u -r1.20 -r1.21 pgp2.spec
--- openpkg-src/pgp2/pgp2.spec 8 Jul 2003 14:41:51 -0000 1.20
+++ openpkg-src/pgp2/pgp2.spec 22 Jul 2003 13:49:14 -0000 1.21
@@ -38,13 +38,12 @@
Group: Cryptography
License: GPL
Version: %{V_long}
-Release: 20030530
+Release: 20030722
# list of sources
Source0: ftp://ftp.pgpi.org/pub/pgp/%{V_short}/src/pgp%{V_strip}is.tar.gz
Source1: language.idx
-Patch0: keygen.patch
-Patch1: system.patch
+Patch0: pgp2.patch
# build information
Prefix: %{l_prefix}
@@ -73,8 +72,7 @@
# extract distribution
%setup -c -n pgp-%{V_long}
%{l_tar} -xf pgp%{V_strip}ii.tar
- %patch0 -p0
- %patch1 -p0
+ %patch -p0
# patch distribution
%{l_shtool} subst \
@@ .
rm -f openpkg-src/pgp2/system.patch <<'@@ .'
Index: openpkg-src/pgp2/system.patch
============================================================================
[NO CHANGE SUMMARY BECAUSE FILE AS A WHOLE IS JUST REMOVED]
@@ .
patch -p0 <<'@@ .'
Index: openpkg-web/news.txt
============================================================================
$ cvs diff -u -r1.5721 -r1.5722 news.txt
--- openpkg-web/news.txt 22 Jul 2003 13:47:14 -0000 1.5721
+++ openpkg-web/news.txt 22 Jul 2003 13:49:12 -0000 1.5722
@@ -1,3 +1,4 @@
+22-Jul-2003: Upgraded package: P<pgp2-2.6.3i-20030722>
22-Jul-2003: Upgraded package: P<gcc2-2.95.3-20030722>
22-Jul-2003: Upgraded package: P<perl56-5.6.1-20030722>
22-Jul-2003: Upgraded package: P<autoconf-2.57-20030722>
@@ .
______________________________________________________________________
The OpenPKG Project www.openpkg.org
CVS Repository Commit List [EMAIL PROTECTED]
