Version bump wrt #297760 (Karl-Robert Ernst) with CVE-2009-3994 patch (Christopher Harvey) and libpng14 compability (Marcin Baczyński)

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

4 files changed, 126 insertions, 2 deletions

diff --git a/media-libs/devil/ChangeLog b/media-libs/devil/ChangeLog
index 996a10b54e35..fcfa617417da 100644
--- a/media-libs/devil/ChangeLog
+++ b/media-libs/devil/ChangeLog
@@ -1,6 +1,13 @@
 # ChangeLog for media-libs/devil
-# Copyright 1999-2009 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/media-libs/devil/ChangeLog,v 1.39 2009/12/21 20:04:32 mr_bones_ Exp $
+# Copyright 1999-2010 Gentoo Foundation; Distributed under the GPL v2
+# $Header: /var/cvsroot/gentoo-x86/media-libs/devil/ChangeLog,v 1.40 2010/05/10 20:50:06 ssuominen Exp $
+
+*devil-1.7.8 (10 May 2010)
+
+  10 May 2010; Samuli Suominen <ssuominen@gentoo.org> +devil-1.7.8.ebuild,
+  +files/devil-1.7.8-CVE-2009-3994.patch, +files/devil-1.7.8-libpng14.patch:
+  Version bump wrt #297760 (Karl-Robert Ernst) with CVE-2009-3994 patch
+  (Christopher Harvey) and libpng14 compability (Marcin Baczyński)
 
   21 Dec 2009; Michael Sterrett <mr_bones_@gentoo.org> devil-1.7.7.ebuild:
   update USE=X deps (bug #297608)
diff --git a/media-libs/devil/devil-1.7.8.ebuild b/media-libs/devil/devil-1.7.8.ebuild
new file mode 100644
index 000000000000..b8e4eb0ad16b
--- /dev/null
+++ b/media-libs/devil/devil-1.7.8.ebuild
@@ -0,0 +1,67 @@
+# Copyright 1999-2010 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Header: /var/cvsroot/gentoo-x86/media-libs/devil/devil-1.7.8.ebuild,v 1.1 2010/05/10 20:50:06 ssuominen Exp $
+
+EAPI=2
+inherit eutils
+
+MY_P=DevIL-${PV}
+
+DESCRIPTION="DevIL image library"
+HOMEPAGE="http://openil.sourceforge.net/"
+SRC_URI="mirror://sourceforge/openil/${MY_P}.tar.gz"
+
+LICENSE="LGPL-2.1"
+SLOT="0"
+KEYWORDS="~amd64 ~ia64 ~ppc ~sparc ~x86"
+IUSE="openexr gif jpeg lcms mng png tiff xpm allegro opengl sdl X"
+
+RDEPEND="gif? ( media-libs/giflib )
+	openexr? ( media-libs/openexr )
+	jpeg? ( media-libs/jpeg )
+	lcms? ( media-libs/lcms )
+	mng? ( media-libs/libmng )
+	png? ( media-libs/libpng )
+	tiff? ( media-libs/tiff )
+	xpm? ( x11-libs/libXpm )
+	allegro? ( media-libs/allegro )
+	opengl? ( virtual/glu )
+	sdl? ( media-libs/libsdl )
+	X? ( x11-libs/libXext
+		 x11-libs/libX11
+		 x11-libs/libXrender )"
+DEPEND="${RDEPEND}
+	X? ( x11-proto/xextproto )"
+
+src_prepare() {
+	epatch "${FILESDIR}"/${P}-{CVE-2009-3994,libpng14}.patch
+}
+
+src_configure() {
+	econf \
+		--disable-dependency-tracking \
+		--enable-ILU \
+		--enable-ILUT \
+		$(use_enable gif) \
+		$(use_enable jpeg) \
+		$(use_enable lcms) \
+		$(use_enable mng) \
+		$(use_enable openexr exr) \
+		$(use_enable png) \
+		$(use_enable tiff) \
+		$(use_enable xpm) \
+		$(use_enable allegro) \
+		$(use_enable opengl) \
+		$(use_enable sdl) \
+		$(use_with X x) \
+		$(use_enable X x11) \
+		$(use_enable X shm) \
+		$(use_enable X render) \
+		--disable-directx8 \
+		--disable-directx9
+}
+
+src_install() {
+	emake DESTDIR="${D}" install || die
+	dodoc AUTHORS CREDITS ChangeLog NEWS README* TODO || die
+}
diff --git a/media-libs/devil/files/devil-1.7.8-CVE-2009-3994.patch b/media-libs/devil/files/devil-1.7.8-CVE-2009-3994.patch
new file mode 100644
index 000000000000..6c9f2db1d270
--- /dev/null
+++ b/media-libs/devil/files/devil-1.7.8-CVE-2009-3994.patch
@@ -0,0 +1,17 @@
+http://bugs.gentoo.org/297760
+
+--- src-IL/src/il_dicom.c
++++ src-IL/src/il_dicom.c
+@@ -427,9 +427,11 @@ ILboolean GetUID(ILubyte *UID)
+ 		return IL_FALSE;
+ 
+ 	ValLen = GetLittleUShort();
++	if (ValLen > 64)
++		return IL_FALSE;
+ 	if (iread(UID, ValLen, 1) != 1)
+ 		return IL_FALSE;
+-	UID[64] = 0;  // Just to make sure that our string is terminated.
++	UID[ValLen] = 0;  // Just to make sure that our string is terminated.
+ 
+ 	return IL_TRUE;
+ }
diff --git a/media-libs/devil/files/devil-1.7.8-libpng14.patch b/media-libs/devil/files/devil-1.7.8-libpng14.patch
new file mode 100644
index 000000000000..b8434692b8bd
--- /dev/null
+++ b/media-libs/devil/files/devil-1.7.8-libpng14.patch
@@ -0,0 +1,33 @@
+diff -Nur devil-1.7.8.orig/src-IL/src/il_icon.c devil-1.7.8/src-IL/src/il_icon.c
+--- devil-1.7.8.orig/src-IL/src/il_icon.c	2009-03-08 09:10:09.000000000 +0200
++++ devil-1.7.8/src-IL/src/il_icon.c	2010-01-17 00:54:09.000000000 +0200
+@@ -525,7 +525,7 @@
+ 
+ 	// Expand low-bit-depth grayscale images to 8 bits
+ 	if (ico_color_type == PNG_COLOR_TYPE_GRAY && bit_depth < 8) {
+-		png_set_gray_1_2_4_to_8(ico_png_ptr);
++		png_set_expand_gray_1_2_4_to_8(ico_png_ptr);
+ 	}
+ 
+ 	// Expand RGB images with transparency to full alpha channels
+diff -Nur devil-1.7.8.orig/src-IL/src/il_png.c devil-1.7.8/src-IL/src/il_png.c
+--- devil-1.7.8.orig/src-IL/src/il_png.c	2009-03-08 09:10:09.000000000 +0200
++++ devil-1.7.8/src-IL/src/il_png.c	2010-01-17 00:55:26.000000000 +0200
+@@ -105,7 +105,7 @@
+ 	Read = iread(Signature, 1, 8);
+ 	iseek(-Read, IL_SEEK_CUR);
+ 
+-	return png_check_sig(Signature, 8);
++	return png_sig_cmp(Signature, 0, 8) == 0;
+ }
+ 
+ 
+@@ -278,7 +278,7 @@
+ 
+ 	// Expand low-bit-depth grayscale images to 8 bits
+ 	if (png_color_type == PNG_COLOR_TYPE_GRAY && bit_depth < 8) {
+-		png_set_gray_1_2_4_to_8(png_ptr);
++		png_set_expand_gray_1_2_4_to_8(png_ptr);
+ 	}
+ 
+ 	// Expand RGB images with transparency to full alpha channels