From a3b83dc93213412cccac35505ca0f28b76c233a8 Mon Sep 17 00:00:00 2001 From: Markus Dittrich Date: Sun, 20 May 2007 17:01:34 +0000 Subject: Added patch to fix overflow in jpc/jpc_cs.c (see bug #179159). (Portage version: 2.1.2.7) --- media-libs/jasper/ChangeLog | 8 ++++- media-libs/jasper/files/digest-jasper-1.900.1-r1 | 3 ++ media-libs/jasper/files/jasper-overflow-fix.patch | 15 ++++++++ media-libs/jasper/jasper-1.900.1-r1.ebuild | 43 +++++++++++++++++++++++ 4 files changed, 68 insertions(+), 1 deletion(-) create mode 100644 media-libs/jasper/files/digest-jasper-1.900.1-r1 create mode 100644 media-libs/jasper/files/jasper-overflow-fix.patch create mode 100644 media-libs/jasper/jasper-1.900.1-r1.ebuild (limited to 'media-libs/jasper') diff --git a/media-libs/jasper/ChangeLog b/media-libs/jasper/ChangeLog index 76d40d96973d..a04cb8346426 100644 --- a/media-libs/jasper/ChangeLog +++ b/media-libs/jasper/ChangeLog @@ -1,6 +1,12 @@ # ChangeLog for media-libs/jasper # Copyright 2000-2007 Gentoo Foundation; Distributed under the GPL v2 -# $Header: /var/cvsroot/gentoo-x86/media-libs/jasper/ChangeLog,v 1.31 2007/02/15 20:21:01 grobian Exp $ +# $Header: /var/cvsroot/gentoo-x86/media-libs/jasper/ChangeLog,v 1.32 2007/05/20 17:01:34 markusle Exp $ + +*jasper-1.900.1-r1 (20 May 2007) + + 20 May 2007; Markus Dittrich + +files/jasper-overflow-fix.patch, +jasper-1.900.1-r1.ebuild: + Added patch to fix overflow in jpc/jpc_cs.c (see bug #179159). 15 Feb 2007; Fabian Groffen jasper-1.701.0.ebuild, jasper-1.900.1.ebuild: diff --git a/media-libs/jasper/files/digest-jasper-1.900.1-r1 b/media-libs/jasper/files/digest-jasper-1.900.1-r1 new file mode 100644 index 000000000000..f458b8acad6b --- /dev/null +++ b/media-libs/jasper/files/digest-jasper-1.900.1-r1 @@ -0,0 +1,3 @@ +MD5 a342b2b4495b3e1394e161eb5d85d754 jasper-1.900.1.zip 1415752 +RMD160 fb2c188abf5b8c297078ac1f913101734f72db5c jasper-1.900.1.zip 1415752 +SHA256 6b905a9c2aca2e275544212666eefc4eb44d95d0a57e4305457b407fe63f9494 jasper-1.900.1.zip 1415752 diff --git a/media-libs/jasper/files/jasper-overflow-fix.patch b/media-libs/jasper/files/jasper-overflow-fix.patch new file mode 100644 index 000000000000..3266866976a1 --- /dev/null +++ b/media-libs/jasper/files/jasper-overflow-fix.patch @@ -0,0 +1,15 @@ +diff -Naur jasper-1.900.1-old/src/libjasper/jpc/jpc_cs.c jasper-1.900.1/src/libjasper/jpc/jpc_cs.c +--- jasper-1.900.1-old/src/libjasper/jpc/jpc_cs.c 2007-01-19 16:43:07.000000000 -0500 ++++ jasper-1.900.1/src/libjasper/jpc/jpc_cs.c 2007-05-20 12:20:02.000000000 -0400 +@@ -982,7 +982,10 @@ + compparms->numstepsizes = (len - n) / 2; + break; + } +- if (compparms->numstepsizes > 0) { ++ if (compparms->numstepsizes > 3 * JPC_MAXRLVLS + 1) { ++ jpc_qcx_destroycompparms(compparms); ++ return -1; ++ } else if (compparms->numstepsizes > 0) { + compparms->stepsizes = jas_malloc(compparms->numstepsizes * + sizeof(uint_fast16_t)); + assert(compparms->stepsizes); diff --git a/media-libs/jasper/jasper-1.900.1-r1.ebuild b/media-libs/jasper/jasper-1.900.1-r1.ebuild new file mode 100644 index 000000000000..a78c797f6a64 --- /dev/null +++ b/media-libs/jasper/jasper-1.900.1-r1.ebuild @@ -0,0 +1,43 @@ +# Copyright 1999-2007 Gentoo Foundation +# Distributed under the terms of the GNU General Public License v2 +# $Header: /var/cvsroot/gentoo-x86/media-libs/jasper/jasper-1.900.1-r1.ebuild,v 1.1 2007/05/20 17:01:34 markusle Exp $ + +inherit libtool eutils + +DESCRIPTION="software-based implementation of the codec specified in the JPEG-2000 Part-1 standard" +HOMEPAGE="http://www.ece.uvic.ca/~mdadams/jasper/" +SRC_URI="http://www.ece.uvic.ca/~mdadams/jasper/software/jasper-${PV}.zip" + +LICENSE="JasPer" +SLOT="0" +KEYWORDS="~alpha ~amd64 ~arm ~hppa ~ia64 ~mips ~ppc ~ppc64 ~s390 ~sh +~sparc ~x86 ~x86-fbsd" +IUSE="opengl jpeg" + +RDEPEND="jpeg? ( media-libs/jpeg ) + opengl? ( virtual/opengl virtual/glut )" +DEPEND="${RDEPEND} + app-arch/unzip" + +src_unpack() { + unpack ${A} + cd ${S} + + epatch "${FILESDIR}"/${PN}-overflow-fix.patch + + elibtoolize +} + +src_compile() { + econf \ + $(use_enable jpeg libjpeg) \ + $(use_enable opengl) \ + --enable-shared \ + || die + emake || die "If you got undefined references to OpenGL related libraries,please try 'eselect opengl set xorg-x11' before emerging. See bug #133609." +} + +src_install() { + make DESTDIR="${D}" install || die + dodoc NEWS README doc/* +} -- cgit v1.2.3-65-gdbad