adding patch for crash in jpgimage.cpp, solving bug #144347.

(Portage version: 2.1.1_pre5-r2)
 (Unsigned Manifest commit)

3 files changed, 15 insertions, 48 deletions

diff --git a/media-gfx/exiv2/Manifest b/media-gfx/exiv2/Manifest
index 20d59296ae7d..355ff12d5306 100644
--- a/media-gfx/exiv2/Manifest
+++ b/media-gfx/exiv2/Manifest
@@ -1,24 +1,28 @@
+AUX exiv2-0.10-jpgimage.diff 710 RMD160 694f22e4e05aff1c6b49ead7b24f9437eb22298b SHA1 1c230a7315674f3a3b7c0363a96d1404a7e1e3c2 SHA256 2b2e641c9162159dc2e7ba85122585e96dbf86f7e7b6dbfe04b877badf51ed9a
+MD5 76171ce5e20ca1d1613e9a41b316cd0a files/exiv2-0.10-jpgimage.diff 710
+RMD160 694f22e4e05aff1c6b49ead7b24f9437eb22298b files/exiv2-0.10-jpgimage.diff 710
+SHA256 2b2e641c9162159dc2e7ba85122585e96dbf86f7e7b6dbfe04b877badf51ed9a files/exiv2-0.10-jpgimage.diff 710
 DIST exiv2-0.10.tar.gz 2053756 RMD160 a236db525e592783ad56e975cd45002a0e7b15ba SHA1 42abd25071f49b0cd2ee4b0fdfcf3096993b5a26 SHA256 0f42a455f89e18e371d114efa8da63c05c183c676e3ea3956fafc9c5ffcac077
 DIST exiv2-0.9.1.tar.gz 1602868 RMD160 95f8dc004e7c70c72a7a40b994bfb80cc47a4ca4 SHA1 e9ad65c5f1dce90b0df2afe6582f87e29c5b1e7d SHA256 36b3a252c6cc2a270e5af6c7c4da57f685799de4f834010b11a7f88076ba4574
-EBUILD exiv2-0.10.ebuild 859 RMD160 76262f92c2f4112eae281e9c0b7477664fcbf530 SHA1 2c37428422c192be59044c183267f8e72e82870f SHA256 7775af58763caaf8955deefeab9c298643c875ea87842d5c11620c47cf1f6aec
-MD5 e285df3e10a3064557ef03d8a12bdca7 exiv2-0.10.ebuild 859
-RMD160 76262f92c2f4112eae281e9c0b7477664fcbf530 exiv2-0.10.ebuild 859
-SHA256 7775af58763caaf8955deefeab9c298643c875ea87842d5c11620c47cf1f6aec exiv2-0.10.ebuild 859
+EBUILD exiv2-0.10-r1.ebuild 903 RMD160 bd616ae1d8ed65f1d1d517c2680fb98e0454fa5c SHA1 1879f2f2da18ba20f6b544365b1f33e259a85aa5 SHA256 3dba3da218d9947a43884936be4d0f2b71239b2e4d8d959f1a50c5e14c33abe8
+MD5 1fb8eda2ecc91171a8b7de49325a329c exiv2-0.10-r1.ebuild 903
+RMD160 bd616ae1d8ed65f1d1d517c2680fb98e0454fa5c exiv2-0.10-r1.ebuild 903
+SHA256 3dba3da218d9947a43884936be4d0f2b71239b2e4d8d959f1a50c5e14c33abe8 exiv2-0.10-r1.ebuild 903
 EBUILD exiv2-0.9.1.ebuild 625 RMD160 9d15bdecaa3571d5cb7d910bd707c88d6ae7e73b SHA1 bb6b1ad32cb2954abd58741dd3c72b74849d41df SHA256 6617f9d0520f502ec844d277b09f8b1cab0af74d99b09630dc7de8e87d151e66
 MD5 8b821ff1649ced7c9a4788bb224106c8 exiv2-0.9.1.ebuild 625
 RMD160 9d15bdecaa3571d5cb7d910bd707c88d6ae7e73b exiv2-0.9.1.ebuild 625
 SHA256 6617f9d0520f502ec844d277b09f8b1cab0af74d99b09630dc7de8e87d151e66 exiv2-0.9.1.ebuild 625
