Version bump wrt #288585, thanks to Arfrever Frehtes Taifersar Arahesis for reporting.

(Portage version: 2.2_rc44/cvs/Linux x86_64)

4 files changed, 49 insertions, 32 deletions

diff --git a/media-libs/libexif/ChangeLog b/media-libs/libexif/ChangeLog
index 2033f7be6bc9..d933120c527c 100644
--- a/media-libs/libexif/ChangeLog
+++ b/media-libs/libexif/ChangeLog
@@ -1,6 +1,13 @@
 # ChangeLog for media-libs/libexif
-# Copyright 2002-2009 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/media-libs/libexif/ChangeLog,v 1.105 2009/02/07 14:36:54 maekke Exp $
+# Copyright 1999-2009 Gentoo Foundation; Distributed under the GPL v2
+# $Header: /var/cvsroot/gentoo-x86/media-libs/libexif/ChangeLog,v 1.106 2009/10/11 16:47:50 ssuominen Exp $
+
+*libexif-0.6.18 (11 Oct 2009)
+
+  11 Oct 2009; Samuli Suominen <ssuominen@gentoo.org>
+  +libexif-0.6.18.ebuild:
+  Version bump wrt #288585, thanks to Arfrever Frehtes Taifersar Arahesis
+  for reporting.
 
   07 Feb 2009; Markus Meier <maekke@gentoo.org> -libexif-0.6.16.ebuild,
   -libexif-0.6.16-r1.ebuild:
diff --git a/media-libs/libexif/files/libexif-CVE-2007-6351.patch b/media-libs/libexif/files/libexif-CVE-2007-6351.patch
deleted file mode 100644
index eecf7e37151b..000000000000
--- a/media-libs/libexif/files/libexif-CVE-2007-6351.patch
+++ /dev/null
@@ -1,13 +0,0 @@
-Index: libexif-0.6.16/libexif/exif-loader.c
-===================================================================
---- libexif-0.6.16.orig/libexif/exif-loader.c
-+++ libexif-0.6.16/libexif/exif-loader.c
-@@ -176,6 +176,8 @@ exif_loader_write (ExifLoader *eld, unsi
- 		break;
- 	}
- 
-+	if (!len)
-+		return 1;
- 	exif_log (eld->log, EXIF_LOG_CODE_DEBUG, "ExifLoader",
- 		  "Scanning %i byte(s) of data...", len);
- 
diff --git a/media-libs/libexif/files/libexif-CVE-2007-6352.patch b/media-libs/libexif/files/libexif-CVE-2007-6352.patch
deleted file mode 100644
index c6d53cee91d9..000000000000
--- a/media-libs/libexif/files/libexif-CVE-2007-6352.patch
+++ /dev/null
@@ -1,17 +0,0 @@
-Index: libexif-0.6.16/libexif/exif-data.c
-===================================================================
---- libexif-0.6.16.orig/libexif/exif-data.c
-+++ libexif-0.6.16/libexif/exif-data.c
-@@ -288,10 +288,9 @@ static void
- exif_data_load_data_thumbnail (ExifData *data, const unsigned char *d,
- 			       unsigned int ds, ExifLong offset, ExifLong size)
- {
--	if (ds < offset + size) {
-+	if ((ds < offset + size) || (offset < 0) || (offset > ds)) {
- 		exif_log (data->priv->log, EXIF_LOG_CODE_DEBUG, "ExifData",
--			  "Bogus thumbnail offset and size: %i < %i + %i.",
--			  (int) ds, (int) offset, (int) size);
-+			  "Bogus thumbnail offset and size.");
- 		return;
- 	}
- 	if (data->data) 
diff --git a/media-libs/libexif/libexif-0.6.18.ebuild b/media-libs/libexif/libexif-0.6.18.ebuild
new file mode 100644
index 000000000000..ff2ba290da28
--- /dev/null
+++ b/media-libs/libexif/libexif-0.6.18.ebuild
@@ -0,0 +1,40 @@
+# Copyright 1999-2009 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Header: /var/cvsroot/gentoo-x86/media-libs/libexif/libexif-0.6.18.ebuild,v 1.1 2009/10/11 16:47:50 ssuominen Exp $
+
+EAPI=2
+inherit eutils libtool
+
+DESCRIPTION="Library for parsing, editing, and saving EXIF data"
+HOMEPAGE="http://libexif.sourceforge.net/"
+SRC_URI="mirror://sourceforge/${PN}/${P}.tar.bz2"
+
+LICENSE="LGPL-2.1"
+SLOT="0"
+KEYWORDS="~alpha ~amd64 ~arm ~hppa ~ia64 ~mips ~ppc ~ppc64 ~s390 ~sh ~sparc ~x86 ~x86-fbsd"
+IUSE="doc nls"
+
+RDEPEND="nls? ( virtual/libintl )"
+DEPEND="${RDEPEND}
+	dev-util/pkgconfig
+	doc? ( app-doc/doxygen )
+	nls? ( sys-devel/gettext )"
+
+src_prepare() {
+	epatch "${FILESDIR}"/${PN}-0.6.13-pkgconfig.patch
+	elibtoolize # FreeBSD .so version
+}
+
+src_configure() {
+	econf \
+		--disable-dependency-tracking \
+		$(use_enable nls) \
+		$(use_enable doc docs) \
+		--with-doc-dir=/usr/share/doc/${PF}
+}
+
+src_install() {
+	emake DESTDIR="${D}" install || die
+	rm -f "${D}"usr/share/doc/${PF}/{ABOUT-NLS,COPYING}
+	prepalldocs
+}