Get Gentoo!
gentoo.org sites
gentoo.org Wiki Bugs Forums Packages
Planet Archives Sources
Infra Status
summaryrefslogtreecommitdiff
path: root/app-office/koffice
diff options
context:
space:
mode:
Diffstat (limited to 'app-office/koffice')
-rw-r--r--app-office/koffice/ChangeLog10
-rw-r--r--app-office/koffice/Manifest9
-rw-r--r--app-office/koffice/files/digest-koffice-1.4.2-r2 (renamed from app-office/koffice/files/digest-koffice-1.4.2-r1)0
-rw-r--r--app-office/koffice/files/digest-koffice-1.4.2-r31
-rw-r--r--app-office/koffice/files/kword-1.4.2-CAN-2005-3193.patch93
-rw-r--r--app-office/koffice/koffice-1.4.2-r2.ebuild (renamed from app-office/koffice/koffice-1.4.2-r1.ebuild)6
-rw-r--r--app-office/koffice/koffice-1.4.2-r3.ebuild67
7 files changed, 179 insertions, 7 deletions
diff --git a/app-office/koffice/ChangeLog b/app-office/koffice/ChangeLog
index 6587741f970f..bfdf002329ce 100644
--- a/app-office/koffice/ChangeLog
+++ b/app-office/koffice/ChangeLog
@@ -1,6 +1,14 @@
# ChangeLog for app-office/koffice
# Copyright 2002-2005 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/app-office/koffice/ChangeLog,v 1.128 2005/12/03 19:43:16 carlo Exp $
+# $Header: /var/cvsroot/gentoo-x86/app-office/koffice/ChangeLog,v 1.129 2005/12/06 01:53:48 carlo Exp $
+
+*koffice-1.4.2-r3 (06 Dec 2005)
+*koffice-1.4.2-r2 (06 Dec 2005)
+
+ 06 Dec 2005; Carsten Lohrke <carlo@gentoo.org>
+ +files/kword-1.4.2-CAN-2005-3193.patch, -koffice-1.4.2-r1.ebuild,
+ +koffice-1.4.2-r2.ebuild, +koffice-1.4.2-r3.ebuild:
+ vulnerabilities in included xpdf code, #114429
*koffice-1.4.2-r1 (03 Dec 2005)
diff --git a/app-office/koffice/Manifest b/app-office/koffice/Manifest
index 0258e994a844..f394dfb1797a 100644
--- a/app-office/koffice/Manifest
+++ b/app-office/koffice/Manifest
@@ -1,18 +1,21 @@
-MD5 1c290237c37cc98c45f6e77db62d9781 ChangeLog 17826
+MD5 ebb0cabd91f6ebddac881fefc483ac13 ChangeLog 18112
MD5 6ee3768e50296eb2a8158093ee518133 files/CAN-2005-0064.patch 829
MD5 12452317cab5461eb911114062f2cce2 files/digest-koffice-1.3.5-r2 68
MD5 fcd72b8c0a0e8d1e8bbf6b76ed92c5cc files/digest-koffice-1.3.5-r3 144
MD5 79e9d059a9a700c3c8009978d0aa0ce3 files/digest-koffice-1.4.1 68
MD5 59512f920182567b8e9420e5e3d1bc9b files/digest-koffice-1.4.1-r1 144
MD5 cf5b314fdf4094ea845edfddf2cf39b5 files/digest-koffice-1.4.2 68
-MD5 cf5b314fdf4094ea845edfddf2cf39b5 files/digest-koffice-1.4.2-r1 68
+MD5 cf5b314fdf4094ea845edfddf2cf39b5 files/digest-koffice-1.4.2-r2 68
+MD5 cf5b314fdf4094ea845edfddf2cf39b5 files/digest-koffice-1.4.2-r3 68
MD5 5f3683b6817935e4f6269bd64398c479 files/kexi-1.4.2-gcc41.patch 1094
MD5 77399be6733ffca4ed1142ab319c1453 files/koffice_1_3_xpdf_buffer_overflow.diff 1808
MD5 f1f58cce115f40fcba31a4976b61d260 files/kspread-1.4.2-gcc41.patch 451
+MD5 fc99a43dc841dc1e656d67266b720f71 files/kword-1.4.2-CAN-2005-3193.patch 2454
MD5 bdcb79a8db04904d6e6c7110e0ff3ec9 koffice-1.3.5-r2.ebuild 1211
MD5 9242394dfa6049940585a4d3fa962907 koffice-1.3.5-r3.ebuild 1289
MD5 3dd6867f27cde022182ed16a091cb0c0 koffice-1.4.1-r1.ebuild 1747
MD5 216a4ec901dca4c7e574aae8a09c40da koffice-1.4.1.ebuild 1538
-MD5 1bf77ce6bf33c783c875fdb9ac852811 koffice-1.4.2-r1.ebuild 1645
+MD5 1e634bef5a1c1e656dfe3030988215f2 koffice-1.4.2-r2.ebuild 1502
+MD5 a858bec04ae0d1e2257af0cdd2ad948d koffice-1.4.2-r3.ebuild 1693
MD5 57795f4f39bb45ba42f8ec112ab278de koffice-1.4.2.ebuild 1545
MD5 02039d51ca4a42817775fd436dfaa956 metadata.xml 157
diff --git a/app-office/koffice/files/digest-koffice-1.4.2-r1 b/app-office/koffice/files/digest-koffice-1.4.2-r2
index a054824ae545..a054824ae545 100644
--- a/app-office/koffice/files/digest-koffice-1.4.2-r1
+++ b/app-office/koffice/files/digest-koffice-1.4.2-r2
diff --git a/app-office/koffice/files/digest-koffice-1.4.2-r3 b/app-office/koffice/files/digest-koffice-1.4.2-r3
new file mode 100644
index 000000000000..a054824ae545
--- /dev/null
+++ b/app-office/koffice/files/digest-koffice-1.4.2-r3
@@ -0,0 +1 @@
+MD5 6b456fb7d54c84b11396b27a96ae0cf8 koffice-1.4.2.tar.bz2 19486852
diff --git a/app-office/koffice/files/kword-1.4.2-CAN-2005-3193.patch b/app-office/koffice/files/kword-1.4.2-CAN-2005-3193.patch
new file mode 100644
index 000000000000..323cdf520b6f
--- /dev/null
+++ b/app-office/koffice/files/kword-1.4.2-CAN-2005-3193.patch
@@ -0,0 +1,93 @@
+--- filters/kword/pdf/xpdf/xpdf/Stream.h.orig 2005-12-04 18:21:42.000000000 +0100
++++ filters/kword/pdf/xpdf/xpdf/Stream.h 2005-12-04 18:25:55.000000000 +0100
+@@ -225,6 +225,8 @@
+
+ ~StreamPredictor();
+
++ GBool isOk() { return ok; }
++
+ int lookChar();
+ int getChar();
+
+@@ -242,6 +244,7 @@
+ int rowBytes; // bytes per line
+ Guchar *predLine; // line buffer
+ int predIdx; // current index in predLine
++ GBool ok;
+ };
+
+ //------------------------------------------------------------------------
+--- filters/kword/pdf/xpdf/xpdf/Stream.cc.orig 2005-12-04 18:21:29.000000000 +0100
++++ filters/kword/pdf/xpdf/xpdf/Stream.cc 2005-12-04 18:33:51.000000000 +0100
+@@ -404,18 +404,33 @@
+
+ StreamPredictor::StreamPredictor(Stream *strA, int predictorA,
+ int widthA, int nCompsA, int nBitsA) {
++ int totalBits;
++
+ str = strA;
+ predictor = predictorA;
+ width = widthA;
+ nComps = nCompsA;
+ nBits = nBitsA;
++ predLine = NULL;
++ ok = gFalse;
+
+ nVals = width * nComps;
++ totalBits = nVals * nBits;
++ if (totalBits == 0 ||
++ (totalBits / nBits) / nComps != width ||
++ totalBits + 7 < 0) {
++ return;
++ }
+ pixBytes = (nComps * nBits + 7) >> 3;
+- rowBytes = ((nVals * nBits + 7) >> 3) + pixBytes;
++ rowBytes = ((totalBits + 7) >> 3) + pixBytes;
++ if (rowBytes < 0) {
++ return;
++ }
+ predLine = (Guchar *)gmalloc(rowBytes);
+ memset(predLine, 0, rowBytes);
+ predIdx = rowBytes;
++
++ ok = gTrue;
+ }
+
+ StreamPredictor::~StreamPredictor() {
+@@ -982,6 +997,10 @@
+ FilterStream(strA) {
+ if (predictor != 1) {
+ pred = new StreamPredictor(this, predictor, columns, colors, bits);
++ if (!pred->isOk()) {
++ delete pred;
++ pred = NULL;
++ }
+ } else {
+ pred = NULL;
+ }
+@@ -2887,6 +2906,14 @@
+ height = read16();
+ width = read16();
+ numComps = str->getChar();
++ if (numComps <= 0 || numComps > 4) {
++ error(getPos(), "Bad number of components in DCT stream", prec);
++ return gFalse;
++ }
++ if (numComps <= 0 || numComps > 4) {
++ error(getPos(), "Bad number of components in DCT stream", prec);
++ return gFalse;
++ }
+ if (prec != 8) {
+ error(getPos(), "Bad DCT precision %d", prec);
+ return gFalse;
+@@ -3179,6 +3206,10 @@
+ FilterStream(strA) {
+ if (predictor != 1) {
+ pred = new StreamPredictor(this, predictor, columns, colors, bits);
++ if (!pred->isOk()) {
++ delete pred;
++ pred = NULL;
++ }
+ } else {
+ pred = NULL;
+ }
diff --git a/app-office/koffice/koffice-1.4.2-r1.ebuild b/app-office/koffice/koffice-1.4.2-r2.ebuild
index ca4d8d7ff46f..13032f8909eb 100644
--- a/app-office/koffice/koffice-1.4.2-r1.ebuild
+++ b/app-office/koffice/koffice-1.4.2-r2.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/koffice/koffice-1.4.2-r1.ebuild,v 1.1 2005/12/03 19:43:17 carlo Exp $
+# $Header: /var/cvsroot/gentoo-x86/app-office/koffice/koffice-1.4.2-r2.ebuild,v 1.1 2005/12/06 01:53:48 carlo Exp $
inherit kde
@@ -26,7 +26,7 @@ RDEPEND=">=media-gfx/imagemagick-5.5.2
dev-lang/python
>=media-libs/lcms-1.12
javascript? ( kde-base/kjsembed )
- >=app-text/libwpd-0.8.2"
+ !dev-db/kexi"
DEPEND="${RDEPEND}
doc? ( app-doc/doxygen )
@@ -44,7 +44,7 @@ need-kde 3.3
# the dependency on python is needed for scripting support in kexi
# and for kivio/kiviopart/kiviosdk.
-PATCHES="${FILESDIR}/kspread-1.4.2-gcc41.patch ${FILESDIR}/kexi-1.4.2-gcc41.patch"
+PATCHES="${FILESDIR}/kword-1.4.2-CAN-2005-3193.patch"
src_compile() {
local myconf="$(use_enable mysql) $(use_enable postgres pgsql)"
diff --git a/app-office/koffice/koffice-1.4.2-r3.ebuild b/app-office/koffice/koffice-1.4.2-r3.ebuild
new file mode 100644
index 000000000000..b4496d095fca
--- /dev/null
+++ b/app-office/koffice/koffice-1.4.2-r3.ebuild
@@ -0,0 +1,67 @@
+# Copyright 1999-2005 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Header: /var/cvsroot/gentoo-x86/app-office/koffice/koffice-1.4.2-r3.ebuild,v 1.1 2005/12/06 01:53:48 carlo Exp $
+
+inherit kde
+
+DESCRIPTION="An integrated office suite for KDE, the K Desktop Environment."
+HOMEPAGE="http://www.koffice.org/"
+SRC_URI="mirror://kde/stable/koffice-${PV}/src/${P}.tar.bz2"
+LICENSE="GPL-2 LGPL-2"
+
+SLOT="0"
+KEYWORDS="~alpha ~amd64 ~ia64 ~ppc ~ppc64 ~sparc ~x86"
+IUSE="doc javascript mysql postgres"
+
+RDEPEND=">=media-gfx/imagemagick-5.5.2
+ >=app-text/wv2-0.1.9
+ >=media-libs/freetype-2
+ media-libs/fontconfig
+ media-libs/libart_lgpl
+ dev-libs/libxml2
+ dev-libs/libxslt
+ sys-libs/readline
+ mysql? ( dev-db/mysql )
+ postgres? ( dev-libs/libpqxx )
+ dev-lang/python
+ >=media-libs/lcms-1.12
+ javascript? ( kde-base/kjsembed )
+ >=app-text/libwpd-0.8.2"
+
+DEPEND="${RDEPEND}
+ doc? ( app-doc/doxygen )
+ dev-util/pkgconfig"
+
+# add blockers on split packages derived from this one
+for x in $(get-child-packages ${CATEGORY}/${PN}); do
+ DEPEND="${DEPEND} !${x}"
+ RDEPEND="${RDEPEND} !${x}"
+done
+
+need-kde 3.3
+
+# TODO: kword sql plugin needs Qt compiled with sql support
+# the dependency on python is needed for scripting support in kexi
+# and for kivio/kiviopart/kiviosdk.
+
+PATCHES="${FILESDIR}/kspread-1.4.2-gcc41.patch
+ ${FILESDIR}/kexi-1.4.2-gcc41.patch
+ ${FILESDIR}/kword-1.4.2-CAN-2005-3193.patch"
+
+src_compile() {
+ local myconf="$(use_enable mysql) $(use_enable postgres pgsql)"
+
+ kde_src_compile
+ if use doc; then
+ make apidox || die
+ fi
+}
+
+src_install() {
+ kde_src_install
+ if use doc; then
+ make DESTDIR="${D}" install-apidox || die
+ fi
+
+ dodoc changes-*
+}