tetex/tetex.patch@300d43423c2e (annotated)
tetex/tetex.patch
Wed, 08 Feb 2012 20:07:00 +0200
- author
- Michael Schloh von Bennewitz <michael@schloh.com>
- date
- Wed, 08 Feb 2012 20:07:00 +0200
- changeset 588
- 300d43423c2e
- parent 505
- 0838649dd325
- permissions
- -rw-r--r--
Update version, adapt patch, correct PID writing, correct build on newer
FreeBSD releases, and most importantly introduce new patch to try to
avoid segfault caused by multiple network interfaces with the same (or
no) address. This is common when configuring bridges and tunnels.
| michael@505 | 1 | Index: texk/gsftopk/gsftopk.c |
| michael@505 | 2 | --- texk/gsftopk/gsftopk.c.orig 2005-03-15 13:05:16.817449597 +0100 |
| michael@505 | 3 | +++ texk/gsftopk/gsftopk.c 2005-03-15 13:06:07.241499293 +0100 |
| michael@505 | 4 | @@ -417,7 +417,7 @@ |
| michael@505 | 5 | Boolean dosnames = False; |
| michael@505 | 6 | Boolean quiet = False; |
| michael@505 | 7 | |
| michael@505 | 8 | -struct option { |
| michael@505 | 9 | +struct option_loc { |
| michael@505 | 10 | const char *longname; |
| michael@505 | 11 | short shortname; |
| michael@505 | 12 | Boolean has_arg; |
| michael@505 | 13 | @@ -425,7 +425,7 @@ |
| michael@505 | 14 | int value; |
| michael@505 | 15 | }; |
| michael@505 | 16 | |
| michael@505 | 17 | -static const struct option options[] = { |
| michael@505 | 18 | +static const struct option_loc options[] = { |
| michael@505 | 19 | {"test", 't', False, &test, True}, |
| michael@505 | 20 | {"mapline", 0, True, &mapline, 0}, |
| michael@505 | 21 | {"mapfile", 0, True, &mapfile, 0}, |
| michael@505 | 22 | @@ -2099,8 +2099,8 @@ |
| michael@505 | 23 | |
| michael@505 | 24 | argp = argv; |
| michael@505 | 25 | while (++argp < argv + argc && (*argp)[0] == '-') { |
| michael@505 | 26 | - const struct option *opt_ptr; |
| michael@505 | 27 | - const struct option *opt; |
| michael@505 | 28 | + const struct option_loc *opt_ptr; |
| michael@505 | 29 | + const struct option_loc *opt; |
| michael@505 | 30 | char *arg = *argp + 1; |
| michael@505 | 31 | |
| michael@505 | 32 | if (*arg == '\0') --arg; /* this will flag an error later */ |
| michael@505 | 33 | |
| michael@505 | 34 | Index: texk/dvipsk/texc.script |
| michael@505 | 35 | --- texk/dvipsk/texc.script.orig 2005-09-25 22:05:56 +0200 |
| michael@505 | 36 | +++ texk/dvipsk/texc.script 2005-09-25 22:05:56 +0200 |
| michael@505 | 37 | @@ -4,9 +4,7 @@ |
| michael@505 | 38 | # To use it, say |
| michael@505 | 39 | # texc.script tex.lpro texc.lpro |
| michael@505 | 40 | # |
| michael@505 | 41 | -ed $1 <<edscriptend |
| michael@505 | 42 | -/% begin code for uncompressed fonts only/d |
| michael@505 | 43 | -.,/% end code for uncompressed fonts only/d |
| michael@505 | 44 | -.,/% end of code for unpacking compressed fonts/s/% // |
| michael@505 | 45 | -w $2 |
| michael@505 | 46 | -edscriptend |
| michael@505 | 47 | +sed <$1 \ |
| michael@505 | 48 | +-e '/% end code for uncompressed fonts only/,/% end of code for unpacking compressed fonts/s/% //' \ |
| michael@505 | 49 | +-e '/% begin code for uncompressed fonts only/,/end code for uncompressed fonts only/d' \ |
| michael@505 | 50 | +>$2 |
| michael@505 | 51 | |
| michael@505 | 52 | Index: texk/web2c/omegafonts/pl.l |
| michael@505 | 53 | --- texk/web2c/omegafonts/pl.l.orig 2003-05-06 10:30:52 +0200 |
| michael@505 | 54 | +++ texk/web2c/omegafonts/pl.l 2007-12-22 12:11:05 +0100 |
| michael@505 | 55 | @@ -63,12 +63,6 @@ |
| michael@505 | 56 | |
| michael@505 | 57 | %} |
| michael@505 | 58 | |
| michael@505 | 59 | -/* For Solaris's lex, to increase tables sizes --RP */ |
| michael@505 | 60 | -/* Space before number keeps ancient flex happy. */ |
| michael@505 | 61 | -%e 4000 |
| michael@505 | 62 | -%p 7000 |
| michael@505 | 63 | -%n 1000 |
| michael@505 | 64 | - |
| michael@505 | 65 | ws [ \t]+ |
| michael@505 | 66 | hexnumber H{ws}[A-F0-9]+ |
| michael@505 | 67 | octnumber O{ws}[0-7]+ |
| michael@505 | 68 | Index: libs/ncurses/ncurses/tinfo/lib_baudrate.c |
| michael@505 | 69 | --- libs/ncurses/ncurses/tinfo/lib_baudrate.c.orig 2002-01-20 00:07:53 +0100 |
| michael@505 | 70 | +++ libs/ncurses/ncurses/tinfo/lib_baudrate.c 2010-01-08 10:40:05 +0100 |
| michael@505 | 71 | @@ -46,7 +46,7 @@ |
| michael@505 | 72 | * of the indices up to B115200 fit nicely in a 'short', allowing us to retain |
| michael@505 | 73 | * ospeed's type for compatibility. |
| michael@505 | 74 | */ |
| michael@505 | 75 | -#if defined(__FreeBSD__) || defined(__NetBSD__) || defined(__OpenBSD__) |
| michael@505 | 76 | +#if defined(__NetBSD__) || defined(__OpenBSD__) |
| michael@505 | 77 | #undef B0 |
| michael@505 | 78 | #undef B50 |
| michael@505 | 79 | #undef B75 |
| michael@505 | 80 | Index: libs/gd/gd_png.c |
| michael@505 | 81 | --- libs/gd/gd_png.c.orig 2004-10-28 20:09:52 +0200 |
| michael@505 | 82 | +++ libs/gd/gd_png.c 2010-01-08 10:57:27 +0100 |
| michael@505 | 83 | @@ -143,7 +143,7 @@ |
| michael@505 | 84 | /* first do a quick check that the file really is a PNG image; could |
| michael@505 | 85 | * have used slightly more general png_sig_cmp() function instead */ |
| michael@505 | 86 | gdGetBuf (sig, 8, infile); |
| michael@505 | 87 | - if (!png_check_sig (sig, 8)) |
| michael@505 | 88 | + if (png_sig_cmp (sig, 0, 8) > 0) |
| michael@505 | 89 | return NULL; /* bad signature */ |
| michael@505 | 90 | |
| michael@505 | 91 | #ifndef PNG_SETJMP_NOT_SUPPORTED |
| michael@505 | 92 | Index: texk/dvipdfm/pngimage.c |
| michael@505 | 93 | --- texk/dvipdfm/pngimage.c.orig 2002-12-25 18:51:16 +0100 |
| michael@505 | 94 | +++ texk/dvipdfm/pngimage.c 2010-01-08 10:58:28 +0100 |
| michael@505 | 95 | @@ -42,7 +42,7 @@ |
| michael@505 | 96 | rewind (png_file); |
| michael@505 | 97 | if (fread (sigbytes, 1, sizeof(sigbytes), png_file) != |
| michael@505 | 98 | sizeof(sigbytes) || |
| michael@505 | 99 | - (!png_check_sig (sigbytes, sizeof(sigbytes)))) |
| michael@505 | 100 | + (png_sig_cmp (sigbytes, 0, sizeof(sigbytes)) > 0)) |
| michael@505 | 101 | return 0; |
| michael@505 | 102 | else |
| michael@505 | 103 | return 1; |
| michael@505 | 104 | Index: texk/dvipdfm/thumbnail.c |
| michael@505 | 105 | --- texk/dvipdfm/thumbnail.c.orig 2002-12-25 18:51:16 +0100 |
| michael@505 | 106 | +++ texk/dvipdfm/thumbnail.c 2010-01-08 10:58:39 +0100 |
| michael@505 | 107 | @@ -79,7 +79,7 @@ |
| michael@505 | 108 | } |
| michael@505 | 109 | if (fread (sigbytes, 1, sizeof(sigbytes), thumb_file) != |
| michael@505 | 110 | sizeof(sigbytes) || |
| michael@505 | 111 | - (!png_check_sig (sigbytes, sizeof(sigbytes)))) { |
| michael@505 | 112 | + (png_sig_cmp (sigbytes, 0, sizeof(sigbytes)) > 0)) { |
| michael@505 | 113 | fprintf (stderr, "\nThumbnail not a png file! Skipping\n"); |
| michael@505 | 114 | return NULL; |
| michael@505 | 115 | } |
| michael@506 | 116 | Index: texk/dvipsk/afm2tfm.c |
| michael@506 | 117 | --- texk/dvipsk/afm2tfm.c.orig 2005-01-30 14:17:09.000000000 +0100 |
| michael@506 | 118 | +++ texk/dvipsk/afm2tfm.c 2012-08-10 13:51:16.204770293 +0200 |
| michael@506 | 119 | @@ -40,6 +40,9 @@ |
| michael@506 | 120 | #endif |
| michael@506 | 121 | #endif /* KPATHSEA */ |
| michael@506 | 122 | |
| michael@506 | 123 | +/* Definitions to accommodate flawed or defective code. */ |
| michael@506 | 124 | +#define getline local_getline |
| michael@506 | 125 | + |
| michael@506 | 126 | /* JLH: added these to make the code easier to read and remove some |
| michael@506 | 127 | ascii<->ebcdic dependencies */ |
| michael@506 | 128 | #define ASCII_A 65 |
| michael@506 | 129 | Index: texk/web2c/cpascal.h |
| michael@506 | 130 | --- texk/web2c/cpascal.h.orig 2004-08-28 22:49:59.000000000 +0200 |
| michael@506 | 131 | +++ texk/web2c/cpascal.h 2012-08-10 13:50:28.634075696 +0200 |
| michael@506 | 132 | @@ -241,6 +241,10 @@ |
| michael@506 | 133 | #define getname vms_getname |
| michael@506 | 134 | #endif |
| michael@506 | 135 | |
| michael@506 | 136 | +/* Definitions to accommodate flawed or defective code. */ |
| michael@506 | 137 | + |
| michael@506 | 138 | +#define getline local_getline |
| michael@506 | 139 | + |
| michael@506 | 140 | /* Declarations for the routines we provide ourselves in lib/. */ |
| michael@506 | 141 | |
| michael@506 | 142 | extern string basenamechangesuffix P3H(const_string,const_string,const_string); |
