diff options
| author | wiz <wiz@pkgsrc.org> | 2009-09-29 17:10:38 +0000 |
|---|---|---|
| committer | wiz <wiz@pkgsrc.org> | 2009-09-29 17:10:38 +0000 |
| commit | 5a70b561b8bdb0a83e4dab997915ab45c22c5d99 (patch) | |
| tree | 14f8422fdb1251b674efc91b385c2a9ff4f5a039 /security | |
| parent | fb815aa40d98c7e7214a46c2111346a55c0dc45d (diff) | |
| download | pkgsrc-5a70b561b8bdb0a83e4dab997915ab45c22c5d99.tar.gz | |
Fix build on systems with native getline() function.
From Anon.
Diffstat (limited to 'security')
| -rw-r--r-- | security/pgp2/distinfo | 3 | ||||
| -rw-r--r-- | security/pgp2/patches/patch-ai | 49 |
2 files changed, 51 insertions, 1 deletions
diff --git a/security/pgp2/distinfo b/security/pgp2/distinfo index 8744f0fc462..0029568a07d 100644 --- a/security/pgp2/distinfo +++ b/security/pgp2/distinfo @@ -1,4 +1,4 @@ -$NetBSD: distinfo,v 1.6 2006/09/28 16:21:46 tron Exp $ +$NetBSD: distinfo,v 1.7 2009/09/29 17:10:38 wiz Exp $ SHA1 (pgp263is.tar.gz) = 031e061ba1d62d7db35f1f854c489867e88f421d RMD160 (pgp263is.tar.gz) = b1cba2be918cecc8b9062272d43626c8876fa7f4 @@ -11,3 +11,4 @@ SHA1 (patch-ae) = 307dddd61ef0ee3257a11822fc7bd423c5fd784f SHA1 (patch-af) = 6f58d2b26a16886947f2e5681a672a7cf9979f42 SHA1 (patch-ag) = 377b17bc3783737c492708de57d6f4259e358a66 SHA1 (patch-ah) = 15fe0597566ad8bf3123a54d3697e104e85ee425 +SHA1 (patch-ai) = 3afafb582e229e70721d7ee96d25d7d1d006d870 diff --git a/security/pgp2/patches/patch-ai b/security/pgp2/patches/patch-ai new file mode 100644 index 00000000000..f64be171ac1 --- /dev/null +++ b/security/pgp2/patches/patch-ai @@ -0,0 +1,49 @@ +$NetBSD: patch-ai,v 1.1 2009/09/29 17:10:38 wiz Exp $ + +--- armor.c.orig 1996-01-17 19:37:20.000000000 +0000 ++++ armor.c +@@ -343,7 +343,7 @@ copyline(FILE * in, FILE * out) + * idea. + */ + static int +-getline(char *buf, int n, FILE * f) ++get_line(char *buf, int n, FILE * f) + { + int state; + char *p; +@@ -376,7 +376,7 @@ getline(char *buf, int n, FILE * f) + return 0; /* Out of buffer space */ + } + } /* for (;;) */ +-} /* getline */ ++} /* get_line */ + + #if 1 + /* This limit is advisory only; longer lines are handled properly. +@@ -547,7 +547,7 @@ armor_file(char *infilename, char *outfi + return 1; + } + fprintf(outFile, "-----BEGIN PGP SIGNED MESSAGE-----\n\n"); +- while ((i = getline(buffer, sizeof buffer, clearFile)) >= 0) { ++ while ((i = get_line(buffer, sizeof buffer, clearFile)) >= 0) { + /* Quote lines beginning with '-' as per RFC1113; + * Also quote lines beginning with "From "; this is + * for Unix mailers which add ">" to such lines. +@@ -1231,7 +1231,7 @@ LANG("\n\007Unable to write ciphertext o + for (;;) { + ++infile_line; + nline = status; +- status = getline(buf, sizeof buf, in); ++ status = get_line(buf, sizeof buf, in); + if (status < 0) { + fprintf(pgpout, + LANG("ERROR: ASCII armor decode input ended unexpectedly!\n")); +@@ -1249,7 +1249,7 @@ LANG("ERROR: ASCII armor decode input en + /* Copy trailing part of line, if any. */ + if (!status) + status = copyline(in, litout); +- /* Ignore error; getline will discover it again */ ++ /* Ignore error; get_line will discover it again */ + } + fflush(litout); + if (ferror(litout)) { |