Pullup ticket 3022 - requested by taca

security update

Revisions pulled up:
- pkgsrc/graphics/netpbm/Makefile
- pkgsrc/graphics/netpbm/distinfo
- pkgsrc/graphics/netpbm/patches/patch-aa
- pkgsrc/graphics/netpbm/patches/patch-ao
- pkgsrc/graphics/netpbm/patches/patch-da
- pkgsrc/graphics/netpbm/patches/patch-db
- pkgsrc/graphics/netpbm/patches/patch-dd

Files added:
pkgsrc/graphics/netpbm/PLIST
pkgsrc/graphics/netpbm/patches/patch-ec

Files deleted:
pkgsrc/graphics/netpbm/patches/patch-ac
pkgsrc/graphics/netpbm/patches/patch-af
pkgsrc/graphics/netpbm/patches/patch-ag
pkgsrc/graphics/netpbm/patches/patch-ai
pkgsrc/graphics/netpbm/patches/patch-aj
pkgsrc/graphics/netpbm/patches/patch-ak
pkgsrc/graphics/netpbm/patches/patch-al
pkgsrc/graphics/netpbm/patches/patch-am
pkgsrc/graphics/netpbm/patches/patch-an
pkgsrc/graphics/netpbm/patches/patch-ap
pkgsrc/graphics/netpbm/patches/patch-aq
pkgsrc/graphics/netpbm/patches/patch-ar
pkgsrc/graphics/netpbm/patches/patch-as
pkgsrc/graphics/netpbm/patches/patch-at
pkgsrc/graphics/netpbm/patches/patch-au
pkgsrc/graphics/netpbm/patches/patch-av
pkgsrc/graphics/netpbm/patches/patch-az
pkgsrc/graphics/netpbm/patches/patch-ba
pkgsrc/graphics/netpbm/patches/patch-ca
pkgsrc/graphics/netpbm/patches/patch-ea

   --------------------------------------------------------------------
   Module Name:    pkgsrc
   Committed By:   drochner
   Date:           Fri Feb 19 18:25:44 UTC 2010

   Modified Files:
           pkgsrc/graphics/netpbm: Makefile distinfo
           pkgsrc/graphics/netpbm/patches: patch-aa patch-ao patch-da patch-db
               patch-dd
   Added Files:
           pkgsrc/graphics/netpbm: PLIST
           pkgsrc/graphics/netpbm/patches: patch-ec
   Removed Files:
           pkgsrc/graphics/netpbm/patches: patch-ac patch-af patch-ag patch-ai
               patch-aj patch-ak patch-al patch-am patch-an patch-ap patch-aq
               patch-ar patch-as patch-at patch-au patch-av patch-az patch-ba
               patch-ca patch-ea

   Log Message:
   update to 10.35.73
   changes: many bugfixes, especially:
    xpmtoppm: fix wild pointer with color index > 127.
    which fixes a stack-based buffer overflow (CVE-2009-4274)

   pkgsrc change: use a fixed PLIST instead of generating on install,
    helps to detect problems


   To generate a diff of this commit:
   cvs rdiff -u -r1.164 -r1.165 pkgsrc/graphics/netpbm/Makefile
   cvs rdiff -u -r0 -r1.6 pkgsrc/graphics/netpbm/PLIST
   cvs rdiff -u -r1.71 -r1.72 pkgsrc/graphics/netpbm/distinfo
   cvs rdiff -u -r1.39 -r1.40 pkgsrc/graphics/netpbm/patches/patch-aa
   cvs rdiff -u -r1.17 -r0 pkgsrc/graphics/netpbm/patches/patch-ac
   cvs rdiff -u -r1.12 -r0 pkgsrc/graphics/netpbm/patches/patch-af
   cvs rdiff -u -r1.18 -r0 pkgsrc/graphics/netpbm/patches/patch-ag
   cvs rdiff -u -r1.11 -r0 pkgsrc/graphics/netpbm/patches/patch-ai \
       pkgsrc/graphics/netpbm/patches/patch-aj
   cvs rdiff -u -r1.7 -r0 pkgsrc/graphics/netpbm/patches/patch-ak
   cvs rdiff -u -r1.3 -r0 pkgsrc/graphics/netpbm/patches/patch-al \
       pkgsrc/graphics/netpbm/patches/patch-am \
       pkgsrc/graphics/netpbm/patches/patch-an \
       pkgsrc/graphics/netpbm/patches/patch-ap \
       pkgsrc/graphics/netpbm/patches/patch-aq \
       pkgsrc/graphics/netpbm/patches/patch-ar \
       pkgsrc/graphics/netpbm/patches/patch-as \
       pkgsrc/graphics/netpbm/patches/patch-at \
       pkgsrc/graphics/netpbm/patches/patch-au
   cvs rdiff -u -r1.3 -r1.4 pkgsrc/graphics/netpbm/patches/patch-ao
   cvs rdiff -u -r1.4 -r0 pkgsrc/graphics/netpbm/patches/patch-av \
       pkgsrc/graphics/netpbm/patches/patch-az
   cvs rdiff -u -r1.5 -r0 pkgsrc/graphics/netpbm/patches/patch-ba
   cvs rdiff -u -r1.1 -r0 pkgsrc/graphics/netpbm/patches/patch-ca \
       pkgsrc/graphics/netpbm/patches/patch-ea
   cvs rdiff -u -r1.1 -r1.2 pkgsrc/graphics/netpbm/patches/patch-da \
       pkgsrc/graphics/netpbm/patches/patch-db \
       pkgsrc/graphics/netpbm/patches/patch-dd
   cvs rdiff -u -r0 -r1.1 pkgsrc/graphics/netpbm/patches/patch-ec

