fix for buffer overflow in rtf import, stable on x86

Package-Manager: portage-2.0.51.22-r3

diff --git a/app-office/kword/ChangeLog b/app-office/kword/ChangeLog
index e44aa28f0bb65ba61e1c6d1926b64421a373e8b2..80183c22b1caa2f6ec885e71c77d265cfc9108fc 100644 (file)
--- a/app-office/kword/ChangeLog
+++ b/app-office/kword/ChangeLog
@@ -1,6 +1,12 @@
 # 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.16 2005/10/10 22:10:08 greg_g Exp $
+# $Header: /var/cvsroot/gentoo-x86/app-office/kword/ChangeLog,v 1.17 2005/10/11 14:54:10 carlo Exp $
+
+*kword-1.3.5-r1 (11 Oct 2005)
+
+  11 Oct 2005; Carsten Lohrke <carlo@gentoo.org> +kword-1.3.5-r1.ebuild,
+  kword-1.4.1-r1.ebuild:
+  fix for buffer overflow in rtf import, stable on x86
 
 *kword-1.4.2 (10 Oct 2005)
 *kword-1.4.1-r1 (10 Oct 2005)

diff --git a/app-office/kword/Manifest b/app-office/kword/Manifest
index 8f7b8004deeeea3acc8c1291f9b394719fb1ffec..4df0b15a3f24ff1cece6fa90d6ff48e4fccff7bf 100644 (file)
--- a/app-office/kword/Manifest
+++ b/app-office/kword/Manifest
@@ -1,12 +1,14 @@
-MD5 02039d51ca4a42817775fd436dfaa956 metadata.xml 157
 MD5 18ae024a439fc6a208affee87245e886 kword-1.4.1.ebuild 1200
-MD5 eb8be38a28ccf55b07c15e3f0e5fb307 kword-1.4.1-r1.ebuild 1401
-MD5 7d94635a79745db5ce1b573b665c5437 ChangeLog 2015
-MD5 6262dd7918cc0eb294e391620c0707cc kword-1.4.2.ebuild 1202
+MD5 79ba9d56baecc7f6fd0ef257b66b0b59 kword-1.3.5-r1.ebuild 1371
 MD5 5948a99247e2967f49cbd364cbe194d7 kword-1.3.5.ebuild 1378
-MD5 12d141df83ce3d5769387e780ee073f7 files/digest-kword-1.3.5 211
+MD5 7ac4b5a82ac92f1fddd5f301f9cbb56a kword-1.4.1-r1.ebuild 1399
+MD5 b0ec82bcef4a5a7cd22fd1459db31970 ChangeLog 2199
+MD5 02039d51ca4a42817775fd436dfaa956 metadata.xml 157
+MD5 6262dd7918cc0eb294e391620c0707cc kword-1.4.2.ebuild 1202
 MD5 6ee3768e50296eb2a8158093ee518133 files/CAN-2005-0064.patch 829
-MD5 59512f920182567b8e9420e5e3d1bc9b files/digest-kword-1.4.1-r1 144
 MD5 77399be6733ffca4ed1142ab319c1453 files/koffice_1_3_xpdf_buffer_overflow.diff 1808
+MD5 12d141df83ce3d5769387e780ee073f7 files/digest-kword-1.3.5 211
 MD5 79e9d059a9a700c3c8009978d0aa0ce3 files/digest-kword-1.4.1 68
 MD5 cf5b314fdf4094ea845edfddf2cf39b5 files/digest-kword-1.4.2 68
+MD5 12d141df83ce3d5769387e780ee073f7 files/digest-kword-1.3.5-r1 211
+MD5 59512f920182567b8e9420e5e3d1bc9b files/digest-kword-1.4.1-r1 144

diff --git a/app-office/kword/files/digest-kword-1.3.5-r1 b/app-office/kword/files/digest-kword-1.3.5-r1
new file mode 100644 (file)
index 0000000..4dc2ef3
--- /dev/null
+++ b/app-office/kword/files/digest-kword-1.3.5-r1
@@ -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/kword-1.3.5-r1.ebuild b/app-office/kword/kword-1.3.5-r1.ebuild
new file mode 100644 (file)
index 0000000..e93efec
--- /dev/null
+++ b/app-office/kword/kword-1.3.5-r1.ebuild
@@ -0,0 +1,54 @@
+# 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-r1.ebuild,v 1.1 2005/10/11 14:54:10 carlo 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="~amd64 ppc ~ppc64 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=""
+
+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
+
+PATCHES="${FILESDIR}/koffice_1_3_xpdf_buffer_overflow.diff
+       ${FILESDIR}/CAN-2005-0064.patch
+       ${FILESDIR}/koffice-1.4.1-rtfimport.patch"
+
+src_unpack() {
+       kde-meta_src_unpack unpack
+
+       # 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/kword-1.4.1-r1.ebuild b/app-office/kword/kword-1.4.1-r1.ebuild
index 16cab8befad0d2adfe30d69c3d084df88e4a287f..8db5aef8cd14d41c481873fdc9a6d1f32436dc3f 100644 (file)
--- a/app-office/kword/kword-1.4.1-r1.ebuild
+++ b/app-office/kword/kword-1.4.1-r1.ebuild
@@ -1,6 +1,6 @@
 # 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.4.1-r1.ebuild,v 1.2 2005/10/11 14:41:23 greg_g Exp $
+# $Header: /var/cvsroot/gentoo-x86/app-office/kword/kword-1.4.1-r1.ebuild,v 1.3 2005/10/11 14:54:10 carlo Exp $
 
 KMNAME=koffice
 MAXKOFFICEVER=${PV}
@@ -14,7 +14,7 @@ SRC_URI="${SRC_URI}
        mirror://kde/security_patches/post-koffice-1.4.1-rtfimport.diff"
 
 SLOT="0"
-KEYWORDS="~alpha ~amd64 ~ppc ~ppc64 ~sparc ~x86"
+KEYWORDS="~alpha ~amd64 ~ppc ~ppc64 ~sparc x86"
 IUSE=""
 
 RDEPEND="$(deprange $PV $MAXKOFFICEVER app-office/koffice-libs)