fixed patch

(Portage version: 2.0.53)

8 files changed, 138 insertions, 115 deletions

diff --git a/app-office/koffice/ChangeLog b/app-office/koffice/ChangeLog
index 4cc8fcc717d3..61905aa95bf1 100644
--- a/app-office/koffice/ChangeLog
+++ b/app-office/koffice/ChangeLog
@@ -1,6 +1,16 @@
 # ChangeLog for app-office/koffice
 # Copyright 2002-2005 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/app-office/koffice/ChangeLog,v 1.133 2005/12/07 19:37:47 cryos Exp $
+# $Header: /var/cvsroot/gentoo-x86/app-office/koffice/ChangeLog,v 1.134 2005/12/09 20:49:43 carlo Exp $
+
+*koffice-1.4.2-r5 (09 Dec 2005)
+*koffice-1.4.2-r4 (09 Dec 2005)
+
+  09 Dec 2005; Carsten Lohrke <carlo@gentoo.org>
+  +files/post-1.3-koffice-CAN-2005-3193.diff,
+  -files/kword-1.4.2-CAN-2005-3193.patch, -koffice-1.4.2-r2.ebuild,
+  -koffice-1.4.2-r3.ebuild, +koffice-1.4.2-r4.ebuild,
+  +koffice-1.4.2-r5.ebuild:
+  fixed patch
 
   07 Dec 2005; Marcus D. Hanwell <cryos@gentoo.org> koffice-1.4.2-r2.ebuild:
   Stable on amd64, bug 114429.
diff --git a/app-office/koffice/Manifest b/app-office/koffice/Manifest
index 5471a7e091eb..b9d5f8e6fbb5 100644
--- a/app-office/koffice/Manifest
+++ b/app-office/koffice/Manifest
@@ -1,31 +1,21 @@
------BEGIN PGP SIGNED MESSAGE-----
-Hash: SHA1
-
-MD5 7163cc5645c8ca89be8b2d7df2a8dbf5 ChangeLog 18518
+MD5 c63ba7c9bf708bf889ce54d615d97ca7 ChangeLog 18843
 MD5 6ee3768e50296eb2a8158093ee518133 files/CAN-2005-0064.patch 829
 MD5 12452317cab5461eb911114062f2cce2 files/digest-koffice-1.3.5-r2 68
 MD5 fcd72b8c0a0e8d1e8bbf6b76ed92c5cc files/digest-koffice-1.3.5-r3 144
 MD5 79e9d059a9a700c3c8009978d0aa0ce3 files/digest-koffice-1.4.1 68
 MD5 59512f920182567b8e9420e5e3d1bc9b files/digest-koffice-1.4.1-r1 144
 MD5 cf5b314fdf4094ea845edfddf2cf39b5 files/digest-koffice-1.4.2 68
-MD5 cf5b314fdf4094ea845edfddf2cf39b5 files/digest-koffice-1.4.2-r2 68
-MD5 cf5b314fdf4094ea845edfddf2cf39b5 files/digest-koffice-1.4.2-r3 68
+MD5 cf5b314fdf4094ea845edfddf2cf39b5 files/digest-koffice-1.4.2-r4 68
+MD5 cf5b314fdf4094ea845edfddf2cf39b5 files/digest-koffice-1.4.2-r5 68
 MD5 5f3683b6817935e4f6269bd64398c479 files/kexi-1.4.2-gcc41.patch 1094
 MD5 77399be6733ffca4ed1142ab319c1453 files/koffice_1_3_xpdf_buffer_overflow.diff 1808
 MD5 f1f58cce115f40fcba31a4976b61d260 files/kspread-1.4.2-gcc41.patch 451
