Added patch to take care of SA28784 and CVE-2008-0553 (see bug #208464).

Package-Manager: portage-2.1.4.2

diff --git a/sci-visualization/paraview/ChangeLog b/sci-visualization/paraview/ChangeLog
index 8d2d0df56915a4f3409b4a25041b44e239d3a3a2..9b84f882571970d7cb4e3ce11f9a570e41ddbe62 100644 (file)
--- a/sci-visualization/paraview/ChangeLog
+++ b/sci-visualization/paraview/ChangeLog
@@ -1,6 +1,10 @@
 # ChangeLog for sci-visualization/paraview
 # Copyright 1999-2008 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/sci-visualization/paraview/ChangeLog,v 1.15 2008/02/14 16:42:16 markusle Exp $
+# $Header: /var/cvsroot/gentoo-x86/sci-visualization/paraview/ChangeLog,v 1.16 2008/02/15 11:14:25 markusle Exp $
+
+  15 Feb 2008; Markus Dittrich <markusle@gentoo.org>
+  +files/paraview-2.6.2-tkImgGIF.patch, paraview-2.6.2.ebuild:
+  Added patch to take care of SA28784 and CVE-2008-0553 (see bug #208464).
 
   14 Feb 2008; Markus Dittrich <markusle@gentoo.org> paraview-3.2.1.ebuild:
   Added pkg_setup logic and EAPI=1 in response to updated qt4.eclass 

diff --git a/sci-visualization/paraview/Manifest b/sci-visualization/paraview/Manifest
index 7a1b2bd82e3098a04dc9988dbfc0d5c22c7ab9ca..d35e7713ade4cacc5458b5d693e727c527d0a08f 100644 (file)
--- a/sci-visualization/paraview/Manifest
+++ b/sci-visualization/paraview/Manifest
@@ -1,11 +1,12 @@
 AUX paraview-2.6.0-hdf5-zlib.patch 754 RMD160 6cfe179aae58f40d424e797384d0931e6c618721 SHA1 6431e39fa027f64abcf43a5c298d9ab0dd02a8b4 SHA256 535bc330528f61c62a6dac45395e704beb94a7dbdc687ed28e1f17ed47dbc69c
 AUX paraview-2.6.0-include.patch 476 RMD160 9f44a83f73da1accd7ea3d8c353f4de50849b654 SHA1 57d67067fae5124b30dcce8317e0e7ae4a5a4976 SHA256 b8ebb52e9181c992561974de39d43a4c20398bed6760dda495dc82d45376fe77
+AUX paraview-2.6.2-tkImgGIF.patch 1333 RMD160 e941a279bbfa4a47c407f294f30e63ec8a1b59bd SHA1 e03435a33f287c1a656fd5b58eb347e6e724acfd SHA256 859a574a854195affde43eb1a835bbc1e0470d39e4ac8e3d2aa664cd6a806cd0
 AUX paraview-3.2-libxml2-fix.patch 1774 RMD160 11ab022b0abca2a226deb648d48fe69cbf5c9352 SHA1 476d18040197100127184e1f547fc5840d8d0d45 SHA256 fda2240e2f0deaef39081e7375e7b99f967cbbe3aa99761f6940bb7c27c942e4
 AUX paraview-3.2-support-qt4.3.patch 3835 RMD160 06d572100ee65f6f68c042bf7204b49c062c4e3a SHA1 ea7a30324e36ea9ed58129818769bafab30c078d SHA256 c2a412b2418f4b34e210851e6d1d7f7d5112d1ead93ddcadd5c8119ea40c160e
 DIST ParaView-2.6.2.tar.gz 75658768 RMD160 068f3fbfea17166d34c488b4e6bd8d8fb07d3cd9 SHA1 ac5efb1c850e89b76dda4f28ecfa4575e45aa22e SHA256 de7cbd808e1ab1730ad87436d30c0a752096a65fe9aa6b82f35a39fc3b67d7c7
 DIST paraview-3.2.1-OpenFOAM.patch.bz2 35956 RMD160 b4f6d3f64e6a0cc952b73d70b59168d33f09b7d5 SHA1 4b63ca09cae3b9197b840319e3bbb7b6594a66d3 SHA256 16bf34d126c65966de20644cb44685bf90cd81f97f9ddb8b6d1749ed97918c7e
 DIST paraview-3.2.1.tar.gz 21360301 RMD160 f7df024f4668901900b7633cf6dbe78337991b49 SHA1 a14e46cbeb7292f5511e1361afeb37455689c325 SHA256 d613d6a86f8a9173f42333760c9f0c29b5fcaa85554ba4b9bf61b6fddfae0cb9
-EBUILD paraview-2.6.2.ebuild 3572 RMD160 7025e7f2415be473138931ee219ddfed6512fe1b SHA1 6f55a32247c74ba6a00821f1d855d2617c8025cc SHA256 f3aec359c523386fab46b3eb98e1d023ac4a1c752db4d1b1358f20d9f7f0c7e0
+EBUILD paraview-2.6.2.ebuild 3614 RMD160 260078b3c86eef59821d8dc8e4a4c67a9c6bc0e5 SHA1 e3184bfd9210d62a23aa84c1de151d33a6159337 SHA256 d5c61939201a2a59d1fbff60e40f3f11e6fd1afcc1115a0b5e4528e7807b8623
 EBUILD paraview-3.2.1.ebuild 5245 RMD160 8101d4197065924102e22d6eaed396f472e093c6 SHA1 b94ce093ad11e8f3d89561cc5be0ea3c81a01ea9 SHA256 574569eb4aba41a5a4e8e9d5f3d33b09f72a07edd0644cffa3aaa55ba9321fa8
-MISC ChangeLog 2975 RMD160 8a2958bae60d24d2af4f116d47c90bf7caa459f4 SHA1 1b5a955de943a9fd34bb35ce3d6793d092c0225c SHA256 d33c91b6fc9c1ccfbf9c9e05d32d29893515597594f062b7f04053b4d3b60fc4
+MISC ChangeLog 3167 RMD160 14b174f259c015d6399c09c49c419a814158060d SHA1 cd694c6a65c7a3c96527e2919d2e67c93eac86ea SHA256 d4fb136ee156dbc81f16b635f90f38a4d5584022a6c9e93224a002e8370d90c2
 MISC metadata.xml 254 RMD160 8e9562c9dd3bd05fdf2dd40bcc5b2ed3dbe9ab75 SHA1 53acb8f334765223c1030a8eb242d584ad376706 SHA256 131c089c8a699c3fb7e8b914f68af259e0b0ad341fba3a8f87827871fc7be701

diff --git a/sci-visualization/paraview/files/paraview-2.6.2-tkImgGIF.patch b/sci-visualization/paraview/files/paraview-2.6.2-tkImgGIF.patch
new file mode 100644 (file)
index 0000000..966d5d7
--- /dev/null
+++ b/sci-visualization/paraview/files/paraview-2.6.2-tkImgGIF.patch
@@ -0,0 +1,32 @@
+diff -Naur ParaView-2.6.2/Utilities/TclTk/tk8.4.13/generic/tkImgGIF.c ParaView-2.6.2.new/Utilities/TclTk/tk8.4.13/generic/tkImgGIF.c
+--- ParaView-2.6.2/Utilities/TclTk/tk8.4.13/generic/tkImgGIF.c 2006-05-06 13:33:55.000000000 -0500
++++ ParaView-2.6.2.new/Utilities/TclTk/tk8.4.13/generic/tkImgGIF.c     2008-02-15 06:01:43.000000000 -0500
+@@ -826,6 +826,12 @@
+     Tcl_PosixError(interp), (char *) NULL);
+   return TCL_ERROR;
+     }
++
++    if (initialCodeSize > MAX_LWZ_BITS) {
++       Tcl_SetResult(interp, "malformed image", TCL_STATIC);
++       return TCL_ERROR;
++    }
++
+     if (transparent != -1) {
+   cmap[transparent][CM_RED] = 0;
+   cmap[transparent][CM_GREEN] = 0;
+diff -Naur ParaView-2.6.2/Utilities/TclTk/tk8.4.5/generic/tkImgGIF.c ParaView-2.6.2.new/Utilities/TclTk/tk8.4.5/generic/tkImgGIF.c
+--- ParaView-2.6.2/Utilities/TclTk/tk8.4.5/generic/tkImgGIF.c  2003-12-19 10:38:18.000000000 -0500
++++ ParaView-2.6.2.new/Utilities/TclTk/tk8.4.5/generic/tkImgGIF.c      2008-02-15 06:01:32.000000000 -0500
+@@ -824,6 +824,12 @@
+               Tcl_PosixError(interp), (char *) NULL);
+       return TCL_ERROR;
+     }
++
++    if (initialCodeSize > MAX_LWZ_BITS) {
++       Tcl_SetResult(interp, "malformed image", TCL_STATIC);
++       return TCL_ERROR;
++    }
++
+     if (transparent != -1) {
+       cmap[transparent][CM_RED] = 0;
+       cmap[transparent][CM_GREEN] = 0;

diff --git a/sci-visualization/paraview/paraview-2.6.2.ebuild b/sci-visualization/paraview/paraview-2.6.2.ebuild
index ec166988ed55603ff8227397f73027f133af8f27..6f9d8bcc83f818493ccc697cd17e3bed643a3c06 100644 (file)
--- a/sci-visualization/paraview/paraview-2.6.2.ebuild
+++ b/sci-visualization/paraview/paraview-2.6.2.ebuild
@@ -1,6 +1,6 @@
-# Copyright 1999-2007 Gentoo Foundation
+# Copyright 1999-2008 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/sci-visualization/paraview/paraview-2.6.2.ebuild,v 1.2 2007/12/14 19:59:46 markusle Exp $
+# $Header: /var/cvsroot/gentoo-x86/sci-visualization/paraview/paraview-2.6.2.ebuild,v 1.3 2008/02/15 11:14:25 markusle Exp $
 
 inherit distutils eutils flag-o-matic toolchain-funcs versionator python
 
@@ -45,6 +45,7 @@ src_unpack() {
        cd "${S}"
        epatch "${FILESDIR}"/${PN}-2.6.0-hdf5-zlib.patch
        epatch "${FILESDIR}"/${PN}-2.6.0-include.patch
+       epatch "${FILESDIR}"/${P}-tkImgGIF.patch
 }
 
 src_compile() {