November 2007 - crux-commits

ports/opt (2.4): [notify] mod_php: update to 5.2.5
by crux＠crux.nu 11 Nov '07

11 Nov '07

commit 039cc7f7320ae0750070a1ad836be4d1950fc921 Author: Juergen Daubert <jue(a)jue.li> Date: Sun Nov 11 10:46:46 2007 +0100 [notify] mod_php: update to 5.2.5 Several security fixes, see http://www.php.net/releases/5_2_5.php diff --git a/mod_php/.md5sum b/mod_php/.md5sum index ac9bdce..a169528 100644 --- a/mod_php/.md5sum +++ b/mod_php/.md5sum @@ -1 +1 @@ -55c97a671fdabf462cc7a82971a656d2 php-5.2.4.tar.bz2 +1fe14ca892460b09f06729941a1bb605 php-5.2.5.tar.bz2 diff --git a/mod_php/Pkgfile b/mod_php/Pkgfile index f57d6f8..db264f0 100644 --- a/mod_php/Pkgfile +++ b/mod_php/Pkgfile @@ -5,7 +5,7 @@ # Group: apache name=mod_php -version=5.2.4 +version=5.2.5 release=1 source=(http://www.php.net/distributions/php-$version.tar.bz2)

1 0

ports/opt (2.4): Merge branch '2.3' into 2.4
by crux＠crux.nu 11 Nov '07

11 Nov '07

commit 4a5fe2e26bcae7b969bed7475c06660cb4e0a38f Merge: 6d4568b... 9b2203a... Author: Juergen Daubert <jue(a)jue.li> Date: Sun Nov 11 10:49:06 2007 +0100 Merge branch '2.3' into 2.4

1 0

ports/opt (2.4): xpdf: updated to 3.02pl2
by crux＠crux.nu 11 Nov '07

11 Nov '07

