fix for xpdf buffer overflow, #75203

diff --git a/app-office/koffice/ChangeLog b/app-office/koffice/ChangeLog
index 16b02ddcf4bac770fcb477f96cec6f2d00298a4f..1095a84270686beafac29391a908e399a0d6e599 100644 (file)
--- a/app-office/koffice/ChangeLog
+++ b/app-office/koffice/ChangeLog
@@ -1,10 +1,22 @@
 # ChangeLog for app-office/koffice
 # Copyright 2002-2004 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/app-office/koffice/ChangeLog,v 1.81 2004/12/21 19:22:00 kloeri Exp $
+# $Header: /var/cvsroot/gentoo-x86/app-office/koffice/ChangeLog,v 1.82 2004/12/22 19:45:09 carlo Exp $
+
+*koffice-1.3.5-r1 (22 Dec 2004)
+
+  22 Dec 2004; Carsten Lohrke <carlo@gentoo.org>
+  +files/koffice_1_3_xpdf_buffer_overflow.diff, +koffice-1.3.5-r1.ebuild:
+  fix for xpdf buffer overflow, #75203
 
   21 Dec 2004; Bryan Østergaard <kloeri@gentoo.org> koffice-1.3.5.ebuild:
   Stable on alpha.
 
+*koffice-1.3.5-r1 (22 Dec 2004)
+
+  22 Dec 2004; Carsten Lohrke <carlo@gentoo.org>
+  +files/koffice_1_3_xpdf_buffer_overflow.diff, +koffice-1.3.5-r1.ebuild:
+  fix for xpdf buffer overflow, #75203
+
   15 Dec 2004; Dylan Carlson <absinthe@gentoo.org> koffice-1.3.5.ebuild:
   Stable on amd64.
 

diff --git a/app-office/koffice/Manifest b/app-office/koffice/Manifest
index 75e57a08f7b3ff039a722d05fb194aeec178fee2..87214cfbe7666ec13ec197fc4544fc0949fa5946 100644 (file)
--- a/app-office/koffice/Manifest
+++ b/app-office/koffice/Manifest
@@ -1,20 +1,13 @@
------BEGIN PGP SIGNED MESSAGE-----
-Hash: SHA1
-
-MD5 13a18da5f8ea71516aac28003d0f4172 koffice-1.3.5.ebuild 919
-MD5 db8df81b850f866c4334950fb68ddbdc ChangeLog 11533
+MD5 d2107328816b0dc5825f126c9875c3b2 koffice-1.3.5-r1.ebuild 982
 MD5 1f16f48b7c9dfce42b1ecfb1d96c3ff9 koffice-1.3.3-r2.ebuild 1148
 MD5 1fd88e400d0cf26a16ea3397561568f9 koffice-1.3.4-r1.ebuild 989
+MD5 13a18da5f8ea71516aac28003d0f4172 koffice-1.3.5.ebuild 919
+MD5 63902a93d8e90e02e0cd1ce7db7fc4e9 ChangeLog 11924
 MD5 96a4184e1e3325923219a5f96a5511a5 metadata.xml 163
 MD5 20d32402fa6f6883dccb63cf1826a15f files/koffice_1_3_4_xpdf_security_integer_overflow.diff 3393
-MD5 d261da2eaab2f46cd2f06609e5f41885 files/digest-koffice-1.3.4-r1 68
+MD5 bf8cc9885832c30290469b3a09e96b6a files/koffice_1_3_xpdf_buffer_overflow.diff 678
+MD5 12452317cab5461eb911114062f2cce2 files/digest-koffice-1.3.5 68
 MD5 e5a6ea2ef1815721c7773577378931a2 files/digest-koffice-1.3.3-r2 68
+MD5 d261da2eaab2f46cd2f06609e5f41885 files/digest-koffice-1.3.4-r1 68
+MD5 12452317cab5461eb911114062f2cce2 files/digest-koffice-1.3.5-r1 68
 MD5 4736559193af7398788799098e16c3c8 files/xpdf-CESA-2004-007-xpdf2-newer.diff 2828
