Added patch to fix overflow in jpc/jpc_cs.c (see bug #179159).

Package-Manager: portage-2.1.2.7

5 files changed, 83 insertions, 5 deletions

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 <markusle@gentoo.org>
+  +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 <grobian@gentoo.org> jasper-1.701.0.ebuild,
   jasper-1.900.1.ebuild:
diff --git a/media-libs/jasper/Manifest b/media-libs/jasper/Manifest
index 0e3ad6a01f98..37c24e1cd449 100644
--- a/media-libs/jasper/Manifest
+++ b/media-libs/jasper/Manifest
@@ -1,17 +1,25 @@
+AUX jasper-overflow-fix.patch 683 RMD160 d70c756f834f27c60b2880490d015db6ef6f8f00 SHA1 7d69151497692611c59c5577e97de8c5089f8af0 SHA256 57b0f78ce02af1dce674664c030d4e9432333a7589b43c042a5b0c730eb3d611
+MD5 8ab371019437a0cdb29037cbe82cc44a files/jasper-overflow-fix.patch 683
+RMD160 d70c756f834f27c60b2880490d015db6ef6f8f00 files/jasper-overflow-fix.patch 683
+SHA256 57b0f78ce02af1dce674664c030d4e9432333a7589b43c042a5b0c730eb3d611 files/jasper-overflow-fix.patch 683
 DIST jasper-1.701.0.zip 1361754 RMD160 3f93bcabccd8461155f4fefc9b1be306b8c1451e SHA1 e304457a3973c3a926792c3e25e16f05818634e4 SHA256 3593532a6dd812d665d7c04d8bb7851e01a9e168f6e851aa63a075f74baf703e
 DIST jasper-1.900.1.zip 1415752 RMD160 fb2c188abf5b8c297078ac1f913101734f72db5c SHA1 9c5735f773922e580bf98c7c7dfda9bbed4c5191 SHA256 6b905a9c2aca2e275544212666eefc4eb44d95d0a57e4305457b407fe63f9494
 EBUILD jasper-1.701.0.ebuild 1116 RMD160 f49674fa5917f40efd66cd881de50ea4da58ae17 SHA1 ded78a5e39d618395564313f838c33f44c7c7569 SHA256 6fb51703391f01eda90e41d39f7763dd4ef45284bfe178c2ed8515d7ce1b1bbf
 MD5 38db9dc71bb02d8e63dff9f9905147d0 jasper-1.701.0.ebuild 1116
 RMD160 f49674fa5917f40efd66cd881de50ea4da58ae17 jasper-1.701.0.ebuild 1116
 SHA256 6fb51703391f01eda90e41d39f7763dd4ef45284bfe178c2ed8515d7ce1b1bbf jasper-1.701.0.ebuild 1116
+EBUILD jasper-1.900.1-r1.ebuild 1177 RMD160 9523a7c61daed09de905bdbac3ce7ab218089ae3 SHA1 d94cdeacc6be99756745c3761d0d110722503910 SHA256 9c80155923211c3615c7145588754de54fffb8a100715881d694dcb0953f788d
+MD5 0b7d15e88f7c652e475f7a9e40b04ec1 jasper-1.900.1-r1.ebuild 1177
+RMD160 9523a7c61daed09de905bdbac3ce7ab218089ae3 jasper-1.900.1-r1.ebuild 1177
+SHA256 9c80155923211c3615c7145588754de54fffb8a100715881d694dcb0953f788d jasper-1.900.1-r1.ebuild 1177
 EBUILD jasper-1.900.1.ebuild 1118 RMD160 302ce49d63eeb33e43e4dfecf6ba6ae420e53c55 SHA1 4d4e29d4dab17ac57fd9a9cbcb9e1bf5577dcae2 SHA256 a022be7cf6c6cea794ccb31519f8f75314757f6d4142cd27778ca5de818221d2
 MD5 7309342c058a421554ddfb2e69080040 jasper-1.900.1.ebuild 1118
 RMD160 302ce49d63eeb33e43e4dfecf6ba6ae420e53c55 jasper-1.900.1.ebuild 1118
 SHA256 a022be7cf6c6cea794ccb31519f8f75314757f6d4142cd27778ca5de818221d2 jasper-1.900.1.ebuild 1118
-MISC ChangeLog 3661 RMD160 e895994a0c23991047494ea7ae07e68fedaf6cc2 SHA1 a77df0d648568a349231e39c9f04d54234e3d391 SHA256 fe31ed18db344b4cd73ca235d459ef0e61f2dff642d3b1a2e75d27f936bb8445
-MD5 67d0cebd9ac873336e25562f04995751 ChangeLog 3661
-RMD160 e895994a0c23991047494ea7ae07e68fedaf6cc2 ChangeLog 3661
-SHA256 fe31ed18db344b4cd73ca235d459ef0e61f2dff642d3b1a2e75d27f936bb8445 ChangeLog 3661
+MISC ChangeLog 3878 RMD160 fd7b34accbce3add5da6ab5fc16a8af75df5aef0 SHA1 53ef58eaefd0afbe690d0d207ace6f5202af60a8 SHA256 c26dc9eae76162ebb73b555d0bad6f82af89820fb59e8fd10b492300ffc948b3
+MD5 dc499028025b33927540a18ec507ac32 ChangeLog 3878
+RMD160 fd7b34accbce3add5da6ab5fc16a8af75df5aef0 ChangeLog 3878
+SHA256 c26dc9eae76162ebb73b555d0bad6f82af89820fb59e8fd10b492300ffc948b3 ChangeLog 3878
 MISC metadata.xml 301 RMD160 91daefdb588e2984774e49daf182936ede2e29f4 SHA1 8d3f29760c4369cb43ae6bc5a8d3032ad1f68d28 SHA256 e10af83464344d5ff709f593848ca25638eb8cfed47fa49ef44b01fdc9a5db32
 MD5 7886cad6b0db799f4a0524df0d66bb85 metadata.xml 301
 RMD160 91daefdb588e2984774e49daf182936ede2e29f4 metadata.xml 301
@@ -22,3 +30,6 @@ SHA256 f06840b23b99769f36536f4d33d9c2d5cfc2493ae592972fc8ec0a93f45b0001 files/di
 MD5 8acd6f7c4b2ebb40c2b2382a728ca3c5 files/digest-jasper-1.900.1 238
 RMD160 61904f06fc8866eb335bcc8b65ec2a63beacdd7e files/digest-jasper-1.900.1 238
 SHA256 596a729a684464eb4ef2cb1e263eeec3fc27ac550bfb9e01ed6ca277b319a40f files/digest-jasper-1.900.1 238
+MD5 8acd6f7c4b2ebb40c2b2382a728ca3c5 files/digest-jasper-1.900.1-r1 238
+RMD160 61904f06fc8866eb335bcc8b65ec2a63beacdd7e files/digest-jasper-1.900.1-r1 238
+SHA256 596a729a684464eb4ef2cb1e263eeec3fc27ac550bfb9e01ed6ca277b319a40f files/digest-jasper-1.900.1-r1 238
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/*
+}