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

Package-Manager: portage-2.2_rc67/cvs/Linux x86_64

5 files changed, 131 insertions, 3 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/Manifest b/media-libs/devil/Manifest
index 78d994ec8e79..7ec1ec8ece41 100644
--- a/media-libs/devil/Manifest
+++ b/media-libs/devil/Manifest
@@ -1,4 +1,8 @@
+AUX devil-1.7.8-CVE-2009-3994.patch 443 RMD160 e90db0441b12ae2fbcf01afa1ed48045c995788a SHA1 60102c7b20c45b90acc2388bd4deae772d7e1d10 SHA256 856c0f3f5b24b4474acaf84277441a390d13fcdd86e9ed19623de07a6261ef90
+AUX devil-1.7.8-libpng14.patch 1221 RMD160 fca759ad54a9849bb0c8e5be27c2b69cd3df7d6a SHA1 ba4f5e883cd975c864a665dd65e0f2227ccaad74 SHA256 bd1da681157678fcffcaba5ec2f7f2d33ad9971816ea33dedcf2721ad0ab4536
+DIST DevIL-1.7.8.tar.gz 2051993 RMD160 a3cdb14fcca5e75ada240a53cbdc3e749a759da5 SHA1 bc27e3e830ba666a3af03548789700d10561fcb1 SHA256 682ffa3fc894686156337b8ce473c954bf3f4fb0f3ecac159c73db632d28a8fd
 DIST devil-1.7.7.tar.gz 1482814 RMD160 a15dfb1ee17513420824e4b0cfb8413c5e9baed0 SHA1 b069aca53680ad18d8cfc4eee87d3ad52186308b SHA256 208f1684109a9da99860515cf4900402713a05f888f5b373ea01910009927da8
 EBUILD devil-1.7.7.ebuild 1688 RMD160 81e907e8f042e79f68cfaa1443cd14bf32d70971 SHA1 16d3ab4e13bc09b98742f9e6670512c599887d51 SHA256 3e52e43ba6655fea2473a45271e04ea8b5198f17fdcd96c44ea7073a06db74f0
-MISC ChangeLog 4920 RMD160 3a269c1f007efb2b0245e46c533fd6c9cdf15beb SHA1 28ed1baf58d3a9755cbc5ca5b51689f3aee16a3c SHA256 b2308f2fc2366abcd17d28cce28773e22b43e4b1ab45445fe0848acaf690316d
+EBUILD devil-1.7.8.ebuild 1652 RMD160 119ae62a5c8d160205a185916bc0cb4f7bd56d10 SHA1 5b9ec51fd9dc15a75695f781c6201563d9a36c00 SHA256 25dbd2bc6df21c56dc080dd97b40239d838a28eca3ad5a21fa738b8dfd9c0795
+MISC ChangeLog 5241 RMD160 0a056604d8f2acd90a944d959ac9fa1b1c1d111b SHA1 9bb422dee4fcae199b1add24f7d783ab47001d93 SHA256 b08a4d530858f82e2209e622ee73c05ee8afa18d940beaa8bcabf5b5e28cea63
 MISC metadata.xml 233 RMD160 114b06f2763b8cf3bb50935f7ef7ae90c118c039 SHA1 79d0bc3bba48a6bba704eb99ceef696f140630b9 SHA256 48e947aad0efbcc67590452c3ca8f8a3f58a20b22788d17012b257109c29e357
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