Fix segfault in pnmtopng #117180 by rgo and grab a patch from Fedora for giftopnm.

(Portage version: 2.1_pre2)

5 files changed, 163 insertions, 1 deletions

diff --git a/media-libs/netpbm/ChangeLog b/media-libs/netpbm/ChangeLog
index 5481f911b183..b9e72ae83a6b 100644
--- a/media-libs/netpbm/ChangeLog
+++ b/media-libs/netpbm/ChangeLog
@@ -1,6 +1,15 @@
 # ChangeLog for media-libs/netpbm
 # Copyright 1999-2005 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/media-libs/netpbm/ChangeLog,v 1.99 2005/12/28 20:31:32 vapier Exp $
+# $Header: /var/cvsroot/gentoo-x86/media-libs/netpbm/ChangeLog,v 1.100 2005/12/31 02:22:20 vapier Exp $
+
+*netpbm-10.31-r1 (31 Dec 2005)
+
+  31 Dec 2005; Mike Frysinger <vapier@gentoo.org>
+  +files/netpbm-10.19-message.patch,
+  +files/netpbm-10.31-pnmtopng-modtime-segfault.patch,
+  +netpbm-10.31-r1.ebuild:
+  Fix segfault in pnmtopng #117180 by rgo and grab a patch from Fedora for
+  giftopnm.
 
 *netpbm-10.26.22 (28 Dec 2005)
 
