Added an upstream patch to fix security bug 198409.

Package-Manager: portage-2.1.3.19

7 files changed, 772 insertions, 15 deletions

diff --git a/kde-base/kpdf/ChangeLog b/kde-base/kpdf/ChangeLog
index 43666e0a5961..5007aa430a06 100644
--- a/kde-base/kpdf/ChangeLog
+++ b/kde-base/kpdf/ChangeLog
@@ -1,6 +1,14 @@
 # ChangeLog for kde-base/kpdf
 # Copyright 1999-2007 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/kde-base/kpdf/ChangeLog,v 1.139 2007/10/19 23:22:31 philantrop Exp $
+# $Header: /var/cvsroot/gentoo-x86/kde-base/kpdf/ChangeLog,v 1.140 2007/11/10 16:47:41 philantrop Exp $
+
+*kpdf-3.5.8-r1 (10 Nov 2007)
+*kpdf-3.5.7-r3 (10 Nov 2007)
+
+  10 Nov 2007; Wulf C. Krueger <philantrop@gentoo.org>
+  +files/post-3.5.8-kdegraphics-kpdf.diff, +kpdf-3.5.7-r3.ebuild,
+  +kpdf-3.5.8-r1.ebuild:
+  Added an upstream patch to fix security bug 198409.
 
 *kpdf-3.5.8 (19 Oct 2007)
 
diff --git a/kde-base/kpdf/Manifest b/kde-base/kpdf/Manifest
index 06f9c2e5ed3a..6a4d8d763c20 100644
--- a/kde-base/kpdf/Manifest
+++ b/kde-base/kpdf/Manifest
@@ -1,6 +1,3 @@
------BEGIN PGP SIGNED MESSAGE-----
-Hash: SHA1
-
 AUX kpdf-3.5.7-hash_path.diff 443 RMD160 e9e45aa4955fe8c0118ce2b4d1322c5ebd557e60 SHA1 804d2b7824815e949e31114fd1ca6b311dbcdfa6 SHA256 8641659f9f43612d53ea68906fdefac01ebdd221e84c5d50ebdcb2b8ce61027b
 MD5 a4c57f5b3b43eefe35bf543c1237a632 files/kpdf-3.5.7-hash_path.diff 443
 RMD160 e9e45aa4955fe8c0118ce2b4d1322c5ebd557e60 files/kpdf-3.5.7-hash_path.diff 443
@@ -13,6 +10,10 @@ AUX post-3.5.7-kdegraphics-CVE-2007-3387.diff 629 RMD160 90ae49e315080e2ef5431ae
 MD5 d1b3248c6a7843ad3265d25adcf7aa2f files/post-3.5.7-kdegraphics-CVE-2007-3387.diff 629
 RMD160 90ae49e315080e2ef5431ae2bcfa25d06fa2fce2 files/post-3.5.7-kdegraphics-CVE-2007-3387.diff 629
 SHA256 6fd0c067f21973064e9903bff9a0516136fe82e8aa39b485714151ae4cdd0943 files/post-3.5.7-kdegraphics-CVE-2007-3387.diff 629
+AUX post-3.5.8-kdegraphics-kpdf.diff 17412 RMD160 e8202b93098ae0523d4f2fbf3661648904a6619b SHA1 fea08298b8f9228ed57ddf0ceffcab12755c1e80 SHA256 266c60858c1e4671f5540fa767d0efd83a5c9530de931de41b14ebaf3dcfb529
+MD5 eee08cb565c24ad645aad3136de5162d files/post-3.5.8-kdegraphics-kpdf.diff 17412
+RMD160 e8202b93098ae0523d4f2fbf3661648904a6619b files/post-3.5.8-kdegraphics-kpdf.diff 17412
+SHA256 266c60858c1e4671f5540fa767d0efd83a5c9530de931de41b14ebaf3dcfb529 files/post-3.5.8-kdegraphics-kpdf.diff 17412
 DIST kdegraphics-3.5.5.tar.bz2 7334117 RMD160 c6febdf8ebd67110be3f27ada4c00e148403217f SHA1 e063f9351e2781cc6a5d23834611fc7dc7dc4fbd SHA256 b6706d37568686e1ca4b4bb2cf1f79c027b94a512f6fe1156b7c7b7f79336f16
 DIST kdegraphics-3.5.6.tar.bz2 7332938 RMD160 4cb41696ffb1284252009edfe8bd0933ef541800 SHA1 481d3f3733c042f7dfe7d9fc6620d17f8b945957 SHA256 2c397f3c524b7c465e6d9289944aa8ed2acc43c8bafb983eb3f252aba7a19a1f
 DIST kdegraphics-3.5.7.tar.bz2 7424976 RMD160 ccf36f5c34a1d484f0878a42a51dc620c2bdfa71 SHA1 2b6ca2c27f565b5ca4a40d461db7b4038658b5f3 SHA256 5689882ade29d0f56e95783f1c3e443fd512ca8291bcb81aac60ac719a8dcdcc