-MISC ChangeLog 706 RMD160 cf56aa6258199d52a7dd34b3a5bcbcc333c02ba5 SHA1 004ce9b791822affee00650bf8a8689c7294b5a5 SHA256 7ac2e78c78e80cd7153a33e94a8d65e91b489c0add8c66ae6e71c423fbbddcb6
-MD5 d26bdfe687cf5d8d667cc014e0817420 ChangeLog 706
-RMD160 cf56aa6258199d52a7dd34b3a5bcbcc333c02ba5 ChangeLog 706
-SHA256 7ac2e78c78e80cd7153a33e94a8d65e91b489c0add8c66ae6e71c423fbbddcb6 ChangeLog 706
+MISC ChangeLog 935 RMD160 f10cbe00aa657aeecd0f72a3871fafb7643d7184 SHA1 23212d84e99e614c459e50a9d2d35059e2c5c983 SHA256 74dadfd76b1026a907efdf22ec5d50f58e96de31070b410da6a9b7abb116fa78
+MD5 cd6bdc11fc625627935a576de6253fde ChangeLog 935
+RMD160 f10cbe00aa657aeecd0f72a3871fafb7643d7184 ChangeLog 935
+SHA256 74dadfd76b1026a907efdf22ec5d50f58e96de31070b410da6a9b7abb116fa78 ChangeLog 935
 MISC metadata.xml 387 RMD160 a39fbeaf5cdd2c1fa53275f5992eb854d9b68376 SHA1 9d36b8e2a13e6d79ba2f7f9d3375b9df4d8ab62e SHA256 e71c1b4b233bfb1b0db47dd829fb579559945f1cc60a8d070900fb20271a6045
 MD5 78f505e7067d34a3788aa0b63cb2cc1b metadata.xml 387
 RMD160 a39fbeaf5cdd2c1fa53275f5992eb854d9b68376 metadata.xml 387
 SHA256 e71c1b4b233bfb1b0db47dd829fb579559945f1cc60a8d070900fb20271a6045 metadata.xml 387
-MD5 4d9cb71ab7187a199f06813e9763e118 files/digest-exiv2-0.10 235
-RMD160 f76a3eac7d5af5c919987cc0ad81770385216ce7 files/digest-exiv2-0.10 235
-SHA256 123200d7ff8a30179fd9f8ebbca21a41cc194c8f4bea212bfcbfd2864a21cd04 files/digest-exiv2-0.10 235
+MD5 4d9cb71ab7187a199f06813e9763e118 files/digest-exiv2-0.10-r1 235
+RMD160 f76a3eac7d5af5c919987cc0ad81770385216ce7 files/digest-exiv2-0.10-r1 235
+SHA256 123200d7ff8a30179fd9f8ebbca21a41cc194c8f4bea212bfcbfd2864a21cd04 files/digest-exiv2-0.10-r1 235
 MD5 b8d240cc8285c0e096aa2af1f3e8b434 files/digest-exiv2-0.9.1 238
 RMD160 e340add6a03370dd2103233f6179e708e44cfd4a files/digest-exiv2-0.9.1 238
 SHA256 0a0c622a715cb6064236fed781699d855d0c26785b29cc09a4cd9f2d7ca068e0 files/digest-exiv2-0.9.1 238
diff --git a/media-gfx/exiv2/exiv2-0.10.ebuild b/media-gfx/exiv2/exiv2-0.10.ebuild
deleted file mode 100644
index 55e8139a2758..000000000000
--- a/media-gfx/exiv2/exiv2-0.10.ebuild
+++ /dev/null
@@ -1,34 +0,0 @@
-# Copyright 1999-2006 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/media-gfx/exiv2/exiv2-0.10.ebuild,v 1.1 2006/06/05 00:40:55 sbriesen Exp $
-
-inherit eutils
-
-DESCRIPTION="Exiv2 is a C++ library and a command line utility to access image metadata"
-HOMEPAGE="http://www.exiv2.org/"
-SRC_URI="http://www.exiv2.org/${P}.tar.gz"
-
-LICENSE="GPL-2"
-SLOT="0"
-KEYWORDS="~amd64 ~ppc ~sparc ~x86"
-IUSE="doc unicode"
-
-DEPEND=""
-
-src_unpack() {
-	unpack ${A}
-	cd "${S}"
-
-	if use unicode; then
-		einfo "Converting docs to UTF-8"
-		for i in doc/cmd.txt; do
-			iconv -f latin1 -t utf8 -o "${i}~" "${i}" && mv -f "${i}~" "${i}" || rm -f "${i}~"
-		done
-	fi
-}
-
-src_install() {
-	make DESTDIR="${D}" install || die "make install failed"
-	dodoc README doc/{ChangeLog,cmd.txt}
-	use doc && dohtml doc/html/*
-}
diff --git a/media-gfx/exiv2/files/digest-exiv2-0.10 b/media-gfx/exiv2/files/digest-exiv2-0.10
deleted file mode 100644
index 14accf6b31e8..000000000000
--- a/media-gfx/exiv2/files/digest-exiv2-0.10
+++ /dev/null
@@ -1,3 +0,0 @@
-MD5 5af2256fb9895d9331684e8c1865b956 exiv2-0.10.tar.gz 2053756
-RMD160 a236db525e592783ad56e975cd45002a0e7b15ba exiv2-0.10.tar.gz 2053756
-SHA256 0f42a455f89e18e371d114efa8da63c05c183c676e3ea3956fafc9c5ffcac077 exiv2-0.10.tar.gz 2053756