fix giffix segfault, by Heath Caldwell in bug #236749; remove old

(Portage version: 2.2_rc8/cvs/Linux 2.6.27-rc5 i686)

4 files changed, 73 insertions, 47 deletions

diff --git a/media-libs/giflib/ChangeLog b/media-libs/giflib/ChangeLog
index 8d1cff6baa4a..50e10b9aa2a2 100644
--- a/media-libs/giflib/ChangeLog
+++ b/media-libs/giflib/ChangeLog
@@ -1,6 +1,13 @@
 # ChangeLog for media-libs/giflib
 # Copyright 1999-2008 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/media-libs/giflib/ChangeLog,v 1.53 2008/02/22 07:15:13 lu_zero Exp $
+# $Header: /var/cvsroot/gentoo-x86/media-libs/giflib/ChangeLog,v 1.54 2008/09/07 15:00:30 maekke Exp $
+
+*giflib-4.1.6-r1 (07 Sep 2008)
+
+  07 Sep 2008; Markus Meier <maekke@gentoo.org>
+  +files/giflib-4.1.6-giffix-null-Extension-fix.patch, -giflib-4.1.4.ebuild,
+  +giflib-4.1.6-r1.ebuild:
+  fix giffix segfault, by Heath Caldwell in bug #236749; remove old
 
   22 Feb 2008; Luca Barbato <lu_zero@gentoo.org> giflib-4.1.6.ebuild:
   fix urt check and clarify, thanks to jakub for pointing it
diff --git a/media-libs/giflib/files/giflib-4.1.6-giffix-null-Extension-fix.patch b/media-libs/giflib/files/giflib-4.1.6-giffix-null-Extension-fix.patch
new file mode 100644
index 000000000000..3e99e66c0d15
--- /dev/null
+++ b/media-libs/giflib/files/giflib-4.1.6-giffix-null-Extension-fix.patch
@@ -0,0 +1,15 @@
+diff -ru giflib-4.1.6/util/giffix.c giflib-4.1.6.new/util/giffix.c
+--- giflib-4.1.6/util/giffix.c	2005-10-09 23:22:23.000000000 -0700
++++ giflib-4.1.6.new/util/giffix.c	2008-09-04 14:00:41.000000000 -0700
+@@ -181,8 +181,8 @@
+ 		/* Skip any extension blocks in file: */
+ 		if (DGifGetExtension(GifFileIn, &ExtCode, &Extension) == GIF_ERROR)
+ 		    QuitGifError(GifFileIn, GifFileOut);
+-		if (EGifPutExtension(GifFileOut, ExtCode, Extension[0],
+-							Extension) == GIF_ERROR)
++		if (Extension && EGifPutExtension(GifFileOut, ExtCode,
++					Extension[0], Extension) == GIF_ERROR)
+ 		    QuitGifError(GifFileIn, GifFileOut);
+ 
+ 		/* No support to more than one extension blocks, so discard: */
+
diff --git a/media-libs/giflib/giflib-4.1.4.ebuild b/media-libs/giflib/giflib-4.1.4.ebuild
deleted file mode 100644
index 13e792c9e167..000000000000
--- a/media-libs/giflib/giflib-4.1.4.ebuild
+++ /dev/null
@@ -1,46 +0,0 @@
-# Copyright 1999-2007 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/media-libs/giflib/giflib-4.1.4.ebuild,v 1.15 2007/07/22 09:40:53 dberkholz Exp $
-
-inherit eutils libtool
-
-DESCRIPTION="Library to handle, display and manipulate GIF images"
-HOMEPAGE="http://sourceforge.net/projects/libungif/"
-SRC_URI="mirror://sourceforge/libungif/${P}.tar.gz"
-
-LICENSE="MIT"
-SLOT="0"
-KEYWORDS="alpha amd64 arm hppa ia64 m68k mips ppc ppc64 s390 sh sparc x86 ~x86-fbsd"
-IUSE="rle X"
-
-DEPEND="X? ( x11-libs/libXt
-		x11-libs/libX11
-		x11-libs/libICE
-		x11-libs/libSM
-	)
-	rle? ( media-libs/urt )
-	!media-libs/libungif"
-
-src_unpack() {
-	unpack ${A}
-	elibtoolize
-	epunt_cxx
-}
-
-yesno() { use $1 && echo yes || echo no ; }
-src_compile() {
-	export \
-		ac_cv_lib_gl_s_main=no \
-		ac_cv_lib_rle_rle_hdr_init=$(yesno rle) \
-		ac_cv_lib_X11_main=$(yesno X)
-	# prevent circular depend #111455
-	has_version media-libs/urt || export ac_cv_lib_rle_rle_hdr_init=no
-	econf || die
-	emake || die "emake failed"
-}
-
-src_install() {
-	make DESTDIR="${D}" install || die "make install failed"
-	dodoc AUTHORS BUGS ChangeLog NEWS ONEWS README TODO doc/*.txt
-	dohtml -r doc
-}
diff --git a/media-libs/giflib/giflib-4.1.6-r1.ebuild b/media-libs/giflib/giflib-4.1.6-r1.ebuild
new file mode 100644
index 000000000000..2f3d99157574
--- /dev/null
+++ b/media-libs/giflib/giflib-4.1.6-r1.ebuild
@@ -0,0 +1,50 @@
+# Copyright 1999-2008 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Header: /var/cvsroot/gentoo-x86/media-libs/giflib/giflib-4.1.6-r1.ebuild,v 1.1 2008/09/07 15:00:30 maekke Exp $
+
+inherit eutils libtool
+
+DESCRIPTION="Library to handle, display and manipulate GIF images"
+HOMEPAGE="http://sourceforge.net/projects/giflib/"
+SRC_URI="mirror://sourceforge/giflib/${P}.tar.bz2"
+
+LICENSE="MIT"
+SLOT="0"
+KEYWORDS="~alpha ~amd64 ~arm ~hppa ~ia64 ~m68k ~mips ~ppc ~ppc64 ~s390 ~sh ~sparc ~x86 ~x86-fbsd"
+IUSE="rle X"
+
+DEPEND="!media-libs/libungif
+	X? (
+		x11-libs/libXt
+		x11-libs/libX11
+		x11-libs/libICE
+		x11-libs/libSM
+	)
+	rle? ( media-libs/urt )"
+
+src_unpack() {
+	unpack ${A}
+	cd "${S}"
+	epatch "${FILESDIR}"/${P}-gif2rle.patch
+	epatch "${FILESDIR}"/${P}-giffix-null-Extension-fix.patch
+	elibtoolize
+	epunt_cxx
+}
+
+src_compile() {
+	local myconf="--disable-gl $(use_enable X x11)"
+	# prevent circular depend #111455
+	if has_version media-libs/urt ; then
+		myconf="${myconf} $(use_enable rle)"
+	else
+		myconf="${myconf} --disable-rle"
+	fi
+	econf ${myconf}
+	emake || die "emake failed"
+}
+
+src_install() {
+	emake DESTDIR="${D}" install || die "make install failed"
+	dodoc AUTHORS BUGS ChangeLog NEWS ONEWS README TODO doc/*.txt
+	dohtml -r doc
+}