@@ -38,18 +39,26 @@ EBUILD kpdf-3.5.7-r2.ebuild 1267 RMD160 76c4688afd5e43e2e5f330d1bc7552f032a88072
 MD5 facdd87bb5b9acf5f35d5075ddfb27aa kpdf-3.5.7-r2.ebuild 1267
 RMD160 76c4688afd5e43e2e5f330d1bc7552f032a88072 kpdf-3.5.7-r2.ebuild 1267
 SHA256 3c506a1cf49037dc62c3e9df7e4282c32a0ee074f8f5fa993823697715d99e3e kpdf-3.5.7-r2.ebuild 1267
+EBUILD kpdf-3.5.7-r3.ebuild 1612 RMD160 6ac2b48e730525a4b2e41ca9050268dd9975886d SHA1 843a1bb206d9255f597c185cbbbf2f91290fbc39 SHA256 76b8e31ddbce309e7cb4e059a654cabb79f3d068c8db641a3daf4da693b43c57
+MD5 05bbaba6d9b0391b57154b9b61fc0d7c kpdf-3.5.7-r3.ebuild 1612
+RMD160 6ac2b48e730525a4b2e41ca9050268dd9975886d kpdf-3.5.7-r3.ebuild 1612
+SHA256 76b8e31ddbce309e7cb4e059a654cabb79f3d068c8db641a3daf4da693b43c57 kpdf-3.5.7-r3.ebuild 1612
 EBUILD kpdf-3.5.7.ebuild 1160 RMD160 eff23765323e103b5350fd599c26f56806905f3f SHA1 7c46a709f1ebb6e8b7b016b025befa11c0b1a592 SHA256 056ba647a0cfdc165a8edec3d8b6d995d7296d59e569fb37c0c4924b295e28ae
 MD5 3b5e84030845ea479a4c51a6fe5c747f kpdf-3.5.7.ebuild 1160
 RMD160 eff23765323e103b5350fd599c26f56806905f3f kpdf-3.5.7.ebuild 1160
 SHA256 056ba647a0cfdc165a8edec3d8b6d995d7296d59e569fb37c0c4924b295e28ae kpdf-3.5.7.ebuild 1160
+EBUILD kpdf-3.5.8-r1.ebuild 1317 RMD160 ffe27cfb3af6f71a46598526279c5c263610d740 SHA1 a2f41d5737f1d6d56df960765734177d4e47a47e SHA256 ba743ff1ce51f7f96531ab2120f8490706026f0bd237a1c32b21a899dec3967c
+MD5 7bc6cc3f98300a442b359541764c48f9 kpdf-3.5.8-r1.ebuild 1317
+RMD160 ffe27cfb3af6f71a46598526279c5c263610d740 kpdf-3.5.8-r1.ebuild 1317
+SHA256 ba743ff1ce51f7f96531ab2120f8490706026f0bd237a1c32b21a899dec3967c kpdf-3.5.8-r1.ebuild 1317
 EBUILD kpdf-3.5.8.ebuild 1258 RMD160 53fefba7bd5fbeb1a74a5c5519a555bdeb2d9b74 SHA1 91673b0ac1f796648dc8787d511f04128ac9d54a SHA256 9733a356917f1516552f63658b24a5b35e9a53d6bb4e2c692ae631159b62f019
 MD5 d63993e41b87a9aa09e7a907297de104 kpdf-3.5.8.ebuild 1258
 RMD160 53fefba7bd5fbeb1a74a5c5519a555bdeb2d9b74 kpdf-3.5.8.ebuild 1258
 SHA256 9733a356917f1516552f63658b24a5b35e9a53d6bb4e2c692ae631159b62f019 kpdf-3.5.8.ebuild 1258
