Adding patches for security bug #75204

8 files changed, 226 insertions, 23 deletions

diff --git a/kde-base/kdegraphics/ChangeLog b/kde-base/kdegraphics/ChangeLog
index 1ec5a4fe1d9d..3806d5c98e3b 100644
--- a/kde-base/kdegraphics/ChangeLog
+++ b/kde-base/kdegraphics/ChangeLog
@@ -1,6 +1,13 @@
 # ChangeLog for kde-base/kdegraphics
 # Copyright 2002-2004 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/kde-base/kdegraphics/ChangeLog,v 1.131 2004/12/18 22:33:31 corsair Exp $
+# $Header: /var/cvsroot/gentoo-x86/kde-base/kdegraphics/ChangeLog,v 1.132 2004/12/27 15:23:12 caleb Exp $
+
+*kdegraphics-3.3.2-r1 (27 Dec 2004)
+
+  27 Dec 2004; Caleb Tennis <caleb@gentoo.org>
+  +files/post-3.2.3-kdegraphics-2.diff, +files/post-3.3.2-kdegraphics.diff,
+  +kdegraphics-3.2.3-r3.ebuild, +kdegraphics-3.3.2-r1.ebuild:
+  Adding patches for security bug #75204
 
   18 Dec 2004; Markus Rothe <corsair@gentoo.org> kdegraphics-3.3.1-r2.ebuild:
   Stable on ppc64
diff --git a/kde-base/kdegraphics/Manifest b/kde-base/kdegraphics/Manifest
index 2e017148445d..8b8495e7ab2a 100644
--- a/kde-base/kdegraphics/Manifest
+++ b/kde-base/kdegraphics/Manifest
@@ -1,36 +1,42 @@
-MD5 d1ec9daec9f6441b436ed38aea903d5b ChangeLog 17944
-MD5 feb2b4270d15a98a32173a5ae04a19fb kdegraphics-3.1.5.ebuild 1048
-MD5 d34737e0c554fe641ce3a353c8b7fe8d kdegraphics-3.2.0.ebuild 1330
+MD5 f423c2e33c0a80966867008b2dc13636 kdegraphics-3.3.2-r1.ebuild 1492
 MD5 0c557af25ca14e9133483d1ff8414c74 kdegraphics-3.2.2.ebuild 1224
-MD5 749ee0be0aab8c1f4ee11978a8d16ae2 kdegraphics-3.2.3-r1.ebuild 1278
-MD5 8e48bc60a542000e2ca8ca2173a21113 kdegraphics-3.2.3.ebuild 1226
-MD5 f8ea687ae1a7ff4a4771f5cf4050a125 kdegraphics-3.3.0-r1.ebuild 1499
+MD5 e569d030aaa73e0b0e4aa114cd90454b kdegraphics-3.2.3-r2.ebuild 1278
 MD5 5a60aa7288a3e688931b84fce55c4b6a kdegraphics-3.3.0.ebuild 1430
+MD5 537bc1e79063d3a641cbcae454c8f6ae kdegraphics-3.3.0-r2.ebuild 1485
 MD5 0dcbff375e401ca8c354637670a32c43 kdegraphics-3.3.1-r1.ebuild 1485
+MD5 dc8236149977ed30d41d954b082d60fd kdegraphics-3.3.2.ebuild 1441
+MD5 749ee0be0aab8c1f4ee11978a8d16ae2 kdegraphics-3.2.3-r1.ebuild 1278
+MD5 f8ea687ae1a7ff4a4771f5cf4050a125 kdegraphics-3.3.0-r1.ebuild 1499
+MD5 feb2b4270d15a98a32173a5ae04a19fb kdegraphics-3.1.5.ebuild 1048
+MD5 8e48bc60a542000e2ca8ca2173a21113 kdegraphics-3.2.3.ebuild 1226
+MD5 86bd4f58724f19845972be252285f4b8 kdegraphics-3.2.3-r3.ebuild 1327
 MD5 6b3fabad5f11df10503b136be549dc16 kdegraphics-3.3.1.ebuild 1434
