Version bump due security bug #100398

(Portage version: 2.0.51.22-r2)

5 files changed, 122 insertions, 3 deletions

diff --git a/media-libs/netpbm/ChangeLog b/media-libs/netpbm/ChangeLog
index f998eaae06d0..3f6cd08a7268 100644
--- a/media-libs/netpbm/ChangeLog
+++ b/media-libs/netpbm/ChangeLog
@@ -1,6 +1,12 @@
 # ChangeLog for media-libs/netpbm
 # Copyright 2002-2005 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/media-libs/netpbm/ChangeLog,v 1.54 2005/07/02 01:00:31 hardave Exp $
+# $Header: /var/cvsroot/gentoo-x86/media-libs/netpbm/ChangeLog,v 1.55 2005/07/30 20:50:33 sekretarz Exp $
+
+*netpbm-10.28 (30 Jul 2005)
+
+  30 Jul 2005; <sekretarz@gentoo.org> +files/netpbm-dSAFER.patch,
+  netpbm-10.20-r1.ebuild, +netpbm-10.28.ebuild:
+  Version bump due security bug #100398
 
   02 Jul 2005; Hardave Riar <hardave@gentoo.org> netpbm-10.20.ebuild:
   Stable on mips
diff --git a/media-libs/netpbm/files/digest-netpbm-10.28 b/media-libs/netpbm/files/digest-netpbm-10.28
new file mode 100644
index 000000000000..997a64badc55
--- /dev/null
+++ b/media-libs/netpbm/files/digest-netpbm-10.28
@@ -0,0 +1 @@
+MD5 18ed6d0f1adf75a748df55d5e924fabb netpbm-10.28.tgz 2324750
diff --git a/media-libs/netpbm/files/netpbm-dSAFER.patch b/media-libs/netpbm/files/netpbm-dSAFER.patch
new file mode 100644
index 000000000000..d6a99b4bc275
--- /dev/null
+++ b/media-libs/netpbm/files/netpbm-dSAFER.patch
@@ -0,0 +1,16 @@
+--- netpbm-10.20/converter/other/pstopnm.c~	2005-06-02 16:20:03.205694176 +0200
++++ netpbm-10.20/converter/other/pstopnm.c	2005-06-02 16:24:24.978262856 +0200
+@@ -568,11 +568,11 @@
+         pm_message("execing '%s' with args '%s' (arg 0), "
+                    "'%s', '%s', '%s', '%s', '%s', '%s', '%s'",
+                    ghostscriptProg, arg0,
+-                   deviceopt, outfileopt, gopt, ropt, "-q", "-dNOPAUSE", "-");
++                   deviceopt, outfileopt, gopt, ropt, "-q", "-dNOPAUSE", "-dSAFER",  "-");
+     }
+ 
+     execl(ghostscriptProg, arg0, deviceopt, outfileopt, gopt, ropt, "-q",
+-          "-dNOPAUSE", "-", NULL);
++          "-dNOPAUSE", "-dSAFER", "-", NULL);
+     
+     pm_error("execl() of Ghostscript ('%s') failed, errno=%d (%s)",
+              ghostscriptProg, errno, strerror(errno));
diff --git a/media-libs/netpbm/netpbm-10.20-r1.ebuild b/media-libs/netpbm/netpbm-10.20-r1.ebuild
index f8013d763539..9b292e44dc4e 100644
--- a/media-libs/netpbm/netpbm-10.20-r1.ebuild
+++ b/media-libs/netpbm/netpbm-10.20-r1.ebuild
@@ -1,8 +1,8 @@
 # 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.20-r1.ebuild,v 1.1 2005/06/22 21:57:01 agriffis Exp $
+# $Header: /var/cvsroot/gentoo-x86/media-libs/netpbm/netpbm-10.20-r1.ebuild,v 1.2 2005/07/30 20:50:33 sekretarz Exp $
 
