Add fix for Memory Corruption Vulnerability (CVE-2010-2575, bug 334469), straight to stable

Package-Manager: portage-2.1.9.26/cvs/Linux i686
RepoMan-Options: --force

4 files changed, 94 insertions, 22 deletions

diff --git a/kde-base/okular/ChangeLog b/kde-base/okular/ChangeLog
index d1b40bc6b2b6..17bc6f7e9c8e 100644
--- a/kde-base/okular/ChangeLog
+++ b/kde-base/okular/ChangeLog
@@ -1,6 +1,13 @@
 # ChangeLog for kde-base/okular
 # Copyright 1999-2010 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/kde-base/okular/ChangeLog,v 1.88 2010/12/02 21:16:16 alexxy Exp $
+# $Header: /var/cvsroot/gentoo-x86/kde-base/okular/ChangeLog,v 1.89 2010/12/30 13:55:11 dilfridge Exp $
+
+*okular-4.4.5-r2 (30 Dec 2010)
+
+  30 Dec 2010; Andreas K. Huettel <dilfridge@gentoo.org>
+  +okular-4.4.5-r2.ebuild, +files/okular-4.4.5-overflow.patch:
+  Add fix for Memory Corruption Vulnerability (CVE-2010-2575, bug 334469),
+  straight to stable
 
 *okular-4.5.4 (02 Dec 2010)
 
diff --git a/kde-base/okular/Manifest b/kde-base/okular/Manifest
index 109689118fcb..519606040629 100644
--- a/kde-base/okular/Manifest
+++ b/kde-base/okular/Manifest
@@ -1,29 +1,11 @@
------BEGIN PGP SIGNED MESSAGE-----
-Hash: SHA256
-
+AUX okular-4.4.5-overflow.patch 1058 RMD160 08dcb1933b6944e929fb5df10bd07392895097ab SHA1 f1437e12a233663da254083c4147af0444bd66e1 SHA256 45c21bf41455e160db9b7893f92706dbb26c3b3ada1bd55c92efcfb07427ccb1
 DIST kdegraphics-4.4.5.tar.bz2 3822688 RMD160 f574b9b5f89b868ccab250093ef75ab8db7d4833 SHA1 9d878e917de53a0b70df7d1d9d9c57f771e4be72 SHA256 1efd376a7e9acd1d19b18c0f60d5cd9f05eb9ba1f593ba55c41e4af5c06e36f9
 DIST kdegraphics-4.5.3.tar.bz2 4964559 RMD160 c3e32114bcd97fb3c1a3f012854391acd05db668 SHA1 94b0fd60dd5018d97861810acdc1b4614b218dfa SHA256 fae20eafe51fce9652f3a44aa4729cef3a13c15ee4c90f2c7990ec1f476a6bb7
 DIST kdegraphics-4.5.4.tar.bz2 4967597 RMD160 4f678f57bff27180e54822a78316989ad4a85e6f SHA1 1effe5c72577c9f63aa4959777c1dd6df5c54d9c SHA256 1a0fc441a72b6ca6d162d3e1e5b319233bc8f00573cd8ce91a41bc5bb40e96ac
 EBUILD okular-4.4.5-r1.ebuild 1357 RMD160 fbc455a5dcfff5f5f586d92dd291d3b98fb70abe SHA1 fc40a1cd448331a499421b33806c49f15902d66f SHA256 518a4589e6f21a6096742988dba4b694a110812dcde7b53956a045011b37f37b
+EBUILD okular-4.4.5-r2.ebuild 1402 RMD160 932366161c195b7744810377dd66186d1fbad4b2 SHA1 b534e23e4ec6df4db12aee80dd869f919ac56877 SHA256 9e160c9f8478493e79cfb0b9aa5d25f04d72eedbc1a1e4e75bed203d1dbef3ed
 EBUILD okular-4.4.5.ebuild 1349 RMD160 5de47b9bfe7132270843efef0d0b0fd091e558d3 SHA1 af5d6157d7e768efdf981e9cad575706371e9ce9 SHA256 e87f2365f30d4206d77eacd81ae74b903d1de213a3c5a04ecd68ea0c5746f970
 EBUILD okular-4.5.3.ebuild 1370 RMD160 1fdafda39814363d62a4d62714f99a1139093a09 SHA1 1e14ec7ac1a86af41db885cbcd88ae94f2fa066a SHA256 6aed0855eb1575679c59a2961f72b0da09f58d822cb199d994b36dc0c1823dce
 EBUILD okular-4.5.4.ebuild 1365 RMD160 d5ec0237ae458183f46b8c8e5cca9ec0971af945 SHA1 b644d20f96b4b4c5bb598a711e72537be1a41d10 SHA256 708d5c71a5c069e8eb20fc5fc0c5d28c973af8c78420aebc25ce16eb0b3f0e7c
-MISC ChangeLog 11491 RMD160 4eebc09ee00115ba714a8728f1c5d4764bd7eedb SHA1 420375c004050803bb53c1b14b1f6a3c03494ede SHA256 23421c662155f7cc7c468d7aaa4a75516e13e077fc816cd7dbac7baf5187d4a8
+MISC ChangeLog 11743 RMD160 edfc7a2bb7c05f4ba29ebb168956193d0c812e0d SHA1 97fad5913958262c8e9d803db9d6a731de093be2 SHA256 6112d6d28544f583ef4688b4771639e7caa6bd30075fd0572ed1f558033129c4
 MISC metadata.xml 341 RMD160 ae4a2971d9d16e6f0be5119e81b1d52a1fd39792 SHA1 cd8dfdd94493ed1df39724e7741763836584bb81 SHA256 1e0f6db3a036dfb47d1071aa9ee653d08d4761147a0756de157d146e66600bfd
