Remove a bunch of orphaned files.

(Portage version: 2.1.2-r4)

7 files changed, 8 insertions, 481 deletions

diff --git a/kde-base/kdegraphics/ChangeLog b/kde-base/kdegraphics/ChangeLog
index f0154087081c..fa62410c0bb1 100644
--- a/kde-base/kdegraphics/ChangeLog
+++ b/kde-base/kdegraphics/ChangeLog
@@ -1,6 +1,13 @@
 # ChangeLog for kde-base/kdegraphics
 # Copyright 2002-2007 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/kde-base/kdegraphics/ChangeLog,v 1.289 2007/01/25 19:10:55 flameeyes Exp $
+# $Header: /var/cvsroot/gentoo-x86/kde-base/kdegraphics/ChangeLog,v 1.290 2007/01/28 12:01:48 flameeyes Exp $
+
+  28 Jan 2007; Diego Pettenò <flameeyes@gentoo.org>
+  -files/post-3.4.3-kdegraphics-CAN-2005-3193.diff,
+  -files/post-3.4.3-kdegraphics-CVE-2006-0301.diff,
+  -files/kdegraphics-3.4-configure.patch, -files/kdegraphics-3.4-gcc4.patch,
+  -files/kdegraphics-3.4.1-gocr.patch, -files/CAN-2005-0064.patch:
+  Remove a bunch of orphaned files.
 
   25 Jan 2007; Diego Pettenò <flameeyes@gentoo.org>
   kdegraphics-3.5.6.ebuild:
