From 0ca63f0626888731659bab538b3cb9469749855b Mon Sep 17 00:00:00 2001 From: Carsten Lohrke Date: Fri, 21 Jan 2005 17:40:00 +0000 Subject: clean up Package-Manager: portage-2.0.51-r14 --- app-office/koffice/ChangeLog | 8 +- app-office/koffice/Manifest | 20 +---- app-office/koffice/files/digest-koffice-1.3.3-r2 | 1 - app-office/koffice/files/digest-koffice-1.3.4-r1 | 1 - app-office/koffice/files/digest-koffice-1.3.5 | 1 - ...ffice_1_3_4_xpdf_security_integer_overflow.diff | 90 ---------------------- .../files/xpdf-CESA-2004-007-xpdf2-newer.diff | 76 ------------------ app-office/koffice/koffice-1.3.3-r2.ebuild | 38 --------- app-office/koffice/koffice-1.3.4-r1.ebuild | 34 -------- app-office/koffice/koffice-1.3.5.ebuild | 33 -------- 10 files changed, 8 insertions(+), 294 deletions(-) delete mode 100644 app-office/koffice/files/digest-koffice-1.3.3-r2 delete mode 100644 app-office/koffice/files/digest-koffice-1.3.4-r1 delete mode 100644 app-office/koffice/files/digest-koffice-1.3.5 delete mode 100644 app-office/koffice/files/koffice_1_3_4_xpdf_security_integer_overflow.diff delete mode 100644 app-office/koffice/files/xpdf-CESA-2004-007-xpdf2-newer.diff delete mode 100644 app-office/koffice/koffice-1.3.3-r2.ebuild delete mode 100644 app-office/koffice/koffice-1.3.4-r1.ebuild delete mode 100644 app-office/koffice/koffice-1.3.5.ebuild (limited to 'app-office') diff --git a/app-office/koffice/ChangeLog b/app-office/koffice/ChangeLog index 3a0a1f052f41..2ed3b8f0bbf9 100644 --- a/app-office/koffice/ChangeLog +++ b/app-office/koffice/ChangeLog @@ -1,6 +1,12 @@ # 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.93 2005/01/20 23:05:59 sekretarz Exp $ +# $Header: /var/cvsroot/gentoo-x86/app-office/koffice/ChangeLog,v 1.94 2005/01/21 17:40:00 carlo Exp $ + + 21 Jan 2005; Carsten Lohrke + -files/koffice_1_3_4_xpdf_security_integer_overflow.diff, + -files/xpdf-CESA-2004-007-xpdf2-newer.diff, -koffice-1.3.3-r2.ebuild, + -koffice-1.3.4-r1.ebuild, -koffice-1.3.5.ebuild: + clean up 21 Jan 2005; Karol Wojtaszek koffice-1.3.5-r2.ebuild: diff --git a/app-office/koffice/Manifest b/app-office/koffice/Manifest index d9a2751b5a64..c1ade077c651 100644 --- a/app-office/koffice/Manifest +++ b/app-office/koffice/Manifest @@ -1,26 +1,8 @@ ------BEGIN PGP SIGNED MESSAGE----- -Hash: SHA1 - MD5 5e43f1b06367878a5a3a497d8597e0b5 koffice-1.3.5-r1.ebuild 982 -MD5 4feb9abecb385306069e098bfed829b5 koffice-1.3.3-r2.ebuild 1153 -MD5 8248ca43da774ec432966e07d6f1b530 koffice-1.3.4-r1.ebuild 994 -MD5 bd355e70e5d8ee68469bbdaf12a8922c koffice-1.3.5.ebuild 923 -MD5 e480a2a7cca5c39aa486c5ea989cc87d ChangeLog 13090 +MD5 030ccfe6254d0645b36fbfe7b8397ca5 ChangeLog 13330 MD5 96a4184e1e3325923219a5f96a5511a5 metadata.xml 163 MD5 9af40185c9e749d686f7fbd33c32d90f koffice-1.3.5-r2.ebuild 1024 -MD5 20d32402fa6f6883dccb63cf1826a15f files/koffice_1_3_4_xpdf_security_integer_overflow.diff 3393 MD5 6ee3768e50296eb2a8158093ee518133 files/CAN-2005-0064.patch 829 MD5 77399be6733ffca4ed1142ab319c1453 files/koffice_1_3_xpdf_buffer_overflow.diff 1808 -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 12452317cab5461eb911114062f2cce2 files/digest-koffice-1.3.5-r2 68 -MD5 4736559193af7398788799098e16c3c8 files/xpdf-CESA-2004-007-xpdf2-newer.diff 2828 ------BEGIN PGP SIGNATURE----- -Version: GnuPG v1.2.6 (GNU/Linux) - -iD8DBQFB8EeGZ/iYVBmujdURAnIsAJkBshaiydMhYDZL69DL1EE+UQm8EACg5qOk -uxho/lbpqkjKrS7JokOB1vI= -=VeXd ------END PGP SIGNATURE----- diff --git a/app-office/koffice/files/digest-koffice-1.3.3-r2 b/app-office/koffice/files/digest-koffice-1.3.3-r2 deleted file mode 100644 index 8c8f121cb5f5..000000000000 --- a/app-office/koffice/files/digest-koffice-1.3.3-r2 +++ /dev/null @@ -1 +0,0 @@ -MD5 2c3b745c6218a9dc9b3f60edea2dca2b koffice-1.3.3.tar.bz2 10739168 diff --git a/app-office/koffice/files/digest-koffice-1.3.4-r1 b/app-office/koffice/files/digest-koffice-1.3.4-r1 deleted file mode 100644 index 27aee10e0979..000000000000 --- a/app-office/koffice/files/digest-koffice-1.3.4-r1 +++ /dev/null @@ -1 +0,0 @@ -MD5 79896426542b0cf07e2e15f84946905a koffice-1.3.4.tar.bz2 10765924 diff --git a/app-office/koffice/files/digest-koffice-1.3.5 b/app-office/koffice/files/digest-koffice-1.3.5 deleted file mode 100644 index 4835c6338154..000000000000 --- a/app-office/koffice/files/digest-koffice-1.3.5 +++ /dev/null @@ -1 +0,0 @@ -MD5 dbc7e76c86647709a3e74f57c0fcf7f5 koffice-1.3.5.tar.bz2 10778584 diff --git a/app-office/koffice/files/koffice_1_3_4_xpdf_security_integer_overflow.diff b/app-office/koffice/files/koffice_1_3_4_xpdf_security_integer_overflow.diff deleted file mode 100644 index 449806bd4fdb..000000000000 --- a/app-office/koffice/files/koffice_1_3_4_xpdf_security_integer_overflow.diff +++ /dev/null @@ -1,90 +0,0 @@ -Index: Catalog.cc -=================================================================== -RCS file: /home/kde/koffice/filters/kword/pdf/xpdf/xpdf/Catalog.cc,v -retrieving revision 1.1.2.1 -retrieving revision 1.1.2.4 -diff -u -p -r1.1.2.1 -r1.1.2.4 ---- filters/kword/pdf/xpdf/xpdf/Catalog.cc 22 Oct 2004 12:13:56 -0000 1.1.2.1 -+++ filters/kword/pdf/xpdf/xpdf/Catalog.cc 30 Oct 2004 16:43:47 -0000 1.1.2.4 -@@ -12,6 +12,7 @@ - #pragma implementation - #endif - -+#include - #include - #include "gmem.h" - #include "Object.h" -@@ -63,8 +64,8 @@ Catalog::Catalog(XRef *xrefA) { - } - pagesSize = numPages0 = obj.getInt(); - obj.free(); -- if (pagesSize*sizeof(Page *)/sizeof(Page *) != pagesSize || -- pagesSize*sizeof(Ref)/sizeof(Ref) != pagesSize) { -+ if ((unsigned) pagesSize >= INT_MAX / sizeof(Page *) || -+ (unsigned) pagesSize >= INT_MAX / sizeof(Ref)) { - error(-1, "Invalid 'pagesSize'"); - ok = gFalse; - return; -@@ -196,8 +197,8 @@ int Catalog::readPageTree(Dict *pagesDic - } - if (start >= pagesSize) { - pagesSize += 32; -- if (pagesSize*sizeof(Page *)/sizeof(Page *) != pagesSize || -- pagesSize*sizeof(Ref)/sizeof(Ref) != pagesSize) { -+ if ((unsigned) pagesSize >= INT_MAX / sizeof(Page *) || -+ (unsigned) pagesSize >= INT_MAX / sizeof(Ref)) { - error(-1, "Invalid 'pagesSize' parameter."); - goto err3; - } -Index: XRef.cc -=================================================================== -RCS file: /home/kde/koffice/filters/kword/pdf/xpdf/xpdf/XRef.cc,v -retrieving revision 1.1.2.1 -retrieving revision 1.1.2.4 -diff -u -p -r1.1.2.1 -r1.1.2.4 ---- filters/kword/pdf/xpdf/xpdf/XRef.cc 22 Oct 2004 12:13:56 -0000 1.1.2.1 -+++ filters/kword/pdf/xpdf/xpdf/XRef.cc 30 Oct 2004 16:43:47 -0000 1.1.2.4 -@@ -12,6 +12,7 @@ - #pragma implementation - #endif - -+#include - #include - #include - #include -@@ -76,7 +77,7 @@ XRef::XRef(BaseStream *strA, GString *ow - - // trailer is ok - read the xref table - } else { -- if (size*sizeof(XRefEntry)/sizeof(XRefEntry) != size) { -+ if ((unsigned) size >= INT_MAX / sizeof(XRefEntry)) { - error(-1, "Invalid 'size' inside xref table."); - ok = gFalse; - errCode = errDamaged; -@@ -273,7 +274,7 @@ GBool XRef::readXRef(Guint *pos) { - // table size - if (first + n > size) { - newSize = size + 256; -- if (newSize*sizeof(XRefEntry)/sizeof(XRefEntry) != newSize) { -+ if ((unsigned) newSize >= INT_MAX / sizeof(XRefEntry)) { - error(-1, "Invalid 'newSize'"); - goto err2; - } -@@ -420,7 +421,7 @@ GBool XRef::constructXRef() { - if (!strncmp(p, "obj", 3)) { - if (num >= size) { - newSize = (num + 1 + 255) & ~255; -- if (newSize*sizeof(XRefEntry)/sizeof(XRefEntry) != newSize) { -+ if ((unsigned) newSize >= INT_MAX / sizeof(XRefEntry)) { - error(-1, "Invalid 'obj' parameters."); - return gFalse; - } -@@ -445,7 +446,7 @@ GBool XRef::constructXRef() { - } else if (!strncmp(p, "endstream", 9)) { - if (streamEndsLen == streamEndsSize) { - streamEndsSize += 64; -- if (streamEndsSize*sizeof(int)/sizeof(int) != streamEndsSize) { -+ if ((unsigned) streamEndsSize >= INT_MAX / sizeof(int)) { - error(-1, "Invalid 'endstream' parameter."); - return gFalse; - } diff --git a/app-office/koffice/files/xpdf-CESA-2004-007-xpdf2-newer.diff b/app-office/koffice/files/xpdf-CESA-2004-007-xpdf2-newer.diff deleted file mode 100644 index 2a9490640ec7..000000000000 --- a/app-office/koffice/files/xpdf-CESA-2004-007-xpdf2-newer.diff +++ /dev/null @@ -1,76 +0,0 @@ ---- filters/kword/pdf/xpdf/xpdf/XRef.cc.orig 2004-09-17 23:54:38.000000000 -0700 -+++ filters/kword/pdf/xpdf/xpdf/XRef.cc 2004-09-25 17:59:36.000000000 -0700 -@@ -76,6 +76,12 @@ - - // trailer is ok - read the xref table - } else { -+ if (size*sizeof(XRefEntry)/sizeof(XRefEntry) != size) { -+ error(-1, "Invalid 'size' inside xref table."); -+ ok = gFalse; -+ errCode = errDamaged; -+ return; -+ } - entries = (XRefEntry *)gmalloc(size * sizeof(XRefEntry)); - for (i = 0; i < size; ++i) { - entries[i].offset = 0xffffffff; -@@ -267,6 +273,10 @@ - // table size - if (first + n > size) { - newSize = size + 256; -+ if (newSize*sizeof(XRefEntry)/sizeof(XRefEntry) != newSize) { -+ error(-1, "Invalid 'newSize'"); -+ goto err2; -+ } - entries = (XRefEntry *)grealloc(entries, newSize * sizeof(XRefEntry)); - for (i = size; i < newSize; ++i) { - entries[i].offset = 0xffffffff; -@@ -410,6 +420,10 @@ - if (!strncmp(p, "obj", 3)) { - if (num >= size) { - newSize = (num + 1 + 255) & ~255; -+ if (newSize*sizeof(XRefEntry)/sizeof(XRefEntry) != newSize) { -+ error(-1, "Invalid 'obj' parameters."); -+ return gFalse; -+ } - entries = (XRefEntry *) - grealloc(entries, newSize * sizeof(XRefEntry)); - for (i = size; i < newSize; ++i) { -@@ -431,6 +445,11 @@ - } else if (!strncmp(p, "endstream", 9)) { - if (streamEndsLen == streamEndsSize) { - streamEndsSize += 64; -+ if (streamEndsSize*sizeof(int)/sizeof(int) != streamEndsSize) { -+ error(-1, "Invalid 'endstream' parameter."); -+ return gFalse; -+ } -+ - streamEnds = (Guint *)grealloc(streamEnds, - streamEndsSize * sizeof(int)); - } ---- filters/kword/pdf/xpdf/xpdf/Catalog.cc.orig 2004-10-18 16:26:39.388666476 +0200 -+++ filters/kword/pdf/xpdf/xpdf/Catalog.cc 2004-10-18 16:27:28.004749073 +0200 -@@ -62,6 +62,12 @@ - } - pagesSize = numPages0 = obj.getInt(); - obj.free(); -+ if (pagesSize*sizeof(Page *)/sizeof(Page *) != pagesSize || -+ pagesSize*sizeof(Ref)/sizeof(Ref) != pagesSize) { -+ error(-1, "Invalid 'pagesSize'"); -+ ok = gFalse; -+ return; -+ } - pages = (Page **)gmalloc(pagesSize * sizeof(Page *)); - pageRefs = (Ref *)gmalloc(pagesSize * sizeof(Ref)); - for (i = 0; i < pagesSize; ++i) { -@@ -186,6 +192,11 @@ - } - if (start >= pagesSize) { - pagesSize += 32; -+ if (pagesSize*sizeof(Page *)/sizeof(Page *) != pagesSize || -+ pagesSize*sizeof(Ref)/sizeof(Ref) != pagesSize) { -+ error(-1, "Invalid 'pagesSize' parameter."); -+ goto err3; -+ } - pages = (Page **)grealloc(pages, pagesSize * sizeof(Page *)); - pageRefs = (Ref *)grealloc(pageRefs, pagesSize * sizeof(Ref)); - for (j = pagesSize - 32; j < pagesSize; ++j) { diff --git a/app-office/koffice/koffice-1.3.3-r2.ebuild b/app-office/koffice/koffice-1.3.3-r2.ebuild deleted file mode 100644 index 7333fd6f41f1..000000000000 --- a/app-office/koffice/koffice-1.3.3-r2.ebuild +++ /dev/null @@ -1,38 +0,0 @@ -# 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.3.3-r2.ebuild,v 1.3 2005/01/01 15:35:59 eradicator 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}/xpdf-CESA-2004-007-xpdf2-newer.diff - epatch ${FILESDIR}/koffice_1_3_4_xpdf_security_integer_overflow.diff -} - -src_compile() { - export LIBPYTHON="`python-config --libs`" - use arts || DO_NOT_COMPILE="$DO_NOT_COMPILE kpresenter" - export DO_NOT_COMPILE="$DO_NOT_COMPILE" - kde_src_compile -} diff --git a/app-office/koffice/koffice-1.3.4-r1.ebuild b/app-office/koffice/koffice-1.3.4-r1.ebuild deleted file mode 100644 index a9698da13734..000000000000 --- a/app-office/koffice/koffice-1.3.4-r1.ebuild +++ /dev/null @@ -1,34 +0,0 @@ -# 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.3.4-r1.ebuild,v 1.8 2005/01/01 15:35:59 eradicator 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_4_xpdf_security_integer_overflow.diff -} -src_compile() { - export LIBPYTHON="`python-config --libs`" - kde_src_compile -} diff --git a/app-office/koffice/koffice-1.3.5.ebuild b/app-office/koffice/koffice-1.3.5.ebuild deleted file mode 100644 index 87c3a6a4cbda..000000000000 --- a/app-office/koffice/koffice-1.3.5.ebuild +++ /dev/null @@ -1,33 +0,0 @@ -# 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.3.5.ebuild,v 1.6 2005/01/01 15:35:59 eradicator 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 -} -src_compile() { - export LIBPYTHON="`python-config --libs`" - kde_src_compile -} -- cgit v1.2.3-65-gdbad