pgp2/pgp2.patch@2289d64c2123 (annotated)
pgp2/pgp2.patch
Mon, 28 Mar 2011 19:41:02 +0200
- author
- Michael Schloh von Bennewitz <michael@schloh.com>
- date
- Mon, 28 Mar 2011 19:41:02 +0200
- changeset 332
- 2289d64c2123
- permissions
- -rw-r--r--
Completely rework package including...
Simpify 64-bit -fPIC logic, instruct make to build in parallel,
force error condition on failed profile dependency, build the
standard 'bootstrap' target as suggested, correct grammar, wording,
and punctuation in general, upgrade to latest upstream vendor version,
rearrange package dependencies mpc, mpfr, and gmp, correct buildconf
thanks to new lto-plugin forced, avoid failed platform specific stage
comparison, adjust patch code to reflect new version update, and most
importantly adjust optimization flags to platform. Please note that
block 'correct hardcoded paths' is likely no yet complete.
| michael@95 | 1 | --- src/system.c.orig Tue Aug 27 12:53:39 2002 |
| michael@95 | 2 | +++ src/system.c Tue Aug 27 12:53:38 2002 |
| michael@95 | 3 | @@ -344,7 +344,7 @@ |
| michael@95 | 4 | #if (defined(MACH) || defined(SVR2) || defined(_BSD)) && !defined(NEXT) \ |
| michael@95 | 5 | && !defined(AUX) && !defined(__MACHTEN__) || (defined(sun) && defined(i386)) |
| michael@95 | 6 | int remove(name) |
| michael@95 | 7 | -char *name; |
| michael@95 | 8 | +const char *name; |
| michael@95 | 9 | { |
| michael@95 | 10 | return unlink(name); |
| michael@95 | 11 | } |
| michael@95 | 12 | --- src/mpilib.h.orig Tue Aug 29 05:03:30 1995 |
| michael@95 | 13 | +++ src/mpilib.h Fri Oct 6 09:08:35 2000 |
| michael@95 | 14 | @@ -321,7 +321,15 @@ |
| michael@95 | 15 | #endif /* mp_smul */ |
| michael@95 | 16 | |
| michael@95 | 17 | #define MIN_KEY_BITS 384 |
| michael@95 | 18 | +#ifdef USA |
| michael@95 | 19 | #define MAX_KEY_BITS 2048 |
| michael@95 | 20 | +#else /* USA */ |
| michael@95 | 21 | +/* |
| michael@95 | 22 | + * MAX_KEY_BITS changed from 2048 to 4096 |
| michael@95 | 23 | + * by Rich Wales <richw@webcom.com>, 06oct2000 |
| michael@95 | 24 | + */ |
| michael@95 | 25 | +#define MAX_KEY_BITS 4096 |
| michael@95 | 26 | +#endif /* USA */ |
| michael@95 | 27 | |
| michael@95 | 28 | /* MAX_BIT_PRECISION is upper limit that assembly primitives can handle. |
| michael@95 | 29 | It must be less than 32704 bits, or 4088 bytes. It should be an |
| michael@95 | 30 | --- src/randpool.h.orig Fri Jul 15 05:59:32 1994 |
| michael@95 | 31 | +++ src/randpool.h Fri Oct 6 09:08:38 2000 |
| michael@95 | 32 | @@ -1,7 +1,15 @@ |
| michael@95 | 33 | #include "usuals.h" |
| michael@95 | 34 | |
| michael@95 | 35 | /* Set this to whatever you need (must be > 512) */ |
| michael@95 | 36 | +#ifdef USA |
| michael@95 | 37 | #define RANDPOOLBITS 3072 |
| michael@95 | 38 | +#else /* USA */ |
| michael@95 | 39 | +/* |
| michael@95 | 40 | + * RANDPOOLBITS changed from 3072 to 10240 |
| michael@95 | 41 | + * by Rich Wales <richw@webcom.com>, 06oct2000 |
| michael@95 | 42 | + */ |
| michael@95 | 43 | +#define RANDPOOLBITS 10240 |
| michael@95 | 44 | +#endif /* USA */ |
| michael@95 | 45 | |
| michael@95 | 46 | void randPoolStir(void); |
| michael@95 | 47 | void randPoolAddBytes(byte const *buf, unsigned len); |
| michael@95 | 48 | --- src/pgp.c.orig Wed Apr 24 10:34:19 1996 |
| michael@95 | 49 | +++ src/pgp.c Fri Oct 6 09:09:59 2000 |
| michael@95 | 50 | @@ -101,6 +101,7 @@ |
| michael@95 | 51 | Version 2.6.2i - 7 May 95 |
| michael@95 | 52 | Version 2.6.3(i) - 18 Jan 96 |
| michael@95 | 53 | Version 2.6.3(i)a - 4 Mar 96 |
| michael@95 | 54 | + Version 2.6.3(i)a+4K - 6 Oct 00 - richw@webcom.com |
| michael@95 | 55 | |
| michael@95 | 56 | */ |
| michael@95 | 57 | |
| michael@95 | 58 | @@ -193,7 +194,7 @@ |
| michael@95 | 59 | " Amiga 68000 version by Rob Knop <rknop@mop.caltech.edu>"; |
| michael@95 | 60 | # endif |
| michael@95 | 61 | #else |
| michael@95 | 62 | -static const char __DOSVer[] = "$VER: PGP 2.6.3ia (04.03.96)" |
| michael@95 | 63 | +static const char __DOSVer[] = "$VER: PGP 2.6.3ia+4K (06.10.00)" |
| michael@95 | 64 | # ifdef _M68020 |
| michael@95 | 65 | " Amiga 68020 version by Peter Simons <simons@peti.rhein.de>"; |
| michael@95 | 66 | # else |
| michael@95 | 67 | @@ -205,10 +206,11 @@ |
| michael@95 | 68 | /* Global filenames and system-wide file extensions... */ |
| michael@95 | 69 | #ifdef USA |
| michael@95 | 70 | char rel_version[] = _LANG("2.6.3a"); /* release version */ |
| michael@95 | 71 | -#else |
| michael@95 | 72 | -char rel_version[] = _LANG("2.6.3ia"); /* release version */ |
| michael@95 | 73 | -#endif |
| michael@95 | 74 | char rel_date[] = "1996-03-04"; /* release date */ |
| michael@95 | 75 | +#else /* USA */ |
| michael@95 | 76 | +char rel_version[] = _LANG("2.6.3ia+4K"); /* release version */ |
| michael@95 | 77 | +char rel_date[] = "2000-10-06"; /* release date */ |
| michael@95 | 78 | +#endif /* USA */ |
| michael@95 | 79 | char PGP_EXTENSION[] = ".pgp"; |
| michael@95 | 80 | char ASC_EXTENSION[] = ".asc"; |
| michael@95 | 81 | char SIG_EXTENSION[] = ".sig"; |
| michael@95 | 82 | @@ -390,13 +392,15 @@ |
| michael@95 | 83 | #ifdef USA |
| michael@95 | 84 | fputs(LANG(signon_legalese), stderr); |
| michael@95 | 85 | #endif |
| michael@95 | 86 | - fputs( |
| michael@95 | 87 | #ifdef USA |
| michael@95 | 88 | + fputs( |
| michael@95 | 89 | LANG("Export of this software may be restricted by the U.S. government.\n"), |
| michael@95 | 90 | -#else |
| michael@95 | 91 | -LANG("International version - not for use in the USA. Does not use RSAREF.\n"), |
| michael@95 | 92 | -#endif |
| michael@95 | 93 | + /* |
| michael@95 | 94 | + * Non-RSAREF warning removed (now that RSA patent has expired) |
| michael@95 | 95 | + * by Rich Wales <richw@webcom.com>, 06oct2000 |
| michael@95 | 96 | + */ |
| michael@95 | 97 | stderr); |
| michael@95 | 98 | +#endif |
| michael@95 | 99 | |
| michael@95 | 100 | get_timestamp((byte *) & tstamp); /* timestamp points to tstamp */ |
| michael@95 | 101 | fprintf(pgpout, LANG("Current time: %s\n"), ctdate(&tstamp)); |
