diff options
Diffstat (limited to 'app-office/kword')
-rw-r--r-- | app-office/kword/ChangeLog | 10 | ||||
-rw-r--r-- | app-office/kword/Manifest | 4 | ||||
-rw-r--r-- | app-office/kword/files/CAN-2005-0064.patch | 31 | ||||
-rw-r--r-- | app-office/kword/files/digest-kword-1.3.5 | 3 | ||||
-rw-r--r-- | app-office/kword/files/koffice_1_3_xpdf_buffer_overflow.diff | 49 | ||||
-rw-r--r-- | app-office/kword/kword-1.3.5.ebuild | 53 | ||||
-rw-r--r-- | app-office/kword/metadata.xml | 5 |
7 files changed, 155 insertions, 0 deletions
diff --git a/app-office/kword/ChangeLog b/app-office/kword/ChangeLog new file mode 100644 index 000000000000..9e8c7620b346 --- /dev/null +++ b/app-office/kword/ChangeLog @@ -0,0 +1,10 @@ +# 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.1 2005/01/29 13:26:21 motaboy Exp $ + +*kword-1.3.5 (29 Jan 2005) + + 29 Jan 2005; Simone Gotti <motaboy@gentoo.org> +metadata.xml, + +kword-1.3.5.ebuild: + Adding koffice's splitted ebuilds to portage. + diff --git a/app-office/kword/Manifest b/app-office/kword/Manifest new file mode 100644 index 000000000000..152c8f075fcd --- /dev/null +++ b/app-office/kword/Manifest @@ -0,0 +1,4 @@ +MD5 5999287f2994bf5afe1cb239991f15e7 kword-1.3.5.ebuild 1270 +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 diff --git a/app-office/kword/files/CAN-2005-0064.patch b/app-office/kword/files/CAN-2005-0064.patch new file mode 100644 index 000000000000..e50d23259f6c --- /dev/null +++ b/app-office/kword/files/CAN-2005-0064.patch @@ -0,0 +1,31 @@ +--- filters/kword/pdf/xpdf/xpdf/Decrypt.cc.jn 2002-12-06 00:44:32.000000000 +0100 ++++ filters/kword/pdf/xpdf/xpdf/Decrypt.cc 2005-01-14 13:38:48.192647128 +0100 +@@ -132,13 +132,19 @@ GBool Decrypt::makeFileKey2(int encVersi + Guchar *buf; + Guchar test[32]; + Guchar fState[256]; +- Guchar tmpKey[16]; ++ Guchar *tmpKey; + Guchar fx, fy; + int len, i, j; + GBool ok; + ++ // check whether we have non-zero keyLength ++ if ( !keyLength ) { ++ return gFalse; ++ } ++ + // generate file key + buf = (Guchar *)gmalloc(68 + fileID->getLength()); ++ tmpKey = (Guchar *)gmalloc(keyLength * sizeof(Guchar)); + if (userPassword) { + len = userPassword->getLength(); + if (len < 32) { +@@ -191,6 +197,7 @@ GBool Decrypt::makeFileKey2(int encVersi + ok = gFalse; + } + ++ gfree(tmpKey); + gfree(buf); + return ok; + } diff --git a/app-office/kword/files/digest-kword-1.3.5 b/app-office/kword/files/digest-kword-1.3.5 new file mode 100644 index 000000000000..4dc2ef3e1dd3 --- /dev/null +++ b/app-office/kword/files/digest-kword-1.3.5 @@ -0,0 +1,3 @@ +MD5 79896426542b0cf07e2e15f84946905a koffice-1.3.4.tar.bz2 10765924 +MD5 18f35fd33b62d4d0549130eceb6fca38 koffice-1.3.4-1.3.5.tar.xdelta 340954 +MD5 dbc7e76c86647709a3e74f57c0fcf7f5 koffice-1.3.5.tar.bz2 10778584 diff --git a/app-office/kword/files/koffice_1_3_xpdf_buffer_overflow.diff b/app-office/kword/files/koffice_1_3_xpdf_buffer_overflow.diff new file mode 100644 index 000000000000..dfcc74d0ac12 --- /dev/null +++ b/app-office/kword/files/koffice_1_3_xpdf_buffer_overflow.diff @@ -0,0 +1,49 @@ +=================================================================== +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(); +=================================================================== +RCS file: /home/kde/koffice/filters/kword/pdf/xpdf/xpdf/GfxState.cc,v +retrieving revision 1.3 +retrieving revision 1.3.2.2 +diff -u -r1.3 -r1.3.2.2 +--- filters/kword/pdf/xpdf/xpdf/GfxState.cc 2003/01/25 23:17:44 1.3 ++++ filters/kword/pdf/xpdf/xpdf/GfxState.cc 2004/12/22 13:50:53 1.3.2.2 +@@ -682,6 +682,11 @@ + } + 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) { +@@ -1023,6 +1028,11 @@ + 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)"); diff --git a/app-office/kword/kword-1.3.5.ebuild b/app-office/kword/kword-1.3.5.ebuild new file mode 100644 index 000000000000..b4d39de6f9ad --- /dev/null +++ b/app-office/kword/kword-1.3.5.ebuild @@ -0,0 +1,53 @@ +# 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.3.5.ebuild,v 1.1 2005/01/29 13:26:21 motaboy Exp $ + +KMNAME=koffice +MAXKOFFICEVER=1.3.5 +inherit kde-meta eutils + +DESCRIPTION="KOffice Word Processor" +HOMEPAGE="http://www.koffice.org/" +SRC_URI="$SRC_URI mirror://kde/stable/${KMNAME}/src/${KMNAME}-${PV}.tar.bz2" +LICENSE="GPL-2 LGPL-2" +KEYWORDS="~x86" +IUSE="" +SLOT="0" +DEPEND="$(deprange $PV $MAXKOFFICEVER app-office/koffice-libs) + >=app-text/wv2-0.1.8 + >=media-gfx/imagemagick-5.4.5 + dev-util/pkgconfig" +PATCHES="$FILESDIR/xpdf_security_integer_overflow_2.diff" + +KMCOPYLIB=" + libkformula lib/kformula + libkofficecore lib/kofficecore + libkofficeui lib/kofficeui + libkopainter lib/kopainter + libkoscript lib/koscript + libkospell lib/kospell + libkotext lib/kotext + libkwmf lib/kwmf + libkowmf lib/kwmf + libkstore lib/store" + +KMEXTRACTONLY="lib/" + +KMCOMPILEONLY="filters/liboofilter" + +KMEXTRA="filters/kword" + +need-kde 3.1 + +src_unpack() { + kde-meta_src_unpack unpack + + epatch ${FILESDIR}/koffice_1_3_xpdf_buffer_overflow.diff + epatch ${FILESDIR}/CAN-2005-0064.patch + + # We need to compile first liboofilter because it's needed by the kword's OOo filters + echo "SUBDIRS = liboofilter kword" > $S/filters/Makefile.am + + kde-meta_src_unpack makefiles +} + diff --git a/app-office/kword/metadata.xml b/app-office/kword/metadata.xml new file mode 100644 index 000000000000..ec42e9fd586b --- /dev/null +++ b/app-office/kword/metadata.xml @@ -0,0 +1,5 @@ +<?xml version="1.0" encoding="UTF-8"?> +<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd"> +<pkgmetadata> +<herd>kde-other</herd> +</pkgmetadata> |