Punt due to being vuln to GLSA 200812-23 #271767.

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

5 files changed, 7 insertions, 171 deletions

diff --git a/media-libs/imlib2/ChangeLog b/media-libs/imlib2/ChangeLog
index e581eff3773f..186e096ff65d 100644
--- a/media-libs/imlib2/ChangeLog
+++ b/media-libs/imlib2/ChangeLog
@@ -1,6 +1,11 @@
 # ChangeLog for media-libs/imlib2
-# Copyright 1999-2008 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/media-libs/imlib2/ChangeLog,v 1.90 2008/12/07 11:30:44 keytoaster Exp $
+# Copyright 1999-2009 Gentoo Foundation; Distributed under the GPL v2
+# $Header: /var/cvsroot/gentoo-x86/media-libs/imlib2/ChangeLog,v 1.91 2009/05/29 20:23:25 vapier Exp $
+
+  29 May 2009; Mike Frysinger <vapier@gentoo.org>
+  -files/imlib2-1.4.0-CVE-2008-2426.patch, -imlib2-1.4.1.ebuild,
+  -files/imlib2-1.4.1-rgb.patch, -imlib2-1.4.2.ebuild:
+  Punt due to being vuln to GLSA 200812-23 #271767.
 
   07 Dec 2008; Tobias Heinlein <keytoaster@gentoo.org>
   imlib2-1.4.2-r1.ebuild:
