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

(Portage version: 2.1.1_pre5-r2)

4 files changed, 60 insertions, 1 deletions

diff --git a/media-gfx/exiv2/ChangeLog b/media-gfx/exiv2/ChangeLog
index 84b842aafc7c..1bb457c35cab 100644
--- a/media-gfx/exiv2/ChangeLog
+++ b/media-gfx/exiv2/ChangeLog
@@ -1,6 +1,13 @@
 # ChangeLog for media-gfx/exiv2
 # Copyright 1999-2006 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/media-gfx/exiv2/ChangeLog,v 1.4 2006/06/05 00:40:55 sbriesen Exp $
+# $Header: /var/cvsroot/gentoo-x86/media-gfx/exiv2/ChangeLog,v 1.5 2006/08/18 23:18:00 sbriesen Exp $
+
+*exiv2-0.10-r1 (18 Aug 2006)
+
+  18 Aug 2006; Stefan Briesenick <sbriesen@gentoo.org>
+  +files/exiv2-0.10-jpgimage.diff, -exiv2-0.10.ebuild,
+  +exiv2-0.10-r1.ebuild:
+  adding patch for crash in jpgimage.cpp, solving bug #144347.
 
 *exiv2-0.10 (05 Jun 2006)
 
diff --git a/media-gfx/exiv2/exiv2-0.10-r1.ebuild b/media-gfx/exiv2/exiv2-0.10-r1.ebuild
new file mode 100644
index 000000000000..c5c2576686bf
--- /dev/null
+++ b/media-gfx/exiv2/exiv2-0.10-r1.ebuild
@@ -0,0 +1,35 @@
+# 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-r1.ebuild,v 1.1 2006/08/18 23:18:00 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}"
+	epatch "${FILESDIR}/${P}-jpgimage.diff"
+
+	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-r1 b/media-gfx/exiv2/files/digest-exiv2-0.10-r1
new file mode 100644
index 000000000000..14accf6b31e8
--- /dev/null
+++ b/media-gfx/exiv2/files/digest-exiv2-0.10-r1
@@ -0,0 +1,3 @@
+MD5 5af2256fb9895d9331684e8c1865b956 exiv2-0.10.tar.gz 2053756
+RMD160 a236db525e592783ad56e975cd45002a0e7b15ba exiv2-0.10.tar.gz 2053756
+SHA256 0f42a455f89e18e371d114efa8da63c05c183c676e3ea3956fafc9c5ffcac077 exiv2-0.10.tar.gz 2053756
diff --git a/media-gfx/exiv2/files/exiv2-0.10-jpgimage.diff b/media-gfx/exiv2/files/exiv2-0.10-jpgimage.diff
new file mode 100644
index 000000000000..d70541015196
--- /dev/null
+++ b/media-gfx/exiv2/files/exiv2-0.10-jpgimage.diff
@@ -0,0 +1,14 @@
+--- src/jpgimage.cpp.orig	2006-06-02 17:29:31.000000000 +0200
++++ src/jpgimage.cpp	2006-08-19 00:59:00.000000000 +0200
+@@ -314,8 +314,9 @@
+                 // Find actual Iptc data within the APP13 segment
+                 if (!Photoshop::locateIptcIrb(psData.pData_, psData.size_,
+                                           &record, &sizeHdr, &sizeIptc)) {
+-                    assert(sizeIptc);
+-                    if (iptcData_.load(record + sizeHdr, sizeIptc)) throw Error(36, "IPTC");
++                    if (sizeIptc) {
++                        if (iptcData_.load(record + sizeHdr, sizeIptc)) throw Error(36, "IPTC");
++                    }
+                 }
+                 --search;
+             }