-MD5 12452317cab5461eb911114062f2cce2 files/digest-koffice-1.3.5 68
------BEGIN PGP SIGNATURE-----
-Version: GnuPG v1.2.6 (GNU/Linux)
-
-iD8DBQFByHfhugEuf3OQ0akRAlc5AJ9F+HvuyNFUj9Dfh0VcxUaaGgOiZwCdH4bp
-ul0APeL9OKcKROekFQgd6vY=
-=usUc
------END PGP SIGNATURE-----

diff --git a/app-office/koffice/files/digest-koffice-1.3.5-r1 b/app-office/koffice/files/digest-koffice-1.3.5-r1
new file mode 100644 (file)
index 0000000..4835c63
--- /dev/null
+++ b/app-office/koffice/files/digest-koffice-1.3.5-r1
@@ -0,0 +1 @@
+MD5 dbc7e76c86647709a3e74f57c0fcf7f5 koffice-1.3.5.tar.bz2 10778584

diff --git a/app-office/koffice/files/koffice_1_3_xpdf_buffer_overflow.diff b/app-office/koffice/files/koffice_1_3_xpdf_buffer_overflow.diff
new file mode 100644 (file)
index 0000000..b808182
--- /dev/null
+++ b/app-office/koffice/files/koffice_1_3_xpdf_buffer_overflow.diff
@@ -0,0 +1,18 @@
+===================================================================
+RCS file: /home/kde/koffice/filters/kword/pdf/xpdf/xpdf/Gfx.cc,v
+retrieving revision 1.3
+retrieving revision 1.3.2.1
+diff -u -r1.3 -r1.3.2.1
+--- filters/kword/pdf/xpdf/xpdf/Gfx.cc 2003/01/25 23:17:44     1.3
++++ filters/kword/pdf/xpdf/xpdf/Gfx.cc 2004/12/22 12:07:12     1.3.2.1
+@@ -2379,7 +2379,9 @@
+     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();

diff --git a/app-office/koffice/koffice-1.3.5-r1.ebuild b/app-office/koffice/koffice-1.3.5-r1.ebuild
new file mode 100644 (file)
index 0000000..e742440
--- /dev/null
+++ b/app-office/koffice/koffice-1.3.5-r1.ebuild
@@ -0,0 +1,34 @@
+# Copyright 1999-2004 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Header: /var/cvsroot/gentoo-x86/app-office/koffice/koffice-1.3.5-r1.ebuild,v 1.1 2004/12/22 19:45:09 carlo Exp $
+
+inherit kde eutils
+
+# TODO : mysql support
+# other refs from configure: jasper, qt-docs, doxygen, libxml2, libxslt, freetype, fontconfig, qt being built with sql support (???)
+
+DESCRIPTION="A free, integrated office suite for KDE, the K Desktop Environment."
+HOMEPAGE="http://www.koffice.org/"
+SRC_URI="mirror://kde/stable/${P}/src/${P}.tar.bz2"
+
+LICENSE="GPL-2 LGPL-2"
+KEYWORDS="x86 ~amd64 ~ppc ~sparc ~alpha ~ppc64"
+
+IUSE=""
+SLOT="0"
+
+DEPEND=">=dev-lang/python-2.2.1
+       >=media-libs/libart_lgpl-2.3.9
+       >=media-gfx/imagemagick-5.4.5
+       >=app-text/wv2-0.1.8
+       dev-util/pkgconfig"
+need-kde 3.1
+
+src_unpack() {
+       kde_src_unpack
+       epatch ${FILESDIR}/koffice_1_3_xpdf_buffer_overflow.diff
+}
+src_compile() {
+       export LIBPYTHON="`python-config --libs`"
+       kde_src_compile
+}