commit 08852477c8bd1d78fdcc36264b112aecdc26529b Author: Antti Nykanen <aon(a)iki.fi> Date: Sat Nov 10 14:47:31 2007 +0200 xpdf: updated to 3.02pl2 diff --git a/xpdf/.md5sum b/xpdf/.md5sum index 6c9cfac..7c771b4 100644 --- a/xpdf/.md5sum +++ b/xpdf/.md5sum @@ -1,2 +1,3 @@ -877118786dfe27d1b7aa5a6759cc6e45 xpdf-3.02.patch 599dc4cc65a07ee868cf92a667a913d2 xpdf-3.02.tar.gz +877118786dfe27d1b7aa5a6759cc6e45 xpdf-3.02pl1.patch +3a5cb165ae66781e0b21e6219ae06795 xpdf-3.02pl2.patch diff --git a/xpdf/Pkgfile b/xpdf/Pkgfile index a599a4d..6842f48 100644 --- a/xpdf/Pkgfile +++ b/xpdf/Pkgfile @@ -6,13 +6,15 @@ name=xpdf version=3.02 -release=2 +release=3 source=(ftp://ftp.foolabs.com/pub/xpdf/$name-$version.tar.gz - $name-$version.patch) + $name-${version}pl1.patch + $name-${version}pl2.patch) build() { cd $name-$version - patch -p1 -i $SRC/$name-$version.patch + patch -p1 -i $SRC/$name-${version}pl1.patch + patch -p1 -i $SRC/$name-${version}pl2.patch ./configure \ --prefix=/usr \ --with-Xm-library=/usr/lib \ diff --git a/xpdf/xpdf-3.02.patch b/xpdf/xpdf-3.02.patch deleted file mode 100644 index cd42fb9..0000000 --- a/xpdf/xpdf-3.02.patch +++ /dev/null @@ -1,33 +0,0 @@ -*** xpdf-3.02.orig/xpdf/Stream.cc Tue Feb 27 14:05:52 2007 ---- xpdf-3.02/xpdf/Stream.cc Thu Jul 26 14:44:43 2007 -*************** -*** 410,424 **** - ok = gFalse; - - nVals = width * nComps; -- if (width <= 0 || nComps <= 0 || nBits <= 0 || -- nComps >= INT_MAX / nBits || -- width >= INT_MAX / nComps / nBits || -- nVals * nBits + 7 < 0) { -- return; -- } - pixBytes = (nComps * nBits + 7) >> 3; - rowBytes = ((nVals * nBits + 7) >> 3) + pixBytes; -! if (rowBytes <= 0) { - return; - } - predLine = (Guchar *)gmalloc(rowBytes); ---- 410,422 ---- - ok = gFalse; - - nVals = width * nComps; - pixBytes = (nComps * nBits + 7) >> 3; - rowBytes = ((nVals * nBits + 7) >> 3) + pixBytes; -! if (width <= 0 || nComps <= 0 || nBits <= 0 || -! nComps > gfxColorMaxComps || -! nBits > 16 || -! width >= INT_MAX / nComps || // check for overflow in nVals -! nVals >= (INT_MAX - 7) / nBits) { // check for overflow in rowBytes - return; - } - predLine = (Guchar *)gmalloc(rowBytes); diff --git a/xpdf/xpdf-3.02pl1.patch b/xpdf/xpdf-3.02pl1.patch new file mode 100644 index 0000000..cd42fb9 --- /dev/null +++ b/xpdf/xpdf-3.02pl1.patch @@ -0,0 +1,33 @@ +*** xpdf-3.02.orig/xpdf/Stream.cc Tue Feb 27 14:05:52 2007 +--- xpdf-3.02/xpdf/Stream.cc Thu Jul 26 14:44:43 2007 +*************** +*** 410,424 **** + ok = gFalse; + + nVals = width * nComps; +- if (width <= 0 || nComps <= 0 || nBits <= 0 || +- nComps >= INT_MAX / nBits || +- width >= INT_MAX / nComps / nBits || +- nVals * nBits + 7 < 0) { +- return; +- } + pixBytes = (nComps * nBits + 7) >> 3; + rowBytes = ((nVals * nBits + 7) >> 3) + pixBytes; +! if (rowBytes <= 0) { + return; + } + predLine = (Guchar *)gmalloc(rowBytes); +--- 410,422 ---- + ok = gFalse; + + nVals = width * nComps; + pixBytes = (nComps * nBits + 7) >> 3; + rowBytes = ((nVals * nBits + 7) >> 3) + pixBytes; +! if (width <= 0 || nComps <= 0 || nBits <= 0 || +! nComps > gfxColorMaxComps || +! nBits > 16 || +! width >= INT_MAX / nComps || // check for overflow in nVals +! nVals >= (INT_MAX - 7) / nBits) { // check for overflow in rowBytes + return; + } + predLine = (Guchar *)gmalloc(rowBytes); diff --git a/xpdf/xpdf-3.02pl2.patch b/xpdf/xpdf-3.02pl2.patch new file mode 100644 index 0000000..ab9e3c6 --- /dev/null +++ b/xpdf/xpdf-3.02pl2.patch @@ -0,0 +1,823 @@ +diff -c -r xpdf-3.02pl1.orig/xpdf/Stream.cc xpdf-3.02/xpdf/Stream.cc +*** xpdf-3.02pl1.orig/xpdf/Stream.cc Thu Oct 25 15:47:38 2007 +--- xpdf-3.02/xpdf/Stream.cc Thu Oct 25 15:48:19 2007 +*************** +*** 1243,1265 **** + columns = columnsA; + if (columns < 1) { + columns = 1; +! } +! if (columns + 4 <= 0) { +! columns = INT_MAX - 4; + } + rows = rowsA; + endOfBlock = endOfBlockA; + black = blackA; +! refLine = (short *)gmallocn(columns + 3, sizeof(short)); +! codingLine = (short *)gmallocn(columns + 2, sizeof(short)); + + eof = gFalse; + row = 0; + nextLine2D = encoding < 0; + inputBits = 0; +! codingLine[0] = 0; +! codingLine[1] = refLine[2] = columns; +! a0 = 1; + + buf = EOF; + } +--- 1243,1268 ---- + columns = columnsA; + if (columns < 1) { + columns = 1; +! } else if (columns > INT_MAX - 2) { +! columns = INT_MAX - 2; + } + rows = rowsA; + endOfBlock = endOfBlockA; + black = blackA; +! // 0 <= codingLine[0] < codingLine[1] < ... < codingLine[n] = columns +! // ---> max codingLine size = columns + 1 +! // refLine has one extra guard entry at the end +! // ---> max refLine size = columns + 2 +! codingLine = (int *)gmallocn(columns + 1, sizeof(int)); +! refLine = (int *)gmallocn(columns + 2, sizeof(int)); + + eof = gFalse; + row = 0; + nextLine2D = encoding < 0; + inputBits = 0; +! codingLine[0] = columns; +! a0i = 0; +! outputBits = 0; + + buf = EOF; + } +*************** +*** 1278,1286 **** + row = 0; + nextLine2D = encoding < 0; + inputBits = 0; +! codingLine[0] = 0; +! codingLine[1] = columns; +! a0 = 1; + buf = EOF; + + // skip any initial zero bits and end-of-line marker, and get the 2D +--- 1281,1289 ---- + row = 0; + nextLine2D = encoding < 0; + inputBits = 0; +! codingLine[0] = columns; +! a0i = 0; +! outputBits = 0; + buf = EOF; + + // skip any initial zero bits and end-of-line marker, and get the 2D +*************** +*** 1297,1507 **** + } + } + + int CCITTFaxStream::lookChar() { + short code1, code2, code3; +! int a0New; +! GBool err, gotEOL; +! int ret; +! int bits, i; + +! // if at eof just return EOF +! if (eof && codingLine[a0] >= columns) { +! return EOF; + } + + // read the next row +! err = gFalse; +! if (codingLine[a0] >= columns) { + + // 2-D encoding + if (nextLine2D) { +- // state: +- // a0New = current position in coding line (0 <= a0New <= columns) +- // codingLine[a0] = last change in coding line +- // (black-to-white if a0 is even, +- // white-to-black if a0 is odd) +- // refLine[b1] = next change in reference line of opposite color +- // to a0 +- // invariants: +- // 0 <= codingLine[a0] <= a0New +- // <= refLine[b1] <= refLine[b1+1] <= columns +- // 0 <= a0 <= columns+1 +- // refLine[0] = 0 +- // refLine[n] = refLine[n+1] = columns +- // -- for some 1 <= n <= columns+1 +- // end condition: +- // 0 = codingLine[0] <= codingLine[1] < codingLine[2] < ... +- // < codingLine[n-1] < codingLine[n] = columns +- // -- where 1 <= n <= columns+1 + for (i = 0; codingLine[i] < columns; ++i) { + refLine[i] = codingLine[i]; + } +! refLine[i] = refLine[i + 1] = columns; +! b1 = 1; +! a0New = codingLine[a0 = 0] = 0; +! do { + code1 = getTwoDimCode(); + switch (code1) { + case twoDimPass: +! if (refLine[b1] < columns) { +! a0New = refLine[b1 + 1]; +! b1 += 2; + } + break; + case twoDimHoriz: +! if ((a0 & 1) == 0) { +! code1 = code2 = 0; + do { +! code1 += code3 = getWhiteCode(); + } while (code3 >= 64); + do { +! code2 += code3 = getBlackCode(); + } while (code3 >= 64); + } else { +- code1 = code2 = 0; + do { +! code1 += code3 = getBlackCode(); + } while (code3 >= 64); + do { +! code2 += code3 = getWhiteCode(); + } while (code3 >= 64); + } +! if (code1 > 0 || code2 > 0) { +! if (a0New + code1 <= columns) { +! codingLine[a0 + 1] = a0New + code1; +! } else { +! codingLine[a0 + 1] = columns; +! } +! ++a0; +! if (codingLine[a0] + code2 <= columns) { +! codingLine[a0 + 1] = codingLine[a0] + code2; +! } else { +! codingLine[a0 + 1] = columns; +! } +! ++a0; +! a0New = codingLine[a0]; +! while (refLine[b1] <= a0New && refLine[b1] < columns) { +! b1 += 2; + } + } + break; +! case twoDimVert0: +! if (refLine[b1] < columns) { +! a0New = codingLine[++a0] = refLine[b1]; +! ++b1; +! while (refLine[b1] <= a0New && refLine[b1] < columns) { +! b1 += 2; + } +- } else { +- a0New = codingLine[++a0] = columns; + } + break; + case twoDimVertR1: +! if (refLine[b1] + 1 < columns) { +! a0New = codingLine[++a0] = refLine[b1] + 1; +! ++b1; +! while (refLine[b1] <= a0New && refLine[b1] < columns) { +! b1 += 2; + } +- } else { +- a0New = codingLine[++a0] = columns; + } + break; +! case twoDimVertL1: +! if (refLine[b1] - 1 > a0New || (a0 == 0 && refLine[b1] == 1)) { +! a0New = codingLine[++a0] = refLine[b1] - 1; +! --b1; +! while (refLine[b1] <= a0New && refLine[b1] < columns) { +! b1 += 2; + } + } + break; +! case twoDimVertR2: +! if (refLine[b1] + 2 < columns) { +! a0New = codingLine[++a0] = refLine[b1] + 2; +! ++b1; +! while (refLine[b1] <= a0New && refLine[b1] < columns) { +! b1 += 2; + } +- } else { +- a0New = codingLine[++a0] = columns; + } + break; + case twoDimVertL2: +! if (refLine[b1] - 2 > a0New || (a0 == 0 && refLine[b1] == 2)) { +! a0New = codingLine[++a0] = refLine[b1] - 2; +! --b1; +! while (refLine[b1] <= a0New && refLine[b1] < columns) { +! b1 += 2; + } +! } +! break; +! case twoDimVertR3: +! if (refLine[b1] + 3 < columns) { +! a0New = codingLine[++a0] = refLine[b1] + 3; +! ++b1; +! while (refLine[b1] <= a0New && refLine[b1] < columns) { +! b1 += 2; + } +- } else { +- a0New = codingLine[++a0] = columns; + } + break; +! case twoDimVertL3: +! if (refLine[b1] - 3 > a0New || (a0 == 0 && refLine[b1] == 3)) { +! a0New = codingLine[++a0] = refLine[b1] - 3; +! --b1; +! while (refLine[b1] <= a0New && refLine[b1] < columns) { +! b1 += 2; + } + } + break; + case EOF: + eof = gTrue; +! codingLine[a0 = 0] = columns; +! return EOF; + default: + error(getPos(), "Bad 2D code %04x in CCITTFax stream", code1); + err = gTrue; + break; + } +! } while (codingLine[a0] < columns); + + // 1-D encoding + } else { +! codingLine[a0 = 0] = 0; +! while (1) { + code1 = 0; +! do { +! code1 += code3 = getWhiteCode(); +! } while (code3 >= 64); +! codingLine[a0+1] = codingLine[a0] + code1; +! ++a0; +! if (codingLine[a0] >= columns) { +! break; +! } +! code2 = 0; +! do { +! code2 += code3 = getBlackCode(); +! } while (code3 >= 64); +! codingLine[a0+1] = codingLine[a0] + code2; +! ++a0; +! if (codingLine[a0] >= columns) { +! break; + } + } + } + +- if (codingLine[a0] != columns) { +- error(getPos(), "CCITTFax row is wrong length (%d)", codingLine[a0]); +- // force the row to be the correct length +- while (codingLine[a0] > columns) { +- --a0; +- } +- codingLine[++a0] = columns; +- err = gTrue; +- } +- + // byte-align the row + if (byteAlign) { + inputBits &= ~7; +--- 1300,1529 ---- + } + } + ++ inline void CCITTFaxStream::addPixels(int a1, int blackPixels) { ++ if (a1 > codingLine[a0i]) { ++ if (a1 > columns) { ++ error(getPos(), "CCITTFax row is wrong length (%d)", a1); ++ err = gTrue; ++ a1 = columns; ++ } ++ if ((a0i & 1) ^ blackPixels) { ++ ++a0i; ++ } ++ codingLine[a0i] = a1; ++ } ++ } ++ ++ inline void CCITTFaxStream::addPixelsNeg(int a1, int blackPixels) { ++ if (a1 > codingLine[a0i]) { ++ if (a1 > columns) { ++ error(getPos(), "CCITTFax row is wrong length (%d)", a1); ++ err = gTrue; ++ a1 = columns; ++ } ++ if ((a0i & 1) ^ blackPixels) { ++ ++a0i; ++ } ++ codingLine[a0i] = a1; ++ } else if (a1 < codingLine[a0i]) { ++ if (a1 < 0) { ++ error(getPos(), "Invalid CCITTFax code"); ++ err = gTrue; ++ a1 = 0; ++ } ++ while (a0i > 0 && a1 <= codingLine[a0i - 1]) { ++ --a0i; ++ } ++ codingLine[a0i] = a1; ++ } ++ } ++ + int CCITTFaxStream::lookChar() { + short code1, code2, code3; +! int b1i, blackPixels, i, bits; +! GBool gotEOL; + +! if (buf != EOF) { +! return buf; + } + + // read the next row +! if (outputBits == 0) { +! +! // if at eof just return EOF +! if (eof) { +! return EOF; +! } +! +! err = gFalse; + + // 2-D encoding + if (nextLine2D) { + for (i = 0; codingLine[i] < columns; ++i) { + refLine[i] = codingLine[i]; + } +! refLine[i++] = columns; +! refLine[i] = columns; +! codingLine[0] = 0; +! a0i = 0; +! b1i = 0; +! blackPixels = 0; +! // invariant: +! // refLine[b1i-1] <= codingLine[a0i] < refLine[b1i] < refLine[b1i+1] +! // <= columns +! // exception at left edge: +! // codingLine[a0i = 0] = refLine[b1i = 0] = 0 is possible +! // exception at right edge: +! // refLine[b1i] = refLine[b1i+1] = columns is possible +! while (codingLine[a0i] < columns) { + code1 = getTwoDimCode(); + switch (code1) { + case twoDimPass: +! addPixels(refLine[b1i + 1], blackPixels); +! if (refLine[b1i + 1] < columns) { +! b1i += 2; + } + break; + case twoDimHoriz: +! code1 = code2 = 0; +! if (blackPixels) { + do { +! code1 += code3 = getBlackCode(); + } while (code3 >= 64); + do { +! code2 += code3 = getWhiteCode(); + } while (code3 >= 64); + } else { + do { +! code1 += code3 = getWhiteCode(); + } while (code3 >= 64); + do { +! code2 += code3 = getBlackCode(); + } while (code3 >= 64); + } +! addPixels(codingLine[a0i] + code1, blackPixels); +! if (codingLine[a0i] < columns) { +! addPixels(codingLine[a0i] + code2, blackPixels ^ 1); +! } +! while (refLine[b1i] <= codingLine[a0i] && refLine[b1i] < columns) { +! b1i += 2; +! } +! break; +! case twoDimVertR3: +! addPixels(refLine[b1i] + 3, blackPixels); +! blackPixels ^= 1; +! if (codingLine[a0i] < columns) { +! ++b1i; +! while (refLine[b1i] <= codingLine[a0i] && refLine[b1i] < columns) { +! b1i += 2; + } + } + break; +! case twoDimVertR2: +! addPixels(refLine[b1i] + 2, blackPixels); +! blackPixels ^= 1; +! if (codingLine[a0i] < columns) { +! ++b1i; +! while (refLine[b1i] <= codingLine[a0i] && refLine[b1i] < columns) { +! b1i += 2; + } + } + break; + case twoDimVertR1: +! addPixels(refLine[b1i] + 1, blackPixels); +! blackPixels ^= 1; +! if (codingLine[a0i] < columns) { +! ++b1i; +! while (refLine[b1i] <= codingLine[a0i] && refLine[b1i] < columns) { +! b1i += 2; + } + } + break; +! case twoDimVert0: +! addPixels(refLine[b1i], blackPixels); +! blackPixels ^= 1; +! if (codingLine[a0i] < columns) { +! ++b1i; +! while (refLine[b1i] <= codingLine[a0i] && refLine[b1i] < columns) { +! b1i += 2; + } + } + break; +! case twoDimVertL3: +! addPixelsNeg(refLine[b1i] - 3, blackPixels); +! blackPixels ^= 1; +! if (codingLine[a0i] < columns) { +! if (b1i > 0) { +! --b1i; +! } else { +! ++b1i; +! } +! while (refLine[b1i] <= codingLine[a0i] && refLine[b1i] < columns) { +! b1i += 2; + } + } + break; + case twoDimVertL2: +! addPixelsNeg(refLine[b1i] - 2, blackPixels); +! blackPixels ^= 1; +! if (codingLine[a0i] < columns) { +! if (b1i > 0) { +! --b1i; +! } else { +! ++b1i; + } +! while (refLine[b1i] <= codingLine[a0i] && refLine[b1i] < columns) { +! b1i += 2; + } + } + break; +! case twoDimVertL1: +! addPixelsNeg(refLine[b1i] - 1, blackPixels); +! blackPixels ^= 1; +! if (codingLine[a0i] < columns) { +! if (b1i > 0) { +! --b1i; +! } else { +! ++b1i; +! } +! while (refLine[b1i] <= codingLine[a0i] && refLine[b1i] < columns) { +! b1i += 2; + } + } + break; + case EOF: ++ addPixels(columns, 0); + eof = gTrue; +! break; + default: + error(getPos(), "Bad 2D code %04x in CCITTFax stream", code1); ++ addPixels(columns, 0); + err = gTrue; + break; + } +! } + + // 1-D encoding + } else { +! codingLine[0] = 0; +! a0i = 0; +! blackPixels = 0; +! while (codingLine[a0i] < columns) { + code1 = 0; +! if (blackPixels) { +! do { +! code1 += code3 = getBlackCode(); +! } while (code3 >= 64); +! } else { +! do { +! code1 += code3 = getWhiteCode(); +! } while (code3 >= 64); + } ++ addPixels(codingLine[a0i] + code1, blackPixels); ++ blackPixels ^= 1; + } + } + + // byte-align the row + if (byteAlign) { + inputBits &= ~7; +*************** +*** 1560,1573 **** + // this if we know the stream contains end-of-line markers because + // the "just plow on" technique tends to work better otherwise + } else if (err && endOfLine) { +! do { + if (code1 == EOF) { + eof = gTrue; + return EOF; + } + eatBits(1); +! code1 = lookBits(13); +! } while ((code1 >> 1) != 0x001); + eatBits(12); + if (encoding > 0) { + eatBits(1); +--- 1582,1598 ---- + // this if we know the stream contains end-of-line markers because + // the "just plow on" technique tends to work better otherwise + } else if (err && endOfLine) { +! while (1) { +! code1 = lookBits(13); + if (code1 == EOF) { + eof = gTrue; + return EOF; + } ++ if ((code1 >> 1) == 0x001) { ++ break; ++ } + eatBits(1); +! } + eatBits(12); + if (encoding > 0) { + eatBits(1); +*************** +*** 1575,1585 **** + } + } + +! a0 = 0; +! outputBits = codingLine[1] - codingLine[0]; +! if (outputBits == 0) { +! a0 = 1; +! outputBits = codingLine[2] - codingLine[1]; + } + + ++row; +--- 1600,1610 ---- + } + } + +! // set up for output +! if (codingLine[0] > 0) { +! outputBits = codingLine[a0i = 0]; +! } else { +! outputBits = codingLine[a0i = 1]; + } + + ++row; +*************** +*** 1587,1625 **** + + // get a byte + if (outputBits >= 8) { +! ret = ((a0 & 1) == 0) ? 0xff : 0x00; +! if ((outputBits -= 8) == 0) { +! ++a0; +! if (codingLine[a0] < columns) { +! outputBits = codingLine[a0 + 1] - codingLine[a0]; +! } + } + } else { + bits = 8; +! ret = 0; + do { + if (outputBits > bits) { +! i = bits; +! bits = 0; +! if ((a0 & 1) == 0) { +! ret |= 0xff >> (8 - i); + } +! outputBits -= i; + } else { +! i = outputBits; +! bits -= outputBits; +! if ((a0 & 1) == 0) { +! ret |= (0xff >> (8 - i)) << bits; + } + outputBits = 0; +! ++a0; +! if (codingLine[a0] < columns) { +! outputBits = codingLine[a0 + 1] - codingLine[a0]; + } + } +! } while (bits > 0 && codingLine[a0] < columns); + } +- buf = black ? (ret ^ 0xff) : ret; + return buf; + } + +--- 1612,1654 ---- + + // get a byte + if (outputBits >= 8) { +! buf = (a0i & 1) ? 0x00 : 0xff; +! outputBits -= 8; +! if (outputBits == 0 && codingLine[a0i] < columns) { +! ++a0i; +! outputBits = codingLine[a0i] - codingLine[a0i - 1]; + } + } else { + bits = 8; +! buf = 0; + do { + if (outputBits > bits) { +! buf <<= bits; +! if (!(a0i & 1)) { +! buf |= 0xff >> (8 - bits); + } +! outputBits -= bits; +! bits = 0; + } else { +! buf <<= outputBits; +! if (!(a0i & 1)) { +! buf |= 0xff >> (8 - outputBits); + } ++ bits -= outputBits; + outputBits = 0; +! if (codingLine[a0i] < columns) { +! ++a0i; +! outputBits = codingLine[a0i] - codingLine[a0i - 1]; +! } else if (bits > 0) { +! buf <<= bits; +! bits = 0; + } + } +! } while (bits); +! } +! if (black) { +! buf ^= 0xff; + } + return buf; + } + +*************** +*** 1661,1666 **** +--- 1690,1698 ---- + code = 0; // make gcc happy + if (endOfBlock) { + code = lookBits(12); ++ if (code == EOF) { ++ return 1; ++ } + if ((code >> 5) == 0) { + p = &whiteTab1[code]; + } else { +*************** +*** 1673,1678 **** +--- 1705,1713 ---- + } else { + for (n = 1; n <= 9; ++n) { + code = lookBits(n); ++ if (code == EOF) { ++ return 1; ++ } + if (n < 9) { + code <<= 9 - n; + } +*************** +*** 1684,1689 **** +--- 1719,1727 ---- + } + for (n = 11; n <= 12; ++n) { + code = lookBits(n); ++ if (code == EOF) { ++ return 1; ++ } + if (n < 12) { + code <<= 12 - n; + } +*************** +*** 1709,1717 **** + code = 0; // make gcc happy + if (endOfBlock) { + code = lookBits(13); + if ((code >> 7) == 0) { + p = &blackTab1[code]; +! } else if ((code >> 9) == 0) { + p = &blackTab2[(code >> 1) - 64]; + } else { + p = &blackTab3[code >> 7]; +--- 1747,1758 ---- + code = 0; // make gcc happy + if (endOfBlock) { + code = lookBits(13); ++ if (code == EOF) { ++ return 1; ++ } + if ((code >> 7) == 0) { + p = &blackTab1[code]; +! } else if ((code >> 9) == 0 && (code >> 7) != 0) { + p = &blackTab2[(code >> 1) - 64]; + } else { + p = &blackTab3[code >> 7]; +*************** +*** 1723,1728 **** +--- 1764,1772 ---- + } else { + for (n = 2; n <= 6; ++n) { + code = lookBits(n); ++ if (code == EOF) { ++ return 1; ++ } + if (n < 6) { + code <<= 6 - n; + } +*************** +*** 1734,1739 **** +--- 1778,1786 ---- + } + for (n = 7; n <= 12; ++n) { + code = lookBits(n); ++ if (code == EOF) { ++ return 1; ++ } + if (n < 12) { + code <<= 12 - n; + } +*************** +*** 1747,1752 **** +--- 1794,1802 ---- + } + for (n = 10; n <= 13; ++n) { + code = lookBits(n); ++ if (code == EOF) { ++ return 1; ++ } + if (n < 13) { + code <<= 13 - n; + } +*************** +*** 1961,1966 **** +--- 2011,2022 ---- + // allocate a buffer for the whole image + bufWidth = ((width + mcuWidth - 1) / mcuWidth) * mcuWidth; + bufHeight = ((height + mcuHeight - 1) / mcuHeight) * mcuHeight; ++ if (bufWidth <= 0 || bufHeight <= 0 || ++ bufWidth > INT_MAX / bufWidth / (int)sizeof(int)) { ++ error(getPos(), "Invalid image size in DCT stream"); ++ y = height; ++ return; ++ } + for (i = 0; i < numComps; ++i) { + frameBuf[i] = (int *)gmallocn(bufWidth * bufHeight, sizeof(int)); + memset(frameBuf[i], 0, bufWidth * bufHeight * sizeof(int)); +*************** +*** 3036,3041 **** +--- 3092,3102 ---- + } + scanInfo.firstCoeff = str->getChar(); + scanInfo.lastCoeff = str->getChar(); ++ if (scanInfo.firstCoeff < 0 || scanInfo.lastCoeff > 63 || ++ scanInfo.firstCoeff > scanInfo.lastCoeff) { ++ error(getPos(), "Bad DCT coefficient numbers in scan info block"); ++ return gFalse; ++ } + c = str->getChar(); + scanInfo.ah = (c >> 4) & 0x0f; + scanInfo.al = c & 0x0f; +diff -c -r xpdf-3.02pl1.orig/xpdf/Stream.h xpdf-3.02/xpdf/Stream.h +*** xpdf-3.02pl1.orig/xpdf/Stream.h Tue Feb 27 14:05:52 2007 +--- xpdf-3.02/xpdf/Stream.h Thu Oct 25 15:48:15 2007 +*************** +*** 528,540 **** + int row; // current row + int inputBuf; // input buffer + int inputBits; // number of bits in input buffer +! short *refLine; // reference line changing elements +! int b1; // index into refLine +! short *codingLine; // coding line changing elements +! int a0; // index into codingLine + int outputBits; // remaining ouput bits + int buf; // character buffer + + short getTwoDimCode(); + short getWhiteCode(); + short getBlackCode(); +--- 528,542 ---- + int row; // current row + int inputBuf; // input buffer + int inputBits; // number of bits in input buffer +! int *codingLine; // coding line changing elements +! int *refLine; // reference line changing elements +! int a0i; // index into codingLine +! GBool err; // error on current line + int outputBits; // remaining ouput bits + int buf; // character buffer + ++ void addPixels(int a1, int black); ++ void addPixelsNeg(int a1, int black); + short getTwoDimCode(); + short getWhiteCode(); + short getBlackCode();

1 0

ports/opt (2.4): wine: updated to 0.9.49
by crux＠crux.nu 11 Nov '07

11 Nov '07

commit b5a3ea891f86007a459d06f8523f5e2dd962259b Author: Antti Nykanen <aon(a)iki.fi> Date: Sat Nov 10 12:59:42 2007 +0200 wine: updated to 0.9.49 diff --git a/wine/.footprint b/wine/.footprint index b266e80..d46c4cc 100644 --- a/wine/.footprint +++ b/wine/.footprint @@ -152,6 +152,7 @@ drwxr-xr-x root/root usr/include/wine/windows/ddk/ -rw-r--r-- root/root usr/include/wine/windows/ddk/ntddser.h -rw-r--r-- root/root usr/include/wine/windows/ddk/ntddtape.h -rw-r--r-- root/root usr/include/wine/windows/ddk/wdm.h +-rw-r--r-- root/root usr/include/wine/windows/ddk/winddiui.h -rw-r--r-- root/root usr/include/wine/windows/ddk/winsplp.h -rw-r--r-- root/root usr/include/wine/windows/ddraw.h -rw-r--r-- root/root usr/include/wine/windows/ddrawi.h @@ -244,6 +245,10 @@ drwxr-xr-x root/root usr/include/wine/windows/ddk/ -rw-r--r-- root/root usr/include/wine/windows/idispids.h -rw-r--r-- root/root usr/include/wine/windows/imagehlp.h -rw-r--r-- root/root usr/include/wine/windows/imm.h +-rw-r--r-- root/root usr/include/wine/windows/imnact.h +-rw-r--r-- root/root usr/include/wine/windows/imnact.idl +-rw-r--r-- root/root usr/include/wine/windows/imnxport.h +-rw-r--r-- root/root usr/include/wine/windows/imnxport.idl -rw-r--r-- root/root usr/include/wine/windows/indexsrv.h -rw-r--r-- root/root usr/include/wine/windows/indexsrv.idl -rw-r--r-- root/root usr/include/wine/windows/initguid.h @@ -285,8 +290,11 @@ drwxr-xr-x root/root usr/include/wine/windows/ddk/ -rw-r--r-- root/root usr/include/wine/windows/mediaerr.h -rw-r--r-- root/root usr/include/wine/windows/mediaobj.h -rw-r--r-- root/root usr/include/wine/windows/mediaobj.idl +-rw-r--r-- root/root usr/include/wine/windows/midles.h -rw-r--r-- root/root usr/include/wine/windows/mimeinfo.h -rw-r--r-- root/root usr/include/wine/windows/mimeinfo.idl +-rw-r--r-- root/root usr/include/wine/windows/mimeole.h +-rw-r--r-- root/root usr/include/wine/windows/mimeole.idl -rw-r--r-- root/root usr/include/wine/windows/minmax.h -rw-r--r-- root/root usr/include/wine/windows/mlang.h -rw-r--r-- root/root usr/include/wine/windows/mlang.idl @@ -535,6 +543,7 @@ drwxr-xr-x root/root usr/lib/wine/ -rwxr-xr-x root/root usr/lib/wine/crypt32.dll.so -rwxr-xr-x root/root usr/lib/wine/cryptdll.dll.so -rwxr-xr-x root/root usr/lib/wine/cryptnet.dll.so +-rwxr-xr-x root/root usr/lib/wine/ctapi32.dll.so -rw-r--r-- root/root usr/lib/wine/ctl3d.dll16 -rwxr-xr-x root/root usr/lib/wine/ctl3d32.dll.so -rw-r--r-- root/root usr/lib/wine/ctl3dv2.dll16 @@ -599,6 +608,7 @@ drwxr-xr-x root/root usr/lib/wine/ -rwxr-xr-x root/root usr/lib/wine/imagehlp.dll.so -rw-r--r-- root/root usr/lib/wine/imm.dll16 -rwxr-xr-x root/root usr/lib/wine/imm32.dll.so +-rwxr-xr-x root/root usr/lib/wine/inetcomm.dll.so -rwxr-xr-x root/root usr/lib/wine/infosoft.dll.so -rwxr-xr-x root/root usr/lib/wine/inkobj.dll.so -rwxr-xr-x root/root usr/lib/wine/inseng.dll.so @@ -657,6 +667,7 @@ drwxr-xr-x root/root usr/lib/wine/ -rw-r--r-- root/root usr/lib/wine/libicmp.def -rw-r--r-- root/root usr/lib/wine/libimagehlp.def -rw-r--r-- root/root usr/lib/wine/libimm32.def +-rw-r--r-- root/root usr/lib/wine/libinetcomm.def -rw-r--r-- root/root usr/lib/wine/libiphlpapi.def -rw-r--r-- root/root usr/lib/wine/libkernel32.def -rw-r--r-- root/root usr/lib/wine/liblz32.def @@ -762,6 +773,7 @@ drwxr-xr-x root/root usr/lib/wine/ -rwxr-xr-x root/root usr/lib/wine/msacm32.dll.so -rwxr-xr-x root/root usr/lib/wine/msacm32.drv.so -rwxr-xr-x root/root usr/lib/wine/msadp32.acm.so +-rwxr-xr-x root/root usr/lib/wine/mscat32.dll.so -rwxr-xr-x root/root usr/lib/wine/mscms.dll.so -rwxr-xr-x root/root usr/lib/wine/mscoree.dll.so -rwxr-xr-x root/root usr/lib/wine/msdmo.dll.so diff --git a/wine/.md5sum b/wine/.md5sum index d54e4e1..8ed4333 100644 --- a/wine/.md5sum +++ b/wine/.md5sum @@ -1 +1 @@ -e2cc11fe7ec7769bcf8fe4f59b1dd75a wine-0.9.48.tar.bz2 +417912f28e48ddc6c4285a493d070564 wine-0.9.49.tar.bz2 diff --git a/wine/Pkgfile b/wine/Pkgfile index 53e7315..7d64831 100644 --- a/wine/Pkgfile +++ b/wine/Pkgfile @@ -5,7 +5,7 @@ # Depends on: fontforge name=wine -version=0.9.48 +version=0.9.49 release=1 source=(http://ibiblio.org/pub/linux/system/emulators/wine/wine-$version.ta…

1 0

ports/opt (2.4): x11-fonts-corefonts: replaced by xorg-font-msttcorefonts
by crux＠crux.nu 11 Nov '07

11 Nov '07

commit adaee3ab69915ee608abfde24cd944b08ab00e22 Author: Matt Housh <jaeger(a)crux.nu> Date: Fri Nov 9 22:48:24 2007 -0600 x11-fonts-corefonts: replaced by xorg-font-msttcorefonts diff --git a/x11-fonts-corefonts/.footprint b/x11-fonts-corefonts/.footprint deleted file mode 100644 index 4d7e37d..0000000 --- a/x11-fonts-corefonts/.footprint +++ /dev/null @@ -1,35 +0,0 @@ -drwxr-xr-x root/root usr/ -drwxr-xr-x root/root usr/share/ -drwxr-xr-x root/root usr/share/fonts/ -drwxr-xr-x root/root usr/share/fonts/corefonts/ --rw-r--r-- root/root usr/share/fonts/corefonts/andalemo.ttf --rw-r--r-- root/root usr/share/fonts/corefonts/arial.ttf --rw-r--r-- root/root usr/share/fonts/corefonts/arialbd.ttf --rw-r--r-- root/root usr/share/fonts/corefonts/arialbi.ttf --rw-r--r-- root/root usr/share/fonts/corefonts/ariali.ttf --rw-r--r-- root/root usr/share/fonts/corefonts/ariblk.ttf --rw-r--r-- root/root usr/share/fonts/corefonts/comic.ttf --rw-r--r-- root/root usr/share/fonts/corefonts/comicbd.ttf --rw-r--r-- root/root usr/share/fonts/corefonts/cour.ttf --rw-r--r-- root/root usr/share/fonts/corefonts/courbd.ttf --rw-r--r-- root/root usr/share/fonts/corefonts/courbi.ttf --rw-r--r-- root/root usr/share/fonts/corefonts/couri.ttf --rw-r--r-- root/root usr/share/fonts/corefonts/georgia.ttf --rw-r--r-- root/root usr/share/fonts/corefonts/georgiab.ttf --rw-r--r-- root/root usr/share/fonts/corefonts/georgiai.ttf --rw-r--r-- root/root usr/share/fonts/corefonts/georgiaz.ttf --rw-r--r-- root/root usr/share/fonts/corefonts/impact.ttf --rw-r--r-- root/root usr/share/fonts/corefonts/tahoma.ttf --rw-r--r-- root/root usr/share/fonts/corefonts/times.ttf --rw-r--r-- root/root usr/share/fonts/corefonts/timesbd.ttf --rw-r--r-- root/root usr/share/fonts/corefonts/timesbi.ttf --rw-r--r-- root/root usr/share/fonts/corefonts/timesi.ttf --rw-r--r-- root/root usr/share/fonts/corefonts/trebuc.ttf --rw-r--r-- root/root usr/share/fonts/corefonts/trebucbd.ttf --rw-r--r-- root/root usr/share/fonts/corefonts/trebucbi.ttf --rw-r--r-- root/root usr/share/fonts/corefonts/trebucit.ttf --rw-r--r-- root/root usr/share/fonts/corefonts/verdana.ttf --rw-r--r-- root/root usr/share/fonts/corefonts/verdanab.ttf --rw-r--r-- root/root usr/share/fonts/corefonts/verdanai.ttf --rw-r--r-- root/root usr/share/fonts/corefonts/verdanaz.ttf --rw-r--r-- root/root usr/share/fonts/corefonts/webdings.ttf diff --git a/x11-fonts-corefonts/.md5sum b/x11-fonts-corefonts/.md5sum deleted file mode 100644 index dab10f8..0000000 --- a/x11-fonts-corefonts/.md5sum +++ /dev/null @@ -1,13 +0,0 @@ -cbdc2fdd7d2ed0832795e86a8b9ee19a andale32.exe -9637df0e91703179f0723ec095a36cb5 arial32.exe -c9089ae0c3b3d0d8c4b0a95979bb9ff0 arialb32.exe -f4b729c0be7d288660f4fc167de199a1 cabextract-1.1.tar.gz -2b30de40bb5e803a0452c7715fc835d1 comic32.exe -4e412c772294403ab62fb2d247d85c60 courie32.exe -4d90016026e2da447593b41a8d8fa8bd georgi32.exe -7907c7dd6684e9bade91cff82683d9d7 impact32.exe -ed39c8ef91b9fb80f76f702568291bd5 times32.exe -0d7ea16cac6261f8513a061fbfcdb2b5 trebuc32.exe -12d2a75f8156e10607be1eaa8e8ef120 verdan32.exe -efa72d3ed0120a07326ce02f051e9b42 wd97vwr32.exe -230a1d13a365b22815f502eb24d9149b webdin32.exe diff --git a/x11-fonts-corefonts/Pkgfile b/x11-fonts-corefonts/Pkgfile deleted file mode 100644 index bde1f26..0000000 --- a/x11-fonts-corefonts/Pkgfile +++ /dev/null @@ -1,32 +0,0 @@ -# URL: http://corefonts.sourceforge.net/ -# Description: Microsoft's Web Fonts (truetype) -# Maintainer: Matt Housh, jaeger at morpheus dot net - -name=x11-fonts-corefonts -version=2.0 -release=1 -source=(http://www.kyz.uklinux.net/downloads/cabextract-1.1.tar.gz \ - http://dl.sourceforge.net/sourceforge/corefonts/andale32.exe \ - http://dl.sourceforge.net/sourceforge/corefonts/arial32.exe \ - http://dl.sourceforge.net/sourceforge/corefonts/arialb32.exe \ - http://dl.sourceforge.net/sourceforge/corefonts/comic32.exe \ - http://dl.sourceforge.net/sourceforge/corefonts/courie32.exe \ - http://dl.sourceforge.net/sourceforge/corefonts/georgi32.exe \ - http://dl.sourceforge.net/sourceforge/corefonts/impact32.exe \ - http://dl.sourceforge.net/sourceforge/corefonts/times32.exe \ - http://dl.sourceforge.net/sourceforge/corefonts/trebuc32.exe \ - http://dl.sourceforge.net/sourceforge/corefonts/verdan32.exe \ - http://dl.sourceforge.net/sourceforge/corefonts/webdin32.exe \ - http://dl.sourceforge.net/sourceforge/corefonts/wd97vwr32.exe) - -build() { - (cd cabextract-1.1 && ./configure && make) - for font in *.exe - do - cabextract-1.1/cabextract --lowercase $font - done - cabextract-1.1/cabextract --lowercase viewer1.cab - mkdir -p $PKG/usr/share/fonts/corefonts - install -o root -g root -m 0644 *.ttf \ - $PKG/usr/share/fonts/corefonts/ -} diff --git a/x11-fonts-corefonts/README b/x11-fonts-corefonts/README deleted file mode 100644 index 1a34123..0000000 --- a/x11-fonts-corefonts/README +++ /dev/null @@ -1,48 +0,0 @@ - -REQUIREMENTS - - freetype, x11 - -PRE-INSTALL - -POST-INSTALL - - 1. Load "freetype" module in xorg.conf: - - ---snip--- - - .. - Section "Module" - .. - Load "freetype" - EndSection - .. - - ---snip--- - - 2. add the truetype directory to your fontpath in - the xorg.conf file: - - ---snip--- - - .. - Section "Files" - .. - FontPath "/usr/share/fonts/corefonts/" - EndSection - .. - - ---snip--- - - 3. create a font info database for the new fonts - - # cd /usr/share/fonts/corefonts/ - # mkfontscale - # mkfontdir - # fc-cache -f - - 4. restart X or rehash the font path like so: - - # xset fp rehash - -PRECAUTION diff --git a/xorg-font-msttcorefonts/.footprint b/xorg-font-msttcorefonts/.footprint new file mode 100644 index 0000000..3d85a9f --- /dev/null +++ b/xorg-font-msttcorefonts/.footprint @@ -0,0 +1,36 @@ +drwxr-xr-x root/root usr/ +drwxr-xr-x root/root usr/lib/ +drwxr-xr-x root/root usr/lib/X11/ +drwxr-xr-x root/root usr/lib/X11/fonts/ +drwxr-xr-x root/root usr/lib/X11/fonts/msttcorefonts/ +-rw-r--r-- root/root usr/lib/X11/fonts/msttcorefonts/andalemo.ttf +-rw-r--r-- root/root usr/lib/X11/fonts/msttcorefonts/arial.ttf +-rw-r--r-- root/root usr/lib/X11/fonts/msttcorefonts/arialbd.ttf +-rw-r--r-- root/root usr/lib/X11/fonts/msttcorefonts/arialbi.ttf +-rw-r--r-- root/root usr/lib/X11/fonts/msttcorefonts/ariali.ttf +-rw-r--r-- root/root usr/lib/X11/fonts/msttcorefonts/ariblk.ttf +-rw-r--r-- root/root usr/lib/X11/fonts/msttcorefonts/comic.ttf +-rw-r--r-- root/root usr/lib/X11/fonts/msttcorefonts/comicbd.ttf +-rw-r--r-- root/root usr/lib/X11/fonts/msttcorefonts/cour.ttf +-rw-r--r-- root/root usr/lib/X11/fonts/msttcorefonts/courbd.ttf +-rw-r--r-- root/root usr/lib/X11/fonts/msttcorefonts/courbi.ttf +-rw-r--r-- root/root usr/lib/X11/fonts/msttcorefonts/couri.ttf +-rw-r--r-- root/root usr/lib/X11/fonts/msttcorefonts/georgia.ttf +-rw-r--r-- root/root usr/lib/X11/fonts/msttcorefonts/georgiab.ttf +-rw-r--r-- root/root usr/lib/X11/fonts/msttcorefonts/georgiai.ttf +-rw-r--r-- root/root usr/lib/X11/fonts/msttcorefonts/georgiaz.ttf +-rw-r--r-- root/root usr/lib/X11/fonts/msttcorefonts/impact.ttf +-rw-r--r-- root/root usr/lib/X11/fonts/msttcorefonts/tahoma.ttf +-rw-r--r-- root/root usr/lib/X11/fonts/msttcorefonts/times.ttf +-rw-r--r-- root/root usr/lib/X11/fonts/msttcorefonts/timesbd.ttf +-rw-r--r-- root/root usr/lib/X11/fonts/msttcorefonts/timesbi.ttf +-rw-r--r-- root/root usr/lib/X11/fonts/msttcorefonts/timesi.ttf +-rw-r--r-- root/root usr/lib/X11/fonts/msttcorefonts/trebuc.ttf +-rw-r--r-- root/root usr/lib/X11/fonts/msttcorefonts/trebucbd.ttf +-rw-r--r-- root/root usr/lib/X11/fonts/msttcorefonts/trebucbi.ttf +-rw-r--r-- root/root usr/lib/X11/fonts/msttcorefonts/trebucit.ttf +-rw-r--r-- root/root usr/lib/X11/fonts/msttcorefonts/verdana.ttf +-rw-r--r-- root/root usr/lib/X11/fonts/msttcorefonts/verdanab.ttf +-rw-r--r-- root/root usr/lib/X11/fonts/msttcorefonts/verdanai.ttf +-rw-r--r-- root/root usr/lib/X11/fonts/msttcorefonts/verdanaz.ttf +-rw-r--r-- root/root usr/lib/X11/fonts/msttcorefonts/webdings.ttf diff --git a/xorg-font-msttcorefonts/.md5sum b/xorg-font-msttcorefonts/.md5sum new file mode 100644 index 0000000..ff30dff --- /dev/null +++ b/xorg-font-msttcorefonts/.md5sum @@ -0,0 +1,13 @@ +cbdc2fdd7d2ed0832795e86a8b9ee19a andale32.exe +9637df0e91703179f0723ec095a36cb5 arial32.exe +c9089ae0c3b3d0d8c4b0a95979bb9ff0 arialb32.exe +dc421a690648b503265c82ade84e143e cabextract-1.2.tar.gz +2b30de40bb5e803a0452c7715fc835d1 comic32.exe +4e412c772294403ab62fb2d247d85c60 courie32.exe +4d90016026e2da447593b41a8d8fa8bd georgi32.exe +7907c7dd6684e9bade91cff82683d9d7 impact32.exe +ed39c8ef91b9fb80f76f702568291bd5 times32.exe +0d7ea16cac6261f8513a061fbfcdb2b5 trebuc32.exe +12d2a75f8156e10607be1eaa8e8ef120 verdan32.exe +efa72d3ed0120a07326ce02f051e9b42 wd97vwr32.exe +230a1d13a365b22815f502eb24d9149b webdin32.exe diff --git a/xorg-font-msttcorefonts/Pkgfile b/xorg-font-msttcorefonts/Pkgfile new file mode 100644 index 0000000..4571cf0 --- /dev/null +++ b/xorg-font-msttcorefonts/Pkgfile @@ -0,0 +1,33 @@ +# URL: http://corefonts.sourceforge.net/ +# Description: Microsoft's Web Fonts (truetype) +# Maintainer: Matt Housh, jaeger at morpheus dot net +# Depends on: xorg-mkfontdir, xorg-mkfontscale + +name=xorg-font-msttcorefonts +version=1.3 +release=1 +source=(http://www.cabextract.org.uk/cabextract-1.2.tar.gz \ + http://dl.sourceforge.net/sourceforge/corefonts/andale32.exe \ + http://dl.sourceforge.net/sourceforge/corefonts/arial32.exe \ + http://dl.sourceforge.net/sourceforge/corefonts/arialb32.exe \ + http://dl.sourceforge.net/sourceforge/corefonts/comic32.exe \ + http://dl.sourceforge.net/sourceforge/corefonts/courie32.exe \ + http://dl.sourceforge.net/sourceforge/corefonts/georgi32.exe \ + http://dl.sourceforge.net/sourceforge/corefonts/impact32.exe \ + http://dl.sourceforge.net/sourceforge/corefonts/times32.exe \ + http://dl.sourceforge.net/sourceforge/corefonts/trebuc32.exe \ + http://dl.sourceforge.net/sourceforge/corefonts/verdan32.exe \ + http://dl.sourceforge.net/sourceforge/corefonts/wd97vwr32.exe \ + http://dl.sourceforge.net/sourceforge/corefonts/webdin32.exe) + +build() { + (cd cabextract-1.2 && ./configure && make) + for font in *.exe + do + cabextract-1.2/cabextract --lowercase $font + done + cabextract-1.2/cabextract --lowercase viewer1.cab + mkdir -p $PKG/usr/lib/X11/fonts/msttcorefonts + install -o root -g root -m 0644 *.ttf \ + $PKG/usr/lib/X11/fonts/msttcorefonts/ +} diff --git a/xorg-font-msttcorefonts/post-install b/xorg-font-msttcorefonts/post-install new file mode 100755 index 0000000..1e5fcde --- /dev/null +++ b/xorg-font-msttcorefonts/post-install @@ -0,0 +1,4 @@ +#!/bin/sh + +mkfontdir /usr/lib/X11/fonts/msttcorefonts +mkfontscale /usr/lib/X11/fonts/msttcorefonts

1 0

ports/opt (2.4): x11-fonts-artwiz-aleczapka: replaced by xorg-font-artwiz-aleczapka
by crux＠crux.nu 11 Nov '07

11 Nov '07

commit 4c1ebb8169029131d4eee932ac3e3316f2eac9e6 Author: Matt Housh <jaeger(a)crux.nu> Date: Fri Nov 9 22:31:54 2007 -0600 x11-fonts-artwiz-aleczapka: replaced by xorg-font-artwiz-aleczapka diff --git a/x11-fonts-artwiz-aleczapka/.footprint b/x11-fonts-artwiz-aleczapka/.footprint deleted file mode 100644 index 6d2092c..0000000 --- a/x11-fonts-artwiz-aleczapka/.footprint +++ /dev/null @@ -1,22 +0,0 @@ -drwxr-xr-x root/root usr/ -drwxr-xr-x root/root usr/share/ -drwxr-xr-x root/root usr/share/fonts/ -drwxr-xr-x root/root usr/share/fonts/artwiz-aleczapka/ --rw-r--r-- root/root usr/share/fonts/artwiz-aleczapka/anorexia.pcf --rw-r--r-- root/root usr/share/fonts/artwiz-aleczapka/aqui.pcf --rw-r--r-- root/root usr/share/fonts/artwiz-aleczapka/cure.pcf --rw-r--r-- root/root usr/share/fonts/artwiz-aleczapka/cursor.pcf --rw-r--r-- root/root usr/share/fonts/artwiz-aleczapka/drift.pcf --rw-r--r-- root/root usr/share/fonts/artwiz-aleczapka/edges.pcf --rw-r--r-- root/root usr/share/fonts/artwiz-aleczapka/fkp.pcf --rw-r--r-- root/root usr/share/fonts/artwiz-aleczapka/fonts.alias --rw-r--r-- root/root usr/share/fonts/artwiz-aleczapka/gelly.pcf --rw-r--r-- root/root usr/share/fonts/artwiz-aleczapka/glisp-bold.pcf --rw-r--r-- root/root usr/share/fonts/artwiz-aleczapka/glisp.pcf --rw-r--r-- root/root usr/share/fonts/artwiz-aleczapka/kates.pcf --rw-r--r-- root/root usr/share/fonts/artwiz-aleczapka/lime.pcf --rw-r--r-- root/root usr/share/fonts/artwiz-aleczapka/mints-mild.pcf --rw-r--r-- root/root usr/share/fonts/artwiz-aleczapka/mints-strong.pcf --rw-r--r-- root/root usr/share/fonts/artwiz-aleczapka/nu.pcf --rw-r--r-- root/root usr/share/fonts/artwiz-aleczapka/smoothansi.pcf --rw-r--r-- root/root usr/share/fonts/artwiz-aleczapka/snap.pcf diff --git a/x11-fonts-artwiz-aleczapka/.md5sum b/x11-fonts-artwiz-aleczapka/.md5sum deleted file mode 100644 index b5ab632..0000000 --- a/x11-fonts-artwiz-aleczapka/.md5sum +++ /dev/null @@ -1 +0,0 @@ -6c6c704f2f08f9d6308d366423dfa90e artwiz-aleczapka-en-1.3.tar.bz2 diff --git a/x11-fonts-artwiz-aleczapka/Pkgfile b/x11-fonts-artwiz-aleczapka/Pkgfile deleted file mode 100644 index 370bb60..0000000 --- a/x11-fonts-artwiz-aleczapka/Pkgfile +++ /dev/null @@ -1,17 +0,0 @@ -# Description: Artwiz X fonts revisited -# URL: http://artwizaleczapka.sourceforge.net/ -# Maintainer: Matt Housh, jaeger at morpheus dot net -# Depends on: x11 - -name=x11-fonts-artwiz-aleczapka -version=1.3 -release=1 -source=(http://dl.sourceforge.net/sourceforge/artwizaleczapka/artwiz-aleczapka-en-1.3.tar.bz2) - -build() { - mkdir -p $PKG/usr/share/fonts/artwiz-aleczapka - cd artwiz-aleczapka-en-1.3 - install -o root -g root -m 0644 *.pcf $PKG/usr/share/fonts/artwiz-aleczapka/ - install -o root -g root -m 0644 fonts.alias \ - $PKG/usr/share/fonts/artwiz-aleczapka/ -} diff --git a/x11-fonts-artwiz-aleczapka/README b/x11-fonts-artwiz-aleczapka/README deleted file mode 100644 index 48668e1..0000000 --- a/x11-fonts-artwiz-aleczapka/README +++ /dev/null @@ -1,34 +0,0 @@ - -REQUIREMENTS - - x11 - -PRE-INSTALL - -POST-INSTALL - - 1. add the artwiz-aleczapka directory to your fontpath - in the xorg.conf file: - - ---snip--- - - .. - Section "Files" - .. - FontPath "/usr/share/fonts/artwiz-aleczapka/" - EndSection - .. - - ---snip--- - - 2. create a font info database for the new fonts - - # cd /usr/share/fonts/artwiz-aleczapka/ - # mkfontdir - # fc-cache -f - - 3. restart X or rehash the font path like so: - - # xset fp rehash - -PRECAUTION diff --git a/xorg-font-artwiz-aleczapka/.footprint b/xorg-font-artwiz-aleczapka/.footprint new file mode 100644 index 0000000..c60e292 --- /dev/null +++ b/xorg-font-artwiz-aleczapka/.footprint @@ -0,0 +1,22 @@ +drwxr-xr-x root/root usr/ +drwxr-xr-x root/root usr/lib/ +drwxr-xr-x root/root usr/lib/X11/ +drwxr-xr-x root/root usr/lib/X11/fonts/ +drwxr-xr-x root/root usr/lib/X11/fonts/artwiz-aleczapka/ +-rw-r--r-- root/root usr/lib/X11/fonts/artwiz-aleczapka/anorexia.pcf +-rw-r--r-- root/root usr/lib/X11/fonts/artwiz-aleczapka/aqui.pcf +-rw-r--r-- root/root usr/lib/X11/fonts/artwiz-aleczapka/cure.pcf +-rw-r--r-- root/root usr/lib/X11/fonts/artwiz-aleczapka/cursor.pcf +-rw-r--r-- root/root usr/lib/X11/fonts/artwiz-aleczapka/drift.pcf +-rw-r--r-- root/root usr/lib/X11/fonts/artwiz-aleczapka/edges.pcf +-rw-r--r-- root/root usr/lib/X11/fonts/artwiz-aleczapka/fkp.pcf +-rw-r--r-- root/root usr/lib/X11/fonts/artwiz-aleczapka/gelly.pcf +-rw-r--r-- root/root usr/lib/X11/fonts/artwiz-aleczapka/glisp-bold.pcf +-rw-r--r-- root/root usr/lib/X11/fonts/artwiz-aleczapka/glisp.pcf +-rw-r--r-- root/root usr/lib/X11/fonts/artwiz-aleczapka/kates.pcf +-rw-r--r-- root/root usr/lib/X11/fonts/artwiz-aleczapka/lime.pcf +-rw-r--r-- root/root usr/lib/X11/fonts/artwiz-aleczapka/mints-mild.pcf +-rw-r--r-- root/root usr/lib/X11/fonts/artwiz-aleczapka/mints-strong.pcf +-rw-r--r-- root/root usr/lib/X11/fonts/artwiz-aleczapka/nu.pcf +-rw-r--r-- root/root usr/lib/X11/fonts/artwiz-aleczapka/smoothansi.pcf +-rw-r--r-- root/root usr/lib/X11/fonts/artwiz-aleczapka/snap.pcf diff --git a/xorg-font-artwiz-aleczapka/.md5sum b/xorg-font-artwiz-aleczapka/.md5sum new file mode 100644 index 0000000..b5ab632 --- /dev/null +++ b/xorg-font-artwiz-aleczapka/.md5sum @@ -0,0 +1 @@ +6c6c704f2f08f9d6308d366423dfa90e artwiz-aleczapka-en-1.3.tar.bz2 diff --git a/xorg-font-artwiz-aleczapka/Pkgfile b/xorg-font-artwiz-aleczapka/Pkgfile new file mode 100644 index 0000000..2cabdad --- /dev/null +++ b/xorg-font-artwiz-aleczapka/Pkgfile @@ -0,0 +1,16 @@ +# Description: Artwiz X fonts revisited +# URL: http://artwizaleczapka.sourceforge.net/ +# Maintainer: Matt Housh, jaeger at morpheus dot net +# Depends on: xorg-mkfontdir, xorg-mkfontscale + +name=xorg-font-artwiz-aleczapka +version=1.3 +release=1 +source=(http://dl.sourceforge.net/sourceforge/artwizaleczapka/artwiz-aleczapka-en-1.3.tar.bz2) + +build() { + mkdir -p $PKG/usr/lib/X11/fonts/artwiz-aleczapka + cd artwiz-aleczapka-en-1.3 + install -o root -g root -m 0644 *.pcf \ + $PKG/usr/lib/X11/fonts/artwiz-aleczapka/ +} diff --git a/xorg-font-artwiz-aleczapka/post-install b/xorg-font-artwiz-aleczapka/post-install new file mode 100755 index 0000000..588ab31 --- /dev/null +++ b/xorg-font-artwiz-aleczapka/post-install @@ -0,0 +1,4 @@ +#!/bin/sh + +mkfontdir /usr/lib/X11/fonts/artwiz-aleczapka +mkfontscale /usr/lib/X11/fonts/artwiz-aleczapka

1 0

ports/opt (2.4): sudo: updated to 1.6.9p8
by crux＠crux.nu 11 Nov '07

11 Nov '07

commit bef98633ee5dd40210e32f05c2669792f4dc6a6c Author: Simone Rota <sip(a)crux.nu> Date: Fri Nov 9 22:20:23 2007 +0100 sudo: updated to 1.6.9p8 diff --git a/sudo/.md5sum b/sudo/.md5sum index c61b6e4..9d17e0f 100644 --- a/sudo/.md5sum +++ b/sudo/.md5sum @@ -1 +1 @@ -1f262526f321af388b37e05ee57bb2c7 sudo-1.6.9p6.tar.gz +67a7f95664e9f3926dc3e36d8684f921 sudo-1.6.9p8.tar.gz diff --git a/sudo/Pkgfile b/sudo/Pkgfile index ad7cb54..eca75c2 100644 --- a/sudo/Pkgfile +++ b/sudo/Pkgfile @@ -5,7 +5,7 @@ # Depends on: name=sudo -version=1.6.9p6 +version=1.6.9p8 release=1 source=(http://www.sudo.ws/$name/dist/$name-$version.tar.gz)

1 0

ports/opt (2.3): [notify] mod_php: update to 5.2.5
by crux＠crux.nu 11 Nov '07

11 Nov '07

commit 039cc7f7320ae0750070a1ad836be4d1950fc921 Author: Juergen Daubert <jue(a)jue.li> Date: Sun Nov 11 10:46:46 2007 +0100 [notify] mod_php: update to 5.2.5 Several security fixes, see http://www.php.net/releases/5_2_5.php diff --git a/mod_php/.md5sum b/mod_php/.md5sum index ac9bdce..a169528 100644 --- a/mod_php/.md5sum +++ b/mod_php/.md5sum @@ -1 +1 @@ -55c97a671fdabf462cc7a82971a656d2 php-5.2.4.tar.bz2 +1fe14ca892460b09f06729941a1bb605 php-5.2.5.tar.bz2 diff --git a/mod_php/Pkgfile b/mod_php/Pkgfile index f57d6f8..db264f0 100644 --- a/mod_php/Pkgfile +++ b/mod_php/Pkgfile @@ -5,7 +5,7 @@ # Group: apache name=mod_php -version=5.2.4 +version=5.2.5 release=1 source=(http://www.php.net/distributions/php-$version.tar.bz2)

1 0

ports/opt (2.3): wine: updated to 0.9.49
by crux＠crux.nu 10 Nov '07

10 Nov '07

commit b5a3ea891f86007a459d06f8523f5e2dd962259b Author: Antti Nykanen <aon(a)iki.fi> Date: Sat Nov 10 12:59:42 2007 +0200 wine: updated to 0.9.49 diff --git a/wine/.footprint b/wine/.footprint index b266e80..d46c4cc 100644 --- a/wine/.footprint +++ b/wine/.footprint @@ -152,6 +152,7 @@ drwxr-xr-x root/root usr/include/wine/windows/ddk/ -rw-r--r-- root/root usr/include/wine/windows/ddk/ntddser.h -rw-r--r-- root/root usr/include/wine/windows/ddk/ntddtape.h -rw-r--r-- root/root usr/include/wine/windows/ddk/wdm.h +-rw-r--r-- root/root usr/include/wine/windows/ddk/winddiui.h -rw-r--r-- root/root usr/include/wine/windows/ddk/winsplp.h -rw-r--r-- root/root usr/include/wine/windows/ddraw.h -rw-r--r-- root/root usr/include/wine/windows/ddrawi.h @@ -244,6 +245,10 @@ drwxr-xr-x root/root usr/include/wine/windows/ddk/ -rw-r--r-- root/root usr/include/wine/windows/idispids.h -rw-r--r-- root/root usr/include/wine/windows/imagehlp.h -rw-r--r-- root/root usr/include/wine/windows/imm.h +-rw-r--r-- root/root usr/include/wine/windows/imnact.h +-rw-r--r-- root/root usr/include/wine/windows/imnact.idl +-rw-r--r-- root/root usr/include/wine/windows/imnxport.h +-rw-r--r-- root/root usr/include/wine/windows/imnxport.idl -rw-r--r-- root/root usr/include/wine/windows/indexsrv.h -rw-r--r-- root/root usr/include/wine/windows/indexsrv.idl -rw-r--r-- root/root usr/include/wine/windows/initguid.h @@ -285,8 +290,11 @@ drwxr-xr-x root/root usr/include/wine/windows/ddk/ -rw-r--r-- root/root usr/include/wine/windows/mediaerr.h -rw-r--r-- root/root usr/include/wine/windows/mediaobj.h -rw-r--r-- root/root usr/include/wine/windows/mediaobj.idl +-rw-r--r-- root/root usr/include/wine/windows/midles.h -rw-r--r-- root/root usr/include/wine/windows/mimeinfo.h -rw-r--r-- root/root usr/include/wine/windows/mimeinfo.idl +-rw-r--r-- root/root usr/include/wine/windows/mimeole.h +-rw-r--r-- root/root usr/include/wine/windows/mimeole.idl -rw-r--r-- root/root usr/include/wine/windows/minmax.h -rw-r--r-- root/root usr/include/wine/windows/mlang.h -rw-r--r-- root/root usr/include/wine/windows/mlang.idl @@ -535,6 +543,7 @@ drwxr-xr-x root/root usr/lib/wine/ -rwxr-xr-x root/root usr/lib/wine/crypt32.dll.so -rwxr-xr-x root/root usr/lib/wine/cryptdll.dll.so -rwxr-xr-x root/root usr/lib/wine/cryptnet.dll.so +-rwxr-xr-x root/root usr/lib/wine/ctapi32.dll.so -rw-r--r-- root/root usr/lib/wine/ctl3d.dll16 -rwxr-xr-x root/root usr/lib/wine/ctl3d32.dll.so -rw-r--r-- root/root usr/lib/wine/ctl3dv2.dll16 @@ -599,6 +608,7 @@ drwxr-xr-x root/root usr/lib/wine/ -rwxr-xr-x root/root usr/lib/wine/imagehlp.dll.so -rw-r--r-- root/root usr/lib/wine/imm.dll16 -rwxr-xr-x root/root usr/lib/wine/imm32.dll.so +-rwxr-xr-x root/root usr/lib/wine/inetcomm.dll.so -rwxr-xr-x root/root usr/lib/wine/infosoft.dll.so -rwxr-xr-x root/root usr/lib/wine/inkobj.dll.so -rwxr-xr-x root/root usr/lib/wine/inseng.dll.so @@ -657,6 +667,7 @@ drwxr-xr-x root/root usr/lib/wine/ -rw-r--r-- root/root usr/lib/wine/libicmp.def -rw-r--r-- root/root usr/lib/wine/libimagehlp.def -rw-r--r-- root/root usr/lib/wine/libimm32.def +-rw-r--r-- root/root usr/lib/wine/libinetcomm.def -rw-r--r-- root/root usr/lib/wine/libiphlpapi.def -rw-r--r-- root/root usr/lib/wine/libkernel32.def -rw-r--r-- root/root usr/lib/wine/liblz32.def @@ -762,6 +773,7 @@ drwxr-xr-x root/root usr/lib/wine/ -rwxr-xr-x root/root usr/lib/wine/msacm32.dll.so -rwxr-xr-x root/root usr/lib/wine/msacm32.drv.so -rwxr-xr-x root/root usr/lib/wine/msadp32.acm.so +-rwxr-xr-x root/root usr/lib/wine/mscat32.dll.so -rwxr-xr-x root/root usr/lib/wine/mscms.dll.so -rwxr-xr-x root/root usr/lib/wine/mscoree.dll.so -rwxr-xr-x root/root usr/lib/wine/msdmo.dll.so diff --git a/wine/.md5sum b/wine/.md5sum index d54e4e1..8ed4333 100644 --- a/wine/.md5sum +++ b/wine/.md5sum @@ -1 +1 @@ -e2cc11fe7ec7769bcf8fe4f59b1dd75a wine-0.9.48.tar.bz2 +417912f28e48ddc6c4285a493d070564 wine-0.9.49.tar.bz2 diff --git a/wine/Pkgfile b/wine/Pkgfile index 53e7315..7d64831 100644 --- a/wine/Pkgfile +++ b/wine/Pkgfile @@ -5,7 +5,7 @@ # Depends on: fontforge name=wine -version=0.9.48 +version=0.9.49 release=1 source=(http://ibiblio.org/pub/linux/system/emulators/wine/wine-$version.ta…

1 0

ports/opt (2.3): xpdf: updated to 3.02pl2
by crux＠crux.nu 10 Nov '07

10 Nov '07

commit 08852477c8bd1d78fdcc36264b112aecdc26529b Author: Antti Nykanen <aon(a)iki.fi> Date: Sat Nov 10 14:47:31 2007 +0200 xpdf: updated to 3.02pl2 diff --git a/xpdf/.md5sum b/xpdf/.md5sum index 6c9cfac..7c771b4 100644 --- a/xpdf/.md5sum +++ b/xpdf/.md5sum @@ -1,2 +1,3 @@ -877118786dfe27d1b7aa5a6759cc6e45 xpdf-3.02.patch 599dc4cc65a07ee868cf92a667a913d2 xpdf-3.02.tar.gz +877118786dfe27d1b7aa5a6759cc6e45 xpdf-3.02pl1.patch +3a5cb165ae66781e0b21e6219ae06795 xpdf-3.02pl2.patch diff --git a/xpdf/Pkgfile b/xpdf/Pkgfile index a599a4d..6842f48 100644 --- a/xpdf/Pkgfile +++ b/xpdf/Pkgfile @@ -6,13 +6,15 @@ name=xpdf version=3.02 -release=2 +release=3 source=(ftp://ftp.foolabs.com/pub/xpdf/$name-$version.tar.gz - $name-$version.patch) + $name-${version}pl1.patch + $name-${version}pl2.patch) build() { cd $name-$version - patch -p1 -i $SRC/$name-$version.patch + patch -p1 -i $SRC/$name-${version}pl1.patch + patch -p1 -i $SRC/$name-${version}pl2.patch ./configure \ --prefix=/usr \ --with-Xm-library=/usr/lib \ diff --git a/xpdf/xpdf-3.02.patch b/xpdf/xpdf-3.02.patch deleted file mode 100644 index cd42fb9..0000000 --- a/xpdf/xpdf-3.02.patch +++ /dev/null @@ -1,33 +0,0 @@ -*** xpdf-3.02.orig/xpdf/Stream.cc Tue Feb 27 14:05:52 2007 ---- xpdf-3.02/xpdf/Stream.cc Thu Jul 26 14:44:43 2007 -*************** -*** 410,424 **** - ok = gFalse; - - nVals = width * nComps; -- if (width <= 0 || nComps <= 0 || nBits <= 0 || -- nComps >= INT_MAX / nBits || -- width >= INT_MAX / nComps / nBits || -- nVals * nBits + 7 < 0) { -- return; -- } - pixBytes = (nComps * nBits + 7) >> 3; - rowBytes = ((nVals * nBits + 7) >> 3) + pixBytes; -! if (rowBytes <= 0) { - return; - } - predLine = (Guchar *)gmalloc(rowBytes); ---- 410,422 ---- - ok = gFalse; - - nVals = width * nComps; - pixBytes = (nComps * nBits + 7) >> 3; - rowBytes = ((nVals * nBits + 7) >> 3) + pixBytes; -! if (width <= 0 || nComps <= 0 || nBits <= 0 || -! nComps > gfxColorMaxComps || -! nBits > 16 || -! width >= INT_MAX / nComps || // check for overflow in nVals -! nVals >= (INT_MAX - 7) / nBits) { // check for overflow in rowBytes - return; - } - predLine = (Guchar *)gmalloc(rowBytes); diff --git a/xpdf/xpdf-3.02pl1.patch b/xpdf/xpdf-3.02pl1.patch new file mode 100644 index 0000000..cd42fb9 --- /dev/null +++ b/xpdf/xpdf-3.02pl1.patch @@ -0,0 +1,33 @@ +*** xpdf-3.02.orig/xpdf/Stream.cc Tue Feb 27 14:05:52 2007 +--- xpdf-3.02/xpdf/Stream.cc Thu Jul 26 14:44:43 2007 +*************** +*** 410,424 **** + ok = gFalse; + + nVals = width * nComps; +- if (width <= 0 || nComps <= 0 || nBits <= 0 || +- nComps >= INT_MAX / nBits || +- width >= INT_MAX / nComps / nBits || +- nVals * nBits + 7 < 0) { +- return; +- } + pixBytes = (nComps * nBits + 7) >> 3; + rowBytes = ((nVals * nBits + 7) >> 3) + pixBytes; +! if (rowBytes <= 0) { + return; + } + predLine = (Guchar *)gmalloc(rowBytes); +--- 410,422 ---- + ok = gFalse; + + nVals = width * nComps; + pixBytes = (nComps * nBits + 7) >> 3; + rowBytes = ((nVals * nBits + 7) >> 3) + pixBytes; +! if (width <= 0 || nComps <= 0 || nBits <= 0 || +! nComps > gfxColorMaxComps || +! nBits > 16 || +! width >= INT_MAX / nComps || // check for overflow in nVals +! nVals >= (INT_MAX - 7) / nBits) { // check for overflow in rowBytes + return; + } + predLine = (Guchar *)gmalloc(rowBytes); diff --git a/xpdf/xpdf-3.02pl2.patch b/xpdf/xpdf-3.02pl2.patch new file mode 100644 index 0000000..ab9e3c6 --- /dev/null +++ b/xpdf/xpdf-3.02pl2.patch @@ -0,0 +1,823 @@ +diff -c -r xpdf-3.02pl1.orig/xpdf/Stream.cc xpdf-3.02/xpdf/Stream.cc +*** xpdf-3.02pl1.orig/xpdf/Stream.cc Thu Oct 25 15:47:38 2007 +--- xpdf-3.02/xpdf/Stream.cc Thu Oct 25 15:48:19 2007 +*************** +*** 1243,1265 **** + columns = columnsA; + if (columns < 1) { + columns = 1; +! } +! if (columns + 4 <= 0) { +! columns = INT_MAX - 4; + } + rows = rowsA; + endOfBlock = endOfBlockA; + black = blackA; +! refLine = (short *)gmallocn(columns + 3, sizeof(short)); +! codingLine = (short *)gmallocn(columns + 2, sizeof(short)); + + eof = gFalse; + row = 0; + nextLine2D = encoding < 0; + inputBits = 0; +! codingLine[0] = 0; +! codingLine[1] = refLine[2] = columns; +! a0 = 1; + + buf = EOF; + } +--- 1243,1268 ---- + columns = columnsA; + if (columns < 1) { + columns = 1; +! } else if (columns > INT_MAX - 2) { +! columns = INT_MAX - 2; + } + rows = rowsA; + endOfBlock = endOfBlockA; + black = blackA; +! // 0 <= codingLine[0] < codingLine[1] < ... < codingLine[n] = columns +! // ---> max codingLine size = columns + 1 +! // refLine has one extra guard entry at the end +! // ---> max refLine size = columns + 2 +! codingLine = (int *)gmallocn(columns + 1, sizeof(int)); +! refLine = (int *)gmallocn(columns + 2, sizeof(int)); + + eof = gFalse; + row = 0; + nextLine2D = encoding < 0; + inputBits = 0; +! codingLine[0] = columns; +! a0i = 0; +! outputBits = 0; + + buf = EOF; + } +*************** +*** 1278,1286 **** + row = 0; + nextLine2D = encoding < 0; + inputBits = 0; +! codingLine[0] = 0; +! codingLine[1] = columns; +! a0 = 1; + buf = EOF; + + // skip any initial zero bits and end-of-line marker, and get the 2D +--- 1281,1289 ---- + row = 0; + nextLine2D = encoding < 0; + inputBits = 0; +! codingLine[0] = columns; +! a0i = 0; +! outputBits = 0; + buf = EOF; + + // skip any initial zero bits and end-of-line marker, and get the 2D +*************** +*** 1297,1507 **** + } + } + + int CCITTFaxStream::lookChar() { + short code1, code2, code3; +! int a0New; +! GBool err, gotEOL; +! int ret; +! int bits, i; + +! // if at eof just return EOF +! if (eof && codingLine[a0] >= columns) { +! return EOF; + } + + // read the next row +! err = gFalse; +! if (codingLine[a0] >= columns) { + + // 2-D encoding + if (nextLine2D) { +- // state: +- // a0New = current position in coding line (0 <= a0New <= columns) +- // codingLine[a0] = last change in coding line +- // (black-to-white if a0 is even, +- // white-to-black if a0 is odd) +- // refLine[b1] = next change in reference line of opposite color +- // to a0 +- // invariants: +- // 0 <= codingLine[a0] <= a0New +- // <= refLine[b1] <= refLine[b1+1] <= columns +- // 0 <= a0 <= columns+1 +- // refLine[0] = 0 +- // refLine[n] = refLine[n+1] = columns +- // -- for some 1 <= n <= columns+1 +- // end condition: +- // 0 = codingLine[0] <= codingLine[1] < codingLine[2] < ... +- // < codingLine[n-1] < codingLine[n] = columns +- // -- where 1 <= n <= columns+1 + for (i = 0; codingLine[i] < columns; ++i) { + refLine[i] = codingLine[i]; + } +! refLine[i] = refLine[i + 1] = columns; +! b1 = 1; +! a0New = codingLine[a0 = 0] = 0; +! do { + code1 = getTwoDimCode(); + switch (code1) { + case twoDimPass: +! if (refLine[b1] < columns) { +! a0New = refLine[b1 + 1]; +! b1 += 2; + } + break; + case twoDimHoriz: +! if ((a0 & 1) == 0) { +! code1 = code2 = 0; + do { +! code1 += code3 = getWhiteCode(); + } while (code3 >= 64); + do { +! code2 += code3 = getBlackCode(); + } while (code3 >= 64); + } else { +- code1 = code2 = 0; + do { +! code1 += code3 = getBlackCode(); + } while (code3 >= 64); + do { +! code2 += code3 = getWhiteCode(); + } while (code3 >= 64); + } +! if (code1 > 0 || code2 > 0) { +! if (a0New + code1 <= columns) { +! codingLine[a0 + 1] = a0New + code1; +! } else { +! codingLine[a0 + 1] = columns; +! } +! ++a0; +! if (codingLine[a0] + code2 <= columns) { +! codingLine[a0 + 1] = codingLine[a0] + code2; +! } else { +! codingLine[a0 + 1] = columns; +! } +! ++a0; +! a0New = codingLine[a0]; +! while (refLine[b1] <= a0New && refLine[b1] < columns) { +! b1 += 2; + } + } + break; +! case twoDimVert0: +! if (refLine[b1] < columns) { +! a0New = codingLine[++a0] = refLine[b1]; +! ++b1; +! while (refLine[b1] <= a0New && refLine[b1] < columns) { +! b1 += 2; + } +- } else { +- a0New = codingLine[++a0] = columns; + } + break; + case twoDimVertR1: +! if (refLine[b1] + 1 < columns) { +! a0New = codingLine[++a0] = refLine[b1] + 1; +! ++b1; +! while (refLine[b1] <= a0New && refLine[b1] < columns) { +! b1 += 2; + } +- } else { +- a0New = codingLine[++a0] = columns; + } + break; +! case twoDimVertL1: +! if (refLine[b1] - 1 > a0New || (a0 == 0 && refLine[b1] == 1)) { +! a0New = codingLine[++a0] = refLine[b1] - 1; +! --b1; +! while (refLine[b1] <= a0New && refLine[b1] < columns) { +! b1 += 2; + } + } + break; +! case twoDimVertR2: +! if (refLine[b1] + 2 < columns) { +! a0New = codingLine[++a0] = refLine[b1] + 2; +! ++b1; +! while (refLine[b1] <= a0New && refLine[b1] < columns) { +! b1 += 2; + } +- } else { +- a0New = codingLine[++a0] = columns; + } + break; + case twoDimVertL2: +! if (refLine[b1] - 2 > a0New || (a0 == 0 && refLine[b1] == 2)) { +! a0New = codingLine[++a0] = refLine[b1] - 2; +! --b1; +! while (refLine[b1] <= a0New && refLine[b1] < columns) { +! b1 += 2; + } +! } +! break; +! case twoDimVertR3: +! if (refLine[b1] + 3 < columns) { +! a0New = codingLine[++a0] = refLine[b1] + 3; +! ++b1; +! while (refLine[b1] <= a0New && refLine[b1] < columns) { +! b1 += 2; + } +- } else { +- a0New = codingLine[++a0] = columns; + } + break; +! case twoDimVertL3: +! if (refLine[b1] - 3 > a0New || (a0 == 0 && refLine[b1] == 3)) { +! a0New = codingLine[++a0] = refLine[b1] - 3; +! --b1; +! while (refLine[b1] <= a0New && refLine[b1] < columns) { +! b1 += 2; + } + } + break; + case EOF: + eof = gTrue; +! codingLine[a0 = 0] = columns; +! return EOF; + default: + error(getPos(), "Bad 2D code %04x in CCITTFax stream", code1); + err = gTrue; + break; + } +! } while (codingLine[a0] < columns); + + // 1-D encoding + } else { +! codingLine[a0 = 0] = 0; +! while (1) { + code1 = 0; +! do { +! code1 += code3 = getWhiteCode(); +! } while (code3 >= 64); +! codingLine[a0+1] = codingLine[a0] + code1; +! ++a0; +! if (codingLine[a0] >= columns) { +! break; +! } +! code2 = 0; +! do { +! code2 += code3 = getBlackCode(); +! } while (code3 >= 64); +! codingLine[a0+1] = codingLine[a0] + code2; +! ++a0; +! if (codingLine[a0] >= columns) { +! break; + } + } + } + +- if (codingLine[a0] != columns) { +- error(getPos(), "CCITTFax row is wrong length (%d)", codingLine[a0]); +- // force the row to be the correct length +- while (codingLine[a0] > columns) { +- --a0; +- } +- codingLine[++a0] = columns; +- err = gTrue; +- } +- + // byte-align the row + if (byteAlign) { + inputBits &= ~7; +--- 1300,1529 ---- + } + } + ++ inline void CCITTFaxStream::addPixels(int a1, int blackPixels) { ++ if (a1 > codingLine[a0i]) { ++ if (a1 > columns) { ++ error(getPos(), "CCITTFax row is wrong length (%d)", a1); ++ err = gTrue; ++ a1 = columns; ++ } ++ if ((a0i & 1) ^ blackPixels) { ++ ++a0i; ++ } ++ codingLine[a0i] = a1; ++ } ++ } ++ ++ inline void CCITTFaxStream::addPixelsNeg(int a1, int blackPixels) { ++ if (a1 > codingLine[a0i]) { ++ if (a1 > columns) { ++ error(getPos(), "CCITTFax row is wrong length (%d)", a1); ++ err = gTrue; ++ a1 = columns; ++ } ++ if ((a0i & 1) ^ blackPixels) { ++ ++a0i; ++ } ++ codingLine[a0i] = a1; ++ } else if (a1 < codingLine[a0i]) { ++ if (a1 < 0) { ++ error(getPos(), "Invalid CCITTFax code"); ++ err = gTrue; ++ a1 = 0; ++ } ++ while (a0i > 0 && a1 <= codingLine[a0i - 1]) { ++ --a0i; ++ } ++ codingLine[a0i] = a1; ++ } ++ } ++ + int CCITTFaxStream::lookChar() { + short code1, code2, code3; +! int b1i, blackPixels, i, bits; +! GBool gotEOL; + +! if (buf != EOF) { +! return buf; + } + + // read the next row +! if (outputBits == 0) { +! +! // if at eof just return EOF +! if (eof) { +! return EOF; +! } +! +! err = gFalse; + + // 2-D encoding + if (nextLine2D) { + for (i = 0; codingLine[i] < columns; ++i) { + refLine[i] = codingLine[i]; + } +! refLine[i++] = columns; +! refLine[i] = columns; +! codingLine[0] = 0; +! a0i = 0; +! b1i = 0; +! blackPixels = 0; +! // invariant: +! // refLine[b1i-1] <= codingLine[a0i] < refLine[b1i] < refLine[b1i+1] +! // <= columns +! // exception at left edge: +! // codingLine[a0i = 0] = refLine[b1i = 0] = 0 is possible +! // exception at right edge: +! // refLine[b1i] = refLine[b1i+1] = columns is possible +! while (codingLine[a0i] < columns) { + code1 = getTwoDimCode(); + switch (code1) { + case twoDimPass: +! addPixels(refLine[b1i + 1], blackPixels); +! if (refLine[b1i + 1] < columns) { +! b1i += 2; + } + break; + case twoDimHoriz: +! code1 = code2 = 0; +! if (blackPixels) { + do { +! code1 += code3 = getBlackCode(); + } while (code3 >= 64); + do { +! code2 += code3 = getWhiteCode(); + } while (code3 >= 64); + } else { + do { +! code1 += code3 = getWhiteCode(); + } while (code3 >= 64); + do { +! code2 += code3 = getBlackCode(); + } while (code3 >= 64); + } +! addPixels(codingLine[a0i] + code1, blackPixels); +! if (codingLine[a0i] < columns) { +! addPixels(codingLine[a0i] + code2, blackPixels ^ 1); +! } +! while (refLine[b1i] <= codingLine[a0i] && refLine[b1i] < columns) { +! b1i += 2; +! } +! break; +! case twoDimVertR3: +! addPixels(refLine[b1i] + 3, blackPixels); +! blackPixels ^= 1; +! if (codingLine[a0i] < columns) { +! ++b1i; +! while (refLine[b1i] <= codingLine[a0i] && refLine[b1i] < columns) { +! b1i += 2; + } + } + break; +! case twoDimVertR2: +! addPixels(refLine[b1i] + 2, blackPixels); +! blackPixels ^= 1; +! if (codingLine[a0i] < columns) { +! ++b1i; +! while (refLine[b1i] <= codingLine[a0i] && refLine[b1i] < columns) { +! b1i += 2; + } + } + break; + case twoDimVertR1: +! addPixels(refLine[b1i] + 1, blackPixels); +! blackPixels ^= 1; +! if (codingLine[a0i] < columns) { +! ++b1i; +! while (refLine[b1i] <= codingLine[a0i] && refLine[b1i] < columns) { +! b1i += 2; + } + } + break; +! case twoDimVert0: +! addPixels(refLine[b1i], blackPixels); +! blackPixels ^= 1; +! if (codingLine[a0i] < columns) { +! ++b1i; +! while (refLine[b1i] <= codingLine[a0i] && refLine[b1i] < columns) { +! b1i += 2; + } + } + break; +! case twoDimVertL3: +! addPixelsNeg(refLine[b1i] - 3, blackPixels); +! blackPixels ^= 1; +! if (codingLine[a0i] < columns) { +! if (b1i > 0) { +! --b1i; +! } else { +! ++b1i; +! } +! while (refLine[b1i] <= codingLine[a0i] && refLine[b1i] < columns) { +! b1i += 2; + } + } + break; + case twoDimVertL2: +! addPixelsNeg(refLine[b1i] - 2, blackPixels); +! blackPixels ^= 1; +! if (codingLine[a0i] < columns) { +! if (b1i > 0) { +! --b1i; +! } else { +! ++b1i; + } +! while (refLine[b1i] <= codingLine[a0i] && refLine[b1i] < columns) { +! b1i += 2; + } + } + break; +! case twoDimVertL1: +! addPixelsNeg(refLine[b1i] - 1, blackPixels); +! blackPixels ^= 1; +! if (codingLine[a0i] < columns) { +! if (b1i > 0) { +! --b1i; +! } else { +! ++b1i; +! } +! while (refLine[b1i] <= codingLine[a0i] && refLine[b1i] < columns) { +! b1i += 2; + } + } + break; + case EOF: ++ addPixels(columns, 0); + eof = gTrue; +! break; + default: + error(getPos(), "Bad 2D code %04x in CCITTFax stream", code1); ++ addPixels(columns, 0); + err = gTrue; + break; + } +! } + + // 1-D encoding + } else { +! codingLine[0] = 0; +! a0i = 0; +! blackPixels = 0; +! while (codingLine[a0i] < columns) { + code1 = 0; +! if (blackPixels) { +! do { +! code1 += code3 = getBlackCode(); +! } while (code3 >= 64); +! } else { +! do { +! code1 += code3 = getWhiteCode(); +! } while (code3 >= 64); + } ++ addPixels(codingLine[a0i] + code1, blackPixels); ++ blackPixels ^= 1; + } + } + + // byte-align the row + if (byteAlign) { + inputBits &= ~7; +*************** +*** 1560,1573 **** + // this if we know the stream contains end-of-line markers because + // the "just plow on" technique tends to work better otherwise + } else if (err && endOfLine) { +! do { + if (code1 == EOF) { + eof = gTrue; + return EOF; + } + eatBits(1); +! code1 = lookBits(13); +! } while ((code1 >> 1) != 0x001); + eatBits(12); + if (encoding > 0) { + eatBits(1); +--- 1582,1598 ---- + // this if we know the stream contains end-of-line markers because + // the "just plow on" technique tends to work better otherwise + } else if (err && endOfLine) { +! while (1) { +! code1 = lookBits(13); + if (code1 == EOF) { + eof = gTrue; + return EOF; + } ++ if ((code1 >> 1) == 0x001) { ++ break; ++ } + eatBits(1); +! } + eatBits(12); + if (encoding > 0) { + eatBits(1); +*************** +*** 1575,1585 **** + } + } + +! a0 = 0; +! outputBits = codingLine[1] - codingLine[0]; +! if (outputBits == 0) { +! a0 = 1; +! outputBits = codingLine[2] - codingLine[1]; + } + + ++row; +--- 1600,1610 ---- + } + } + +! // set up for output +! if (codingLine[0] > 0) { +! outputBits = codingLine[a0i = 0]; +! } else { +! outputBits = codingLine[a0i = 1]; + } + + ++row; +*************** +*** 1587,1625 **** + + // get a byte + if (outputBits >= 8) { +! ret = ((a0 & 1) == 0) ? 0xff : 0x00; +! if ((outputBits -= 8) == 0) { +! ++a0; +! if (codingLine[a0] < columns) { +! outputBits = codingLine[a0 + 1] - codingLine[a0]; +! } + } + } else { + bits = 8; +! ret = 0; + do { + if (outputBits > bits) { +! i = bits; +! bits = 0; +! if ((a0 & 1) == 0) { +! ret |= 0xff >> (8 - i); + } +! outputBits -= i; + } else { +! i = outputBits; +! bits -= outputBits; +! if ((a0 & 1) == 0) { +! ret |= (0xff >> (8 - i)) << bits; + } + outputBits = 0; +! ++a0; +! if (codingLine[a0] < columns) { +! outputBits = codingLine[a0 + 1] - codingLine[a0]; + } + } +! } while (bits > 0 && codingLine[a0] < columns); + } +- buf = black ? (ret ^ 0xff) : ret; + return buf; + } + +--- 1612,1654 ---- + + // get a byte + if (outputBits >= 8) { +! buf = (a0i & 1) ? 0x00 : 0xff; +! outputBits -= 8; +! if (outputBits == 0 && codingLine[a0i] < columns) { +! ++a0i; +! outputBits = codingLine[a0i] - codingLine[a0i - 1]; + } + } else { + bits = 8; +! buf = 0; + do { + if (outputBits > bits) { +! buf <<= bits; +! if (!(a0i & 1)) { +! buf |= 0xff >> (8 - bits); + } +! outputBits -= bits; +! bits = 0; + } else { +! buf <<= outputBits; +! if (!(a0i & 1)) { +! buf |= 0xff >> (8 - outputBits); + } ++ bits -= outputBits; + outputBits = 0; +! if (codingLine[a0i] < columns) { +! ++a0i; +! outputBits = codingLine[a0i] - codingLine[a0i - 1]; +! } else if (bits > 0) { +! buf <<= bits; +! bits = 0; + } + } +! } while (bits); +! } +! if (black) { +! buf ^= 0xff; + } + return buf; + } + +*************** +*** 1661,1666 **** +--- 1690,1698 ---- + code = 0; // make gcc happy + if (endOfBlock) { + code = lookBits(12); ++ if (code == EOF) { ++ return 1; ++ } + if ((code >> 5) == 0) { + p = &whiteTab1[code]; + } else { +*************** +*** 1673,1678 **** +--- 1705,1713 ---- + } else { + for (n = 1; n <= 9; ++n) { + code = lookBits(n); ++ if (code == EOF) { ++ return 1; ++ } + if (n < 9) { + code <<= 9 - n; + } +*************** +*** 1684,1689 **** +--- 1719,1727 ---- + } + for (n = 11; n <= 12; ++n) { + code = lookBits(n); ++ if (code == EOF) { ++ return 1; ++ } + if (n < 12) { + code <<= 12 - n; + } +*************** +*** 1709,1717 **** + code = 0; // make gcc happy + if (endOfBlock) { + code = lookBits(13); + if ((code >> 7) == 0) { + p = &blackTab1[code]; +! } else if ((code >> 9) == 0) { + p = &blackTab2[(code >> 1) - 64]; + } else { + p = &blackTab3[code >> 7]; +--- 1747,1758 ---- + code = 0; // make gcc happy + if (endOfBlock) { + code = lookBits(13); ++ if (code == EOF) { ++ return 1; ++ } + if ((code >> 7) == 0) { + p = &blackTab1[code]; +! } else if ((code >> 9) == 0 && (code >> 7) != 0) { + p = &blackTab2[(code >> 1) - 64]; + } else { + p = &blackTab3[code >> 7]; +*************** +*** 1723,1728 **** +--- 1764,1772 ---- + } else { + for (n = 2; n <= 6; ++n) { + code = lookBits(n); ++ if (code == EOF) { ++ return 1; ++ } + if (n < 6) { + code <<= 6 - n; + } +*************** +*** 1734,1739 **** +--- 1778,1786 ---- + } + for (n = 7; n <= 12; ++n) { + code = lookBits(n); ++ if (code == EOF) { ++ return 1; ++ } + if (n < 12) { + code <<= 12 - n; + } +*************** +*** 1747,1752 **** +--- 1794,1802 ---- + } + for (n = 10; n <= 13; ++n) { + code = lookBits(n); ++ if (code == EOF) { ++ return 1; ++ } + if (n < 13) { + code <<= 13 - n; + } +*************** +*** 1961,1966 **** +--- 2011,2022 ---- + // allocate a buffer for the whole image + bufWidth = ((width + mcuWidth - 1) / mcuWidth) * mcuWidth; + bufHeight = ((height + mcuHeight - 1) / mcuHeight) * mcuHeight; ++ if (bufWidth <= 0 || bufHeight <= 0 || ++ bufWidth > INT_MAX / bufWidth / (int)sizeof(int)) { ++ error(getPos(), "Invalid image size in DCT stream"); ++ y = height; ++ return; ++ } + for (i = 0; i < numComps; ++i) { + frameBuf[i] = (int *)gmallocn(bufWidth * bufHeight, sizeof(int)); + memset(frameBuf[i], 0, bufWidth * bufHeight * sizeof(int)); +*************** +*** 3036,3041 **** +--- 3092,3102 ---- + } + scanInfo.firstCoeff = str->getChar(); + scanInfo.lastCoeff = str->getChar(); ++ if (scanInfo.firstCoeff < 0 || scanInfo.lastCoeff > 63 || ++ scanInfo.firstCoeff > scanInfo.lastCoeff) { ++ error(getPos(), "Bad DCT coefficient numbers in scan info block"); ++ return gFalse; ++ } + c = str->getChar(); + scanInfo.ah = (c >> 4) & 0x0f; + scanInfo.al = c & 0x0f; +diff -c -r xpdf-3.02pl1.orig/xpdf/Stream.h xpdf-3.02/xpdf/Stream.h +*** xpdf-3.02pl1.orig/xpdf/Stream.h Tue Feb 27 14:05:52 2007 +--- xpdf-3.02/xpdf/Stream.h Thu Oct 25 15:48:15 2007 +*************** +*** 528,540 **** + int row; // current row + int inputBuf; // input buffer + int inputBits; // number of bits in input buffer +! short *refLine; // reference line changing elements +! int b1; // index into refLine +! short *codingLine; // coding line changing elements +! int a0; // index into codingLine + int outputBits; // remaining ouput bits + int buf; // character buffer + + short getTwoDimCode(); + short getWhiteCode(); + short getBlackCode(); +--- 528,542 ---- + int row; // current row + int inputBuf; // input buffer + int inputBits; // number of bits in input buffer +! int *codingLine; // coding line changing elements +! int *refLine; // reference line changing elements +! int a0i; // index into codingLine +! GBool err; // error on current line + int outputBits; // remaining ouput bits + int buf; // character buffer + ++ void addPixels(int a1, int black); ++ void addPixelsNeg(int a1, int black); + short getTwoDimCode(); + short getWhiteCode(); + short getBlackCode();

1 0