diff --git a/media-libs/imlib2/files/imlib2-1.4.0-CVE-2008-2426.patch b/media-libs/imlib2/files/imlib2-1.4.0-CVE-2008-2426.patch
deleted file mode 100644
index 06b9a352085a..000000000000
--- a/media-libs/imlib2/files/imlib2-1.4.0-CVE-2008-2426.patch
+++ /dev/null
@@ -1,52 +0,0 @@
-fix from upstream for security issue
-http://bugs.gentoo.org/223965
-
-----------------------------
-revision 1.9
-date: 2008/05/27 14:35:17;  author: raster;  state: Exp;  lines: +1 -1
-
-2 possible security vulns fixed. should probably release new version with
-these.
-
-Index: imlib2/src/modules/loaders/loader_xpm.c
-===================================================================
-RCS file: /cvs/e/e17/libs/imlib2/src/modules/loaders/loader_xpm.c,v
-retrieving revision 1.8
-retrieving revision 1.9
-diff -u -p -r1.8 -r1.9
---- imlib2/src/modules/loaders/loader_xpm.c	25 Aug 2007 02:07:08 -0000	1.8
-+++ imlib2/src/modules/loaders/loader_xpm.c	27 May 2008 14:35:17 -0000	1.9
-@@ -286,7 +286,7 @@ load(ImlibImage * im, ImlibProgressFunct
-                                  if (line[k] != ' ')
-                                    {
-                                       s[0] = 0;
--                                      sscanf(&line[k], "%65535s", s);
-+                                      sscanf(&line[k], "%255s", s);
-                                       slen = strlen(s);
-                                       k += slen;
-                                       if (!strcmp(s, "c"))
-
-----------------------------
-revision 1.5
-date: 2008/05/27 14:35:17;  author: raster;  state: Exp;  lines: +1 -1
-
-2 possible security vulns fixed. should probably release new version with
-these.
-
-Index: imlib2/src/modules/loaders/loader_pnm.c
-===================================================================
-RCS file: /cvs/e/e17/libs/imlib2/src/modules/loaders/loader_pnm.c,v
-retrieving revision 1.4
-retrieving revision 1.5
-diff -u -p -r1.4 -r1.5
---- imlib2/src/modules/loaders/loader_pnm.c	9 Apr 2007 12:55:29 -0000	1.4
-+++ imlib2/src/modules/loaders/loader_pnm.c	27 May 2008 14:35:17 -0000	1.5
-@@ -68,7 +68,7 @@ load(ImlibImage * im, ImlibProgressFunct
-              int                 i = 0;
- 
-              /* read numbers */
--             while (c != EOF && !isspace(c))
-+             while (c != EOF && !isspace(c) && (i < 255))
-                {
-                   buf[i++] = c;
-                   c = fgetc(f);
diff --git a/media-libs/imlib2/files/imlib2-1.4.1-rgb.patch b/media-libs/imlib2/files/imlib2-1.4.1-rgb.patch
deleted file mode 100644
index ce4f4eab5afe..000000000000
--- a/media-libs/imlib2/files/imlib2-1.4.1-rgb.patch
+++ /dev/null
@@ -1,17 +0,0 @@
-Index: imlib2/src/modules/loaders/loader_xpm.c
-===================================================================
-RCS file: /cvs/e/e17/libs/imlib2/src/modules/loaders/loader_xpm.c,v
-retrieving revision 1.9
-retrieving revision 1.10
-diff -u -p -r1.9 -r1.10
---- imlib2/src/modules/loaders/loader_xpm.c	27 May 2008 14:35:17 -0000	1.9
-+++ imlib2/src/modules/loaders/loader_xpm.c	13 Jun 2008 22:39:27 -0000	1.10
-@@ -52,6 +52,8 @@ xpm_parse_color(char *color, int *r, int
-    /* look in rgb txt database */
-    if (!rgb_txt)
- #ifndef __EMX__
-+     rgb_txt = fopen("/usr/share/X11/rgb.txt", "r");
-+   if (!rgb_txt)
-      rgb_txt = fopen("/usr/X11R6/lib/X11/rgb.txt", "r");
-    if (!rgb_txt)
-      rgb_txt = fopen("/usr/openwin/lib/X11/rgb.txt", "r");
diff --git a/media-libs/imlib2/imlib2-1.4.1.ebuild b/media-libs/imlib2/imlib2-1.4.1.ebuild
deleted file mode 100644
index 518689cb94f4..000000000000
--- a/media-libs/imlib2/imlib2-1.4.1.ebuild
+++ /dev/null
@@ -1,53 +0,0 @@
-# Copyright 1999-2008 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/media-libs/imlib2/imlib2-1.4.1.ebuild,v 1.9 2008/09/20 19:04:45 vapier Exp $
-
-inherit enlightenment toolchain-funcs
-
-MY_P=${P/_/-}
-DESCRIPTION="Version 2 of an advanced replacement library for libraries like libXpm"
-HOMEPAGE="http://www.enlightenment.org/"
-
-KEYWORDS="alpha amd64 arm hppa ia64 ~mips ppc ppc64 sh sparc x86 ~x86-fbsd"
-IUSE="X bzip2 gif jpeg mmx mp3 png tiff zlib"
-
-DEPEND="=media-libs/freetype-2*
-	bzip2? ( app-arch/bzip2 )
-	zlib? ( sys-libs/zlib )
-	gif? ( >=media-libs/giflib-4.1.0 )
-	png? ( >=media-libs/libpng-1.2.1 )
-	jpeg? ( media-libs/jpeg )
-	tiff? ( >=media-libs/tiff-3.5.5 )
-	X? ( x11-libs/libXext x11-proto/xextproto )
-	mp3? ( media-libs/libid3tag )"
-
-src_unpack() {
-	enlightenment_src_unpack
-	cd "${S}"
-	epatch "${FILESDIR}"/${P}-rgb.patch
-}
-
-src_compile() {
-	# imlib2 has diff configure options for x86/amd64 mmx
-	local myconf=""
-	if [[ $(tc-arch) == "amd64" ]] ; then
-		myconf="$(use_enable mmx amd64) --disable-mmx"
-	else
-		myconf="--disable-amd64 $(use_enable mmx)"
-	fi
-
-	[[ $(gcc-major-version) -ge 4 ]] && myconf="${myconf} --enable-visibility-hiding"
-
-	export MY_ECONF="
-		$(use_with X x) \
-		$(use_with jpeg) \
-		$(use_with png) \
-		$(use_with tiff) \
-		$(use_with gif) \
-		$(use_with zlib) \
-		$(use_with bzip2) \
-		$(use_with mp3 id3) \
-		${myconf} \
-	"
-	enlightenment_src_compile
-}
diff --git a/media-libs/imlib2/imlib2-1.4.2.ebuild b/media-libs/imlib2/imlib2-1.4.2.ebuild
deleted file mode 100644
index 4d98dab2ec74..000000000000
--- a/media-libs/imlib2/imlib2-1.4.2.ebuild
+++ /dev/null
@@ -1,47 +0,0 @@
-# Copyright 1999-2008 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/media-libs/imlib2/imlib2-1.4.2.ebuild,v 1.6 2008/10/30 19:07:14 dertobi123 Exp $
-
-inherit enlightenment toolchain-funcs
-
-MY_P=${P/_/-}
-DESCRIPTION="Version 2 of an advanced replacement library for libraries like libXpm"
-HOMEPAGE="http://www.enlightenment.org/"
-
-KEYWORDS="alpha amd64 arm hppa ia64 ~mips ppc ppc64 sh sparc x86 ~x86-fbsd"
-IUSE="X bzip2 gif jpeg mmx mp3 png tiff zlib"
-
-DEPEND="=media-libs/freetype-2*
-	bzip2? ( app-arch/bzip2 )
-	zlib? ( sys-libs/zlib )
-	gif? ( >=media-libs/giflib-4.1.0 )
-	png? ( >=media-libs/libpng-1.2.1 )
-	jpeg? ( media-libs/jpeg )
-	tiff? ( >=media-libs/tiff-3.5.5 )
-	X? ( x11-libs/libXext x11-proto/xextproto )
-	mp3? ( media-libs/libid3tag )"
-
-src_compile() {
-	# imlib2 has diff configure options for x86/amd64 mmx
-	local myconf=""
-	if [[ $(tc-arch) == "amd64" ]] ; then
-		myconf="$(use_enable mmx amd64) --disable-mmx"
-	else
-		myconf="--disable-amd64 $(use_enable mmx)"
-	fi
-
-	[[ $(gcc-major-version) -ge 4 ]] && myconf="${myconf} --enable-visibility-hiding"
-
-	export MY_ECONF="
-		$(use_with X x) \
-		$(use_with jpeg) \
-		$(use_with png) \
-		$(use_with tiff) \
-		$(use_with gif) \
-		$(use_with zlib) \
-		$(use_with bzip2) \
-		$(use_with mp3 id3) \
-		${myconf} \
-	"
-	enlightenment_src_compile
-}