diff --git a/kde-base/kdegraphics/files/CAN-2005-0064.patch b/kde-base/kdegraphics/files/CAN-2005-0064.patch
deleted file mode 100644
index 620f8a34969f..000000000000
--- a/kde-base/kdegraphics/files/CAN-2005-0064.patch
+++ /dev/null
@@ -1,31 +0,0 @@
---- kpdf/xpdf/Decrypt.cc.jn	2002-12-06 00:44:32.000000000 +0100
-+++ kpdf/xpdf/Decrypt.cc	2005-01-14 13:38:48.192647128 +0100
-@@ -132,13 +132,19 @@ GBool Decrypt::makeFileKey2(int encVersi
-   Guchar *buf;
-   Guchar test[32];
-   Guchar fState[256];
--  Guchar tmpKey[16];
-+  Guchar *tmpKey;
-   Guchar fx, fy;
-   int len, i, j;
-   GBool ok;
- 
-+  // check whether we have non-zero keyLength
-+  if ( !keyLength ) {
-+    return gFalse;
-+  }
-+  
-   // generate file key
-   buf = (Guchar *)gmalloc(68 + fileID->getLength());
-+  tmpKey = (Guchar *)gmalloc(keyLength * sizeof(Guchar));
-   if (userPassword) {
-     len = userPassword->getLength();
-     if (len < 32) {
-@@ -191,6 +197,7 @@ GBool Decrypt::makeFileKey2(int encVersi
-     ok = gFalse;
-   }
- 
-+  gfree(tmpKey);
-   gfree(buf);
-   return ok;
- }
diff --git a/kde-base/kdegraphics/files/kdegraphics-3.4-configure.patch b/kde-base/kdegraphics/files/kdegraphics-3.4-configure.patch
deleted file mode 100644
index ab54f067f705..000000000000
--- a/kde-base/kdegraphics/files/kdegraphics-3.4-configure.patch
+++ /dev/null
@@ -1,23 +0,0 @@
-diff -Nur kdegraphics-3.4.2.orig/kfile-plugins/exr/configure.in.in kdegraphics-3.4.2/kfile-plugins/exr/configure.in.in
---- kdegraphics-3.4.2.orig/kfile-plugins/exr/configure.in.in	2005-05-23 14:06:14.000000000 +0200
-+++ kdegraphics-3.4.2/kfile-plugins/exr/configure.in.in	2005-07-26 13:32:45.000000000 +0200
-@@ -68,6 +68,17 @@
-   AC_SUBST(EXR_FLAGS)
- ])
- 
--AC_FIND_LIBEXR
--AM_CONDITIONAL(include_EXR_MODULES, test -n "$LIB_EXR")
-+AC_ARG_WITH([openexr],
-+  [AC_HELP_STRING([--with-openexr],
-+    [Enable support for OpenEXR @<:@default=check@:>@])],
-+  [], with_openexr=check)
-+
-+if test "x$with_openexr" != xno; then
-+  AC_FIND_LIBEXR
- 
-+  if test "x$with_openexr" != xcheck && test -z "$LIB_EXR"; then
-+    AC_MSG_ERROR([--with-openexr was given, but test for OpenEXR failed])
-+  fi
-+fi
-+
-+AM_CONDITIONAL(include_EXR_MODULES, test -n "$LIB_EXR")
diff --git a/kde-base/kdegraphics/files/kdegraphics-3.4-gcc4.patch b/kde-base/kdegraphics/files/kdegraphics-3.4-gcc4.patch
deleted file mode 100644
index d9bb7a101acd..000000000000
--- a/kde-base/kdegraphics/files/kdegraphics-3.4-gcc4.patch
+++ /dev/null
@@ -1,26 +0,0 @@
-diff -Nur kdegraphics-3.4.2.orig/kghostview/displayoptions.cpp kdegraphics-3.4.2/kghostview/displayoptions.cpp
---- kdegraphics-3.4.2.orig/kghostview/displayoptions.cpp	2005-07-20 12:00:39.000000000 +0200
-+++ kdegraphics-3.4.2/kghostview/displayoptions.cpp	2005-08-05 12:02:27.000000000 +0200
-@@ -56,7 +56,7 @@
- 	res.setMagnification( args->getOption( "scale" ).toFloat() );
- 	res.setPage( args->getOption( "page" ).toInt() - 1 ); // transform from 1-based into 0-based
- 	//res._overridePageMedia = args->getOption( "paper" );
--	kdDebug(4500 ) << "Parsed options: " << res << endl;
-+	kdDebug(4500 ) << "Parsed options: " << DisplayOptions::toString( res ) << endl;
- 	return res;
- }
- 
-diff -Nur kdegraphics-3.4.2.orig/kghostview/displayoptions.h kdegraphics-3.4.2/kghostview/displayoptions.h
---- kdegraphics-3.4.2.orig/kghostview/displayoptions.h	2005-05-23 14:06:10.000000000 +0200
-+++ kdegraphics-3.4.2/kghostview/displayoptions.h	2005-08-05 12:02:27.000000000 +0200
-@@ -109,10 +109,4 @@
- 	setMagnification( 1.0 );
- }
- 
--template <typename OutStream>
--OutStream& operator << ( OutStream& out, const DisplayOptions& obj ) {
--	out << DisplayOptions::toString( obj ).utf8().data();
--	return out;
--}
--
- #endif // DISPLAYOPTIONS_H
diff --git a/kde-base/kdegraphics/files/kdegraphics-3.4.1-gocr.patch b/kde-base/kdegraphics/files/kdegraphics-3.4.1-gocr.patch
deleted file mode 100644
index 1edb6b89bf9a..000000000000
--- a/kde-base/kdegraphics/files/kdegraphics-3.4.1-gocr.patch
+++ /dev/null
@@ -1,14 +0,0 @@
-diff -Nur kdegraphics-3.4.1.orig/kooka/ksaneocr.cpp kdegraphics-3.4.1/kooka/ksaneocr.cpp
---- kdegraphics-3.4.1.orig/kooka/ksaneocr.cpp	2005-05-23 14:05:50.000000000 +0200
-+++ kdegraphics-3.4.1/kooka/ksaneocr.cpp	2005-05-31 18:31:43.000000000 +0200
-@@ -108,6 +108,10 @@
- 	{
- 	    m_ocrEngine = OCRAD;
- 	}
-+	else if( eng == "gocr" )
-+	{
-+	    m_ocrEngine = GOCR;
-+	}
- 
- #ifdef HAVE_KADMOS
-         else if( eng == QString("kadmos") ) m_ocrEngine = KADMOS;
diff --git a/kde-base/kdegraphics/files/post-3.4.3-kdegraphics-CAN-2005-3193.diff b/kde-base/kdegraphics/files/post-3.4.3-kdegraphics-CAN-2005-3193.diff
deleted file mode 100644
index 8c1d3ac42603..000000000000
--- a/kde-base/kdegraphics/files/post-3.4.3-kdegraphics-CAN-2005-3193.diff
+++ /dev/null
@@ -1,334 +0,0 @@
-Index: kpdf/xpdf/xpdf/JBIG2Stream.cc
-===================================================================
---- kpdf/xpdf/xpdf/JBIG2Stream.cc	(revision 466932)
-+++ kpdf/xpdf/xpdf/JBIG2Stream.cc	(revision 488714)
-@@ -7,6 +7,7 @@
- //========================================================================
- 
- #include <aconf.h>
-+#include <limits.h>
- 
- #ifdef USE_GCC_PRAGMAS
- #pragma implementation
-@@ -681,6 +682,13 @@ JBIG2Bitmap::JBIG2Bitmap(Guint segNumA, 
-   w = wA;
-   h = hA;
-   line = (wA + 7) >> 3;
-+
-+  if (h < 0 || line <= 0 || h >= INT_MAX / line) {
-+    error(-1, "invalid width/height");
-+    data = NULL;
-+    return;
-+  }
-+
-   data = (Guchar *)gmalloc(h * line);
- }
- 
-@@ -690,6 +698,13 @@ JBIG2Bitmap::JBIG2Bitmap(Guint segNumA, 
-   w = bitmap->w;
-   h = bitmap->h;
-   line = bitmap->line;
-+
-+  if (h < 0 || line <= 0 || h >= INT_MAX / line) {
-+    error(-1, "invalid width/height");
-+    data = NULL;
-+    return;
-+  }
-+
-   data = (Guchar *)gmalloc(h * line);
-   memcpy(data, bitmap->data, h * line);
- }
-@@ -716,7 +731,10 @@ JBIG2Bitmap *JBIG2Bitmap::getSlice(Guint
- }
- 
- void JBIG2Bitmap::expand(int newH, Guint pixel) {
--  if (newH <= h) {
-+  if (newH <= h || line <= 0 || newH >= INT_MAX / line) {
-+    error(-1, "invalid width/height");
-+    gfree(data);
-+    data = NULL;
-     return;
-   }
-   data = (Guchar *)grealloc(data, newH * line);
-@@ -2256,6 +2274,15 @@ void JBIG2Stream::readHalftoneRegionSeg(
-     error(getPos(), "Bad symbol dictionary reference in JBIG2 halftone segment");
-     return;
-   }
-+  if (gridH == 0 || gridW >= INT_MAX / gridH) {
-+    error(getPos(), "Bad size in JBIG2 halftone segment");
-+    return;
-+  }
-+  if (w == 0 || h >= INT_MAX / w) {
-+     error(getPos(), "Bad size in JBIG2 bitmap segment");
-+    return;
-+  }
-+
-   patternDict = (JBIG2PatternDict *)seg;
-   bpp = 0;
-   i = 1;
-@@ -2887,6 +2914,11 @@ JBIG2Bitmap *JBIG2Stream::readGenericRef
-   JBIG2BitmapPtr tpgrCXPtr0, tpgrCXPtr1, tpgrCXPtr2;
-   int x, y, pix;
- 
-+  if (w < 0 || h <= 0 || w >= INT_MAX / h) {
-+    error(-1, "invalid width/height");
-+    return NULL;
-+  }
-+
-   bitmap = new JBIG2Bitmap(0, w, h);
-   bitmap->clearToZero();
- 
-Index: kpdf/xpdf/xpdf/Stream.cc
-===================================================================
---- kpdf/xpdf/xpdf/Stream.cc	(revision 466932)
-+++ kpdf/xpdf/xpdf/Stream.cc	(revision 488714)
-@@ -15,6 +15,7 @@
- #include <stdio.h>
- #include <stdlib.h>
- #include <stddef.h>
-+#include <limits.h>
- #ifndef WIN32
- #include <unistd.h>
- #endif
-@@ -413,13 +414,27 @@ StreamPredictor::StreamPredictor(Stream 
-   width = widthA;
-   nComps = nCompsA;
-   nBits = nBitsA;
-+  predLine = NULL;
-+  ok = gFalse;
-+
-+  if (width <= 0 || nComps <= 0 || nBits <= 0 ||
-+      nComps >= INT_MAX / nBits ||
-+      width >= INT_MAX / nComps / nBits)
-+    return;
- 
-   nVals = width * nComps;
-+  if (nVals * nBits + 7 <= 0)
-+    return;
-   pixBytes = (nComps * nBits + 7) >> 3;
-   rowBytes = ((nVals * nBits + 7) >> 3) + pixBytes;
-+  if (rowBytes < 0)
-+    return;
-+
-   predLine = (Guchar *)gmalloc(rowBytes);
-   memset(predLine, 0, rowBytes);
-   predIdx = rowBytes;
-+
-+  ok = gTrue;
- }
- 
- StreamPredictor::~StreamPredictor() {
-@@ -1013,6 +1028,10 @@ LZWStream::LZWStream(Stream *strA, int p
-     FilterStream(strA) {
-   if (predictor != 1) {
-     pred = new StreamPredictor(this, predictor, columns, colors, bits);
-+    if (!pred->isOk()) {
-+      delete pred;
-+      pred = NULL;
-+    }
-   } else {
-     pred = NULL;
-   }
-@@ -1261,6 +1280,10 @@ CCITTFaxStream::CCITTFaxStream(Stream *s
-   endOfLine = endOfLineA;
-   byteAlign = byteAlignA;
-   columns = columnsA;
-+  if (columns < 1 || columns >= INT_MAX / sizeof(short)) {
-+    error(-1, "invalid number of columns");
-+    exit(1);
-+  }
-   rows = rowsA;
-   endOfBlock = endOfBlockA;
-   black = blackA;
-@@ -2899,6 +2922,11 @@ GBool DCTStream::readBaselineSOF() {
-   height = read16();
-   width = read16();
-   numComps = str->getChar();
-+  if (numComps <= 0 || numComps > 4) {
-+    numComps = 0;
-+    error(getPos(), "Bad number of components in DCT stream");
-+    return gFalse;
-+  }
-   if (prec != 8) {
-     error(getPos(), "Bad DCT precision %d", prec);
-     return gFalse;
-@@ -2925,6 +2953,11 @@ GBool DCTStream::readProgressiveSOF() {
-   height = read16();
-   width = read16();
-   numComps = str->getChar();
-+  if (numComps <= 0 || numComps > 4) {
-+    numComps = 0;
-+    error(getPos(), "Bad number of components in DCT stream");
-+    return gFalse;
-+  }
-   if (prec != 8) {
-     error(getPos(), "Bad DCT precision %d", prec);
-     return gFalse;
-@@ -2947,6 +2980,11 @@ GBool DCTStream::readScanInfo() {
- 
-   length = read16() - 2;
-   scanInfo.numComps = str->getChar();
-+  if (scanInfo.numComps <= 0 || scanInfo.numComps > 4) {
-+    scanInfo.numComps = 0;
-+    error(getPos(), "Bad number of components in DCT stream");
-+    return gFalse;
-+  }
-   --length;
-   if (length != 2 * scanInfo.numComps + 3) {
-     error(getPos(), "Bad DCT scan info block");
-@@ -3021,12 +3059,12 @@ GBool DCTStream::readHuffmanTables() {
-   while (length > 0) {
-     index = str->getChar();
-     --length;
--    if ((index & 0x0f) >= 4) {
-+    if ((index & ~0x10) >= 4 || (index & ~0x10) < 0) {
-       error(getPos(), "Bad DCT Huffman table");
-       return gFalse;
-     }
-     if (index & 0x10) {
--      index &= 0x0f;
-+      index &= 0x03;
-       if (index >= numACHuffTables)
- 	numACHuffTables = index+1;
-       tbl = &acHuffTables[index];
-@@ -3144,9 +3182,11 @@ int DCTStream::readMarker() {
-   do {
-     do {
-       c = str->getChar();
-+      if(c == EOF) return EOF;
-     } while (c != 0xff);
-     do {
-       c = str->getChar();
-+      if(c == EOF) return EOF;
-     } while (c == 0xff);
-   } while (c == 0x00);
-   return c;
-@@ -3258,6 +3298,10 @@ FlateStream::FlateStream(Stream *strA, i
-     FilterStream(strA) {
-   if (predictor != 1) {
-     pred = new StreamPredictor(this, predictor, columns, colors, bits);
-+    if (!pred->isOk()) {
-+      delete pred;
-+      pred = NULL;
-+    }
-   } else {
-     pred = NULL;
-   }
-Index: kpdf/xpdf/xpdf/Stream.h
-===================================================================
---- kpdf/xpdf/xpdf/Stream.h	(revision 466932)
-+++ kpdf/xpdf/xpdf/Stream.h	(revision 488714)
-@@ -233,6 +233,8 @@ public:
- 
-   ~StreamPredictor();
- 
-+  GBool isOk() { return ok; }
-+
-   int lookChar();
-   int getChar();
- 
-@@ -250,6 +252,7 @@ private:
-   int rowBytes;			// bytes per line
-   Guchar *predLine;		// line buffer
-   int predIdx;			// current index in predLine
-+  GBool ok;
- };
- 
- //------------------------------------------------------------------------
-Index: kpdf/xpdf/xpdf/JPXStream.cc
-===================================================================
---- kpdf/xpdf/xpdf/JPXStream.cc	(revision 466932)
-+++ kpdf/xpdf/xpdf/JPXStream.cc	(revision 488714)
-@@ -7,6 +7,7 @@
- //========================================================================
- 
- #include <aconf.h>
-+#include <limits.h>
- 
- #ifdef USE_GCC_PRAGMAS
- #pragma implementation
-@@ -666,7 +667,7 @@ GBool JPXStream::readCodestream(Guint /*
-   int segType;
-   GBool haveSIZ, haveCOD, haveQCD, haveSOT;
-   Guint precinctSize, style;
--  Guint segLen, capabilities, comp, i, j, r;
-+  Guint segLen, capabilities, nTiles, comp, i, j, r;
- 
-   //----- main header
-   haveSIZ = haveCOD = haveQCD = haveSOT = gFalse;
-@@ -701,8 +702,12 @@ GBool JPXStream::readCodestream(Guint /*
- 	            / img.xTileSize;
-       img.nYTiles = (img.ySize - img.yTileOffset + img.yTileSize - 1)
- 	            / img.yTileSize;
--      img.tiles = (JPXTile *)gmalloc(img.nXTiles * img.nYTiles *
--				     sizeof(JPXTile));
-+      nTiles = img.nXTiles * img.nYTiles;
-+      if (img.nXTiles <= 0 || img.nYTiles <= 0 || img.nXTiles >= INT_MAX / img.nYTiles) {
-+        error(getPos(), "Bad tile count in JPX SIZ marker segment");  
-+        return gFalse;
-+      }
-+      img.tiles = (JPXTile *)gmallocn(nTiles, sizeof(JPXTile));
-       for (i = 0; i < img.nXTiles * img.nYTiles; ++i) {
- 	img.tiles[i].tileComps = (JPXTileComp *)gmalloc(img.nComps *
- 							sizeof(JPXTileComp));
-Index: kpdf/xpdf/goo/gmem.c
-===================================================================
---- kpdf/xpdf/goo/gmem.c	(revision 466932)
-+++ kpdf/xpdf/goo/gmem.c	(revision 488714)
-@@ -11,6 +11,7 @@
- #include <stdlib.h>
- #include <stddef.h>
- #include <string.h>
-+#include <limits.h>
- #include "gmem.h"
- 
- #ifdef DEBUG_MEM
-@@ -175,6 +176,28 @@ void gfree(void *p) {
- #endif
- }
- 
-+void *gmallocn(int nObjs, int objSize) {
-+  int n;
-+
-+  n = nObjs * objSize;
-+  if (objSize <= 0 || nObjs < 0 || nObjs >= INT_MAX / objSize) {
-+    fprintf(stderr, "Bogus memory allocation size\n");
-+    exit(1);
-+  }
-+  return gmalloc(n);
-+}
-+
-+void *greallocn(void *p, int nObjs, int objSize) {
-+  int n;
-+
-+  n = nObjs * objSize;
-+  if (objSize <= 0 || nObjs < 0 || nObjs >= INT_MAX / objSize) {
-+    fprintf(stderr, "Bogus memory allocation size\n");
-+    exit(1);
-+  }
-+  return grealloc(p, n);
-+}
-+
- #ifdef DEBUG_MEM
- void gMemReport(FILE *f) {
-   GMemHdr *p;
-Index: kpdf/xpdf/goo/gmem.h
-===================================================================
---- kpdf/xpdf/goo/gmem.h	(revision 466932)
-+++ kpdf/xpdf/goo/gmem.h	(revision 488714)
-@@ -28,6 +28,15 @@ extern void *gmalloc(size_t size);
- extern void *grealloc(void *p, size_t size);
- 
- /*
-+ * These are similar to gmalloc and grealloc, but take an object count
-+ * and size.  The result is similar to allocating nObjs * objSize
-+ * bytes, but there is an additional error check that the total size
-+ * doesn't overflow an int.
-+ */
-+extern void *gmallocn(int nObjs, int objSize);
-+extern void *greallocn(void *p, int nObjs, int objSize);
-+
-+/*
-  * Same as free, but checks for and ignores NULL pointers.
-  */
- extern void gfree(void *p);
diff --git a/kde-base/kdegraphics/files/post-3.4.3-kdegraphics-CVE-2006-0301.diff b/kde-base/kdegraphics/files/post-3.4.3-kdegraphics-CVE-2006-0301.diff
deleted file mode 100644
index 7c6b1fe28d80..000000000000
--- a/kde-base/kdegraphics/files/post-3.4.3-kdegraphics-CVE-2006-0301.diff
+++ /dev/null
@@ -1,52 +0,0 @@
-Index: kpdf/xpdf/splash/SplashXPathScanner.cc
-===================================================================
---- kpdf/xpdf/splash/SplashXPathScanner.cc	(Revision 504400)
-+++ kpdf/xpdf/splash/SplashXPathScanner.cc	(Revision 505063)
-@@ -182,7 +182,7 @@ GBool SplashXPathScanner::getNextSpan(in
- }
- 
- void SplashXPathScanner::computeIntersections(int y) {
--  SplashCoord ySegMin, ySegMax, xx0, xx1;
-+  SplashCoord xSegMin, xSegMax, ySegMin, ySegMax, xx0, xx1;
-   SplashXPathSeg *seg;
-   int i, j;
- 
-@@ -232,19 +232,27 @@ void SplashXPathScanner::computeIntersec
-     } else if (seg->flags & splashXPathVert) {
-       xx0 = xx1 = seg->x0;
-     } else {
--      if (ySegMin <= y) {
--	// intersection with top edge
--	xx0 = seg->x0 + (y - seg->y0) * seg->dxdy;
-+      if (seg->x0 < seg->x1) {
-+	xSegMin = seg->x0;
-+	xSegMax = seg->x1;
-       } else {
--	// x coord of segment endpoint with min y coord
--	xx0 = (seg->flags & splashXPathFlip) ? seg->x1 : seg->x0;
-+	xSegMin = seg->x1;
-+	xSegMax = seg->x0;
-       }
--      if (ySegMax >= y + 1) {
--	// intersection with bottom edge
--	xx1 = seg->x0 + (y + 1 - seg->y0) * seg->dxdy;
--      } else {
--	// x coord of segment endpoint with max y coord
--	xx1 = (seg->flags & splashXPathFlip) ? seg->x0 : seg->x1;
-+      // intersection with top edge
-+      xx0 = seg->x0 + ((SplashCoord)y - seg->y0) * seg->dxdy;
-+      // intersection with bottom edge
-+      xx1 = seg->x0 + ((SplashCoord)y + 1 - seg->y0) * seg->dxdy;
-+      // the segment may not actually extend to the top and/or bottom edges
-+      if (xx0 < xSegMin) {
-+	xx0 = xSegMin;
-+      } else if (xx0 > xSegMax) {
-+	xx0 = xSegMax;
-+      }
-+      if (xx1 < xSegMin) {
-+	xx1 = xSegMin;
-+      } else if (xx1 > xSegMax) {
-+	xx1 = xSegMax;
-       }
-     }
-     if (xx0 < xx1) {