diff options
Diffstat (limited to 'print/teTeX-bin/patches')
-rw-r--r-- | print/teTeX-bin/patches/patch-aa | 14 | ||||
-rw-r--r-- | print/teTeX-bin/patches/patch-ab | 178 | ||||
-rw-r--r-- | print/teTeX-bin/patches/patch-ac | 13 | ||||
-rw-r--r-- | print/teTeX-bin/patches/patch-ad | 13 | ||||
-rw-r--r-- | print/teTeX-bin/patches/patch-ae | 12 | ||||
-rw-r--r-- | print/teTeX-bin/patches/patch-af | 36 | ||||
-rw-r--r-- | print/teTeX-bin/patches/patch-ag | 196 | ||||
-rw-r--r-- | print/teTeX-bin/patches/patch-ah | 15 | ||||
-rw-r--r-- | print/teTeX-bin/patches/patch-ai | 16 | ||||
-rw-r--r-- | print/teTeX-bin/patches/patch-aj | 37 | ||||
-rw-r--r-- | print/teTeX-bin/patches/patch-ak | 67 | ||||
-rw-r--r-- | print/teTeX-bin/patches/patch-ap | 110 | ||||
-rw-r--r-- | print/teTeX-bin/patches/patch-aq | 16 |
13 files changed, 0 insertions, 723 deletions
diff --git a/print/teTeX-bin/patches/patch-aa b/print/teTeX-bin/patches/patch-aa deleted file mode 100644 index 0ed8889513e..00000000000 --- a/print/teTeX-bin/patches/patch-aa +++ /dev/null @@ -1,14 +0,0 @@ -$NetBSD: patch-aa,v 1.4 2004/10/11 04:54:05 minskim Exp $ - ---- texk/configure.in.orig Mon Jan 13 11:32:40 2003 -+++ texk/configure.in -@@ -29,6 +29,9 @@ dnl Pass this down from the top level so - dnl install kpathsea a command line value is propagated. - AC_PROG_INSTALL - -+AC_CONFIG_HEADER(ac_config.h) -+AC_HEADER_SYS_WAIT -+ - dnl If the other programs ever acquire their own --with or --enable - dnl options, they must be added, so configure --help at the top level - dnl will show all the options. diff --git a/print/teTeX-bin/patches/patch-ab b/print/teTeX-bin/patches/patch-ab deleted file mode 100644 index 8778fbc0345..00000000000 --- a/print/teTeX-bin/patches/patch-ab +++ /dev/null @@ -1,178 +0,0 @@ -$NetBSD: patch-ab,v 1.4 2004/10/11 04:54:05 minskim Exp $ - ---- texk/configure.orig Mon Feb 17 22:12:51 2003 -+++ texk/configure -@@ -1082,6 +1082,50 @@ test -z "$INSTALL_DATA" && INSTALL_DATA= - - - -+echo $ac_n "checking for sys/wait.h that is POSIX.1 compatible""... $ac_c" 1>&6 -+echo "configure:1070: checking for sys/wait.h that is POSIX.1 compatible" >&5 -+if eval "test \"`echo '$''{'ac_cv_header_sys_wait_h'+set}'`\" = set"; then -+ echo $ac_n "(cached) $ac_c" 1>&6 -+else -+ cat > conftest.$ac_ext <<EOF -+#line 1075 "configure" -+#include "confdefs.h" -+#include <sys/types.h> -+#include <sys/wait.h> -+#ifndef WEXITSTATUS -+#define WEXITSTATUS(stat_val) ((unsigned)(stat_val) >> 8) -+#endif -+#ifndef WIFEXITED -+#define WIFEXITED(stat_val) (((stat_val) & 255) == 0) -+#endif -+int main() { -+int s; -+wait (&s); -+s = WIFEXITED (s) ? WEXITSTATUS (s) : 1; -+; return 0; } -+EOF -+if { (eval echo configure:1091: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then -+ rm -rf conftest* -+ ac_cv_header_sys_wait_h=yes -+else -+ echo "configure: failed program was:" >&5 -+ cat conftest.$ac_ext >&5 -+ rm -rf conftest* -+ ac_cv_header_sys_wait_h=no -+fi -+rm -f conftest* -+fi -+ -+echo "$ac_t""$ac_cv_header_sys_wait_h" 1>&6 -+if test $ac_cv_header_sys_wait_h = yes; then -+ cat >> confdefs.h <<\EOF -+#define HAVE_SYS_WAIT_H 1 -+EOF -+ -+fi -+ -+ -+ - - # Check whether --with-bibtex8 or --without-bibtex8 was given. - if test "${with_bibtex8+set}" = set; then -@@ -2010,7 +2054,7 @@ done - ac_given_srcdir=$srcdir - ac_given_INSTALL="$INSTALL" - --trap 'rm -fr `echo "Makefile" | sed "s/:[^ ]*//g"` conftest*; exit 1' 1 2 15 -+trap 'rm -fr `echo "Makefile ac_config.h" | sed "s/:[^ ]*//g"` conftest*; exit 1' 1 2 15 - EOF - cat >> $CONFIG_STATUS <<EOF - -@@ -2199,6 +2243,113 @@ s%@INSTALL@%$INSTALL%g - " | (eval "$ac_sed_cmds") > $ac_file - fi; done - rm -f conftest.s* -+ -+# These sed commands are passed to sed as "A NAME B NAME C VALUE D", where -+# NAME is the cpp macro being defined and VALUE is the value it is being given. -+# -+# ac_d sets the value in "#define NAME VALUE" lines. -+ac_dA='s%^\([ ]*\)#\([ ]*define[ ][ ]*\)' -+ac_dB='\([ ][ ]*\)[^ ]*%\1#\2' -+ac_dC='\3' -+ac_dD='%g' -+# ac_u turns "#undef NAME" with trailing blanks into "#define NAME VALUE". -+ac_uA='s%^\([ ]*\)#\([ ]*\)undef\([ ][ ]*\)' -+ac_uB='\([ ]\)%\1#\2define\3' -+ac_uC=' ' -+ac_uD='\4%g' -+# ac_e turns "#undef NAME" without trailing blanks into "#define NAME VALUE". -+ac_eA='s%^\([ ]*\)#\([ ]*\)undef\([ ][ ]*\)' -+ac_eB='$%\1#\2define\3' -+ac_eC=' ' -+ac_eD='%g' -+ -+if test "${CONFIG_HEADERS+set}" != set; then -+EOF -+cat >> $CONFIG_STATUS <<EOF -+ CONFIG_HEADERS="ac_config.h" -+EOF -+cat >> $CONFIG_STATUS <<\EOF -+fi -+for ac_file in .. $CONFIG_HEADERS; do if test "x$ac_file" != x..; then -+ # Support "outfile[:infile[:infile...]]", defaulting infile="outfile.in". -+ case "$ac_file" in -+ *:*) ac_file_in=`echo "$ac_file"|sed 's%[^:]*:%%'` -+ ac_file=`echo "$ac_file"|sed 's%:.*%%'` ;; -+ *) ac_file_in="${ac_file}.in" ;; -+ esac -+ -+ echo creating $ac_file -+ -+ rm -f conftest.frag conftest.in conftest.out -+ ac_file_inputs=`echo $ac_file_in|sed -e "s%^%$ac_given_srcdir/%" -e "s%:% $ac_given_srcdir/%g"` -+ cat $ac_file_inputs > conftest.in -+ -+EOF -+ -+# Transform confdefs.h into a sed script conftest.vals that substitutes -+# the proper values into ac_config.h.in to produce ac_config.h. And first: -+# Protect against being on the right side of a sed subst in config.status. -+# Protect against being in an unquoted here document in config.status. -+rm -f conftest.vals -+cat > conftest.hdr <<\EOF -+s/[\\&%]/\\&/g -+s%[\\$`]%\\&%g -+s%#define \([A-Za-z_][A-Za-z0-9_]*\) *\(.*\)%${ac_dA}\1${ac_dB}\1${ac_dC}\2${ac_dD}%gp -+s%ac_d%ac_u%gp -+s%ac_u%ac_e%gp -+EOF -+sed -n -f conftest.hdr confdefs.h > conftest.vals -+rm -f conftest.hdr -+ -+# This sed command replaces #undef with comments. This is necessary, for -+# example, in the case of _POSIX_SOURCE, which is predefined and required -+# on some systems where configure will not decide to define it. -+cat >> conftest.vals <<\EOF -+s%^[ ]*#[ ]*undef[ ][ ]*[a-zA-Z_][a-zA-Z_0-9]*%/* & */% -+EOF -+ -+# Break up conftest.vals because some shells have a limit on -+# the size of here documents, and old seds have small limits too. -+ -+rm -f conftest.tail -+while : -+do -+ ac_lines=`grep -c . conftest.vals` -+ # grep -c gives empty output for an empty file on some AIX systems. -+ if test -z "$ac_lines" || test "$ac_lines" -eq 0; then break; fi -+ # Write a limited-size here document to conftest.frag. -+ echo ' cat > conftest.frag <<CEOF' >> $CONFIG_STATUS -+ sed ${ac_max_here_lines}q conftest.vals >> $CONFIG_STATUS -+ echo 'CEOF -+ sed -f conftest.frag conftest.in > conftest.out -+ rm -f conftest.in -+ mv conftest.out conftest.in -+' >> $CONFIG_STATUS -+ sed 1,${ac_max_here_lines}d conftest.vals > conftest.tail -+ rm -f conftest.vals -+ mv conftest.tail conftest.vals -+done -+rm -f conftest.vals -+ -+cat >> $CONFIG_STATUS <<\EOF -+ rm -f conftest.frag conftest.h -+ echo "/* $ac_file. Generated automatically by configure. */" > conftest.h -+ cat conftest.in >> conftest.h -+ rm -f conftest.in -+ if cmp -s $ac_file conftest.h 2>/dev/null; then -+ echo "$ac_file is unchanged" -+ rm -f conftest.h -+ else -+ # Remove last slash and all that follows it. Not all systems have dirname. -+ ac_dir=`echo $ac_file|sed 's%/[^/][^/]*$%%'` -+ if test "$ac_dir" != "$ac_file" && test "$ac_dir" != .; then -+ # The file is in a subdirectory. -+ test ! -d "$ac_dir" && mkdir "$ac_dir" -+ fi -+ rm -f $ac_file -+ mv conftest.h $ac_file -+ fi -+fi; done - - EOF - cat >> $CONFIG_STATUS <<EOF diff --git a/print/teTeX-bin/patches/patch-ac b/print/teTeX-bin/patches/patch-ac deleted file mode 100644 index 13ded76575f..00000000000 --- a/print/teTeX-bin/patches/patch-ac +++ /dev/null @@ -1,13 +0,0 @@ -$NetBSD: patch-ac,v 1.2 2003/12/24 12:51:31 jmmv Exp $ - ---- texk/oxdvik/Makefile.in.orig Mon Feb 3 03:53:12 2003 -+++ texk/oxdvik/Makefile.in Fri Feb 21 10:20:33 2003 -@@ -20,7 +20,7 @@ - x_ext_lib = @x_ext_lib@ - # Follow the library order used in X11R6 itself: - # -lXaw -lXmu -lXt -lSM -lICE -lXext -lX11 (some may not be present). --x_link = $(LDLIBWWW) $(LDLIBT1) $(x_ldflags) $(x_tool_libs) $(x_pre_libs) $(x_ext_lib) -lX11 $(x_extra_libs) -+x_link = $(LDLIBWWW) $(LDLIBT1) $(x_ldflags) $(x_tool_libs) $(x_pre_libs) $(x_ext_lib) -lX11 $(x_extra_libs) -lz - - LDLIBWWW=@LDLIBWWW@ - LIBWWWCPPFLAGS=@LIBWWWCPPFLAGS@ diff --git a/print/teTeX-bin/patches/patch-ad b/print/teTeX-bin/patches/patch-ad deleted file mode 100644 index d09f7254bc9..00000000000 --- a/print/teTeX-bin/patches/patch-ad +++ /dev/null @@ -1,13 +0,0 @@ -$NetBSD: patch-ad,v 1.2 2003/12/24 12:51:31 jmmv Exp $ - ---- texk/xdvik/Makefile.in.orig Mon Feb 3 03:53:22 2003 -+++ texk/xdvik/Makefile.in Fri Feb 21 10:22:23 2003 -@@ -20,7 +20,7 @@ - x_ext_lib = @x_ext_lib@ - # Follow the library order used in X11R6 itself: - # -lXaw -lXmu -lXt -lSM -lICE -lXext -lX11 (some may not be present). --x_link = $(LDLIBWWW) $(LDLIBT1) $(x_ldflags) $(x_tool_libs) $(x_pre_libs) $(x_ext_lib) -lX11 $(x_extra_libs) -+x_link = $(LDLIBWWW) $(LDLIBT1) $(x_ldflags) $(x_tool_libs) $(x_pre_libs) $(x_ext_lib) -lX11 $(x_extra_libs) -lz - - LDLIBWWW=@LDLIBWWW@ - LIBWWWCPPFLAGS=@LIBWWWCPPFLAGS@ diff --git a/print/teTeX-bin/patches/patch-ae b/print/teTeX-bin/patches/patch-ae deleted file mode 100644 index 7ee84932b93..00000000000 --- a/print/teTeX-bin/patches/patch-ae +++ /dev/null @@ -1,12 +0,0 @@ -$NetBSD: patch-ae,v 1.3 2004/10/11 04:54:05 minskim Exp $ - ---- texk/ac_config.h.in.orig Sun Oct 10 22:15:08 2004 -+++ texk/ac_config.h.in -@@ -0,0 +1,7 @@ -+/* ac_config.h.in. Generated automatically from configure.in by autoheader. */ -+ -+/* Define if you have <sys/wait.h> that is POSIX.1 compatible. */ -+#undef HAVE_SYS_WAIT_H -+ -+/* Define if you need to in order for stat and other things to work. */ -+#undef _POSIX_SOURCE diff --git a/print/teTeX-bin/patches/patch-af b/print/teTeX-bin/patches/patch-af deleted file mode 100644 index acd9469f3eb..00000000000 --- a/print/teTeX-bin/patches/patch-af +++ /dev/null @@ -1,36 +0,0 @@ -$NetBSD: patch-af,v 1.3 2004/10/11 04:54:05 minskim Exp $ - ---- texk/web2c/lib/coredump.c.orig Thu Jan 16 13:51:12 1997 -+++ texk/web2c/lib/coredump.c -@@ -9,6 +9,7 @@ - you. Perl has some things to say about these days. */ - - #include "config.h" -+#include "ac_config.h" - - /* Do not try to compile this Unix-y unportable stuff unless it's needed. */ - -@@ -29,7 +30,11 @@ funny_core_dump P1H(void) - } - #else /* !__EMX__ */ - int pid, w; -+#ifdef HAVE_SYS_WAIT_H -+ int status; -+#else - union wait status; -+#endif - - switch (pid = fork ()) - { -@@ -48,7 +53,11 @@ funny_core_dump P1H(void) - default: /* parent */ - while ((w = wait (&status)) != pid && w != -1) - ; -+#ifdef HAVE_SYS_WAIT_H -+ if (WCOREDUMP(status)) -+#else - if (status.w_coredump) -+#endif - exit (0); - (void) write (2, "attempt to dump core failed\n", 28); - exit (1); diff --git a/print/teTeX-bin/patches/patch-ag b/print/teTeX-bin/patches/patch-ag deleted file mode 100644 index 97c70a557eb..00000000000 --- a/print/teTeX-bin/patches/patch-ag +++ /dev/null @@ -1,196 +0,0 @@ -$NetBSD: patch-ag,v 1.4 2004/10/22 19:32:35 jmmv Exp $ - -This diff is taken from the url below: -http://cvs.sourceforge.net/viewcvs.py/xdvi/xdvik/texk/xdvik/xdvizilla?r1=text&tr1=1.2&r2=text&tr2=1.10&diff_format=u - -=================================================================== -RCS file: /cvsroot/xdvi/xdvik/texk/xdvik/xdvizilla,v -retrieving revision 1.2 -retrieving revision 1.10 -diff -u -r1.2 -r1.10 ---- texk/xdvik/xdvizilla 2002/10/12 13:29:17 1.2 -+++ texk/xdvik/xdvizilla 2004/02/24 22:37:37 1.10 -@@ -1,11 +1,68 @@ - #! /bin/sh -- -+# - # This is a kludge to fix helper apps in mozilla. See mozilla bugs #57420 - # and also #78919. -- -+# - # It's also useful for tar files with Netscape 4.x -+# -+# Copyright (c) 2002-2004 Paul Vojta -+# -+# Permission is hereby granted, free of charge, to any person obtaining a copy -+# of this software and associated documentation files (the "Software"), to -+# deal in the Software without restriction, including without limitation the -+# rights to use, copy, modify, merge, publish, distribute, sublicense, and/or -+# sell copies of the Software, and to permit persons to whom the Software is -+# furnished to do so, subject to the following conditions: -+# -+# The above copyright notice and this permission notice shall be included in -+# all copies or substantial portions of the Software. -+# -+# THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, -+# EXPRESS OR IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF -+# MERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. -+# IN NO EVENT SHALL PAUL VOJTA OR ANY OTHER AUTHOR OF OR CONTRIBUTOR TO -+# THIS SOFTWARE BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER LIABILITY, -+# WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, -+# OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS -+# IN THE SOFTWARE. -+ -+# Some changes suggested by Thomas Esser included by -+# <stefanulrich@users.sourceforge.net>. - -+IN_FILE= - NO_RM= -+TMP_DIR= -+progname=xdvizilla -+ -+do_cleanup() -+{ -+ exitval=$? -+ if [ -z "$NO_RM" -a -n "$IN_FILE" ] ; then -+ rm -f "$IN_FILE" -+ fi -+ test -n "$TMP_DIR" && rm -rf "$TMP_DIR" -+ exit $exitval -+} -+ -+do_abort() -+{ -+ xmessage -nearmouse "$progname: $1" -+ do_cleanup -+ exit 1 -+} -+ -+usage() -+{ -+ xmessage -nearmouse "Usage: $progname [-no-rm] <file>" -+ do_cleanup -+ exit 1 -+} -+ -+trap 'do_cleanup' 1 2 3 7 13 15 -+ -+### create a temporary directory only read/writable by user -+TMP_DIR=${TMP-/tmp}/$progname.$$ -+(umask 077; mkdir "$TMP_DIR") || do_abort "Could not create directory \`$TMP_DIR'" - - if [ $# -gt 1 -a "x$1" = "x-no-rm" ]; then - NO_RM=y -@@ -13,8 +70,7 @@ - fi - - if [ $# -ne 1 ]; then -- xmessage -nearmouse 'Usage: xdvizilla [-no-rm] <file>' -- exit 1 -+ usage - fi - - DIR=`dirname "$0"` -@@ -27,55 +83,52 @@ - DIR= - fi - --FILE=$1 --FILETYPE=`file "$FILE"` -- --case "$FILETYPE" in -- -- *"gzip compressed data"*) -- FILE=/tmp/xdvizilla$$ -- gunzip -c "$1" > $FILE -- [ -n "$NO_RM" ] || rm -f -- "$1" -- NO_RM= -- FILETYPE=`file "$FILE"` -- ;; -- -- *"compressed data"* | *"compress'd data"*) -- FILE=/tmp/xdvizilla$$ -- uncompress -c "$1" > $FILE -- [ -n "$NO_RM" ] || rm -f -- "$1" -- NO_RM= -- FILETYPE=`file "$FILE"` -- ;; -- -- "$1: empty") -- xmessage -nearmouse "$1 is an empty file --(this is a bug in Mozilla)" -- [ -n "$NO_RM" ] || rm -f -- "$1" -- exit 1 -- ;; -- --esac -- --case "$FILETYPE" in -- -- *" tar archive") -- TARDIR=/tmp/xdvitar$$ -- mkdir $TARDIR -- cat "$FILE" | (cd $TARDIR; tar xf -) -- DVINAME=`tar tf "$FILE" | grep '\.dvi$' | head -1` -- [ -n "$NO_RM" ] || rm -f -- "$FILE" -- if [ -z "$DVINAME" ]; then -- xmessage -nearmouse "Tar file does not contain a dvi file" -- else -- (cd $TARDIR; "$DIR"xdvi -safer "$DVINAME") -- fi -- rm -rf $TARDIR -- ;; -+# need to preserve IN_FILE for eventual deletion -+IN_FILE="$1" -+TMP_FILE="$IN_FILE" -+ -+while [ 1 ]; do -+ [ -f "$TMP_FILE" ] || do_abort "$TMP_FILE: File not found." -+ FILETYPE=`file "$TMP_FILE"` -+ case "$FILETYPE" in -+ *"gzip compressed data"*) -+ out="$TMP_DIR"/tmp-gz -+ gunzip -c "$TMP_FILE" > "$out" -+ TMP_FILE="$out" -+ ;; -+ *"compressed data"* | *"compress'd data"*) -+ out="$TMP_DIR"/tmp-compress -+ uncompress -c "$TMP_FILE" > "$out" -+ TMP_FILE="$out" -+ ;; -+ "$TMP_FILE: empty") -+ do_abort "$TMP_FILE is an empty file -+(probably a bug in Mozilla?)" -+ ;; -+ *" tar archive") -+ ### do sanity checks on the tar archive, to avoid overwriting user files: -+ dangerous=`tar tf "$TMP_FILE" | egrep '^(/|.*\.\./)'` -+ [ -z "$dangerous" ] || do_abort "Tar file contains files with absolute paths or \`../' components, -+which may overwrite user files. Not unpacking it." -+ ### also check for gzipped DVI files inside the archive ... -+ out="$TMP_DIR"/`tar tf "$TMP_FILE" | egrep '\.(dvi|dvi.gz|dvi.Z)$' | head -1` -+ if [ -z "$out" ]; then -+ do_abort "Tar file does not contain a dvi file." -+ else -+ cat "$TMP_FILE" | (cd "$TMP_DIR"; tar xf -) -+ TMP_FILE="$out" -+ fi -+ ;; -+ *"DVI file"*) -+ "$DIR"xdvi -safer "$TMP_FILE" -+ break -+ ;; -+ *) -+ do_abort "$TMP_FILE: Unrecognized file format!" -+ ;; -+ esac -+done - -- *) -- "$DIR"xdvi -safer "$FILE" -- [ -n "$NO_RM" ] || rm -f -- "$FILE" -- ;; -+do_cleanup - --esac -+exit 0 diff --git a/print/teTeX-bin/patches/patch-ah b/print/teTeX-bin/patches/patch-ah deleted file mode 100644 index 0fb3b54e858..00000000000 --- a/print/teTeX-bin/patches/patch-ah +++ /dev/null @@ -1,15 +0,0 @@ -$NetBSD: patch-ah,v 1.3 2005/01/16 08:35:08 kei Exp $ - ---- libs/xpdf/xpdf/Gfx.cc.orig 2005-01-04 16:23:02.000000000 +0900 -+++ libs/xpdf/xpdf/Gfx.cc 2005-01-04 16:27:39.000000000 +0900 -@@ -2381,7 +2381,9 @@ - haveMask = gFalse; - dict->lookup("Mask", &maskObj); - if (maskObj.isArray()) { -- for (i = 0; i < maskObj.arrayGetLength(); ++i) { -+ for (i = 0; -+ i < maskObj.arrayGetLength() && i < 2*gfxColorMaxComps; -+ ++i) { - maskObj.arrayGet(i, &obj1); - maskColors[i] = obj1.getInt(); - obj1.free(); diff --git a/print/teTeX-bin/patches/patch-ai b/print/teTeX-bin/patches/patch-ai deleted file mode 100644 index 88c388e42e3..00000000000 --- a/print/teTeX-bin/patches/patch-ai +++ /dev/null @@ -1,16 +0,0 @@ -$NetBSD: patch-ai,v 1.3 2005/01/16 08:35:08 kei Exp $ - ---- libs/xpdf/xpdf/GfxState.cc.orig 2005-01-04 16:27:49.000000000 +0900 -+++ libs/xpdf/xpdf/GfxState.cc 2005-01-04 16:30:39.000000000 +0900 -@@ -708,6 +708,11 @@ - } - nCompsA = obj2.getInt(); - obj2.free(); -+ if (nCompsA > gfxColorMaxComps) { -+ error(-1, "ICCBased color space with too many (%d > %d) components", -+ nCompsA, gfxColorMaxComps); -+ nCompsA = gfxColorMaxComps; -+ } - if (dict->lookup("Alternate", &obj2)->isNull() || - !(altA = GfxColorSpace::parse(&obj2))) { - switch (nCompsA) { diff --git a/print/teTeX-bin/patches/patch-aj b/print/teTeX-bin/patches/patch-aj deleted file mode 100644 index e47294b51a8..00000000000 --- a/print/teTeX-bin/patches/patch-aj +++ /dev/null @@ -1,37 +0,0 @@ -$NetBSD: patch-aj,v 1.3 2005/01/17 12:19:13 kei Exp $ - ---- libs/xpdf/xpdf/Catalog.cc.orig Mon Nov 4 07:15:36 2002 -+++ libs/xpdf/xpdf/Catalog.cc Fri Oct 29 09:18:17 2004 -@@ -22,6 +22,7 @@ - #include "Error.h" - #include "Link.h" - #include "Catalog.h" -+#include <limits.h> - - //------------------------------------------------------------------------ - // Catalog -@@ -63,6 +64,12 @@ - } - pagesSize = numPages0 = obj.getInt(); - obj.free(); -+ if ((pagesSize >= INT_MAX / sizeof(Page *)) || -+ (pagesSize >= INT_MAX / sizeof(Ref))) { -+ error(-1, "Invalid 'pagesSize'"); -+ ok = gFalse; -+ return; -+ } - pages = (Page **)gmalloc(pagesSize * sizeof(Page *)); - pageRefs = (Ref *)gmalloc(pagesSize * sizeof(Ref)); - for (i = 0; i < pagesSize; ++i) { -@@ -190,6 +197,11 @@ - } - if (start >= pagesSize) { - pagesSize += 32; -+ if ((pagesSize >= INT_MAX/sizeof(Page *)) || -+ (pagesSize >= INT_MAX/sizeof(Ref))) { -+ error(-1, "Invalid 'pagesSize' parameter."); -+ goto err3; -+ } - pages = (Page **)grealloc(pages, pagesSize * sizeof(Page *)); - pageRefs = (Ref *)grealloc(pageRefs, pagesSize * sizeof(Ref)); - for (j = pagesSize - 32; j < pagesSize; ++j) { diff --git a/print/teTeX-bin/patches/patch-ak b/print/teTeX-bin/patches/patch-ak deleted file mode 100644 index a1fbbe3303c..00000000000 --- a/print/teTeX-bin/patches/patch-ak +++ /dev/null @@ -1,67 +0,0 @@ -$NetBSD: patch-ak,v 1.4 2005/01/24 15:22:16 kei Exp $ - ---- libs/xpdf/xpdf/XRef.cc.original 2005-01-24 23:15:21.000000000 +0900 -+++ libs/xpdf/xpdf/XRef.cc 2005-01-24 23:15:57.000000000 +0900 -@@ -28,6 +28,7 @@ - #include "Error.h" - #include "ErrorCodes.h" - #include "XRef.h" -+#include <limits.h> - - //------------------------------------------------------------------------ - -@@ -76,6 +77,11 @@ - - // trailer is ok - read the xref table - } else { -+ if ( size >= INT_MAX/sizeof(XRefEntry)) { -+ error(-1, "Invalid 'size' inside xref table."); -+ ok = gFalse; -+ return; -+ } - entries = (XRefEntry *)gmalloc(size * sizeof(XRefEntry)); - for (i = 0; i < size; ++i) { - entries[i].offset = 0xffffffff; -@@ -267,6 +273,10 @@ - // table size - if (first + n > size) { - newSize = size + 256; -+ if (newSize >= INT_MAX/sizeof(XRefEntry)) { -+ error(-1, "Invalid 'newSize'"); -+ goto err2; -+ } - entries = (XRefEntry *)grealloc(entries, newSize * sizeof(XRefEntry)); - for (i = size; i < newSize; ++i) { - entries[i].offset = 0xffffffff; -@@ -410,6 +420,10 @@ - if (!strncmp(p, "obj", 3)) { - if (num >= size) { - newSize = (num + 1 + 255) & ~255; -+ if (newSize >= INT_MAX / sizeof(XRefEntry)) { -+ error(-1, "Invalid 'obj' parameters."); -+ return gFalse; -+ } - entries = (XRefEntry *) - grealloc(entries, newSize * sizeof(XRefEntry)); - for (i = size; i < newSize; ++i) { -@@ -431,6 +445,10 @@ - } else if (!strncmp(p, "endstream", 9)) { - if (streamEndsLen == streamEndsSize) { - streamEndsSize += 64; -+ if (streamEndsSize >= INT_MAX/sizeof(int)) { -+ error(-1, "Invalid 'endstream' parameter."); -+ return gFalse; -+ } - streamEnds = (Guint *)grealloc(streamEnds, - streamEndsSize * sizeof(int)); - } -@@ -481,6 +499,9 @@ - } else { - keyLength = 5; - } -+ if (keyLength > 16) { -+ keyLength = 16; -+ } - permFlags = permissions.getInt(); - if (encVersion >= 1 && encVersion <= 2 && - encRevision >= 2 && encRevision <= 3) { diff --git a/print/teTeX-bin/patches/patch-ap b/print/teTeX-bin/patches/patch-ap deleted file mode 100644 index c558ffa708f..00000000000 --- a/print/teTeX-bin/patches/patch-ap +++ /dev/null @@ -1,110 +0,0 @@ -$NetBSD: patch-ap,v 1.5 2003/12/24 12:51:31 jmmv Exp $ - ---- texk/tetex/texconfig.orig 2003-03-01 10:13:18.000000000 +0100 -+++ texk/tetex/texconfig -@@ -7,8 +7,6 @@ - # Thomas Esser, te@dbs.uni-hannover.de - # Copyright: Thomas Esser, 1994, 1995, 1996, 1997, 1999, 2002. Public domain. - --# You may override DIALOG_TERMINFO and DIALOG_TERM in your environment. -- - version=teTeX - #version='TeX Live' - -@@ -192,29 +190,11 @@ abort() - cleanup - exit 1 - } -- --# Some systems have their own dialog. Use it then and do not use --# faked TERM and TERMINFO variables when calling that dialog. --find_dialogtype() --{ -- { u=`uname -s`; } 2>/dev/null -- case "$u" in -- FreeBSD|Linux) -- test -f /usr/bin/whiptail && DIALOG_PROG=/usr/bin/whiptail -- test -f /usr/bin/dialog && DIALOG_PROG=/usr/bin/dialog -- test -f /bin/dialog && DIALOG_PROG=/bin/dialog -- ;; -- esac --} - - run_dialog() - { - test -z "$NO_CLEAR" && tty >/dev/null 2>&1 && clear; -- if test -n "$DIALOG_PROG"; then -- $DIALOG_PROG --title "$version setup utility" ${1+"$@"} -- else -- TERM=$DIALOG_TERM TERMINFO=$DIALOG_TERMINFO tcdialog --title "$version setup utility" ${1+"$@"} -- fi -+ dialog --title "$version setup utility" "$@" - } - - check_environ() -@@ -293,22 +273,6 @@ fonts_rw() - echo "Done." >&2 - } - --check_terminal() --{ -- terminfo=${DIALOG_TERMINFO-/usr/lib/terminfo} -- -- test -f $terminfo/`echo $DIALOG_TERM | sed 's/\(.\).*/\1/'`/$DIALOG_TERM \ -- && return -- -- cat >&2 <<eof --TERM=$DIALOG_TERM is not supported by your terminfo system. --See terminfo(5), tic(1m) and term(5) for help. -- --$progname failed. Program aborted. --eof -- exit_return 1 --} -- - fix_pager_more() - { - case "$PAGER" in -@@ -1454,7 +1418,7 @@ echo_file_location() - do_print_setup() - { - echo '==================== binaries found by searching $PATH ===================' -- echo_locate_binary tex etex dvipdfm pdftex omega mf mpost tcdialog dvips xdvi kpsewhich mktexpk mktextfm -+ echo_locate_binary tex etex dvipdfm pdftex omega mf mpost dialog dvips xdvi kpsewhich mktexpk mktextfm - echo - echo '=========================== Kpathsea variables ===========================' - echo_show_variable TEXMF TEXMFMAIN VARTEXMF -@@ -1737,7 +1701,6 @@ esac - needsCleanup=false - find_echo - find_fmt --find_dialogtype - check_environ - require_binary kpsewhich pwd - -@@ -1813,8 +1776,6 @@ test -z "$TC_DFT_UPDMAP_CFG" && TC_DFT_U - - # The fallback directory for private scripts and config files. - : ${TEXMF=`kpsewhich -expand-var '$TEXMF'`} --: ${DIALOG_TERMINFO=$TC_TEXMFMAIN/texconfig} --: ${DIALOG_TERM=generic} - - formats=$TC_VARTEXMF/web2c - xdvi_app_dir=$TC_VARTEXMF/xdvi -@@ -1955,7 +1916,7 @@ cd "$tmpdir" || exit_return 1 - EDIT=${VISUAL-${EDITOR-$std_editor}} - PAGER=${PAGER-$std_pager} - --check_for_binary tcdialog >/dev/null || test -n "$DIALOG_PROG" -+check_for_binary dialog >/dev/null || test -n "$DIALOG_PROG" - dialogok=$? - - # we have called some shellfunctions, so for HP-UX's shell, we need -@@ -1975,7 +1936,6 @@ fi - # fmtutil --missing - # texlinks --multiplatform - --check_terminal - cat <<eof - - The interactive texconfig utility will be started now. Make sure your diff --git a/print/teTeX-bin/patches/patch-aq b/print/teTeX-bin/patches/patch-aq deleted file mode 100644 index d160bddfc63..00000000000 --- a/print/teTeX-bin/patches/patch-aq +++ /dev/null @@ -1,16 +0,0 @@ -$NetBSD: patch-aq,v 1.4 2003/12/24 12:51:31 jmmv Exp $ - ---- texk/tetex/Makefile.in.orig Thu Feb 27 14:57:21 2003 -+++ texk/tetex/Makefile.in Sat Mar 15 12:44:15 2003 -@@ -8,9 +8,9 @@ - man5dir = $(mandir)/man5 - man8dir = $(mandir)/man8 - --SCRIPTS= dvi2fax ps2frag texconfig dvired pslatex texi2html allcm allneeded fontexport fontimport kpsetool mkfontdesc MakeTeXPK fontinst rubibtex rumakeindex fmtutil texdoc texlinks texexec texdoctk updmap -+SCRIPTS= dvi2fax ps2frag texconfig dvired pslatex allcm allneeded fontexport fontimport kpsetool mkfontdesc MakeTeXPK fontinst rubibtex rumakeindex fmtutil texdoc texlinks texexec texdoctk updmap - PDFSCRIPTS=e2pall epstopdf texi2pdf thumbpdf --manpgs= allcm allec allneeded dvi2fax dvired e2pall epstopdf fontexport fontimport fontinst kpsetool ps2frag pslatex rubibtex rumakeindex texconfig texdoc texexec texi2html texi2pdf texshow texutil thumbpdf texdoctk updmap -+manpgs= allcm allec allneeded dvi2fax dvired e2pall epstopdf fontexport fontimport fontinst kpsetool ps2frag pslatex rubibtex rumakeindex texconfig texdoc texexec texi2pdf texshow texutil thumbpdf texdoctk updmap - - INFOFILES= latex.info latex.info-1 latex.info-2 latex.info-3 - POOLFILES = etex-pl.pool pdfetex-pl.pool pdftex-pl.pool tex-pl.pool |