-MD5 14889ab75f97d76e58b0c1154e7683a9 metadata.xml 161
-MD5 e569d030aaa73e0b0e4aa114cd90454b kdegraphics-3.2.3-r2.ebuild 1278
-MD5 537bc1e79063d3a641cbcae454c8f6ae kdegraphics-3.3.0-r2.ebuild 1485
+MD5 29c8d5b452415d50b6a3a3a59d9af53a ChangeLog 18206
 MD5 57dfdf988fd0880f66578e4e9d720eea kdegraphics-3.3.1-r2.ebuild 1489
-MD5 dc8236149977ed30d41d954b082d60fd kdegraphics-3.3.2.ebuild 1441
+MD5 d34737e0c554fe641ce3a353c8b7fe8d kdegraphics-3.2.0.ebuild 1330
+MD5 14889ab75f97d76e58b0c1154e7683a9 metadata.xml 161
+MD5 33d7a652f3ae6f9e66d79fb818b684f6 files/digest-kdegraphics-3.3.0-r1 71
+MD5 33d7a652f3ae6f9e66d79fb818b684f6 files/digest-kdegraphics-3.3.0-r2 71
+MD5 fecf5cb3209323e56be3368df325411a files/digest-kdegraphics-3.3.1-r1 71
+MD5 fecf5cb3209323e56be3368df325411a files/digest-kdegraphics-3.3.1-r2 71
+MD5 9eb12845ce85cc31e216d463877cb519 files/digest-kdegraphics-3.3.2-r1 71
+MD5 eb03ab721af71700a0b445f1c50b55f8 files/kdegraphics-3.2.2-gcc34-compile.patch 7723
 MD5 78ab0a172f24863df0ba35300e95a890 files/digest-kdegraphics-3.1.5 71
 MD5 8c9db7f8d52169b544da66be07e9979a files/digest-kdegraphics-3.2.0 71
 MD5 80f49f2fcc0bb31559666e47fc28b047 files/digest-kdegraphics-3.2.2 71
 MD5 e43eeb201ab38aa05917d4de1573ff59 files/digest-kdegraphics-3.2.3 71
-MD5 e43eeb201ab38aa05917d4de1573ff59 files/digest-kdegraphics-3.2.3-r1 71
 MD5 33d7a652f3ae6f9e66d79fb818b684f6 files/digest-kdegraphics-3.3.0 71
-MD5 33d7a652f3ae6f9e66d79fb818b684f6 files/digest-kdegraphics-3.3.0-r1 71
 MD5 fecf5cb3209323e56be3368df325411a files/digest-kdegraphics-3.3.1 71
-MD5 fecf5cb3209323e56be3368df325411a files/digest-kdegraphics-3.3.1-r1 71
-MD5 eb03ab721af71700a0b445f1c50b55f8 files/kdegraphics-3.2.2-gcc34-compile.patch 7723
-MD5 d97c962408abd235435f6857fc405ebf files/kdegraphics-3.2.3-gcc34-compile.patch 7162
-MD5 4f854adb507f4d04e997702e44ffc2ea files/post-3.2.3-kdegraphics.diff 3853
-MD5 651fba579516ea947fbefee373f40a6c files/post-3.3.1-kdegraphics.diff 1533
+MD5 9eb12845ce85cc31e216d463877cb519 files/digest-kdegraphics-3.3.2 71
+MD5 bf6b28780e0f5ea8f99e0777187e73cb files/post-3.3.2-kdegraphics.diff 1385
 MD5 8d995a343d5083ba8ac84f1d4136d359 files/xpdf-3.3.0-kdegraphics.diff 1630
-MD5 e43eeb201ab38aa05917d4de1573ff59 files/digest-kdegraphics-3.2.3-r2 71
-MD5 33d7a652f3ae6f9e66d79fb818b684f6 files/digest-kdegraphics-3.3.0-r2 71
-MD5 fecf5cb3209323e56be3368df325411a files/digest-kdegraphics-3.3.1-r2 71
-MD5 870d90051bb236753070fb553890f95d files/post-3.2.3-kdegraphics_2.diff 3205
+MD5 4f854adb507f4d04e997702e44ffc2ea files/post-3.2.3-kdegraphics.diff 3853
+MD5 26b54ece47e2617478338586ebfd253d files/post-3.2.3-kdegraphics-2.diff 1742
+MD5 d97c962408abd235435f6857fc405ebf files/kdegraphics-3.2.3-gcc34-compile.patch 7162
 MD5 06573d3829a3009c879f870746607056 files/post-3.3.0-kdegraphics_2.diff 3586