1 files changed, 2 insertions, 5 deletions

diff --git a/graphics/netpbm/Makefile b/graphics/netpbm/Makefile
index 394f9839607..06daed3ca30 100644
--- a/graphics/netpbm/Makefile
+++ b/graphics/netpbm/Makefile
@@ -1,7 +1,6 @@
-# $NetBSD: Makefile,v 1.163 2009/08/26 19:56:52 sno Exp $
+# $NetBSD: Makefile,v 1.163.4.1 2010/02/25 08:43:28 spz Exp $
 
-DISTNAME=	netpbm-10.34
-PKGREVISION=	3
+DISTNAME=	netpbm-10.35.73
 CATEGORIES=	graphics
 MASTER_SITES=	${MASTER_SITE_SOURCEFORGE:=netpbm/}
 EXTRACT_SUFX=	.tgz
@@ -22,7 +21,6 @@ INSTALL_TARGET=	install-dev install-run
 MAKE_ENV+=	INSTALL=${INSTALL:Q} STRIPFLAG=${_STRIPFLAG_INSTALL:Q} \
 		pkgdir=${STAGEDIR:Q} MACHINE=${MACHINE:Q}
 MAKE_FILE=	GNUmakefile
-PLIST_SRC=	${WRKDIR}/PLIST_STAGE
 REPLACE_PERL+=	editor/ppmfade editor/ppmshadow editor/pnmquant \
 		generator/ppmrainbow manweb editor/pnmflip editor/ppmquant
 STAGEDIR=	${WRKDIR}/staging
@@ -90,7 +88,6 @@ post-install:
 	${MV} share/doc/netpbm/*.1	${PKGMANDIR}/man1 &&	\
 	${MV} misc share/netpbm && 				\
 	${CHOWN} -R ${BINOWN}:${BINGRP} . &&			\
-	${FIND} * \! -type d -print | ${SORT} >${PLIST_SRC} &&	\
 	pax -rwpppm . ${DESTDIR}${PREFIX}
 	${RM} -fr ${STAGEDIR}
 	${FIND} ${DESTDIR}${PREFIX}/share/doc/netpbm -type f -print |	\