-MD5 fc99a43dc841dc1e656d67266b720f71 files/kword-1.4.2-CAN-2005-3193.patch 2454
+MD5 6b5dbefadc93d1d7f27fb5fcb93be65f files/post-1.3-koffice-CAN-2005-3193.diff 3317
 MD5 bdcb79a8db04904d6e6c7110e0ff3ec9 koffice-1.3.5-r2.ebuild 1211
 MD5 9242394dfa6049940585a4d3fa962907 koffice-1.3.5-r3.ebuild 1289
 MD5 3dd6867f27cde022182ed16a091cb0c0 koffice-1.4.1-r1.ebuild 1747
 MD5 216a4ec901dca4c7e574aae8a09c40da koffice-1.4.1.ebuild 1538
-MD5 c12e32e081ee6621d23c205046e80d6f koffice-1.4.2-r2.ebuild 1602
-MD5 b46c312d68b7996d91df7eff084de2c7 koffice-1.4.2-r3.ebuild 1691
+MD5 5c65ea788a9e1707b494ae63d10b93cd koffice-1.4.2-r4.ebuild 1506
+MD5 ca4158be1beb799c97b1f15f70ff0711 koffice-1.4.2-r5.ebuild 1696
 MD5 57795f4f39bb45ba42f8ec112ab278de koffice-1.4.2.ebuild 1545
 MD5 02039d51ca4a42817775fd436dfaa956 metadata.xml 157