-MISC ChangeLog 18929 RMD160 08b14c59cc9f3b36bb4409178507bc1e4e4403e4 SHA1 82ace823020008679ad4d7bd57387a318bf02430 SHA256 db3026cd39aa244e52ec1ec5fe03d01ca9e6672add969d79c9a4debb58e40d0e
-MD5 349ff1b06ad294de0d9c331aa92c7f78 ChangeLog 18929
-RMD160 08b14c59cc9f3b36bb4409178507bc1e4e4403e4 ChangeLog 18929
-SHA256 db3026cd39aa244e52ec1ec5fe03d01ca9e6672add969d79c9a4debb58e40d0e ChangeLog 18929
+MISC ChangeLog 19189 RMD160 2f5a10ece449e0109ed04ca3dedded2b0e31ee16 SHA1 c6b0f54976e5107c728e207c4d165ece47819b0f SHA256 a4d2fbf9f8510ca8350950873e65db4f67a2c32bc7a09f5e8ff9ab94e10e0065
+MD5 1eb9c994b99acd72abfcb7fa3917ce91 ChangeLog 19189
+RMD160 2f5a10ece449e0109ed04ca3dedded2b0e31ee16 ChangeLog 19189
+SHA256 a4d2fbf9f8510ca8350950873e65db4f67a2c32bc7a09f5e8ff9ab94e10e0065 ChangeLog 19189
 MISC metadata.xml 156 RMD160 ecce3b981f150c45ae1e84e2d208e678d6124259 SHA1 b64f7c0b4e5db816d82ad19848f72118af129d35 SHA256 2f4da28506b9d4185f320f67a6191d30c7a921217ed4447ed46ea0bc4aefc79a
 MD5 acc03a4b12bb0433a57e95bd253b9501 metadata.xml 156
 RMD160 ecce3b981f150c45ae1e84e2d208e678d6124259 metadata.xml 156
@@ -72,13 +81,12 @@ SHA256 966352b87e403830c2a5583b276692e95d2fd1f2adfcca35e442eea893c7dc30 files/di
 MD5 cafdfdfc9d2cbe64afeacd252c6c23ad files/digest-kpdf-3.5.7-r2 259
 RMD160 1da8f54e69b92a192523c26c44f95a35acaa0efb files/digest-kpdf-3.5.7-r2 259
 SHA256 966352b87e403830c2a5583b276692e95d2fd1f2adfcca35e442eea893c7dc30 files/digest-kpdf-3.5.7-r2 259
+MD5 cafdfdfc9d2cbe64afeacd252c6c23ad files/digest-kpdf-3.5.7-r3 259
+RMD160 1da8f54e69b92a192523c26c44f95a35acaa0efb files/digest-kpdf-3.5.7-r3 259
+SHA256 966352b87e403830c2a5583b276692e95d2fd1f2adfcca35e442eea893c7dc30 files/digest-kpdf-3.5.7-r3 259
 MD5 d7609889e9782680831036ddcd22441e files/digest-kpdf-3.5.8 259
 RMD160 e840b3d0c48941ec461d3a5a529a7ce3b618e2a1 files/digest-kpdf-3.5.8 259
 SHA256 33db54300334bdaf6fc8d10ed0b752919b0812a2544d3fe3bfe93af0f4b92aaa files/digest-kpdf-3.5.8 259
