Grab patch from upstream 1.2.x branch for "Guard against num_components being a ridiculousvalue due to a corrupt header"

Package-Manager: portage-2.2.0_alpha108/cvs/Linux x86_64

4 files changed, 158 insertions, 9 deletions

diff --git a/media-libs/libjpeg-turbo/ChangeLog b/media-libs/libjpeg-turbo/ChangeLog
index 33ccfc39c256..490e608ef9b9 100644
--- a/media-libs/libjpeg-turbo/ChangeLog
+++ b/media-libs/libjpeg-turbo/ChangeLog
@@ -1,6 +1,14 @@
 # ChangeLog for media-libs/libjpeg-turbo
 # Copyright 1999-2012 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/media-libs/libjpeg-turbo/ChangeLog,v 1.42 2012/04/26 13:11:21 ssuominen Exp $
+# $Header: /var/cvsroot/gentoo-x86/media-libs/libjpeg-turbo/ChangeLog,v 1.43 2012/05/31 19:12:17 ssuominen Exp $
+
+*libjpeg-turbo-1.2.0-r2 (31 May 2012)
+
+  31 May 2012; Samuli Suominen <ssuominen@gentoo.org>
+  +libjpeg-turbo-1.2.0-r2.ebuild,
+  +files/libjpeg-turbo-1.2.0-guard_against_bad_num_components_value.patch:
+  Grab patch from upstream 1.2.x branch for "Guard against num_components being
+  a ridiculousvalue due to a corrupt header"
 
   26 Apr 2012; Samuli Suominen <ssuominen@gentoo.org>
   -libjpeg-turbo-1.1.1.ebuild:
diff --git a/media-libs/libjpeg-turbo/Manifest b/media-libs/libjpeg-turbo/Manifest
index 97581f0ea11b..871249485913 100644
--- a/media-libs/libjpeg-turbo/Manifest
+++ b/media-libs/libjpeg-turbo/Manifest
@@ -1,19 +1,21 @@
 -----BEGIN PGP SIGNED MESSAGE-----
 Hash: SHA1
 
+AUX libjpeg-turbo-1.2.0-guard_against_bad_num_components_value.patch 889 RMD160 a59bdfd56f86c5b35627fede136ab1f1bddeb6e7 SHA1 3bce6b6c1b5df4167a5694cc7ad44896fee073d1 SHA256 66bef73d49350d1bb173f27226aeb215d5c4b3729a5a23088a7dbbac5a2f960c
 DIST libjpeg-turbo-1.2.0.tar.gz 1752925 RMD160 d60a7de07c3164aeb1800ba21a86782e195f00f8 SHA1 4ab00afc9a8d54cd2e7a67aacb9c49e01a8bccac SHA256 629db2a9b1295a1b0e5fa8dddda36c5da61a90536bef8295e0b209cbcd50f98e
 DIST libjpeg8_8d-1.debian.tar.gz 13676 RMD160 9a60fe29a866b76935f8e26c7bf90324e1dc0ce6 SHA1 00b45ec61555c86da250f3a73823c7d46cfd81aa SHA256 70ec6689b0ad85739802cf3ebbdcc12ea01e21edd8f931c614b25b44cf199057
 EBUILD libjpeg-turbo-1.2.0-r1.ebuild 2717 RMD160 0794ed5957eac1203db8dc2ac15b13913ef8a9ee SHA1 1aebcad8acca47bf04a876e722e1361c7833a6d0 SHA256 cf7a4de5a32d8309c2b784e984f2dacfe9437daec6f3e49b9e37e599f2c726dc
-MISC ChangeLog 6277 RMD160 b4206bab1702d3df568fc142d82517d9d7b12443 SHA1 55296d3af96856fa757d9f5b98a61ba91ac1448f SHA256 85c1e635040e50026fa1652a9e7409b5efa3e83e0080bb3b8e0772dac89eebc0
+EBUILD libjpeg-turbo-1.2.0-r2.ebuild 2793 RMD160 9cddae3c0164bde3a5e487ad93f3ebf812087f26 SHA1 8a143bc09b05e39e2b3698f51663feae575b31d6 SHA256 7d962098c4b3e36f74309c96c1ae3c454bb3476f49512f103cc8ba783b17fc88
+MISC ChangeLog 6605 RMD160 256660a4556341fd7b0411d73ca386ca33907563 SHA1 20ce54a0e893499201e4ba13166aefd7772772ec SHA256 e058e5b163ef915558d29fc94379c3f74249d7820ec223d1fd708da185a58a04
 MISC metadata.xml 367 RMD160 904c022029879a401ebec35c5a94e8092cf2f5ad SHA1 86a0413cf0356331eda8202c54241c7f712a4d1f SHA256 6b8c81649360de8af20a434749d90a9ee689026f959c814e22dac83513c5b0d4
 -----BEGIN PGP SIGNATURE-----
 Version: GnuPG v2.0.19 (GNU/Linux)
 
