Patch applied according to #115851.

(Portage version: 2.0.53)

7 files changed, 270 insertions, 31 deletions

diff --git a/app-office/kword/ChangeLog b/app-office/kword/ChangeLog
index 121e6f814ffe..42b2fe1fc132 100644
--- a/app-office/kword/ChangeLog
+++ b/app-office/kword/ChangeLog
@@ -1,6 +1,14 @@
 # ChangeLog for app-office/kword
 # Copyright 1999-2005 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/app-office/kword/ChangeLog,v 1.38 2005/12/16 01:22:31 yoswink Exp $
+# $Header: /var/cvsroot/gentoo-x86/app-office/kword/ChangeLog,v 1.39 2005/12/20 17:29:23 carlo Exp $
+
+*kword-1.4.2-r7 (20 Dec 2005)
+*kword-1.4.2-r6 (20 Dec 2005)
+
+  20 Dec 2005; Carsten Lohrke <carlo@gentoo.org>
+  files/post-1.3-koffice-CAN-2005-3193.diff, +kword-1.4.2-r6.ebuild,
+  +kword-1.4.2-r7.ebuild:
+  Patch applied according to #115851.
 
   16 Dec 2005; Jose Luis Rivero <yoswink@gentoo.org> kword-1.4.2-r4.ebuild:
   Stable on Alpha wrt security bug #114429
diff --git a/app-office/kword/Manifest b/app-office/kword/Manifest
index 064f0f53b6f1..5f90396c75a5 100644
--- a/app-office/kword/Manifest
+++ b/app-office/kword/Manifest
@@ -1,30 +1,24 @@
------BEGIN PGP SIGNED MESSAGE-----
-Hash: SHA1
-
-MD5 dd4e1252d9492a184a8a0066f734da34 kword-1.4.2-r4.ebuild 1265
-MD5 18ae024a439fc6a208affee87245e886 kword-1.4.1.ebuild 1200
-MD5 113e6434c255e20ee8de241c0a1b53bd kword-1.3.5-r1.ebuild 1440
-MD5 5948a99247e2967f49cbd364cbe194d7 kword-1.3.5.ebuild 1378
-MD5 4a5def53a5e48ab29b32d9ddcd601258 kword-1.4.1-r1.ebuild 1396
-MD5 d9b7e8492eb8e911135353748af3b67d kword-1.4.2-r5.ebuild 1332
-MD5 8f0acb5e8042cd72200b18a6f6ebd436 ChangeLog 4872
-MD5 02039d51ca4a42817775fd436dfaa956 metadata.xml 157
-MD5 b0d602dfdc9115c98b9fe1f9a45052e2 kword-1.4.2.ebuild 1205
-MD5 f1f58cce115f40fcba31a4976b61d260 files/kspread-1.4.2-gcc41.patch 451
+MD5 fb11ddabd0c4c412c739648a00aca19e ChangeLog 5116
 MD5 6ee3768e50296eb2a8158093ee518133 files/CAN-2005-0064.patch 829
-MD5 77399be6733ffca4ed1142ab319c1453 files/koffice_1_3_xpdf_buffer_overflow.diff 1808
 MD5 12d141df83ce3d5769387e780ee073f7 files/digest-kword-1.3.5 211
-MD5 79e9d059a9a700c3c8009978d0aa0ce3 files/digest-kword-1.4.1 68
-MD5 cf5b314fdf4094ea845edfddf2cf39b5 files/digest-kword-1.4.2 68
-MD5 6b5dbefadc93d1d7f27fb5fcb93be65f files/post-1.3-koffice-CAN-2005-3193.diff 3317
 MD5 4db1fd7ff582f6437830745f93412312 files/digest-kword-1.3.5-r1 287
+MD5 79e9d059a9a700c3c8009978d0aa0ce3 files/digest-kword-1.4.1 68
 MD5 59512f920182567b8e9420e5e3d1bc9b files/digest-kword-1.4.1-r1 144