------BEGIN PGP SIGNATURE-----
-Version: GnuPG v2.0.7 (GNU/Linux)
-
-iD8DBQFHGTxMCkvF58q80IkRAkpOAKCHL3xj33hYlXA332rkxrSYzPxkeQCdGcC5
-pyLNwhnly8q7Fig7mqiCsuw=
-=uaFo
------END PGP SIGNATURE-----
+MD5 d7609889e9782680831036ddcd22441e files/digest-kpdf-3.5.8-r1 259
+RMD160 e840b3d0c48941ec461d3a5a529a7ce3b618e2a1 files/digest-kpdf-3.5.8-r1 259
+SHA256 33db54300334bdaf6fc8d10ed0b752919b0812a2544d3fe3bfe93af0f4b92aaa files/digest-kpdf-3.5.8-r1 259
diff --git a/kde-base/kpdf/files/digest-kpdf-3.5.7-r3 b/kde-base/kpdf/files/digest-kpdf-3.5.7-r3
new file mode 100644
index 000000000000..ba24610e2ca5
--- /dev/null
+++ b/kde-base/kpdf/files/digest-kpdf-3.5.7-r3
@@ -0,0 +1,3 @@
+MD5 eae753e80c5f8dd304e7fd0dca84ae67 kdegraphics-3.5.7.tar.bz2 7424976
+RMD160 ccf36f5c34a1d484f0878a42a51dc620c2bdfa71 kdegraphics-3.5.7.tar.bz2 7424976
+SHA256 5689882ade29d0f56e95783f1c3e443fd512ca8291bcb81aac60ac719a8dcdcc kdegraphics-3.5.7.tar.bz2 7424976
diff --git a/kde-base/kpdf/files/digest-kpdf-3.5.8-r1 b/kde-base/kpdf/files/digest-kpdf-3.5.8-r1
new file mode 100644
index 000000000000..3bbc87669000
--- /dev/null
+++ b/kde-base/kpdf/files/digest-kpdf-3.5.8-r1
@@ -0,0 +1,3 @@
+MD5 a3a31fc0e5b791ef330dd0627095d90f kdegraphics-3.5.8.tar.bz2 7444011
+RMD160 8e77f76a6edcf6a1c20b4d76fcc5c79fe196599b kdegraphics-3.5.8.tar.bz2 7444011
+SHA256 4d041d892f17ef90e0029ef14925980cf6a637d7a9971fba5835a5620ff3e155 kdegraphics-3.5.8.tar.bz2 7444011
diff --git a/kde-base/kpdf/files/post-3.5.8-kdegraphics-kpdf.diff b/kde-base/kpdf/files/post-3.5.8-kdegraphics-kpdf.diff
new file mode 100644
index 000000000000..94e44a0280e9
--- /dev/null
+++ b/kde-base/kpdf/files/post-3.5.8-kdegraphics-kpdf.diff
@@ -0,0 +1,643 @@
+--- kpdf/xpdf/xpdf/Stream.cc
++++ kpdf/xpdf/xpdf/Stream.cc
+@@ -1245,23 +1245,26 @@ CCITTFaxStream::CCITTFaxStream(Stream *s
+   columns = columnsA;
+   if (columns < 1) {
+     columns = 1;
+-  }
+-  if (columns + 4 <= 0) {
+-    columns = INT_MAX - 4;
++  } else if (columns > INT_MAX - 2) {
++    columns = INT_MAX - 2;
+   }
+   rows = rowsA;
+   endOfBlock = endOfBlockA;
+   black = blackA;
+-  refLine = (short *)gmallocn(columns + 3, sizeof(short));
+-  codingLine = (short *)gmallocn(columns + 2, sizeof(short));
++  // 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] = 0;
+-  codingLine[1] = refLine[2] = columns;
+-  a0 = 1;
++  codingLine[0] = columns;
++  a0i = 0;
++  outputBits = 0;
+ 
+   buf = EOF;
+ }
+@@ -1280,9 +1283,9 @@ void CCITTFaxStream::reset() {
+   row = 0;
+   nextLine2D = encoding < 0;
+   inputBits = 0;
+-  codingLine[0] = 0;
+-  codingLine[1] = columns;
+-  a0 = 1;
++  codingLine[0] = columns;
++  a0i = 0;
++  outputBits = 0;
+   buf = EOF;
+ 
+   // skip any initial zero bits and end-of-line marker, and get the 2D
+@@ -1299,211 +1302,230 @@ void CCITTFaxStream::reset() {
+   }
+ }
+ 
++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 a0New;
+-  GBool err, gotEOL;
+-  int ret;
+-  int bits, i;
++  int b1i, blackPixels, i, bits;
++  GBool gotEOL;
+ 
+-  // if at eof just return EOF
+-  if (eof && codingLine[a0] >= columns) {
+-    return EOF;
++  if (buf != EOF) {
++    return buf;
+   }
+ 
+   // read the next row
+-  err = gFalse;
+-  if (codingLine[a0] >= columns) {
++  if (outputBits == 0) {
++
++    // if at eof just return EOF
++    if (eof) {
++      return EOF;
++    }
++
++    err = gFalse;
+ 
+     // 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 {
++      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:
+-	  if (refLine[b1] < columns) {
+-	    a0New = refLine[b1 + 1];
+-	    b1 += 2;
++	  addPixels(refLine[b1i + 1], blackPixels);
++	  if (refLine[b1i + 1] < columns) {
++	    b1i += 2;
+ 	  }
+ 	  break;
+ 	case twoDimHoriz:
+-	  if ((a0 & 1) == 0) {
+-	    code1 = code2 = 0;
++	  code1 = code2 = 0;
++	  if (blackPixels) {
+ 	    do {
+-	      code1 += code3 = getWhiteCode();
++	      code1 += code3 = getBlackCode();
+ 	    } while (code3 >= 64);
+ 	    do {
+-	      code2 += code3 = getBlackCode();
++	      code2 += code3 = getWhiteCode();
+ 	    } while (code3 >= 64);
+ 	  } else {
+-	    code1 = code2 = 0;
+ 	    do {
+-	      code1 += code3 = getBlackCode();
++	      code1 += code3 = getWhiteCode();
+ 	    } while (code3 >= 64);
+ 	    do {
+-	      code2 += code3 = getWhiteCode();
++	      code2 += code3 = getBlackCode();
+ 	    } 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;
++	  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 twoDimVert0:
+-	  if (refLine[b1] < columns) {
+-	    a0New = codingLine[++a0] = refLine[b1];
+-	    ++b1;
+-	    while (refLine[b1] <= a0New && refLine[b1] < columns) {
+-	      b1 += 2;
++	case twoDimVertR2:
++	  addPixels(refLine[b1i] + 2, blackPixels);
++	  blackPixels ^= 1;
++	  if (codingLine[a0i] < columns) {
++	    ++b1i;
++	    while (refLine[b1i] <= codingLine[a0i] && refLine[b1i] < columns) {
++	      b1i += 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;
++	  addPixels(refLine[b1i] + 1, blackPixels);
++	  blackPixels ^= 1;
++	  if (codingLine[a0i] < columns) {
++	    ++b1i;
++	    while (refLine[b1i] <= codingLine[a0i] && refLine[b1i] < columns) {
++	      b1i += 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;
++	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 twoDimVertR2:
+-	  if (refLine[b1] + 2 < columns) {
+-	    a0New = codingLine[++a0] = refLine[b1] + 2;
+-	    ++b1;
+-	    while (refLine[b1] <= a0New && refLine[b1] < columns) {
+-	      b1 += 2;
++	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;
+ 	    }
+-	  } 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;
++	  addPixelsNeg(refLine[b1i] - 2, blackPixels);
++	  blackPixels ^= 1;
++	  if (codingLine[a0i] < columns) {
++	    if (b1i > 0) {
++	      --b1i;
++	    } else {
++	      ++b1i;
+ 	    }
+-	  }
+-	  break;
+-	case twoDimVertR3:
+-	  if (refLine[b1] + 3 < columns) {
+-	    a0New = codingLine[++a0] = refLine[b1] + 3;
+-	    ++b1;
+-	    while (refLine[b1] <= a0New && refLine[b1] < columns) {
+-	      b1 += 2;
++	    while (refLine[b1i] <= codingLine[a0i] && refLine[b1i] < columns) {
++	      b1i += 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;
++	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;
+-	  codingLine[a0 = 0] = columns;
+-	  return EOF;
++	  break;
+ 	default:
+ 	  error(getPos(), "Bad 2D code %04x in CCITTFax stream", code1);
++	  addPixels(columns, 0);
+ 	  err = gTrue;
+ 	  break;
+ 	}
+-      } while (codingLine[a0] < columns);
++      }
+ 
+     // 1-D encoding
+     } else {
+-      codingLine[a0 = 0] = 0;
+-      while (1) {
++      codingLine[0] = 0;
++      a0i = 0;
++      blackPixels = 0;
++      while (codingLine[a0i] < columns) {
+ 	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 (blackPixels) {
++	  do {
++	    code1 += code3 = getBlackCode();
++	  } while (code3 >= 64);
++	} else {
++	  do {
++	    code1 += code3 = getWhiteCode();
++	  } while (code3 >= 64);
+ 	}
++	addPixels(codingLine[a0i] + code1, blackPixels);
++	blackPixels ^= 1;
+       }
+     }
+ 
+-    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;
+@@ -1562,14 +1584,17 @@ int CCITTFaxStream::lookChar() {
+     // 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 {
++      while (1) {
++	code1 = lookBits(13);
+ 	if (code1 == EOF) {
+ 	  eof = gTrue;
+ 	  return EOF;
+ 	}
++	if ((code1 >> 1) == 0x001) {
++	  break;
++	}
+ 	eatBits(1);
+-	code1 = lookBits(13);
+-      } while ((code1 >> 1) != 0x001);
++      }
+       eatBits(12); 
+       if (encoding > 0) {
+ 	eatBits(1);
+@@ -1577,11 +1602,11 @@ int CCITTFaxStream::lookChar() {
+       }
+     }
+ 
+-    a0 = 0;
+-    outputBits = codingLine[1] - codingLine[0];
+-    if (outputBits == 0) {
+-      a0 = 1;
+-      outputBits = codingLine[2] - codingLine[1];
++    // set up for output
++    if (codingLine[0] > 0) {
++      outputBits = codingLine[a0i = 0];
++    } else {
++      outputBits = codingLine[a0i = 1];
+     }
+ 
+     ++row;
+@@ -1589,39 +1614,43 @@ int CCITTFaxStream::lookChar() {
+ 
+   // 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];
+-      }
++    buf = (a0i & 1) ? 0x00 : 0xff;
++    outputBits -= 8;
++    if (outputBits == 0 && codingLine[a0i] < columns) {
++      ++a0i;
++      outputBits = codingLine[a0i] - codingLine[a0i - 1];
+     }
+   } else {
+     bits = 8;
+-    ret = 0;
++    buf = 0;
+     do {
+       if (outputBits > bits) {
+-	i = bits;
+-	bits = 0;
+-	if ((a0 & 1) == 0) {
+-	  ret |= 0xff >> (8 - i);
++	buf <<= bits;
++	if (!(a0i & 1)) {
++	  buf |= 0xff >> (8 - bits);
+ 	}
+-	outputBits -= i;
++	outputBits -= bits;
++	bits = 0;
+       } else {
+-	i = outputBits;
+-	bits -= outputBits;
+-	if ((a0 & 1) == 0) {
+-	  ret |= (0xff >> (8 - i)) << bits;
++	buf <<= outputBits;
++	if (!(a0i & 1)) {
++	  buf |= 0xff >> (8 - outputBits);
+ 	}
++	bits -= outputBits;
+ 	outputBits = 0;
+-	++a0;
+-	if (codingLine[a0] < columns) {
+-	  outputBits = codingLine[a0 + 1] - codingLine[a0];
++	if (codingLine[a0i] < columns) {
++	  ++a0i;
++	  outputBits = codingLine[a0i] - codingLine[a0i - 1];
++	} else if (bits > 0) {
++	  buf <<= bits;
++	  bits = 0;
+ 	}
+       }
+-    } while (bits > 0 && codingLine[a0] < columns);
++    } while (bits);
++  }
++  if (black) {
++    buf ^= 0xff;
+   }
+-  buf = black ? (ret ^ 0xff) : ret;
+   return buf;
+ }
+ 
+@@ -1663,6 +1692,9 @@ short CCITTFaxStream::getWhiteCode() {
+   code = 0; // make gcc happy
+   if (endOfBlock) {
+     code = lookBits(12);
++    if (code == EOF) {
++      return 1;
++    }
+     if ((code >> 5) == 0) {
+       p = &whiteTab1[code];
+     } else {
+@@ -1675,6 +1707,9 @@ short CCITTFaxStream::getWhiteCode() {
+   } else {
+     for (n = 1; n <= 9; ++n) {
+       code = lookBits(n);
++      if (code == EOF) {
++	return 1;
++      }
+       if (n < 9) {
+ 	code <<= 9 - n;
+       }
+@@ -1686,6 +1721,9 @@ short CCITTFaxStream::getWhiteCode() {
+     }
+     for (n = 11; n <= 12; ++n) {
+       code = lookBits(n);
++      if (code == EOF) {
++	return 1;
++      }
+       if (n < 12) {
+ 	code <<= 12 - n;
+       }
+@@ -1711,9 +1749,12 @@ short CCITTFaxStream::getBlackCode() {
+   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) {
++    } else if ((code >> 9) == 0 && (code >> 7) != 0) {
+       p = &blackTab2[(code >> 1) - 64];
+     } else {
+       p = &blackTab3[code >> 7];
+@@ -1725,6 +1766,9 @@ short CCITTFaxStream::getBlackCode() {
+   } else {
+     for (n = 2; n <= 6; ++n) {
+       code = lookBits(n);
++      if (code == EOF) {
++	return 1;
++      }
+       if (n < 6) {
+ 	code <<= 6 - n;
+       }
+@@ -1736,6 +1780,9 @@ short CCITTFaxStream::getBlackCode() {
+     }
+     for (n = 7; n <= 12; ++n) {
+       code = lookBits(n);
++      if (code == EOF) {
++	return 1;
++      }
+       if (n < 12) {
+ 	code <<= 12 - n;
+       }
+@@ -1749,6 +1796,9 @@ short CCITTFaxStream::getBlackCode() {
+     }
+     for (n = 10; n <= 13; ++n) {
+       code = lookBits(n);
++      if (code == EOF) {
++	return 1;
++      }
+       if (n < 13) {
+ 	code <<= 13 - n;
+       }
+@@ -1963,6 +2013,12 @@ void DCTStream::reset() {
+     // 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));
+@@ -3038,6 +3094,11 @@ GBool DCTStream::readScanInfo() {
+   }
+   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;
+--- kpdf/xpdf/xpdf/Stream.h
++++ kpdf/xpdf/xpdf/Stream.h
+@@ -528,13 +528,15 @@ private:
+   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 *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();
diff --git a/kde-base/kpdf/kpdf-3.5.7-r3.ebuild b/kde-base/kpdf/kpdf-3.5.7-r3.ebuild
new file mode 100644
index 000000000000..6a817900c0c2
--- /dev/null
+++ b/kde-base/kpdf/kpdf-3.5.7-r3.ebuild
@@ -0,0 +1,50 @@
+# Copyright 1999-2007 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Header: /var/cvsroot/gentoo-x86/kde-base/kpdf/kpdf-3.5.7-r3.ebuild,v 1.1 2007/11/10 16:47:41 philantrop Exp $
+
+KMNAME=kdegraphics
+MAXKDEVER=$PV
+KM_DEPRANGE="$PV $MAXKDEVER"
+inherit kde-meta flag-o-matic
+
+DESCRIPTION="kpdf, a kde pdf viewer based on xpdf"
+KEYWORDS="~alpha ~amd64 ~ia64 ~ppc ~ppc64 ~sparc ~x86 ~x86-fbsd"
+IUSE=""
+KMEXTRA="kfile-plugins/pdf"
+
+DEPEND=">=media-libs/freetype-2.0.5
+	media-libs/t1lib
+	>=app-text/poppler-0.5.1
+	>=app-text/poppler-bindings-0.5.1"
+RDEPEND="${DEPEND}
+	$(deprange-dual $PV $MAXKDEVER kde-base/kdeprint)"
+
+PATCHES="${FILESDIR}/post-3.5.7-kdegraphics-CVE-2007-3387.diff
+		${FILESDIR}/${P}-hash_path.diff
+		${FILESDIR}/post-3.5.8-kdegraphics-kpdf.diff"
+
+pkg_setup() {
+	kde_pkg_setup
+	# check for qt still until it had a revision bump in both ~arch and stable.
+	if ! built_with_use app-text/poppler-bindings qt3; then
+		eerror "This package requires app-text/poppler-bindings compiled with Qt 3.x support."
+		eerror "Please reemerge app-text/poppler-bindings with USE=\"qt3\"."
+		die "Please reemerge app-text/poppler-bindings with USE=\"qt3\"."
+	fi
+}
+
+src_unpack() {
+	kde-meta_src_unpack
+
+	# Fixing the desktop file
+	sed -i -e "s:^\(MimeType=.*\):&;:" "${S}"/kpdf/shell/kpdf.desktop \
+		|| die "Desktop file fix 1 failed"
+	sed -i -e "s:^\(Categories=.*\)\(PDFViewer\):\1X-\2:" "${S}"/kpdf/shell/kpdf.desktop \
+		|| die "Desktop file fix 2 failed"
+}
+
+src_compile() {
+	local myconf="--with-poppler"
+	replace-flags "-Os" "-O2" # see bug 114822
+	kde-meta_src_compile
+}
diff --git a/kde-base/kpdf/kpdf-3.5.8-r1.ebuild b/kde-base/kpdf/kpdf-3.5.8-r1.ebuild
new file mode 100644
index 000000000000..e4b8828c5fb7
--- /dev/null
+++ b/kde-base/kpdf/kpdf-3.5.8-r1.ebuild
@@ -0,0 +1,42 @@
+# Copyright 1999-2007 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Header: /var/cvsroot/gentoo-x86/kde-base/kpdf/kpdf-3.5.8-r1.ebuild,v 1.1 2007/11/10 16:47:41 philantrop Exp $
+
+KMNAME=kdegraphics
+MAXKDEVER=$PV
+KM_DEPRANGE="$PV $MAXKDEVER"
+inherit kde-meta flag-o-matic
+
+DESCRIPTION="kpdf, a kde pdf viewer based on xpdf"
+KEYWORDS="~alpha ~amd64 ~ia64 ~ppc ~ppc64 ~sparc ~x86 ~x86-fbsd"
+IUSE=""
+KMEXTRA="kfile-plugins/pdf"
+
+DEPEND=">=media-libs/freetype-2.0.5
+	media-libs/t1lib
+	>=app-text/poppler-0.5.1
+	>=app-text/poppler-bindings-0.5.1"
+RDEPEND="${DEPEND}
+	$(deprange-dual $PV $MAXKDEVER kde-base/kdeprint)"
+
+PATCHES="${FILESDIR}/post-3.5.8-kdegraphics-kpdf.diff"
+
+pkg_setup() {
+	kde_pkg_setup
+	# check for qt still until it had a revision bump in both ~arch and stable.
+	if ! built_with_use app-text/poppler-bindings qt3; then
+		eerror "This package requires app-text/poppler-bindings compiled with Qt 3.x support."
+		eerror "Please reemerge app-text/poppler-bindings with USE=\"qt3\"."
+		die "Please reemerge app-text/poppler-bindings with USE=\"qt3\"."
+	fi
+}
+
+src_compile() {
+	local myconf="--with-poppler"
+	replace-flags "-Os" "-O2" # see bug 114822
+
+	# Fix the desktop file.
+	sed -i -e "s:PDFViewer;:Viewer;:" "${S}/kpdf/shell/kpdf.desktop"
+
+	kde-meta_src_compile
+}