revision bump wrt security bug #292130

(Portage version: 2.2_rc49/cvs/Linux i686)

3 files changed, 67 insertions, 1 deletions

diff --git a/media-libs/gd/ChangeLog b/media-libs/gd/ChangeLog
index 7df87e70f245..4ceaae9fb252 100644
--- a/media-libs/gd/ChangeLog
+++ b/media-libs/gd/ChangeLog
@@ -1,6 +1,12 @@
 # ChangeLog for media-libs/gd
 # Copyright 1999-2009 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/media-libs/gd/ChangeLog,v 1.54 2009/05/29 21:00:48 vapier Exp $
+# $Header: /var/cvsroot/gentoo-x86/media-libs/gd/ChangeLog,v 1.55 2009/11/09 12:59:47 maekke Exp $
+
+*gd-2.0.35-r1 (09 Nov 2009)
+
+  09 Nov 2009; Markus Meier <maekke@gentoo.org> +gd-2.0.35-r1.ebuild,
+  +files/gd-2.0.35-maxcolors.patch:
+  revision bump wrt security bug #292130
 
   29 May 2009; Mike Frysinger <vapier@gentoo.org> -gd-2.0.34.ebuild:
   Punt due to GLSA 200708-05 vuln #271688 by Robert Buchholz.
diff --git a/media-libs/gd/files/gd-2.0.35-maxcolors.patch b/media-libs/gd/files/gd-2.0.35-maxcolors.patch
new file mode 100644
index 000000000000..0e3039ad3b4f
--- /dev/null
+++ b/media-libs/gd/files/gd-2.0.35-maxcolors.patch
@@ -0,0 +1,14 @@
+diff -ru gd-2.0.35.orig/gd_gd.c gd-2.0.35/gd_gd.c
+--- gd-2.0.35.orig/gd_gd.c	2006-04-05 17:52:22.000000000 +0200
++++ gd-2.0.35/gd_gd.c	2009-11-09 11:57:01.000000000 +0100
+@@ -44,6 +44,10 @@
+ 	    {
+ 	      goto fail1;
+ 	    }
++	  if (im->colorsTotal > gdMaxColors)
++	    {
++		   goto fail1;
++		 }
+ 	}
+       /* Int to accommodate truecolor single-color transparency */
+       if (!gdGetInt (&im->transparent, in))
diff --git a/media-libs/gd/gd-2.0.35-r1.ebuild b/media-libs/gd/gd-2.0.35-r1.ebuild
new file mode 100644
index 000000000000..731a98b36e07
--- /dev/null
+++ b/media-libs/gd/gd-2.0.35-r1.ebuild
@@ -0,0 +1,46 @@
+# Copyright 1999-2009 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Header: /var/cvsroot/gentoo-x86/media-libs/gd/gd-2.0.35-r1.ebuild,v 1.1 2009/11/09 12:59:47 maekke Exp $
+
+inherit autotools
+
+DESCRIPTION="A graphics library for fast image creation"
+HOMEPAGE="http://libgd.org/"
+SRC_URI="http://libgd.org/releases/${P}.tar.bz2"
+
+LICENSE="|| ( as-is BSD )"
+SLOT="2"
+KEYWORDS="~alpha ~amd64 ~arm ~hppa ~ia64 ~m68k ~mips ~ppc ~ppc64 ~s390 ~sh ~sparc ~x86 ~sparc-fbsd ~x86-fbsd"
+IUSE="fontconfig jpeg png truetype xpm"
+
+RDEPEND="fontconfig? ( media-libs/fontconfig )
+	jpeg? ( >=media-libs/jpeg-6b )
+	png? ( >=media-libs/libpng-1.2.5 sys-libs/zlib )
+	truetype? ( >=media-libs/freetype-2.1.5 )
+	xpm? ( x11-libs/libXpm x11-libs/libXt )"
+DEPEND="${RDEPEND}"
+
+src_unpack() {
+	unpack ${A}
+	cd "${S}"
+	epatch "${FILESDIR}"/${P}-maxcolors.patch
+	eautoconf
+	find . -type f -print0 | xargs -0 touch -r configure
+}
+
+src_compile() {
+	econf \
+		$(use_with fontconfig) \
+		$(use_with png) \
+		$(use_with truetype freetype) \
+		$(use_with jpeg) \
+		$(use_with xpm) \
+		|| die
+	emake || die
+}
+
+src_install() {
+	emake DESTDIR="${D}" install || die
+	dodoc INSTALL README*
+	dohtml -r ./
+}