+MD5 cf5b314fdf4094ea845edfddf2cf39b5 files/digest-kword-1.4.2 68
 MD5 cf5b314fdf4094ea845edfddf2cf39b5 files/digest-kword-1.4.2-r4 68
 MD5 cf5b314fdf4094ea845edfddf2cf39b5 files/digest-kword-1.4.2-r5 68
------BEGIN PGP SIGNATURE-----
-Version: GnuPG v1.4.1 (GNU/Linux)
-
-iD8DBQFDohZe3og80iZgVQgRAorJAJ9wcZrrB+u61UoNdeECk6HFRl+aAgCfR0dA
-U84mD6za0doG3dqTIureG2I=
-=ANGI
------END PGP SIGNATURE-----
+MD5 cf5b314fdf4094ea845edfddf2cf39b5 files/digest-kword-1.4.2-r6 68
+MD5 cf5b314fdf4094ea845edfddf2cf39b5 files/digest-kword-1.4.2-r7 68
+MD5 77399be6733ffca4ed1142ab319c1453 files/koffice_1_3_xpdf_buffer_overflow.diff 1808
+MD5 f1f58cce115f40fcba31a4976b61d260 files/kspread-1.4.2-gcc41.patch 451
+MD5 32ff061a8fba0e82d069a8a6fa6932e0 files/post-1.3-koffice-CAN-2005-3193.diff 6760
+MD5 113e6434c255e20ee8de241c0a1b53bd kword-1.3.5-r1.ebuild 1440
+MD5 5948a99247e2967f49cbd364cbe194d7 kword-1.3.5.ebuild 1378
+MD5 4a5def53a5e48ab29b32d9ddcd601258 kword-1.4.1-r1.ebuild 1396
+MD5 18ae024a439fc6a208affee87245e886 kword-1.4.1.ebuild 1200
+MD5 dd4e1252d9492a184a8a0066f734da34 kword-1.4.2-r4.ebuild 1265
+MD5 d9b7e8492eb8e911135353748af3b67d kword-1.4.2-r5.ebuild 1332
+MD5 fddd578ded7c4ee2b331ab06a3ccfa68 kword-1.4.2-r6.ebuild 1269
+MD5 9fb607a2992d87ec624a526ba40de6c2 kword-1.4.2-r7.ebuild 1332
+MD5 b0d602dfdc9115c98b9fe1f9a45052e2 kword-1.4.2.ebuild 1205
+MD5 02039d51ca4a42817775fd436dfaa956 metadata.xml 157
diff --git a/app-office/kword/files/digest-kword-1.4.2-r6 b/app-office/kword/files/digest-kword-1.4.2-r6
new file mode 100644
index 000000000000..a054824ae545
--- /dev/null
+++ b/app-office/kword/files/digest-kword-1.4.2-r6
@@ -0,0 +1 @@
+MD5 6b456fb7d54c84b11396b27a96ae0cf8 koffice-1.4.2.tar.bz2 19486852
diff --git a/app-office/kword/files/digest-kword-1.4.2-r7 b/app-office/kword/files/digest-kword-1.4.2-r7
new file mode 100644
index 000000000000..a054824ae545
--- /dev/null
+++ b/app-office/kword/files/digest-kword-1.4.2-r7
@@ -0,0 +1 @@
+MD5 6b456fb7d54c84b11396b27a96ae0cf8 koffice-1.4.2.tar.bz2 19486852
diff --git a/app-office/kword/files/post-1.3-koffice-CAN-2005-3193.diff b/app-office/kword/files/post-1.3-koffice-CAN-2005-3193.diff
index 57fee5c3757f..b1f436e9781f 100644
--- a/app-office/kword/files/post-1.3-koffice-CAN-2005-3193.diff
+++ b/app-office/kword/files/post-1.3-koffice-CAN-2005-3193.diff
@@ -1,7 +1,87 @@
+Index: filters/kword/pdf/xpdf/xpdf/JBIG2Stream.cc
+===================================================================
+--- filters/kword/pdf/xpdf/xpdf/JBIG2Stream.cc	(revision 409205)
++++ filters/kword/pdf/xpdf/xpdf/JBIG2Stream.cc	(revision 488234)
+@@ -7,6 +7,7 @@
+ //========================================================================
+ 
+ #include <aconf.h>
++#include <limits.h>
+ 
+ #ifdef USE_GCC_PRAGMAS
+ #pragma implementation
+@@ -977,6 +978,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);
+ }
+ 
+@@ -986,6 +994,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);
+ }
+@@ -1012,7 +1027,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);
+@@ -2505,6 +2523,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;
+@@ -3078,6 +3105,11 @@ JBIG2Bitmap *JBIG2Stream::readGenericRef
+   Guint ltpCX, cx, cx0, cx2, cx3, cx4, tpgrCX0, tpgrCX1, tpgrCX2;
+   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: 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)
++++ filters/kword/pdf/xpdf/xpdf/Stream.cc	(revision 488234)
 @@ -15,6 +15,7 @@
  #include <stdio.h>
  #include <stdlib.h>