-iQEcBAEBAgAGBQJPmUkQAAoJEEdUh39IaPFNDN0H/3fJv6eUHbCS5U3jFlLACjrW
-BGLbE6J7oNkEvE8X/5Hc8wSzbpcOwZlLo4uaZ0rTeoDjRHVeKrqV5hEjyYwMLmn4
-vwkkofWQli395kZuemzHZwIqhu1j7B/hg7X44UMw489s5bcMErwRjjssNi/zBuET
-yZKFjK6wknkAXkFtw4gkn25t9u8H/msU9fyXG038UkXGKBAmlh5e64oPJd/KLmpP
-eWtKjTRORk866edKy6XM3SpFUVf4aVADJ1LjZtPBUfSB1bKJvZLc2YVRmyuH1HnK
-J4piLEwb0FBHq9o0CWx0i7oJChHrP6EbnbQucGadD0hTWnWJ4sY2Tth5MB46K7A=
-=1QP1
+iQEcBAEBAgAGBQJPx8G2AAoJEEdUh39IaPFN1tgH/0SYvdShY8KMrAWOtrxvBoPW
+Br07h1zQknc7QeRO3aTMPgkzMMsjJ9slBCBNGDZfJGduhRz4tlGL1Ykc2uou7u3W
+YgCbpdi25SXp7nnEXo4VayWp5TjvpMPqGXH6wCjkmuzhFf9xMbU2HqwcRe6jbraj
+svxquyyNXuG4/XHVF8gg++MxFlb+S62jnT5osCnGvIOtKKDes4bE2nPLk76txb3e
+nTI8l3ZnZTjyKBrhmUlj3WW3Ns2WLEW/wUXigz/R4I99ClS2ocTiiAQlVSofPt3g
+2kIfdGcA54cMLK/Q3fvIpXn+o25tatmD4YHQ3f4fN1ccaWoItLHYo2GOd7o08DQ=
+=jPMp
 -----END PGP SIGNATURE-----