------BEGIN PGP SIGNATURE-----
-Version: GnuPG v2.0.16 (GNU/Linux)
-
-iQIcBAEBCAAGBQJM+A1GAAoJEOf+E+/4L5LmKwIP/jDhHSvBNNXhb38+nv7wsmw+
-/4bU5NyduILpdJX1mUAGiuQvRkzJU4SWURSUcH091cVev7uK6pLsel4cM4NfNVY9
-z15vIZtgIgc47UBTLx/SA5Qls67zPx+vtQAcqfHoWzOPYUjqVJ2bVeyVg5qMY8QI
-CLfV8ykZihg/OMngYmcOO/klFU711tIFLDIcAkzGEDERkKComDvbX6KKjvCM1M5h
-0/P7AFk8i9J1PI0vTL/BWF1jDElIfEb5fCmVpymiaco9lh4V6AZkX7kG97HbWjYt
-R+QpumOs2p6QZTkq0kY4lLUbj3M0O6W6JNuIzLRJ3Kli4mdLMMjXm6ypwRAV26aX
-Gp0VRmQN168NjNtKb0xdPeEiiWzR7frmrLixKManfYJCLon5KO66polszrH9/U5V
-sRVbxfyuNnUdswC/KYDqRwgDsJZukldCxn8WtDVSTSnhWsINCIQev8FUlUj6LzLk
-rormsFcg6pR1l/nGkAD3WZ2GJgHnfhGAhd9il4B7Nt5W7AoXYIFnRSyZk94N7Of3
-OpBakuX0q4hKtYNVqShRA6bxPu4ni6aD06dHkprRcX13DdRgpIcV9iUdZAnXdGzz
-gsOq0cOmk9yR2DpXKklEPKkKsT6lE3xbRMRCuKzhZRo8+GCMnB9A+aKtHYSW/7nr
-NC5hEvQHJBZJsaI6EcwJ
-=xADy
------END PGP SIGNATURE-----
diff --git a/kde-base/okular/files/okular-4.4.5-overflow.patch b/kde-base/okular/files/okular-4.4.5-overflow.patch
new file mode 100644
index 000000000000..478bb4d4359e
--- /dev/null
+++ b/kde-base/okular/files/okular-4.4.5-overflow.patch
@@ -0,0 +1,30 @@
+Index: okular/generators/plucker/unpluck/image.cpp
+===================================================================
+--- okular/generators/plucker/unpluck/image.cpp	(Revision 1167825)
++++ okular/generators/plucker/unpluck/image.cpp	(Revision 1167826)
+@@ -289,8 +289,23 @@
+             for (j = 0; j < bytes_per_row;) {
+                 incount = *palm_ptr++;
+                 inval = *palm_ptr++;
+-                memset (rowbuf + j, inval, incount);
+-                j += incount;
++                if (incount + j <= bytes_per_row  * width)
++                {
++                    memset (rowbuf + j, inval, incount);
++                    j += incount;
++                }
++                else
++                {
++                    free (rowbuf);
++                    free (lastrow);
++                    free (jpeg_row);
++
++                    jpeg_destroy_compress (&cinfo);
++
++                    fclose( outfile );
++
++                    return false;
++                }
+             }
+         }
+         else if ((flags & PALM_IS_COMPRESSED_FLAG)
diff --git a/kde-base/okular/okular-4.4.5-r2.ebuild b/kde-base/okular/okular-4.4.5-r2.ebuild
new file mode 100644
index 000000000000..d46e1ff50b48
--- /dev/null
+++ b/kde-base/okular/okular-4.4.5-r2.ebuild
@@ -0,0 +1,53 @@
+# Copyright 1999-2010 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Header: /var/cvsroot/gentoo-x86/kde-base/okular/okular-4.4.5-r2.ebuild,v 1.1 2010/12/30 13:55:11 dilfridge Exp $
+
+EAPI="3"
+
+KMNAME="kdegraphics"
+inherit kde4-meta
+
+DESCRIPTION="Okular is an universal document viewer based on KPDF for KDE 4."
+KEYWORDS="amd64 ~ppc ~ppc64 x86 ~amd64-linux ~x86-linux"
+IUSE="chm crypt debug djvu ebook +handbook +jpeg +ps +pdf +tiff"
+
+DEPEND="
+	media-libs/freetype
+	sys-libs/zlib
+	chm? ( dev-libs/chmlib )
+	crypt? ( app-crypt/qca:2 )
+	djvu? ( app-text/djvu )
+	ebook? ( app-text/ebook-tools )
+	jpeg? ( virtual/jpeg:0 )
+	pdf? ( >=app-text/poppler-0.12.3-r3[lcms,qt4,-exceptions] )
+	ps? ( app-text/libspectre )
+	tiff? ( media-libs/tiff )
+"
+RDEPEND="${DEPEND}"
+
+PATCHES=( "${FILESDIR}/${P}"-overflow.patch )
+
+KMEXTRACTONLY="libs/mobipocket"
+
+src_configure() {
+	mycmakeargs=(
+		$(cmake-utils_use_with chm)
+		$(cmake-utils_use_with crypt QCA2)
+		$(cmake-utils_use_with djvu DjVuLibre)
+		$(cmake-utils_use_with ebook EPub)
+		$(cmake-utils_use_with jpeg)
+		$(cmake-utils_use_with ps LibSpectre)
+		$(cmake-utils_use_with pdf PopplerQt4)
+		$(cmake-utils_use_with pdf Poppler)
+		$(cmake-utils_use_with tiff)
+	)
+
+	kde4-meta_src_configure
+}
+
+src_install() {
+	insinto "${KDEDIR}"/share/apps/cmake/modules
+	doins "${S}"/cmake/modules/FindOkular.cmake
+
+	kde4-meta_src_install
+}