@@ -50,40 +130,82 @@ Index: filters/kword/pdf/xpdf/xpdf/Stream.cc
    } else {
      pred = NULL;
    }
-@@ -2861,6 +2881,10 @@ GBool DCTStream::readBaselineSOF() {
+@@ -1227,6 +1247,11 @@ CCITTFaxStream::CCITTFaxStream(Stream *s
+   endOfLine = endOfLineA;
+   byteAlign = byteAlignA;
+   columns = columnsA;
++  if (columns < 1 || columns + 2 < 0 || columns + 3 < 0 ||
++	  (columns + 2) >= INT_MAX / sizeof(short) || (columns + 3) >= INT_MAX / sizeof(short)) {
++    error(-1, "invalid number of columns");
++    exit(1);
++  }
+   rows = rowsA;
+   endOfBlock = endOfBlockA;
+   black = blackA;
+@@ -2861,6 +2886,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;
-@@ -2887,6 +2911,10 @@ GBool DCTStream::readProgressiveSOF() {
+@@ -2887,6 +2917,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;
-@@ -2909,6 +2937,10 @@ GBool DCTStream::readScanInfo() {
+@@ -2909,6 +2944,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");
-@@ -3179,6 +3211,10 @@ FlateStream::FlateStream(Stream *strA, i
+@@ -2976,12 +3016,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];
+@@ -3069,9 +3109,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;
+@@ -3179,6 +3221,10 @@ FlateStream::FlateStream(Stream *strA, i
      FilterStream(strA) {
    if (predictor != 1) {
      pred = new StreamPredictor(this, predictor, columns, colors, bits);
@@ -97,7 +219,7 @@ Index: filters/kword/pdf/xpdf/xpdf/Stream.cc
 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)
++++ filters/kword/pdf/xpdf/xpdf/Stream.h	(revision 488234)
 @@ -227,6 +227,7 @@ public:
  
    int lookChar();
diff --git a/app-office/kword/kword-1.4.2-r6.ebuild b/app-office/kword/kword-1.4.2-r6.ebuild
new file mode 100644
index 000000000000..58edf5cc9ff4
--- /dev/null
+++ b/app-office/kword/kword-1.4.2-r6.ebuild
@@ -0,0 +1,56 @@
+# Copyright 1999-2005 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Header: /var/cvsroot/gentoo-x86/app-office/kword/kword-1.4.2-r6.ebuild,v 1.1 2005/12/20 17:29:23 carlo Exp $
+
+KMNAME=koffice
+MAXKOFFICEVER=${PV}
+inherit kde-meta eutils
+
+DESCRIPTION="KOffice word processor."
+HOMEPAGE="http://www.koffice.org/"
+LICENSE="GPL-2 LGPL-2"
+
+SLOT="0"
+KEYWORDS="~alpha ~amd64 ~ia64 ~ppc ~ppc64 ~sparc ~x86"
+IUSE=""
+
+RDEPEND="$(deprange $PV $MAXKOFFICEVER app-office/koffice-libs)
+	$(deprange $PV $MAXKOFFICEVER app-office/kspread)
+	>=app-text/wv2-0.1.8
+	>=media-gfx/imagemagick-5.5.2"
+
+DEPEND="${RDEPEND}
+	dev-util/pkgconfig"
+
+KMCOPYLIB="
+	libkformula lib/kformula
+	libkofficecore lib/kofficecore
+	libkofficeui lib/kofficeui
+	libkopainter lib/kopainter
+	libkoscript lib/koscript
+	libkotext lib/kotext
+	libkwmf lib/kwmf
+	libkowmf lib/kwmf
+	libkstore lib/store
+	libkspreadcommon kspread"
+
+KMEXTRACTONLY="
+	lib/
+	kspread/"
+
+KMCOMPILEONLY="filters/liboofilter"
+
+KMEXTRA="filters/kword"
+
+need-kde 3.3
+
+PATCHES="${FILESDIR}/post-1.3-koffice-CAN-2005-3193.diff"
+
+src_unpack() {
+	kde-meta_src_unpack unpack
+
+	# We need to compile liboofilter first
+	echo "SUBDIRS = liboofilter kword" > $S/filters/Makefile.am
+
+	kde-meta_src_unpack makefiles
+}
diff --git a/app-office/kword/kword-1.4.2-r7.ebuild b/app-office/kword/kword-1.4.2-r7.ebuild
new file mode 100644
index 000000000000..f2e2040a8811
--- /dev/null
+++ b/app-office/kword/kword-1.4.2-r7.ebuild
@@ -0,0 +1,57 @@
+# Copyright 1999-2005 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Header: /var/cvsroot/gentoo-x86/app-office/kword/kword-1.4.2-r7.ebuild,v 1.1 2005/12/20 17:29:23 carlo Exp $
+
+KMNAME=koffice
+MAXKOFFICEVER=${PV}
+inherit kde-meta eutils
+
+DESCRIPTION="KOffice word processor."
+HOMEPAGE="http://www.koffice.org/"
+LICENSE="GPL-2 LGPL-2"
+
+SLOT="0"
+KEYWORDS="~alpha ~amd64 ~ia64 ~ppc ~ppc64 ~sparc ~x86"
+IUSE=""
+
+RDEPEND="$(deprange $PV $MAXKOFFICEVER app-office/koffice-libs)
+	$(deprange $PV $MAXKOFFICEVER app-office/kspread)
+	>=app-text/wv2-0.1.8
+	>=media-gfx/imagemagick-5.5.2
+	>=app-text/libwpd-0.8.2"
+
+DEPEND="${RDEPEND}
+	dev-util/pkgconfig"
+
+KMCOPYLIB="
+	libkformula lib/kformula
+	libkofficecore lib/kofficecore
+	libkofficeui lib/kofficeui
+	libkopainter lib/kopainter
+	libkoscript lib/koscript
+	libkotext lib/kotext
+	libkwmf lib/kwmf
+	libkowmf lib/kwmf
+	libkstore lib/store
+	libkspreadcommon kspread"
+
+KMEXTRACTONLY="
+	lib/
+	kspread/"
+
+KMCOMPILEONLY="filters/liboofilter"
+
+KMEXTRA="filters/kword"
+
+need-kde 3.3
+
+PATCHES="${FILESDIR}/kspread-1.4.2-gcc41.patch ${FILESDIR}/post-1.3-koffice-CAN-2005-3193.diff"
+
+src_unpack() {
+	kde-meta_src_unpack unpack
+
+	# We need to compile liboofilter first
+	echo "SUBDIRS = liboofilter kword" > $S/filters/Makefile.am
+
+	kde-meta_src_unpack makefiles
+}