------BEGIN PGP SIGNATURE-----
-Version: GnuPG v1.4.2 (GNU/Linux)
-
-iD8DBQFDlzoWntT9W3vfTuoRAkXOAJ4ifdiwrlom6mCONS8upDrUxYca7gCeLVk6
-RsfzHiwr4qwXdzXLdDkHRrQ=
-=IlLS
------END PGP SIGNATURE-----
diff --git a/app-office/koffice/files/digest-koffice-1.4.2-r2 b/app-office/koffice/files/digest-koffice-1.4.2-r4
index a054824ae545..a054824ae545 100644
--- a/app-office/koffice/files/digest-koffice-1.4.2-r2
+++ b/app-office/koffice/files/digest-koffice-1.4.2-r4
diff --git a/app-office/koffice/files/digest-koffice-1.4.2-r3 b/app-office/koffice/files/digest-koffice-1.4.2-r5
index a054824ae545..a054824ae545 100644
--- a/app-office/koffice/files/digest-koffice-1.4.2-r3
+++ b/app-office/koffice/files/digest-koffice-1.4.2-r5
diff --git a/app-office/koffice/files/kword-1.4.2-CAN-2005-3193.patch b/app-office/koffice/files/kword-1.4.2-CAN-2005-3193.patch
deleted file mode 100644
index 323cdf520b6f..000000000000
--- a/app-office/koffice/files/kword-1.4.2-CAN-2005-3193.patch
+++ /dev/null
@@ -1,93 +0,0 @@
---- filters/kword/pdf/xpdf/xpdf/Stream.h.orig	2005-12-04 18:21:42.000000000 +0100
-+++ filters/kword/pdf/xpdf/xpdf/Stream.h	2005-12-04 18:25:55.000000000 +0100
-@@ -225,6 +225,8 @@
- 
-   ~StreamPredictor();
- 
-+  GBool isOk() { return ok; }
-+
-   int lookChar();
-   int getChar();
- 
-@@ -242,6 +244,7 @@
-   int rowBytes;			// bytes per line
-   Guchar *predLine;		// line buffer
-   int predIdx;			// current index in predLine
-+  GBool ok;
- };
- 
- //------------------------------------------------------------------------
---- filters/kword/pdf/xpdf/xpdf/Stream.cc.orig	2005-12-04 18:21:29.000000000 +0100
-+++ filters/kword/pdf/xpdf/xpdf/Stream.cc	2005-12-04 18:33:51.000000000 +0100
-@@ -404,18 +404,33 @@
- 
- StreamPredictor::StreamPredictor(Stream *strA, int predictorA,
- 				 int widthA, int nCompsA, int nBitsA) {
-+  int totalBits;
-+
-   str = strA;
-   predictor = predictorA;
-   width = widthA;
-   nComps = nCompsA;
-   nBits = nBitsA;
-+  predLine = NULL;
-+  ok = gFalse;
- 
-   nVals = width * nComps;
-+  totalBits = nVals * nBits;
-+  if (totalBits == 0 ||
-+      (totalBits / nBits) / nComps != width ||
-+      totalBits + 7 < 0) {
-+    return;
-+  }
-   pixBytes = (nComps * nBits + 7) >> 3;
--  rowBytes = ((nVals * nBits + 7) >> 3) + pixBytes;
-+  rowBytes = ((totalBits + 7) >> 3) + pixBytes;
-+  if (rowBytes < 0) {
-+    return;
-+  }
-   predLine = (Guchar *)gmalloc(rowBytes);
-   memset(predLine, 0, rowBytes);
-   predIdx = rowBytes;
-+
-+  ok = gTrue;
- }
- 
- StreamPredictor::~StreamPredictor() {
-@@ -982,6 +997,10 @@
-     FilterStream(strA) {
-   if (predictor != 1) {
-     pred = new StreamPredictor(this, predictor, columns, colors, bits);
-+    if (!pred->isOk()) {
-+      delete pred;
-+      pred = NULL;
-+    }
-   } else {
-     pred = NULL;
-   }
-@@ -2887,6 +2906,14 @@
-   height = read16();
-   width = read16();
-   numComps = str->getChar();
-+  if (numComps <= 0 || numComps > 4) {
-+    error(getPos(), "Bad number of components in DCT stream", prec);
-+    return gFalse;
-+  }
-+  if (numComps <= 0 || numComps > 4) {
-+    error(getPos(), "Bad number of components in DCT stream", prec);
-+    return gFalse;
-+  }
-   if (prec != 8) {
-     error(getPos(), "Bad DCT precision %d", prec);
-     return gFalse;
-@@ -3179,6 +3206,10 @@
-     FilterStream(strA) {
-   if (predictor != 1) {
-     pred = new StreamPredictor(this, predictor, columns, colors, bits);
-+    if (!pred->isOk()) {
-+      delete pred;
-+      pred = NULL;
-+    }
-   } else {
-     pred = NULL;
-   }
diff --git a/app-office/koffice/files/post-1.3-koffice-CAN-2005-3193.diff b/app-office/koffice/files/post-1.3-koffice-CAN-2005-3193.diff
new file mode 100644
index 000000000000..57fee5c3757f
--- /dev/null
+++ b/app-office/koffice/files/post-1.3-koffice-CAN-2005-3193.diff
@@ -0,0 +1,116 @@
+Index: filters/kword/pdf/xpdf/xpdf/Stream.cc
+===================================================================
+--- filters/kword/pdf/xpdf/xpdf/Stream.cc	(revision 409205)
++++ filters/kword/pdf/xpdf/xpdf/Stream.cc	(revision 487205)
+@@ -15,6 +15,7 @@
+ #include <stdio.h>
+ #include <stdlib.h>
+ #include <stddef.h>
++#include <limits.h>
+ #ifndef WIN32
+ #include <unistd.h>
+ #endif
+@@ -409,13 +410,28 @@ 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 + 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() {
+@@ -982,6 +998,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;
+   }
+@@ -2861,6 +2881,10 @@ GBool DCTStream::readBaselineSOF() {
+   height = read16();
+   width = read16();
+   numComps = str->getChar();
++  if (numComps <= 0 || numComps > 4) {
++     error(getPos(), "Bad number of components in DCT stream");
++     return gFalse;
++  }
+   if (prec != 8) {
+     error(getPos(), "Bad DCT precision %d", prec);
+     return gFalse;
+@@ -2887,6 +2911,10 @@ GBool DCTStream::readProgressiveSOF() {
+   height = read16();
+   width = read16();
+   numComps = str->getChar();
++  if (numComps <= 0 || numComps > 4) {
++     error(getPos(), "Bad number of components in DCT stream");
++     return gFalse;
++  }
+   if (prec != 8) {
+     error(getPos(), "Bad DCT precision %d", prec);
+     return gFalse;
+@@ -2909,6 +2937,10 @@ GBool DCTStream::readScanInfo() {
+ 
+   length = read16() - 2;
+   scanInfo.numComps = str->getChar();
++  if (scanInfo.numComps <= 0 || scanInfo.numComps > 4) {
++     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");
+@@ -3179,6 +3211,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: filters/kword/pdf/xpdf/xpdf/Stream.h
+===================================================================
+--- filters/kword/pdf/xpdf/xpdf/Stream.h	(revision 409205)
++++ filters/kword/pdf/xpdf/xpdf/Stream.h	(revision 487205)
+@@ -227,6 +227,7 @@ public:
+ 
+   int lookChar();
+   int getChar();
++  GBool isOk() { return ok; }
+ 
+ private:
+ 
+@@ -242,6 +243,7 @@ private:
+   int rowBytes;			// bytes per line
+   Guchar *predLine;		// line buffer
+   int predIdx;			// current index in predLine
++  GBool ok;
+ };
+ 
+ //------------------------------------------------------------------------
diff --git a/app-office/koffice/koffice-1.4.2-r2.ebuild b/app-office/koffice/koffice-1.4.2-r4.ebuild
index 5fee093f32b6..0f4d5056306f 100644
--- a/app-office/koffice/koffice-1.4.2-r2.ebuild
+++ b/app-office/koffice/koffice-1.4.2-r4.ebuild
@@ -1,6 +1,6 @@
 # Copyright 1999-2005 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/app-office/koffice/koffice-1.4.2-r2.ebuild,v 1.4 2005/12/07 19:37:47 cryos Exp $
+# $Header: /var/cvsroot/gentoo-x86/app-office/koffice/koffice-1.4.2-r4.ebuild,v 1.1 2005/12/09 20:49:43 carlo Exp $
 
 inherit kde
 
@@ -10,7 +10,7 @@ SRC_URI="mirror://kde/stable/koffice-${PV}/src/${P}.tar.bz2"
 LICENSE="GPL-2 LGPL-2"
 
 SLOT="0"
-KEYWORDS="~alpha amd64 ~ia64 ppc ppc64 ~sparc ~x86"
+KEYWORDS="~alpha ~amd64 ~ia64 ~ppc ~ppc64 ~sparc ~x86"
 IUSE="doc javascript mysql postgres"
 
 RDEPEND=">=media-gfx/imagemagick-5.5.2
@@ -44,7 +44,7 @@ need-kde 3.3
 # the dependency on python is needed for scripting support in kexi
 # and for kivio/kiviopart/kiviosdk.
 
-PATCHES="${FILESDIR}/kword-1.4.2-CAN-2005-3193.patch"
+PATCHES="${FILESDIR}/post-1.3-koffice-CAN-2005-3193.diff"
 
 src_compile() {
 	local myconf="$(use_enable mysql) $(use_enable postgres pgsql)"
diff --git a/app-office/koffice/koffice-1.4.2-r3.ebuild b/app-office/koffice/koffice-1.4.2-r5.ebuild
index dafc651ede5a..bb8973d7362d 100644
--- a/app-office/koffice/koffice-1.4.2-r3.ebuild
+++ b/app-office/koffice/koffice-1.4.2-r5.ebuild
@@ -1,6 +1,6 @@
 # Copyright 1999-2005 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/app-office/koffice/koffice-1.4.2-r3.ebuild,v 1.2 2005/12/06 01:57:35 carlo Exp $
+# $Header: /var/cvsroot/gentoo-x86/app-office/koffice/koffice-1.4.2-r5.ebuild,v 1.1 2005/12/09 20:49:43 carlo Exp $
 
 inherit kde
 
@@ -46,7 +46,7 @@ need-kde 3.3
 
 PATCHES="${FILESDIR}/kspread-1.4.2-gcc41.patch
 	${FILESDIR}/kexi-1.4.2-gcc41.patch
-	${FILESDIR}/kword-1.4.2-CAN-2005-3193.patch"
+	${FILESDIR}/post-1.3-koffice-CAN-2005-3193.diff"
 
 src_compile() {
 	local myconf="$(use_enable mysql) $(use_enable postgres pgsql)"