diff --git a/media-libs/netpbm/files/digest-netpbm-10.31-r1 b/media-libs/netpbm/files/digest-netpbm-10.31-r1
new file mode 100644
index 000000000000..f78109f5f80c
--- /dev/null
+++ b/media-libs/netpbm/files/digest-netpbm-10.31-r1
@@ -0,0 +1,2 @@
+MD5 2d90a47369f74692aa24b773dfd6a122 netpbm-10.30-manpages.tar.bz2 233254
+MD5 6ba2e0ee998eb23f4620ec9c175a90b6 netpbm-10.31.tgz 2383586
diff --git a/media-libs/netpbm/files/netpbm-10.19-message.patch b/media-libs/netpbm/files/netpbm-10.19-message.patch
new file mode 100644
index 000000000000..10a57442a8d8
--- /dev/null
+++ b/media-libs/netpbm/files/netpbm-10.19-message.patch
@@ -0,0 +1,12 @@
+--- netpbm-10.19/converter/other/giftopnm.c.message	2003-10-30 02:46:12.000000000 +0100
++++ netpbm-10.19/converter/other/giftopnm.c	2004-02-09 17:02:56.964219996 +0100
+@@ -1255,7 +1255,8 @@
+                          requestedImageSeq+1,
+                          imageSeq, imageSeq>1?"s":"" );
+         } else {
+-            pm_message("Reading Image Sequence %d", imageSeq);
++            if (verbose)
++                pm_message("Reading Image Sequence %d", imageSeq+1);
+             convertImage(ifP, !allImages && (imageSeq != requestedImageSeq), 
+                          imageout_file, alphafile, gifScreen, gif89);
+         }
diff --git a/media-libs/netpbm/files/netpbm-10.31-pnmtopng-modtime-segfault.patch b/media-libs/netpbm/files/netpbm-10.31-pnmtopng-modtime-segfault.patch
new file mode 100644
index 000000000000..ba81837d3f5d
--- /dev/null
+++ b/media-libs/netpbm/files/netpbm-10.31-pnmtopng-modtime-segfault.patch
@@ -0,0 +1,24 @@
+Fix segfault when running `pnmtopng`
+
+http://bugs.gentoo.org/117180
+
+--- netpbm-10.31/converter/other/pnmtopng.c
++++ netpbm-10.31/converter/other/pnmtopng.c
+@@ -267,7 +267,7 @@ parseCommandLine (int argc, char ** argv
+     unsigned int option_def_index;
+ 
+     unsigned int alphaSpec, transparentSpec, backgroundSpec;
+-    unsigned int textSpec, ztxtSpec, modtimeSpec, paletteSpec;
++    unsigned int textSpec, ztxtSpec, paletteSpec;
+     unsigned int filterSpec;
+ 
+     unsigned int nofilter, sub, up, avg, paeth, filter;
+@@ -296,7 +296,7 @@ parseCommandLine (int argc, char ** argv
+     OPTENT3(0, "ztxt",             OPT_STRING,    &cmdlineP->ztxt,
+             &ztxtSpec,             0);
+     OPTENT3(0, "modtime",          OPT_STRING,    &modtime,
+-            &modtimeSpec,          0);
++            &cmdlineP->modtimeSpec,0);
+     OPTENT3(0, "palette",          OPT_STRING,    &cmdlineP->palette,
+             &paletteSpec,          0);
+     OPTENT3(0, "compression",      OPT_UINT,
diff --git a/media-libs/netpbm/netpbm-10.31-r1.ebuild b/media-libs/netpbm/netpbm-10.31-r1.ebuild
new file mode 100644
index 000000000000..8605ffc494ed
--- /dev/null
+++ b/media-libs/netpbm/netpbm-10.31-r1.ebuild
@@ -0,0 +1,115 @@
+# Copyright 1999-2005 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Header: /var/cvsroot/gentoo-x86/media-libs/netpbm/netpbm-10.31-r1.ebuild,v 1.1 2005/12/31 02:22:20 vapier Exp $
+
+inherit flag-o-matic toolchain-funcs eutils multilib
+
+MAN_VER=10.30
+DESCRIPTION="A set of utilities for converting to/from the netpbm (and related) formats"
+HOMEPAGE="http://netpbm.sourceforge.net/"
+SRC_URI="mirror://sourceforge/${PN}/${P}.tgz
+	mirror://gentoo/${PN}-${MAN_VER}-manpages.tar.bz2"
+
+LICENSE="GPL-2"
+SLOT="0"
+KEYWORDS="~alpha ~amd64 ~arm ~hppa ~ia64 ~mips ~ppc ~ppc64 ~sparc ~x86"
+IUSE="svga jpeg tiff png zlib"
+
+DEPEND="jpeg? ( >=media-libs/jpeg-6b )
+	tiff? ( >=media-libs/tiff-3.5.5 )
+	png? ( >=media-libs/libpng-1.2.1 )
+	zlib? ( sys-libs/zlib )
+	svga? ( media-libs/svgalib )
+	media-libs/jbigkit
+	media-libs/jasper
+	media-libs/urt"
+
+netpbm_libtype() {
+	case ${CHOST} in
+		*-darwin*) echo dylib;;
+		*)         echo unixshared;;
+	esac
+}
+netpbm_libsuffix() {
+	local suffix=$(get_libname)
+	echo ${suffix//\.}
+}
+netpbm_ldshlib() {
+	case ${CHOST} in
+		*-darwin*) echo '-dynamiclib -install_name $(SONAME)';;
+		*)         echo '-shared -Wl,-soname,$(SONAME)';;
+	esac
+}
+netpbm_config() {
+	use $1 && echo -l${2:-$1} || echo NONE
+}
+
+src_unpack() {
+	unpack ${A}
+	cd "${S}"
+
+	epatch "${FILESDIR}"/netpbm-10.31-build.patch
+	epatch "${FILESDIR}"/netpbm-10.30-tifftopnm.patch
+	epatch "${FILESDIR}"/netpbm-10.31-pnmtopng-modtime-segfault.patch #117180
+	epatch "${FILESDIR}"/netpbm-10.19-message.patch #Fedora
+
+	rm -f configure
+	cp Makefile.config.in Makefile.config
+	cat >> Makefile.config <<-EOF
+	# Gentoo toolchain options
+	CC = $(tc-getCC)
+	CC_FOR_BUILD = $(tc-getBUILD_CC)
+	AR = $(tc-getAR)
+	RANLIB = $(tc-getRANLIB)
+	STRIPFLAG =
+	CFLAGS_SHLIB = -fPIC
+
+	NETPBMLIBTYPE = $(netpbm_libtype)
+	NETPBMLIBSUFFIX = $(netpbm_libsuffix)
+	LDSHLIB = $(netpbm_ldshlib)
+
+	# Gentoo build options
+	TIFFLIB = $(netpbm_config tiff)
+	JPEGLIB = $(netpbm_config jpeg)
+	PNGLIB = $(netpbm_config png)
+	ZLIB = $(netpbm_config zlib z)
+	LINUXSVGALIB = $(netpbm_config svga vga)
+
+	# Use system versions instead of bundled
+	JBIGLIB = -ljbig
+	JBIGHDR_DIR =
+	JASPERLIB = -ljasper
+	JASPERHDR_DIR =
+	URTLIB = -lrle
+	URTHDR_DIR =
+	EOF
+	append-flags -Wall
+
+	# Sparc support ...
+	replace-flags -mcpu=ultrasparc "-mcpu=v8 -mtune=ultrasparc"
+	replace-flags -mcpu=v9 "-mcpu=v8 -mtune=v9"
+}
+
+src_install() {
+	make package pkgdir="${D}"/usr || die "make package failed"
+
+	[[ $(get_libdir) != "lib" ]] && mv "${D}"/usr/lib "${D}"/usr/$(get_libdir)
+
+	# Remove cruft that we don't need, and move around stuff we want
+	rm -f "${D}"/usr/bin/{doc.url,manweb}
+	rm -rf "${D}"/usr/man/web
+	rm -rf "${D}"/usr/link
+	rm -f "${D}"/usr/{README,VERSION,config_template,pkginfo}
+	dodir /usr/share
+	mv "${D}"/usr/man "${D}"/usr/share/
+	mv "${D}"/usr/misc "${D}"/usr/share/netpbm
+
+	dodoc README
+	cd doc
+	GLOBIGNORE='*.html:.*' dodoc *
+	dohtml -r .
+
+	cd "${WORKDIR}"/${PN}-${MAN_VER}-manpages || die
+	doman *.[0-9]
+	dodoc README* gen-netpbm-manpages
+}