head 1.4; access; symbols pkgsrc-2013Q2:1.4.0.32 pkgsrc-2013Q2-base:1.4 pkgsrc-2012Q4:1.4.0.30 pkgsrc-2012Q4-base:1.4 pkgsrc-2011Q4:1.4.0.28 pkgsrc-2011Q4-base:1.4 pkgsrc-2011Q2:1.4.0.26 pkgsrc-2011Q2-base:1.4 pkgsrc-2009Q4:1.4.0.24 pkgsrc-2009Q4-base:1.4 pkgsrc-2008Q4:1.4.0.22 pkgsrc-2008Q4-base:1.4 pkgsrc-2008Q3:1.4.0.20 pkgsrc-2008Q3-base:1.4 cube-native-xorg:1.4.0.18 cube-native-xorg-base:1.4 pkgsrc-2008Q2:1.4.0.16 pkgsrc-2008Q2-base:1.4 pkgsrc-2008Q1:1.4.0.14 pkgsrc-2008Q1-base:1.4 pkgsrc-2007Q4:1.4.0.12 pkgsrc-2007Q4-base:1.4 pkgsrc-2007Q3:1.4.0.10 pkgsrc-2007Q3-base:1.4 pkgsrc-2007Q2:1.4.0.8 pkgsrc-2007Q2-base:1.4 pkgsrc-2007Q1:1.4.0.6 pkgsrc-2007Q1-base:1.4 pkgsrc-2006Q4:1.4.0.4 pkgsrc-2006Q4-base:1.4 pkgsrc-2006Q3:1.4.0.2 pkgsrc-2006Q3-base:1.4 pkgsrc-2006Q2:1.3.0.12 pkgsrc-2006Q2-base:1.3 pkgsrc-2006Q1:1.3.0.10 pkgsrc-2006Q1-base:1.3 pkgsrc-2005Q4:1.3.0.8 pkgsrc-2005Q4-base:1.3 pkgsrc-2005Q3:1.3.0.6 pkgsrc-2005Q3-base:1.3 pkgsrc-2005Q2:1.3.0.4 pkgsrc-2005Q2-base:1.3 pkgsrc-2005Q1:1.3.0.2 pkgsrc-2005Q1-base:1.3 pkgsrc-2004Q4:1.2.0.8 pkgsrc-2004Q4-base:1.2 pkgsrc-2004Q3:1.2.0.6 pkgsrc-2004Q3-base:1.2 pkgsrc-2004Q2:1.2.0.4 pkgsrc-2004Q2-base:1.2 pkgsrc-2004Q1:1.2.0.2 pkgsrc-2004Q1-base:1.2 pkgsrc-2003Q4:1.1.0.10 pkgsrc-2003Q4-base:1.1 netbsd-1-6-1:1.1.0.6 netbsd-1-6-1-base:1.1 netbsd-1-6:1.1.0.8 netbsd-1-6-RELEASE-base:1.1 pkgviews:1.1.0.4 pkgviews-base:1.1 buildlink2:1.1.0.2 buildlink2-base:1.1 netbsd-1-5-PATCH003:1.1 netbsd-1-5-PATCH001:1.1 netbsd-1-5-RELEASE:1.1 netbsd-1-4-PATCH003:1.1 netbsd-1-4-PATCH002:1.1 comdex-fall-1999:1.1; locks; strict; comment @# @; 1.4 date 2006.08.10.03.45.32; author minskim; state dead; branches; next 1.3; 1.3 date 2005.01.16.08.35.08; author kei; state Exp; branches; next 1.2; 1.2 date 2003.12.24.12.51.31; author jmmv; state dead; branches; next 1.1; 1.1 date 99.10.04.23.21.45; author simonb; state Exp; branches; next ; desc @@ 1.4 log @Remove teTeX2. @ text @$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(); @ 1.3 log @applied patches pulled from xpdf-3.00pl2.patch. this should fix security problems described in CAN-2004-0888. pointed out by Thomas Klausner. @ text @d1 1 a1 1 $NetBSD$ @ 1.2 log @Update teTeX packages to 2.0.2 (really merge teTeX2 into teTeX). The 2.x branch becomes the default teTeX package. @ text @d1 1 a1 1 $NetBSD: patch-ah,v 1.1 1999/10/04 23:21:45 simonb Exp $ d3 13 a15 96 --- texk/ps2pkm/hints.c.orig Sat Jan 24 23:11:28 1998 +++ texk/ps2pkm/hints.c Thu Sep 30 13:34:00 1999 @@@@ -167,7 +167,7 @@@@ } else /* error */ { - abort("ComputeHint: invalid orientation"); + t1_abort("ComputeHint: invalid orientation"); } IfTrace4((HintDebug > 1), @@@@ -201,7 +201,7 @@@@ } else /* error */ { - abort("ComputeHint: invalid hinttype"); + t1_abort("ComputeHint: invalid hinttype"); } IfTrace1((HintDebug > 1)," hintValue=%p", hintValue); @@@@ -218,7 +218,7 @@@@ } else /* error */ { - abort("ComputeHint: invalid orientation"); + t1_abort("ComputeHint: invalid orientation"); } } @@@@ -267,7 +267,7 @@@@ } else /* error */ { - abort("ProcessHint: invalid label"); + t1_abort("ProcessHint: invalid label"); } } else if (hP->adjusttype == 'r') /* Reverse */ @@@@ -283,18 +283,18 @@@@ } else /* error */ { - abort("ProcessHint: label is not in use"); + t1_abort("ProcessHint: label is not in use"); } } else /* error */ { - abort("ProcessHint: invalid label"); + t1_abort("ProcessHint: invalid label"); } } else /* error */ { - abort("ProcessHint: invalid adjusttype"); + t1_abort("ProcessHint: invalid adjusttype"); } IfTrace3((HintDebug > 1)," label=%d, thisHint=(%p,%p)\n", hP->label, thisHint.x, thisHint.y); @@@@ -386,7 +386,7 @@@@ else return(XofY(edge, y)); - abort("bad subpath chain"); + t1_abort("bad subpath chain"); /*NOTREACHED*/ } /* @@@@ -467,7 +467,7 @@@@ else if (ISBOTTOM(e1->flag) && y == e1->ymax) return(!ISDOWN(e2->flag)); else - abort("ImpliedHorizontalLine: why ask?"); + t1_abort("ImpliedHorizontalLine: why ask?"); /*NOTREACHED*/ } @@@@ -506,7 +506,7 @@@@ if (!ISBREAK(edge, next)) continue; if (edge->ymax < next->ymin) - abort("disjoint subpath?"); + t1_abort("disjoint subpath?"); /* 'edge' now contains an edgelist at the bottom of an edge, and 'next' contains the next subsequent edgelist in the subpath, which must be at @@@@ -567,7 +567,7 @@@@ break1->subpath = break2->subpath; if (ISBREAK(break1, break1->subpath)) - abort("unable to fix subpath break?"); + t1_abort("unable to fix subpath break?"); break2->subpath = next; @ 1.1 log @Don't use a function called "abort" that takes one char * as a parameter. Fixes compile problems on at least pmax, arm32. @ text @d1 1 a1 1 $NetBSD$ @