+MD5 870d90051bb236753070fb553890f95d files/post-3.2.3-kdegraphics_2.diff 3205
+MD5 651fba579516ea947fbefee373f40a6c files/post-3.3.1-kdegraphics.diff 1533
 MD5 6c3f55477c5f566c711563caa3c51296 files/post-3.3.1-kdegraphics_2.diff 3887
-MD5 9eb12845ce85cc31e216d463877cb519 files/digest-kdegraphics-3.3.2 71
+MD5 e43eeb201ab38aa05917d4de1573ff59 files/digest-kdegraphics-3.2.3-r1 71
+MD5 e43eeb201ab38aa05917d4de1573ff59 files/digest-kdegraphics-3.2.3-r2 71
+MD5 e43eeb201ab38aa05917d4de1573ff59 files/digest-kdegraphics-3.2.3-r3 71
diff --git a/kde-base/kdegraphics/files/digest-kdegraphics-3.2.3-r3 b/kde-base/kdegraphics/files/digest-kdegraphics-3.2.3-r3
new file mode 100644
index 000000000000..2e0072d98c01
--- /dev/null
+++ b/kde-base/kdegraphics/files/digest-kdegraphics-3.2.3-r3
@@ -0,0 +1 @@
+MD5 af7092f2afc5a8565eb5017ecee6b67e kdegraphics-3.2.3.tar.bz2 5676995
diff --git a/kde-base/kdegraphics/files/digest-kdegraphics-3.3.2-r1 b/kde-base/kdegraphics/files/digest-kdegraphics-3.3.2-r1
new file mode 100644
index 000000000000..19c2a1ed829e
--- /dev/null
+++ b/kde-base/kdegraphics/files/digest-kdegraphics-3.3.2-r1
@@ -0,0 +1 @@
+MD5 03092b8be2f7054d71895b8fd58ad26e kdegraphics-3.3.2.tar.bz2 6234394
diff --git a/kde-base/kdegraphics/files/post-3.2.3-kdegraphics-2.diff b/kde-base/kdegraphics/files/post-3.2.3-kdegraphics-2.diff
new file mode 100644
index 000000000000..9e6828bfeb72
--- /dev/null
+++ b/kde-base/kdegraphics/files/post-3.2.3-kdegraphics-2.diff
@@ -0,0 +1,51 @@
+--- kpdf/xpdf/Gfx.cc	28 Sep 2003 12:17:12 -0000	1.4
++++ kpdf/xpdf/Gfx.cc	22 Dec 2004 12:04:49 -0000
+@@ -2379,11 +2379,13 @@ void Gfx::doImage(Object *ref, Stream *s
+ 
+     // get the mask
+     haveMask = gFalse;
+     dict->lookup("Mask", &maskObj);
+     if (maskObj.isArray()) {
+-      for (i = 0; i < maskObj.arrayGetLength(); ++i) {
++      for (i = 0;
++	   i < maskObj.arrayGetLength() && i < 2*gfxColorMaxComps;
++	   ++i) {
+ 	maskObj.arrayGet(i, &obj1);
+ 	maskColors[i] = obj1.getInt();
+ 	obj1.free();
+       }
+       haveMask = gTrue;
+--- kpdf/xpdf/GfxState.cc	20 Aug 2003 21:25:12 -0000	1.3
++++ kpdf/xpdf/GfxState.cc	22 Dec 2004 12:04:49 -0000
+@@ -706,10 +706,15 @@ GfxColorSpace *GfxICCBasedColorSpace::pa
+     obj1.free();
+     return NULL;
+   }
+   nCompsA = obj2.getInt();
+   obj2.free();
++  if (nCompsA > gfxColorMaxComps) {
++    error(-1, "ICCBased color space with too many (%d > %d) components",
++          nCompsA, gfxColorMaxComps);
++    nCompsA = gfxColorMaxComps;
++  }
+   if (dict->lookup("Alternate", &obj2)->isNull() ||
+       !(altA = GfxColorSpace::parse(&obj2))) {
+     switch (nCompsA) {
+     case 1:
+       altA = new GfxDeviceGrayColorSpace();
+@@ -1045,10 +1050,15 @@ GfxColorSpace *GfxDeviceNColorSpace::par
+   if (!arr->get(1, &obj1)->isArray()) {
+     error(-1, "Bad DeviceN color space (names)");
+     goto err2;
+   }
+   nCompsA = obj1.arrayGetLength();
++  if (nCompsA > gfxColorMaxComps) {
++    error(-1, "DeviceN color space with too many (%d > %d) components",
++          nCompsA, gfxColorMaxComps);
++    nCompsA = gfxColorMaxComps;
++  }
+   for (i = 0; i < nCompsA; ++i) {
+     if (!obj1.arrayGet(i, &obj2)->isName()) {
+       error(-1, "Bad DeviceN color space (names)");
+       obj2.free();
+       goto err2;
diff --git a/kde-base/kdegraphics/files/post-3.3.2-kdegraphics.diff b/kde-base/kdegraphics/files/post-3.3.2-kdegraphics.diff
new file mode 100644
index 000000000000..26c6facccc01
--- /dev/null
+++ b/kde-base/kdegraphics/files/post-3.3.2-kdegraphics.diff
@@ -0,0 +1,36 @@
+--- kpdf/xpdf/Gfx.cc	2 Sep 2004 21:30:18 -0000	1.4.4.1
++++ kpdf/xpdf/Gfx.cc	22 Dec 2004 12:05:50 -0000	1.4.4.2
+@@ -2654,7 +2654,9 @@ void Gfx::doImage(Object *ref, Stream *s
+     haveMask = gFalse;
+     dict->lookup("Mask", &maskObj);
+     if (maskObj.isArray()) {
+-      for (i = 0; i < maskObj.arrayGetLength(); ++i) {
++      for (i = 0;
++	   i < maskObj.arrayGetLength() && i < 2*gfxColorMaxComps;
++	   ++i) {
+ 	maskObj.arrayGet(i, &obj1);
+ 	maskColors[i] = obj1.getInt();
+ 	obj1.free();
+--- kpdf/xpdf/GfxState.cc	2 Sep 2004 21:30:18 -0000	1.3.4.1
++++ kpdf/xpdf/GfxState.cc	22 Dec 2004 12:05:50 -0000	1.3.4.2
+@@ -708,6 +708,11 @@ GfxColorSpace *GfxICCBasedColorSpace::pa
+   }
+   nCompsA = obj2.getInt();
+   obj2.free();
++  if (nCompsA > gfxColorMaxComps) {
++    error(-1, "ICCBased color space with too many (%d > %d) components",
++	  nCompsA, gfxColorMaxComps);
++    nCompsA = gfxColorMaxComps;
++  }
+   if (dict->lookup("Alternate", &obj2)->isNull() ||
+       !(altA = GfxColorSpace::parse(&obj2))) {
+     switch (nCompsA) {
+@@ -1054,7 +1059,7 @@ GfxColorSpace *GfxDeviceNColorSpace::par
+   }
+   nCompsA = obj1.arrayGetLength();
+   if (nCompsA > gfxColorMaxComps) {
+-    error(-1, "DeviceN color space with more than %d > %d components",
++    error(-1, "DeviceN color space with too many (%d > %d) components",
+ 	  nCompsA, gfxColorMaxComps);
+     nCompsA = gfxColorMaxComps;
+   }
diff --git a/kde-base/kdegraphics/kdegraphics-3.2.3-r3.ebuild b/kde-base/kdegraphics/kdegraphics-3.2.3-r3.ebuild
new file mode 100644
index 000000000000..cb2b22922240
--- /dev/null
+++ b/kde-base/kdegraphics/kdegraphics-3.2.3-r3.ebuild
@@ -0,0 +1,46 @@
+# Copyright 1999-2004 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Header: /var/cvsroot/gentoo-x86/kde-base/kdegraphics/kdegraphics-3.2.3-r3.ebuild,v 1.1 2004/12/27 15:23:12 caleb Exp $
+
+inherit kde-dist eutils
+
+DESCRIPTION="KDE graphics-related apps"
+
+KEYWORDS="x86 ppc ~sparc ~alpha hppa ~amd64 ia64"
+IUSE="gphoto2 tetex scanner opengl"
+
+DEPEND="~kde-base/kdebase-${PV}
+	gphoto2? ( media-gfx/gphoto2 )
+	scanner? ( media-gfx/sane-backends )
+	tetex? ( virtual/tetex )
+	dev-libs/fribidi
+	opengl? ( virtual/glut virtual/opengl )
+	media-libs/imlib
+	virtual/ghostscript
+	media-libs/tiff
+	x86? ( scanner? sys-libs/libieee1284 )"
+RDEPEND="${DEPEND}
+	app-text/xpdf"
+
+src_unpack() {
+	kde_src_unpack
+	epatch ${FILESDIR}/${P}-gcc34-compile.patch
+	epatch ${FILESDIR}/post-3.2.3-kdegraphics_2.diff
+	epatch ${FILESDIR}/post-3.2.3-kdegraphics-2.diff
+}
+
+src_compile() {
+
+	use gphoto2	\
+		&& myconf="$myconf --with-kamera \
+				   --with-gphoto2-includes=/usr/include/gphoto2 \
+				   --with-gphoto2-libraries=/usr/lib/gphoto2" \
+		|| myconf="$myconf --without-kamera"
+
+	use tetex 	&& myconf="$myconf --with-system-kpathsea --with-tex-datadir=/usr/share"
+
+	use scanner	|| DO_NOT_COMPILE="$DO_NOT_COMPILE kooka libkscan"
+
+	myconf="$myconf --with-imlib --with-imlib-config=/usr/bin"
+	kde_src_compile
+}
diff --git a/kde-base/kdegraphics/kdegraphics-3.3.2-r1.ebuild b/kde-base/kdegraphics/kdegraphics-3.3.2-r1.ebuild
new file mode 100644
index 000000000000..13a7620478b3
--- /dev/null
+++ b/kde-base/kdegraphics/kdegraphics-3.3.2-r1.ebuild
@@ -0,0 +1,55 @@
+# Copyright 1999-2004 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Header: /var/cvsroot/gentoo-x86/kde-base/kdegraphics/kdegraphics-3.3.2-r1.ebuild,v 1.1 2004/12/27 15:23:12 caleb Exp $
+
+inherit kde-dist eutils
+
+DESCRIPTION="KDE graphics-related apps"
+
+KEYWORDS="~x86 ~amd64 ~ppc64 ~sparc ~ppc ~hppa ~alpha"
+IUSE="gphoto2 imlib jpeg2k opengl povray scanner tetex"
+
+DEPEND="~kde-base/kdebase-${PV}
+	gphoto2? ( media-gfx/gphoto2 )
+	scanner? ( media-gfx/sane-backends )
+	dev-libs/fribidi
+	opengl? ( virtual/glut virtual/opengl )
+	imlib? ( media-libs/imlib )
+	virtual/ghostscript
+	media-libs/tiff
+	x86? ( scanner? sys-libs/libieee1284 )
+	povray? ( x86? ( media-gfx/povray ) )
+	jpeg2k? ( x86? ( media-libs/jasper ) )
+	!media-gfx/kolourpaint"
+RDEPEND="${DEPEND}
+	app-text/xpdf
+	tetex? (
+	|| ( >=app-text/tetex-2
+	app-text/ptex
+	app-text/cstetex
+	app-text/dvipdfm )
+	)"
+
+src_unpack() {
+	kde_src_unpack
+	epatch ${FILESDIR}/post-3.3.2-kdegraphics.diff
+}
+
+src_compile() {
+
+	use gphoto2	\
+		&& myconf="$myconf --with-kamera \
+				   --with-gphoto2-includes=/usr/include/gphoto2 \
+				   --with-gphoto2-libraries=/usr/lib/gphoto2" \
+		|| myconf="$myconf --without-kamera"
+
+	use tetex 	&& myconf="$myconf --with-system-kpathsea --with-tex-datadir=/usr/share"
+
+	use scanner	|| DO_NOT_COMPILE="$DO_NOT_COMPILE kooka libkscan"
+
+	use imlib \
+		&& myconf="$myconf --with-imlib --with-imlib-config=/usr/bin" \
+		|| myconf="$myconf --without-imlib"
+
+	kde_src_compile
+}