From 957828f7192e5ebaf417e8cafd78e7a5996cfa9a Mon Sep 17 00:00:00 2001 From: Armando Di Cianno Date: Wed, 12 Jan 2005 21:03:28 +0000 Subject: Security fixes per xpdf related security issues in bug 75199 and bug 75191 --- gnustep-libs/pdfkit/ChangeLog | 11 +++++- gnustep-libs/pdfkit/Manifest | 9 ++--- gnustep-libs/pdfkit/files/digest-pdfkit-0.8 | 1 - gnustep-libs/pdfkit/files/digest-pdfkit-0.8-r1 | 1 - gnustep-libs/pdfkit/files/digest-pdfkit-0.8-r3 | 1 + gnustep-libs/pdfkit/files/xpdf-3.00pl2.patch | 54 ++++++++++++++++++++++++++ gnustep-libs/pdfkit/pdfkit-0.8-r1.ebuild | 27 ------------- gnustep-libs/pdfkit/pdfkit-0.8-r2.ebuild | 4 +- gnustep-libs/pdfkit/pdfkit-0.8-r3.ebuild | 32 +++++++++++++++ gnustep-libs/pdfkit/pdfkit-0.8.ebuild | 21 ---------- 10 files changed, 102 insertions(+), 59 deletions(-) delete mode 100644 gnustep-libs/pdfkit/files/digest-pdfkit-0.8 delete mode 100644 gnustep-libs/pdfkit/files/digest-pdfkit-0.8-r1 create mode 100644 gnustep-libs/pdfkit/files/digest-pdfkit-0.8-r3 create mode 100644 gnustep-libs/pdfkit/files/xpdf-3.00pl2.patch delete mode 100644 gnustep-libs/pdfkit/pdfkit-0.8-r1.ebuild create mode 100644 gnustep-libs/pdfkit/pdfkit-0.8-r3.ebuild delete mode 100644 gnustep-libs/pdfkit/pdfkit-0.8.ebuild (limited to 'gnustep-libs') diff --git a/gnustep-libs/pdfkit/ChangeLog b/gnustep-libs/pdfkit/ChangeLog index 287f7a5d8cea..414fac4987e9 100644 --- a/gnustep-libs/pdfkit/ChangeLog +++ b/gnustep-libs/pdfkit/ChangeLog @@ -1,6 +1,13 @@ # ChangeLog for gnustep-libs/pdfkit -# Copyright 1999-2004 Gentoo Foundation; Distributed under the GPL v2 -# $Header: /var/cvsroot/gentoo-x86/gnustep-libs/pdfkit/ChangeLog,v 1.4 2004/11/12 03:50:59 fafhrd Exp $ +# Copyright 1999-2005 Gentoo Foundation; Distributed under the GPL v2 +# $Header: /var/cvsroot/gentoo-x86/gnustep-libs/pdfkit/ChangeLog,v 1.5 2005/01/12 21:03:28 fafhrd Exp $ + +*pdfkit-0.8-r3 (12 Jan 2005) + + 12 Jan 2005; Armando Di Cianno + +files/xpdf-3.00pl2.patch, -pdfkit-0.8-r1.ebuild, +pdfkit-0.8-r3.ebuild, + -pdfkit-0.8.ebuild: + Security fixes per xpdf related security issues in bug 75199 and bug 75191 11 Nov 2004; Armando Di Cianno files/xpdf-3.00-CESA-2004-007.diff.bz2, pdfkit-0.8-r2.ebuild: diff --git a/gnustep-libs/pdfkit/Manifest b/gnustep-libs/pdfkit/Manifest index 19dbc7320761..d031789e5e42 100644 --- a/gnustep-libs/pdfkit/Manifest +++ b/gnustep-libs/pdfkit/Manifest @@ -1,10 +1,9 @@ -MD5 7b1a700e284a42fd78c3fad3b85bb601 pdfkit-0.8.ebuild 638 -MD5 55df5b3d81df276a9179202f37bb8691 pdfkit-0.8-r1.ebuild 760 +MD5 6a83f06a8f7b639b9f32fccbe0bc8685 pdfkit-0.8-r3.ebuild 829 MD5 4932a3290e2f6bf92ea9207f4987beaf ChangeLog 1187 MD5 7665a07a9a72d21043383c0cbbc02177 metadata.xml 346 -MD5 3d44c6811cf26924a9bc78cd2149031b pdfkit-0.8-r2.ebuild 864 +MD5 ee6949cada08435b50b42dd3fac4e675 pdfkit-0.8-r2.ebuild 864 MD5 84d2e5e0ce13534390f4f761f017c67c files/xpdf-3.00-CESA-2004-007.diff.bz2 2075 -MD5 41964a8057a8059f88f443baffe84f44 files/digest-pdfkit-0.8 64 +MD5 d4de4d643cf7db65c2a6cdbd4ac868e2 files/xpdf-3.00pl2.patch 1645 MD5 2fce5bedd61300fad1566a41f991a782 files/xpdf-goo-sizet.patch 1424 -MD5 41964a8057a8059f88f443baffe84f44 files/digest-pdfkit-0.8-r1 64 MD5 41964a8057a8059f88f443baffe84f44 files/digest-pdfkit-0.8-r2 64 +MD5 41964a8057a8059f88f443baffe84f44 files/digest-pdfkit-0.8-r3 64 diff --git a/gnustep-libs/pdfkit/files/digest-pdfkit-0.8 b/gnustep-libs/pdfkit/files/digest-pdfkit-0.8 deleted file mode 100644 index 2256fc733979..000000000000 --- a/gnustep-libs/pdfkit/files/digest-pdfkit-0.8 +++ /dev/null @@ -1 +0,0 @@ -MD5 75a0a437f2e9aa82ecf2189a67a67b35 PDFKit-0.8.tar.bz2 1735057 diff --git a/gnustep-libs/pdfkit/files/digest-pdfkit-0.8-r1 b/gnustep-libs/pdfkit/files/digest-pdfkit-0.8-r1 deleted file mode 100644 index 2256fc733979..000000000000 --- a/gnustep-libs/pdfkit/files/digest-pdfkit-0.8-r1 +++ /dev/null @@ -1 +0,0 @@ -MD5 75a0a437f2e9aa82ecf2189a67a67b35 PDFKit-0.8.tar.bz2 1735057 diff --git a/gnustep-libs/pdfkit/files/digest-pdfkit-0.8-r3 b/gnustep-libs/pdfkit/files/digest-pdfkit-0.8-r3 new file mode 100644 index 000000000000..2256fc733979 --- /dev/null +++ b/gnustep-libs/pdfkit/files/digest-pdfkit-0.8-r3 @@ -0,0 +1 @@ +MD5 75a0a437f2e9aa82ecf2189a67a67b35 PDFKit-0.8.tar.bz2 1735057 diff --git a/gnustep-libs/pdfkit/files/xpdf-3.00pl2.patch b/gnustep-libs/pdfkit/files/xpdf-3.00pl2.patch new file mode 100644 index 000000000000..8e5a08d290f1 --- /dev/null +++ b/gnustep-libs/pdfkit/files/xpdf-3.00pl2.patch @@ -0,0 +1,54 @@ +*** Gfx.cc.orig Sun Dec 12 16:04:43 2004 +--- Gfx.cc Sun Dec 12 16:05:16 2004 +*************** +*** 2654,2660 **** + haveMask = gFalse; + dict->lookup("Mask", &maskObj); + if (maskObj.isArray()) { +! for (i = 0; i < maskObj.arrayGetLength(); ++i) { + maskObj.arrayGet(i, &obj1); + maskColors[i] = obj1.getInt(); + obj1.free(); +--- 2654,2662 ---- + haveMask = gFalse; + dict->lookup("Mask", &maskObj); + if (maskObj.isArray()) { +! for (i = 0; +! i < maskObj.arrayGetLength() && i < 2*gfxColorMaxComps; +! ++i) { + maskObj.arrayGet(i, &obj1); + maskColors[i] = obj1.getInt(); + obj1.free(); +*** GfxState.cc.orig Sun Dec 12 16:04:48 2004 +--- GfxState.cc Sun Dec 12 16:06:38 2004 +*************** +*** 708,713 **** +--- 708,718 ---- + } + 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) { +*************** +*** 1054,1060 **** + } + nCompsA = obj1.arrayGetLength(); + if (nCompsA > gfxColorMaxComps) { +! error(-1, "DeviceN color space with more than %d > %d components", + nCompsA, gfxColorMaxComps); + nCompsA = gfxColorMaxComps; + } +--- 1059,1065 ---- + } + nCompsA = obj1.arrayGetLength(); + if (nCompsA > gfxColorMaxComps) { +! error(-1, "DeviceN color space with too many (%d > %d) components", + nCompsA, gfxColorMaxComps); + nCompsA = gfxColorMaxComps; + } diff --git a/gnustep-libs/pdfkit/pdfkit-0.8-r1.ebuild b/gnustep-libs/pdfkit/pdfkit-0.8-r1.ebuild deleted file mode 100644 index efcdd2759e3c..000000000000 --- a/gnustep-libs/pdfkit/pdfkit-0.8-r1.ebuild +++ /dev/null @@ -1,27 +0,0 @@ -# Copyright 1999-2004 Gentoo Foundation -# Distributed under the terms of the GNU General Public License v2 -# $Header: /var/cvsroot/gentoo-x86/gnustep-libs/pdfkit/pdfkit-0.8-r1.ebuild,v 1.1 2004/10/29 20:36:52 fafhrd Exp $ - -inherit gnustep - -S=${WORKDIR}/${PN/pdfk/PDFK} - -DESCRIPTION="PDFKit is a framework that supports rendering of PDF content in GNUstep applications" -HOMEPAGE="http://home.gna.org/gsimageapps/" -SRC_URI="http://download.gna.org/gsimageapps/${P/pdfk/PDFK}.tar.bz2" -LICENSE="GPL-2" -KEYWORDS="~ppc ~x86" -SLOT="0" - -IUSE="${IUSE}" -DEPEND="${GS_DEPEND} - !gnustep-libs/imagekits" -RDEPEND="${GS_RDEPEND} - !gnustep-libs/imagekits" - -src_unpack() -{ - gnustep_src_unpack - ( cd xpdf/xpdf-3.00/xpdf; epatch ${FILESDIR}/xpdf-3.00-CESA-2004-007.diff.bz2 ) -} - diff --git a/gnustep-libs/pdfkit/pdfkit-0.8-r2.ebuild b/gnustep-libs/pdfkit/pdfkit-0.8-r2.ebuild index 8cfd63512262..b6bb20f62eed 100644 --- a/gnustep-libs/pdfkit/pdfkit-0.8-r2.ebuild +++ b/gnustep-libs/pdfkit/pdfkit-0.8-r2.ebuild @@ -1,6 +1,6 @@ -# Copyright 1999-2004 Gentoo Foundation +# Copyright 1999-2005 Gentoo Foundation # Distributed under the terms of the GNU General Public License v2 -# $Header: /var/cvsroot/gentoo-x86/gnustep-libs/pdfkit/pdfkit-0.8-r2.ebuild,v 1.2 2004/11/12 03:50:59 fafhrd Exp $ +# $Header: /var/cvsroot/gentoo-x86/gnustep-libs/pdfkit/pdfkit-0.8-r2.ebuild,v 1.3 2005/01/12 21:03:28 fafhrd Exp $ inherit gnustep diff --git a/gnustep-libs/pdfkit/pdfkit-0.8-r3.ebuild b/gnustep-libs/pdfkit/pdfkit-0.8-r3.ebuild new file mode 100644 index 000000000000..0b073d3a8069 --- /dev/null +++ b/gnustep-libs/pdfkit/pdfkit-0.8-r3.ebuild @@ -0,0 +1,32 @@ +# Copyright 1999-2005 Gentoo Foundation +# Distributed under the terms of the GNU General Public License v2 +# $Header: /var/cvsroot/gentoo-x86/gnustep-libs/pdfkit/pdfkit-0.8-r3.ebuild,v 1.1 2005/01/12 21:03:28 fafhrd Exp $ + +inherit gnustep + +S=${WORKDIR}/${PN/pdfk/PDFK} + +DESCRIPTION="PDFKit is a framework that supports rendering of PDF content in GNUstep applications" +HOMEPAGE="http://home.gna.org/gsimageapps/" +SRC_URI="http://download.gna.org/gsimageapps/${P/pdfk/PDFK}.tar.bz2" +LICENSE="GPL-2" +KEYWORDS="~ppc ~x86" +SLOT="0" + +IUSE="${IUSE}" +DEPEND="${GS_DEPEND} + !gnustep-libs/imagekits" +RDEPEND="${GS_RDEPEND} + !gnustep-libs/imagekits" + +egnustep_install_domain "System" + +src_unpack() +{ + unpack ${A} + cd ${S} + ( cd xpdf/xpdf-3.00/xpdf; epatch ${FILESDIR}/xpdf-3.00-CESA-2004-007.diff.bz2 ) + ( cd xpdf/xpdf-3.00/goo; epatch ${FILESDIR}/xpdf-goo-sizet.patch ) + ( cd xpdf/xpdf-3.00/xpdf; epatch ${FILESDIR}/xpdf-3.00pl2.patch ) +} + diff --git a/gnustep-libs/pdfkit/pdfkit-0.8.ebuild b/gnustep-libs/pdfkit/pdfkit-0.8.ebuild deleted file mode 100644 index b2e5a7a73ce4..000000000000 --- a/gnustep-libs/pdfkit/pdfkit-0.8.ebuild +++ /dev/null @@ -1,21 +0,0 @@ -# Copyright 1999-2004 Gentoo Foundation -# Distributed under the terms of the GNU General Public License v2 -# $Header: /var/cvsroot/gentoo-x86/gnustep-libs/pdfkit/pdfkit-0.8.ebuild,v 1.2 2004/10/22 19:50:42 fafhrd Exp $ - -inherit gnustep - -S=${WORKDIR}/${PN/pdfk/PDFK} - -DESCRIPTION="PDFKit is a framework that supports rendering of PDF content in GNUstep applications" -HOMEPAGE="http://home.gna.org/gsimageapps/" -SRC_URI="http://download.gna.org/gsimageapps/${P/pdfk/PDFK}.tar.bz2" -LICENSE="GPL-2" -KEYWORDS="~ppc ~x86" -SLOT="0" - -IUSE="${IUSE}" -DEPEND="${GS_DEPEND} - !gnustep-libs/imagekits" -RDEPEND="${GS_RDEPEND} - !gnustep-libs/imagekits" - -- cgit v1.2.3-65-gdbad