[pkgsrc/pkgsrc-2009Q4]: pkgsrc/graphics/netpbm Pullup ticket 3022 - requested...

[spz <spz%pkgsrc.org@localhost>]

details:   https://anonhg.NetBSD.org/pkgsrc/rev/38a8ed67751d
branches:  pkgsrc-2009Q4
changeset: 569274:38a8ed67751d
user:      spz <spz%pkgsrc.org@localhost>
date:      Thu Feb 25 08:43:28 2010 +0000

description:
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

diffstat:

 graphics/netpbm/Makefile         |    7 +-
 graphics/netpbm/PLIST            |  671 +++++++++++++++++++++++++++++++++++++++
 graphics/netpbm/distinfo         |   39 +-
 graphics/netpbm/patches/patch-aa |   51 +-
 graphics/netpbm/patches/patch-ac |   22 -
 graphics/netpbm/patches/patch-af |   25 -
 graphics/netpbm/patches/patch-ag |   14 -
 graphics/netpbm/patches/patch-ai |   13 -
 graphics/netpbm/patches/patch-aj |   13 -
 graphics/netpbm/patches/patch-ak |   31 -
 graphics/netpbm/patches/patch-al |   13 -
 graphics/netpbm/patches/patch-am |   22 -
 graphics/netpbm/patches/patch-an |   31 -
 graphics/netpbm/patches/patch-ao |   15 +-
 graphics/netpbm/patches/patch-ap |   13 -
 graphics/netpbm/patches/patch-aq |   13 -
 graphics/netpbm/patches/patch-ar |   13 -
 graphics/netpbm/patches/patch-as |   19 -
 graphics/netpbm/patches/patch-at |   13 -
 graphics/netpbm/patches/patch-au |   44 --
 graphics/netpbm/patches/patch-av |   24 -
 graphics/netpbm/patches/patch-az |   13 -
 graphics/netpbm/patches/patch-ba |   61 ---
 graphics/netpbm/patches/patch-ca |   12 -
 graphics/netpbm/patches/patch-da |   12 +-
 graphics/netpbm/patches/patch-db |   12 +-
 graphics/netpbm/patches/patch-dd |   12 +-
 graphics/netpbm/patches/patch-ea |   39 --
 graphics/netpbm/patches/patch-ec |   17 +
 29 files changed, 749 insertions(+), 535 deletions(-)

diffs (truncated from 1570 to 300 lines):