diff --git a/media-libs/libjpeg-turbo/files/libjpeg-turbo-1.2.0-guard_against_bad_num_components_value.patch b/media-libs/libjpeg-turbo/files/libjpeg-turbo-1.2.0-guard_against_bad_num_components_value.patch
new file mode 100644
index 000000000000..7c6b7ad45176
--- /dev/null
+++ b/media-libs/libjpeg-turbo/files/libjpeg-turbo-1.2.0-guard_against_bad_num_components_value.patch
@@ -0,0 +1,26 @@
+Wed May 30 20:36:42 2012 UTC by dcommander with message:
+
+"Guard against num_components being a ridiculous value due to a corrupt header"
+
+http://libjpeg-turbo.svn.sourceforge.net/viewvc/libjpeg-turbo/branches/1.2.x/jdmarker.c?r1=751&r2=831&pathrev=831
+
+--- jdmarker.c
++++ jdmarker.c
+@@ -323,14 +323,15 @@
+ 
+   /* Collect the component-spec parameters */
+ 
+-  for (i = 0; i < cinfo->num_components; i++)
++  for (i = 0; i < MAX_COMPS_IN_SCAN; i++)
+     cinfo->cur_comp_info[i] = NULL;
+ 
+   for (i = 0; i < n; i++) {
+     INPUT_BYTE(cinfo, cc, return FALSE);
+     INPUT_BYTE(cinfo, c, return FALSE);
+     
+-    for (ci = 0, compptr = cinfo->comp_info; ci < cinfo->num_components;
++    for (ci = 0, compptr = cinfo->comp_info;
++	 ci < cinfo->num_components && ci < MAX_COMPS_IN_SCAN;
+ 	 ci++, compptr++) {
+       if (cc == compptr->component_id && !cinfo->cur_comp_info[ci])
+ 	goto id_found;
diff --git a/media-libs/libjpeg-turbo/libjpeg-turbo-1.2.0-r2.ebuild b/media-libs/libjpeg-turbo/libjpeg-turbo-1.2.0-r2.ebuild
new file mode 100644
index 000000000000..3bd09fe58678
--- /dev/null
+++ b/media-libs/libjpeg-turbo/libjpeg-turbo-1.2.0-r2.ebuild
@@ -0,0 +1,113 @@
+# Copyright 1999-2012 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Header: /var/cvsroot/gentoo-x86/media-libs/libjpeg-turbo/libjpeg-turbo-1.2.0-r2.ebuild,v 1.1 2012/05/31 19:12:17 ssuominen Exp $
+
+EAPI=4
+
+unset _inherits
+
+JPEG_ABI=8
+
+if [[ ${PV} == *_p20* ]]; then
+	SRC_URI="mirror://gentoo/${P}.tar.xz"
+	_inherits=autotools
+else
+	SRC_URI="mirror://sourceforge/${PN}/${P}.tar.gz"
+fi
+
+inherit ${_inherits} eutils java-pkg-opt-2 libtool toolchain-funcs
+
+DESCRIPTION="MMX, SSE, and SSE2 SIMD accelerated JPEG library"
+HOMEPAGE="http://libjpeg-turbo.virtualgl.org/ http://sourceforge.net/projects/libjpeg-turbo/"
+SRC_URI="${SRC_URI}
+	mirror://debian/pool/main/libj/libjpeg${JPEG_ABI}/libjpeg${JPEG_ABI}_${JPEG_ABI}d-1.debian.tar.gz"
+
+LICENSE="BSD"
+SLOT="0"
+KEYWORDS="~alpha ~amd64 ~arm ~hppa ~ia64 ~m68k ~mips ~ppc ~ppc64 ~s390 ~sh ~sparc ~x86 ~amd64-fbsd ~x86-fbsd ~amd64-linux ~x86-linux ~x64-macos ~x86-macos"
+IUSE="java static-libs"
+
+ASM_DEPEND="|| ( dev-lang/nasm dev-lang/yasm )"
+COMMON_DEPEND="!media-libs/jpeg:0"
+RDEPEND="${COMMON_DEPEND}
+	java? ( >=virtual/jre-1.5 )"
+DEPEND="${COMMON_DEPEND}
+	amd64? ( ${ASM_DEPEND} )
+	x86? ( ${ASM_DEPEND} )
+	amd64-fbsd? ( ${ASM_DEPEND} )
+	x86-fbsd? ( ${ASM_DEPEND} )
+	amd64-linux? ( ${ASM_DEPEND} )
+	x86-linux? ( ${ASM_DEPEND} )
+	java? ( >=virtual/jdk-1.5 )"
+
+src_prepare() {
+	epatch "${FILESDIR}"/${P}-guard_against_bad_num_components_value.patch
+
+	if [[ -x ./configure ]]; then
+		elibtoolize
+	else
+		eautoreconf
+	fi
+	java-pkg-opt-2_src_prepare
+}
+
+src_configure() {
+	if use java; then
+		export JAVACFLAGS="$(java-pkg_javac-args)"
+		export JNI_CFLAGS="$(java-pkg_get-jni-cflags)"
+	fi
+
+	econf \
+		$(use_enable static-libs static) \
+		--with-jpeg${JPEG_ABI} \
+		$(use_with java)
+}
+
+src_compile() {
+	local _java_makeopts
+	use java && _java_makeopts="-j1"
+	emake ${_java_makeopts}
+
+	ebegin "Building exifautotran and jpegexiforient extra tools"
+	pushd ../debian/extra >/dev/null
+	emake CC="$(tc-getCC)" CFLAGS="${LDFLAGS} ${CFLAGS}"
+	popd >/dev/null
+	eend $?
+}
+
+src_test() {
+	emake test
+}
+
+src_install() {
+	emake \
+		DESTDIR="${D}" \
+		docdir="${EPREFIX}"/usr/share/doc/${PF} \
+		exampledir="${EPREFIX}"/usr/share/doc/${PF} \
+		install
+
+	find "${ED}"usr -name '*.la' -exec rm -f {} +
+
+	insinto /usr/share/doc/${PF}/html
+	doins -r doc/html/*
+
+	if use java; then
+		insinto /usr/share/doc/${PF}/html/java
+		doins -r java/doc/*
+		newdoc java/README README.java
+
+		rm -rf "${ED}"usr/classes
+		java-pkg_dojar java/turbojpeg.jar
+	fi
+
+	ebegin "Installing exifautotran and jpegexiforient extra tools"
+	pushd ../debian/extra >/dev/null
+	newdoc ../changelog changelog.debian
+
+	emake \
+		DESTDIR="${D}" prefix="${EPREFIX}"/usr \
+		INSTALL="install -m755" INSTALLDIR="install -d -m755" \
+		install
+	popd >/dev/null
+	eend $?
+}