Fix multiple integer overflows (bug #222819), remove mips stable keyword.

Package-Manager: portage-2.2_rc11/cvs/Linux 2.6.25-gentoo-r6 x86_64
RepoMan-Options: --force

4 files changed, 66 insertions, 7 deletions

diff --git a/media-libs/jasper/ChangeLog b/media-libs/jasper/ChangeLog
index 0decbf566bc5..59dc532d16d5 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.40 2007/07/13 09:53:59 uberlord Exp $
+# Copyright 2000-2008 Gentoo Foundation; Distributed under the GPL v2
+# $Header: /var/cvsroot/gentoo-x86/media-libs/jasper/ChangeLog,v 1.41 2008/10/04 18:36:24 rbu Exp $
+
+*jasper-1.900.1-r2 (04 Oct 2008)
+
+  04 Oct 2008; Robert Buchholz <rbu@gentoo.org> jasper-1.701.0.ebuild,
+  +jasper-1.900.1-r2.ebuild:
+  Fix multiple integer overflows (bug #222819), remove mips stable keyword.
 
   13 Jul 2007; Roy Marples <uberlord@gentoo.org> jasper-1.900.1-r1.ebuild:
   Keyworded ~sparc-fbsd
diff --git a/media-libs/jasper/Manifest b/media-libs/jasper/Manifest
index ab4e7eb7bb97..5175fbd41aeb 100644
--- a/media-libs/jasper/Manifest
+++ b/media-libs/jasper/Manifest
@@ -1,8 +1,10 @@
 AUX jasper-overflow-fix.patch 683 RMD160 d70c756f834f27c60b2880490d015db6ef6f8f00 SHA1 7d69151497692611c59c5577e97de8c5089f8af0 SHA256 57b0f78ce02af1dce674664c030d4e9432333a7589b43c042a5b0c730eb3d611
 DIST jasper-1.701.0.zip 1361754 RMD160 3f93bcabccd8461155f4fefc9b1be306b8c1451e SHA1 e304457a3973c3a926792c3e25e16f05818634e4 SHA256 3593532a6dd812d665d7c04d8bb7851e01a9e168f6e851aa63a075f74baf703e
+DIST jasper-1.900.1-CVE-2008-3520+1+2.patch.bz2 6189 RMD160 273d3ca0e8e9e488db090237f15090d3b7c5688f SHA1 59214defc45c2a46581d7c3a77b6113904c9641e SHA256 fcba19c496b409feb07e37224ec834f857736a5a49b925980405ffd672dc2b36
 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
+EBUILD jasper-1.701.0.ebuild 1113 RMD160 ffc483543676b404010ad3cbc5be1a04a9285790 SHA1 96ee3718d295c2e7ad1e11ae0c158b3a94b22037 SHA256 ad57a17de77f4ec8039cf3e97ac028a1db0da4ad427ac271a96e5d00e4861114
 EBUILD jasper-1.900.1-r1.ebuild 1331 RMD160 9e048edb43c300541ab66a33004fc2dc916bb681 SHA1 cce00c2386263949c48eaebd5dd169d6c34406f8 SHA256 42ec398067427da26d2a778255c7369df615251f70c3beb72f298221101933b6
+EBUILD jasper-1.900.1-r2.ebuild 1431 RMD160 ad9ae4e861ef316f39c6ecff7c6705c3127919d5 SHA1 3a3664bc22034ffec11b6d756d0fa9cdfaefb700 SHA256 1651cbfd74adb47457a36317343569a00db7bfc959102e9e14bff5627cec4566
 EBUILD jasper-1.900.1.ebuild 1118 RMD160 302ce49d63eeb33e43e4dfecf6ba6ae420e53c55 SHA1 4d4e29d4dab17ac57fd9a9cbcb9e1bf5577dcae2 SHA256 a022be7cf6c6cea794ccb31519f8f75314757f6d4142cd27778ca5de818221d2
-MISC ChangeLog 4872 RMD160 6ec61b256ba860b1484199d8fedece8c93f93224 SHA1 3b3f1c5d87be6dda3cd078d27179aa25e7c6f9f4 SHA256 951c79ea48e73c804aca5acfba655c351a8748ef71dce112ac05c124e2542aab
+MISC ChangeLog 5078 RMD160 faf4d93453162ad16b34937b78c782d791f1b3d0 SHA1 f7e0af6aaa50440c3de90af536e6540cb25a352b SHA256 9a3215dbb7f417eef8c0044d5647214861399bf85758e88f13e766bce2550830
 MISC metadata.xml 301 RMD160 91daefdb588e2984774e49daf182936ede2e29f4 SHA1 8d3f29760c4369cb43ae6bc5a8d3032ad1f68d28 SHA256 e10af83464344d5ff709f593848ca25638eb8cfed47fa49ef44b01fdc9a5db32
diff --git a/media-libs/jasper/jasper-1.701.0.ebuild b/media-libs/jasper/jasper-1.701.0.ebuild
index 3f63be90adab..53dd233095b1 100644
--- a/media-libs/jasper/jasper-1.701.0.ebuild
+++ b/media-libs/jasper/jasper-1.701.0.ebuild
@@ -1,6 +1,6 @@
-# Copyright 1999-2007 Gentoo Foundation
+# Copyright 1999-2008 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/media-libs/jasper/jasper-1.701.0.ebuild,v 1.29 2007/02/15 20:21:01 grobian Exp $
+# $Header: /var/cvsroot/gentoo-x86/media-libs/jasper/jasper-1.701.0.ebuild,v 1.30 2008/10/04 18:36:24 rbu Exp $
 
 inherit libtool
 
@@ -10,7 +10,7 @@ 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"
+KEYWORDS="alpha amd64 arm hppa ia64 ~mips ppc ppc64 s390 sh sparc x86 ~x86-fbsd"
 IUSE="opengl jpeg"
 
 RDEPEND="jpeg? ( media-libs/jpeg )
diff --git a/media-libs/jasper/jasper-1.900.1-r2.ebuild b/media-libs/jasper/jasper-1.900.1-r2.ebuild
new file mode 100644
index 000000000000..5660c117454d
--- /dev/null
+++ b/media-libs/jasper/jasper-1.900.1-r2.ebuild
@@ -0,0 +1,51 @@
+# Copyright 1999-2008 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-r2.ebuild,v 1.1 2008/10/04 18:36:24 rbu 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
+	mirror://gentoo/${P}-CVE-2008-3520+1+2.patch.bz2"
+
+LICENSE="JasPer"
+SLOT="0"
+KEYWORDS="alpha amd64 ~arm hppa ia64 ~mips ~ppc ppc64 ~s390 ~sh sparc ~sparc-fbsd 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
+	epatch "${WORKDIR}"/${P}-CVE-2008-3520+1+2.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/*
+}
+
+pkg_postinst() {
+	elog
+	elog "Be noted that API has been changed, and you need to run"
+	elog "revdep-rebuild from gentoolkit to correct deps."
+	elog
+}