diff -r 790f81b8ee0c -r 38a8ed67751d graphics/netpbm/Makefile
--- a/graphics/netpbm/Makefile  Wed Feb 24 14:47:15 2010 +0000
+++ b/graphics/netpbm/Makefile  Thu Feb 25 08:43:28 2010 +0000
@@ -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 @@
 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 @@
        ${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 |   \
diff -r 790f81b8ee0c -r 38a8ed67751d graphics/netpbm/PLIST
--- /dev/null   Thu Jan 01 00:00:00 1970 +0000
+++ b/graphics/netpbm/PLIST     Thu Feb 25 08:43:28 2010 +0000
@@ -0,0 +1,671 @@
+@comment $NetBSD: PLIST,v 1.5.46.1 2010/02/25 08:43:28 spz Exp $
+bin/411toppm
+bin/anytopnm
+bin/asciitopgm
+bin/atktopbm
+bin/bioradtopgm
+bin/bmptopnm
+bin/bmptoppm
+bin/brushtopbm
+bin/cameratopam
+bin/cmuwmtopbm
+bin/ddbugtopbm
+bin/doc.url
+bin/escp2topbm
+bin/eyuvtoppm
+bin/fiascotopnm
+bin/fitstopnm
+bin/fstopgm
+bin/g3topbm
+bin/gemtopbm
+bin/gemtopnm
+bin/giftopnm
+bin/gouldtoppm
+bin/hdifftopam
+bin/hipstopgm
+bin/hpcdtoppm
+bin/icontopbm
+bin/ilbmtoppm
+bin/imgtoppm
+bin/infotopam
+bin/jbigtopnm
+bin/jpeg2ktopam
+bin/jpegtopnm
+bin/leaftoppm
+bin/lispmtopgm
+bin/macptopbm
+bin/manweb
+bin/mdatopbm
+bin/mgrtopbm
+bin/mrftopbm
+bin/mtvtoppm
+bin/neotoppm
+bin/palmtopnm
+bin/pamaddnoise
+bin/pamarith
+bin/pambayer
+bin/pamchannel
+bin/pamcomp
+bin/pamcut
+bin/pamdeinterlace
+bin/pamdepth
+bin/pamdice
+bin/pamditherbw
+bin/pamedge
+bin/pamendian
+bin/pamenlarge
+bin/pamfile
+bin/pamflip
+bin/pamfunc
+bin/pamgauss
+bin/pamgradient
+bin/pamlookup
+bin/pammasksharpen
+bin/pammixinterlace
+bin/pamoil
+bin/pamperspective
+bin/pampick
+bin/pampop9
+bin/pamrgbatopng
+bin/pamscale
+bin/pamseq
+bin/pamsharpmap
+bin/pamsharpness
+bin/pamslice
+bin/pamsplit
+bin/pamstack
+bin/pamstereogram
+bin/pamstretch
+bin/pamstretch-gen
+bin/pamsumm
+bin/pamsummcol
+bin/pamthreshold
+bin/pamtilt
+bin/pamtodjvurle
+bin/pamtofits
+bin/pamtohdiff
+bin/pamtohtmltbl
+bin/pamtojpeg2k
+bin/pamtopfm
+bin/pamtopnm
+bin/pamtosvg
+bin/pamtotga
+bin/pamtotiff
+bin/pamtouil
+bin/pamtoxvmini
+bin/pbmclean
+bin/pbmlife
+bin/pbmmake
+bin/pbmmask
+bin/pbmpage
+bin/pbmpscale
+bin/pbmreduce
+bin/pbmtext
+bin/pbmtextps
+bin/pbmto10x
+bin/pbmto4425
+bin/pbmtoascii
+bin/pbmtoatk
+bin/pbmtobbnbg
+bin/pbmtocmuwm
+bin/pbmtodjvurle
+bin/pbmtoepsi
+bin/pbmtoepson
+bin/pbmtoescp2
+bin/pbmtog3
+bin/pbmtogem
+bin/pbmtogo
+bin/pbmtoibm23xx
+bin/pbmtoicon
+bin/pbmtolj
+bin/pbmtoln03
+bin/pbmtolps
+bin/pbmtomacp
+bin/pbmtomatrixorbital
+bin/pbmtomda
+bin/pbmtomgr
+bin/pbmtomrf
+bin/pbmtonokia
+bin/pbmtopgm
+bin/pbmtopi3
+bin/pbmtopk
+bin/pbmtoplot
+bin/pbmtoppa
+bin/pbmtopsg3
+bin/pbmtoptx
+bin/pbmtowbmp
+bin/pbmtox10bm
+bin/pbmtoxbm
+bin/pbmtoybm
+bin/pbmtozinc
+bin/pbmupc
+bin/pc1toppm
+bin/pcdovtoppm
+bin/pcxtoppm
+bin/pfmtopam
+bin/pgmabel
+bin/pgmbentley
+bin/pgmcrater
+bin/pgmdeshadow
+bin/pgmedge
+bin/pgmenhance
+bin/pgmhist
+bin/pgmkernel
+bin/pgmmake
+bin/pgmmedian
+bin/pgmminkowski
+bin/pgmmorphconv
+bin/pgmnoise
+bin/pgmnorm
+bin/pgmoil
+bin/pgmramp
+bin/pgmslice
+bin/pgmtexture
+bin/pgmtofs
+bin/pgmtolispm
+bin/pgmtopbm
+bin/pgmtopgm
+bin/pgmtoppm
+bin/pi1toppm
+bin/pi3topbm
+bin/picttoppm
+bin/pjtoppm
+bin/pktopbm
+bin/pngtopnm
+bin/pnmalias
+bin/pnmarith
+bin/pnmcat
+bin/pnmcolormap
+bin/pnmcomp
+bin/pnmconvol
+bin/pnmcrop
+bin/pnmcut
+bin/pnmdepth
+bin/pnmenlarge
+bin/pnmfile
+bin/pnmflip
+bin/pnmgamma
+bin/pnmhisteq
+bin/pnmhistmap
+bin/pnmindex
+bin/pnminterp
+bin/pnminvert
+bin/pnmmargin
+bin/pnmmontage
+bin/pnmnlfilt
+bin/pnmnoraw
+bin/pnmnorm
+bin/pnmpad
+bin/pnmpaste
+bin/pnmpsnr
+bin/pnmquant
+bin/pnmremap
+bin/pnmrotate
+bin/pnmscale
+bin/pnmscalefixed
+bin/pnmshear
+bin/pnmsmooth
+bin/pnmsplit
+bin/pnmstitch
+bin/pnmtile
+bin/pnmtoddif
+bin/pnmtofiasco
+bin/pnmtofits
+bin/pnmtojbig
+bin/pnmtojpeg
+bin/pnmtopalm
+bin/pnmtopclxl
+bin/pnmtoplainpnm
+bin/pnmtopng
+bin/pnmtopnm
+bin/pnmtops
+bin/pnmtorast
+bin/pnmtorle
+bin/pnmtosgi
+bin/pnmtosir
+bin/pnmtotiff
+bin/pnmtotiffcmyk
+bin/pnmtoxwd
+bin/ppm3d
+bin/ppmbrighten
+bin/ppmchange
+bin/ppmcie
+bin/ppmcolormask
+bin/ppmcolors
+bin/ppmdcfont
+bin/ppmddumpfont
+bin/ppmdim
+bin/ppmdist
+bin/ppmdither
+bin/ppmdmkfont
+bin/ppmdraw
+bin/ppmfade
+bin/ppmflash
+bin/ppmforge
+bin/ppmglobe
+bin/ppmhist
+bin/ppmlabel
+bin/ppmmake
+bin/ppmmix
+bin/ppmnorm
+bin/ppmntsc
+bin/ppmpat
+bin/ppmquant
+bin/ppmquantall
+bin/ppmrainbow
+bin/ppmrelief
+bin/ppmrough
+bin/ppmshadow
+bin/ppmshift
+bin/ppmspread
+bin/ppmtoacad
+bin/ppmtoarbtxt
+bin/ppmtobmp
+bin/ppmtoeyuv
+bin/ppmtogif
+bin/ppmtoicr
+bin/ppmtoilbm