-inherit flag-o-matic toolchain-funcs
+inherit flag-o-matic toolchain-funcs eutils
 
 DESCRIPTION="A set of utilities for converting to/from the netpbm (and related) formats"
 HOMEPAGE="http://netpbm.sourceforge.net/"
@@ -55,6 +55,8 @@ src_unpack() {
 		lib/Makefile
 	 sed -i -e 's:$(CCOPT):$(CCOPT) -fPIC:' \
 	 	lib/util/Makefile
+
+	epatch ${FILESDIR}/${PN}-dSAFER.patch
 }
 
 src_compile() {
diff --git a/media-libs/netpbm/netpbm-10.28.ebuild b/media-libs/netpbm/netpbm-10.28.ebuild
new file mode 100644
index 000000000000..d48050666f6a
--- /dev/null
+++ b/media-libs/netpbm/netpbm-10.28.ebuild
@@ -0,0 +1,94 @@
+# 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.28.ebuild,v 1.1 2005/07/30 20:50:33 sekretarz Exp $
+
+inherit flag-o-matic toolchain-funcs eutils
+
+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"
+
+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 )"
+
+src_unpack() {
+	unpack ${A}
+	cd ${S}
+	cp Makefile.config.in Makefile.config
+
+	if use svga ; then
+		echo "LINUXSVGAHDR_DIR = /usr/include" >> Makefile.config
+		echo "LINUXSVGALIB = /usr/$(get_libdir)/libvga.so" >> Makefile.config
+	fi
+
+	if use jpeg ; then
+		echo "JPEGLIB = libjpeg.so" >> Makefile.config
+	fi
+
+	if use png ; then
+		echo "PNGLIB = libpng.so" >> Makefile.config
+	fi
+
+	if use tiff ; then
+		echo "TIFFLIB = libtiff.so" >> Makefile.config
+	fi
+
+	if use zlib ; then
+		echo "ZLIB = libz.so" >> Makefile.config
+	fi
+
+	# Sparc support ...
+	replace-flags "-mcpu=ultrasparc" "-mcpu=v8 -mtune=ultrasparc"
+	replace-flags "-mcpu=v9" "-mcpu=v8 -mtune=v9"
+
+	sed -i \
+		-e 's:$(CFLAGS):$(CFLAGS) -fPIC:' \
+		-e 's:$(LDFLAGS):$(LDFLAGS) -fPIC:' \
+		lib/Makefile
+	 sed -i -e 's:$(CCOPT):$(CCOPT) -fPIC:' \
+	 	lib/util/Makefile
+
+	epatch ${FILESDIR}/${PN}-dSAFER.patch
+}
+
+src_compile() {
+	emake -j1 CC="$(tc-getCC)" CXX="$(tc-getCXX)" || die "emake failed"
+}
+
+src_install() {
+	make package pkgdir=${D}/usr/ || die "make package failed"
+
+	if [ "$(get_libdir)" != "lib" ]; then
+		mv ${D}/usr/lib ${D}/usr/$(get_libdir)
+	fi
+
+	# Fix symlink not being created.
+	dosym `basename ${D}/usr/$(get_libdir)/libnetpbm.so.*` /usr/$(get_libdir)/libnetpbm.so
+
+	rm -rf ${D}/usr/bin/doc.url
+	rm -rf ${D}/usr/man/web
+	rm -rf ${D}/usr/link
+	rm -rf ${D}/usr/README
+	rm -rf ${D}/usr/VERSION
+	rm -rf ${D}/usr/pkginfo
+	dodir /usr/share
+	mv ${D}/usr/man ${D}/usr/share/man
+
+	# Install the maps in /usr/share/netpbm so other programs (like plucker) can
+	# use them.  #77797
+	mv ${D}/usr/misc ${D}/usr/share/netpbm
+
+	dodoc README
+	export GLOBIGNORE='*.html:.*'
+	cd doc && \
+		dodoc * && \
+		dohtml -r . || die "doc install failed"
+}