From: Heinrich Wendel Date: Thu, 21 Oct 2004 14:02:35 +0000 (+0000) Subject: fix integer overflows, bug #68058 X-Git-Url: http://git.tremily.us/?a=commitdiff_plain;h=431a0cc57e9c55a9ec008c74b97f35d6a82b951e;p=gentoo.git fix integer overflows, bug #68058 --- diff --git a/app-text/xpdf/ChangeLog b/app-text/xpdf/ChangeLog index 9177c648c322..f59c645c304c 100644 --- a/app-text/xpdf/ChangeLog +++ b/app-text/xpdf/ChangeLog @@ -1,6 +1,12 @@ # ChangeLog for app-text/xpdf # Copyright 2002-2004 Gentoo Foundation; Distributed under the GPL v2 -# $Header: /var/cvsroot/gentoo-x86/app-text/xpdf/ChangeLog,v 1.44 2004/10/19 20:11:33 gmsoft Exp $ +# $Header: /var/cvsroot/gentoo-x86/app-text/xpdf/ChangeLog,v 1.45 2004/10/21 14:02:35 lanius Exp $ + +*xpdf-3.00-r3 (21 Oct 2004) + + 21 Oct 2004; Heinrich Wendel -xpdf-2.02.1.ebuild, + -xpdf-3.00-r2.ebuild, +xpdf-3.00-r3.ebuild, -xpdf-3.00.ebuild: + fix integer overflows, bug #68058 19 Oct 2004; Guy Martin xpdf-3.00-r2.ebuild: Stable on hppa. diff --git a/app-text/xpdf/Manifest b/app-text/xpdf/Manifest index 783df6a4e980..dd618dd1df1f 100644 --- a/app-text/xpdf/Manifest +++ b/app-text/xpdf/Manifest @@ -1,18 +1,15 @@ -MD5 ecbbe9f936de244d360e021fa85e030f ChangeLog 5451 -MD5 26b4b081d538c195dc39bcb2ec8e6f3a metadata.xml 161 -MD5 78e8623c972db9014d5ed698031c9189 xpdf-2.02.1.ebuild 1127 -MD5 e72ff64a0feb9484ea01864bd308c13c xpdf-2.03.ebuild 1128 MD5 da4e42aa1b0307c9a605711650025436 xpdf-3.00-r1.ebuild 951 -MD5 6077c4fa36327883ebb4aaa2ed20023e xpdf-3.00.ebuild 835 -MD5 21c3483ef925b4a49d6aab4bf8cb6ae2 xpdf-3.00-r2.ebuild 3034 -MD5 5b8ecf36053280853d55ea04143da297 files/digest-xpdf-2.02.1 64 -MD5 87cd94ef77a9e99ca1fac42c32270d39 files/digest-xpdf-2.03 61 -MD5 fd6eaa6f4bb5d94506718515cf20ac26 files/digest-xpdf-3.00 61 -MD5 fd6eaa6f4bb5d94506718515cf20ac26 files/digest-xpdf-3.00-r1 61 -MD5 d2fc1b3562bfee9f9c7fb5beaa741084 files/xpdf-3.00-truetype.diff.gz 3288 -MD5 7c0787e730fecfb5b6ebc5a7a69cd64e files/xpdfrc 1092 -MD5 36b521d0408d11075c1e6536e91265f2 files/digest-xpdf-3.00-r2 767 -MD5 f200f24c7cfa6061337dc6c0e03f36b9 files/xpdf-3.00-nodrm.diff 1049 -MD5 263f91efedaa87e4597ab0a83407137d files/xpdfrc.1 1593 +MD5 a7e6e442988c8de81473e15ac55dd6ff xpdf-3.00-r3.ebuild 3098 +MD5 e72ff64a0feb9484ea01864bd308c13c xpdf-2.03.ebuild 1128 +MD5 3455778d746d41122095cb3e9fb87981 ChangeLog 5654 +MD5 26b4b081d538c195dc39bcb2ec8e6f3a metadata.xml 161 MD5 8221707abac9c48b486b8c2b9bc7a7a0 files/xpdf-3.00-empty-bookmark.patch 373 +MD5 263f91efedaa87e4597ab0a83407137d files/xpdfrc.1 1593 +MD5 f200f24c7cfa6061337dc6c0e03f36b9 files/xpdf-3.00-nodrm.diff 1049 +MD5 90113e3ad42ec1df8d56deefa4571c10 files/xpdf-3.00-CESA-2004-007.diff.bz2 2083 +MD5 d2fc1b3562bfee9f9c7fb5beaa741084 files/xpdf-3.00-truetype.diff.gz 3288 +MD5 87cd94ef77a9e99ca1fac42c32270d39 files/digest-xpdf-2.03 61 MD5 1ca86139c360680d756c771b7c6c8647 files/xpdf-3.00-freetype-2.1.7.patch 2743 +MD5 7c0787e730fecfb5b6ebc5a7a69cd64e files/xpdfrc 1092 +MD5 fd6eaa6f4bb5d94506718515cf20ac26 files/digest-xpdf-3.00-r1 61 +MD5 36b521d0408d11075c1e6536e91265f2 files/digest-xpdf-3.00-r3 767 diff --git a/app-text/xpdf/files/digest-xpdf-2.02.1 b/app-text/xpdf/files/digest-xpdf-2.02.1 deleted file mode 100644 index 1e72fb400d32..000000000000 --- a/app-text/xpdf/files/digest-xpdf-2.02.1 +++ /dev/null @@ -1 +0,0 @@ -MD5 e2932bb0f844d8318c940350c2aa2eb6 xpdf-2.02pl1.tar.gz 476349 diff --git a/app-text/xpdf/files/digest-xpdf-3.00 b/app-text/xpdf/files/digest-xpdf-3.00 deleted file mode 100644 index 0c8a53eec796..000000000000 --- a/app-text/xpdf/files/digest-xpdf-3.00 +++ /dev/null @@ -1 +0,0 @@ -MD5 95294cef3031dd68e65f331e8750b2c2 xpdf-3.00.tar.gz 534697 diff --git a/app-text/xpdf/files/digest-xpdf-3.00-r2 b/app-text/xpdf/files/digest-xpdf-3.00-r3 similarity index 100% rename from app-text/xpdf/files/digest-xpdf-3.00-r2 rename to app-text/xpdf/files/digest-xpdf-3.00-r3 diff --git a/app-text/xpdf/files/xpdf-3.00-CESA-2004-007.diff.bz2 b/app-text/xpdf/files/xpdf-3.00-CESA-2004-007.diff.bz2 new file mode 100644 index 000000000000..8899286e879b Binary files /dev/null and b/app-text/xpdf/files/xpdf-3.00-CESA-2004-007.diff.bz2 differ diff --git a/app-text/xpdf/xpdf-2.02.1.ebuild b/app-text/xpdf/xpdf-2.02.1.ebuild deleted file mode 100644 index f77ab8a10609..000000000000 --- a/app-text/xpdf/xpdf-2.02.1.ebuild +++ /dev/null @@ -1,50 +0,0 @@ -# Copyright 1999-2004 Gentoo Foundation -# Distributed under the terms of the GNU General Public License v2 -# $Header: /var/cvsroot/gentoo-x86/app-text/xpdf/xpdf-2.02.1.ebuild,v 1.10 2004/06/24 22:57:22 agriffis Exp $ - -IUSE="motif" - -MY_PV=${PV/.1/pl1} - -S=${WORKDIR}/${PN}-${MY_PV} -DESCRIPTION="An X Viewer for PDF Files" -HOMEPAGE="http://www.foolabs.com/xpdf/" -SRC_URI="ftp://ftp.foolabs.com/pub/xpdf/${PN}-${MY_PV}.tar.gz" - -SLOT="0" -LICENSE="GPL-2" -KEYWORDS="x86 ppc sparc alpha hppa amd64" - -DEPEND="motif? ( virtual/x11 - x11-libs/openmotif ) - >=media-libs/freetype-2.0.5 - >=media-libs/t1lib-1.3 - virtual/ghostscript" - -src_compile() { - econf \ - --enable-freetype2 \ - --with-freetype2-includes=/usr/include/freetype2 \ - --with-gzip || die - - make ${MAKEOPTS} || die -} - - -src_install() { - make DESTDIR=${D} install || die - prepallman - dodoc README ANNOUNCE CHANGES - insinto /etc - doins ${FILESDIR}/xpdfrc -} - -pkg_postinst() { - einfo - einfo "HINT: To have even nicer results add these lines to your ~/.xpdfrc" - einfo - einfo " include /etc/xpdfrc" - einfo " t1libControl high" - einfo " freetypeControl high" - einfo -} diff --git a/app-text/xpdf/xpdf-3.00-r2.ebuild b/app-text/xpdf/xpdf-3.00-r3.ebuild similarity index 92% rename from app-text/xpdf/xpdf-3.00-r2.ebuild rename to app-text/xpdf/xpdf-3.00-r3.ebuild index c651af9119c7..cce51dd4b4f4 100644 --- a/app-text/xpdf/xpdf-3.00-r2.ebuild +++ b/app-text/xpdf/xpdf-3.00-r3.ebuild @@ -1,6 +1,6 @@ # Copyright 1999-2004 Gentoo Foundation # Distributed under the terms of the GNU General Public License v2 -# $Header: /var/cvsroot/gentoo-x86/app-text/xpdf/xpdf-3.00-r2.ebuild,v 1.9 2004/10/19 20:11:33 gmsoft Exp $ +# $Header: /var/cvsroot/gentoo-x86/app-text/xpdf/xpdf-3.00-r3.ebuild,v 1.1 2004/10/21 14:02:35 lanius Exp $ inherit eutils @@ -21,7 +21,7 @@ SRC_URI="ftp://ftp.foolabs.com/pub/xpdf/${P}.tar.gz LICENSE="GPL-2" SLOT="0" -KEYWORDS="x86 ~ppc sparc ~alpha hppa amd64 ~ia64 ~ppc64" +KEYWORDS="x86 ppc sparc alpha hppa amd64 ~ia64 ~ppc64" DEPEND="motif? ( virtual/x11 x11-libs/openmotif ) @@ -53,6 +53,7 @@ src_unpack() { epatch ${FILESDIR}/xpdf-3.00-freetype-2.1.7.patch epatch ${FILESDIR}/xpdf-3.00-empty-bookmark.patch use nodrm && epatch ${FILESDIR}/xpdf-3.00-nodrm.diff + ( cd xpdf; epatch ${FILESDIR}/xpdf-3.00-CESA-2004-007.diff.bz2 ) autoconf } diff --git a/app-text/xpdf/xpdf-3.00.ebuild b/app-text/xpdf/xpdf-3.00.ebuild deleted file mode 100644 index d9af6dc8dabd..000000000000 --- a/app-text/xpdf/xpdf-3.00.ebuild +++ /dev/null @@ -1,34 +0,0 @@ -# Copyright 1999-2004 Gentoo Foundation -# Distributed under the terms of the GNU General Public License v2 -# $Header: /var/cvsroot/gentoo-x86/app-text/xpdf/xpdf-3.00.ebuild,v 1.4 2004/06/24 22:57:22 agriffis Exp $ - -DESCRIPTION="An X Viewer for PDF Files" -HOMEPAGE="http://www.foolabs.com/xpdf/" -SRC_URI="ftp://ftp.foolabs.com/pub/xpdf/${P}.tar.gz" - -LICENSE="GPL-2" -SLOT="0" -KEYWORDS="~x86 ~ppc ~sparc ~alpha hppa ~amd64 ~ia64" -IUSE="motif" - -DEPEND="motif? ( virtual/x11 - x11-libs/openmotif ) - >=media-libs/freetype-2.0.5 - >=media-libs/t1lib-1.3 - virtual/ghostscript" - -src_compile() { - econf \ - --enable-freetype2 \ - --with-freetype2-includes=/usr/include/freetype2 || die - - emake || die -} - -src_install() { - make DESTDIR=${D} install || die - prepallman - dodoc README ANNOUNCE CHANGES COPYING - insinto /etc - doins ${FILESDIR}/xpdfrc -}