Pullup ticket 1711 - requested by salo

security update for netpbm

Revisions pulled up:
- pkgsrc/graphics/netpbm/Makefile		1.136, 1.137, 1.138, 1.142, 1.143
- pkgsrc/graphics/netpbm/distinfo		1.54, 1.56, 1.58, 1.59
- pkgsrc/graphics/netpbm/patches/patch-aa	1.37, 1.38
- pkgsrc/graphics/netpbm/patches/patch-ab	1.20
- pkgsrc/graphics/netpbm/patches/patch-ac	removed
- pkgsrc/graphics/netpbm/patches/patch-ag	removed
- pkgsrc/graphics/netpbm/patches/patch-ai	removed
- pkgsrc/graphics/netpbm/patches/patch-aj	removed
- pkgsrc/graphics/netpbm/patches/patch-ca	1.1

   Module Name:	pkgsrc
   Committed By:	tron
   Date:		Mon Apr  3 16:46:51 UTC 2006

   Modified Files:
	pkgsrc/graphics/netpbm: Makefile

   Log Message:
   Make sure all documentation files are installed world readable. Bump
   package revision because this change affects the binary package.
---
   Module Name:	pkgsrc
   Committed By:	tron
   Date:		Mon Apr  3 16:53:58 UTC 2006

   Modified Files:
	pkgsrc/graphics/netpbm: Makefile

   Log Message:
   Make last change work with IRIX's old fashioned "find" command.
---
   Module Name:	pkgsrc
   Committed By:	adam
   Date:		Mon Apr 17 08:11:17 UTC 2006

   Modified Files:
	pkgsrc/graphics/netpbm: Makefile distinfo
   Removed Files:
	pkgsrc/graphics/netpbm/patches: patch-ag

   Log Message:
   Changes 10.33:
   Add pamtosvg.

   g3topbm: Add -width, -paper_size.

   libnetpbm / most newer programs: Fix bug that produces
   plain format output when it should be raw because
   pnm_readpaminit() does not set 'plainformat' and most
   programs just copy the input pam to the output pam.

   pamflip: fix bug with left/right flip of PBM that has
   width an even multiple of 8 plus something less than 8.

   pnmquant: turn on autoflush when creating seekable file.

   install: fix symbolic link pnmdepth -> pamdepth.

   build: fix some importinc dependencies.
---
   Module Name:	pkgsrc
   Committed By:	jlam
   Date:		Wed May 10 17:19:00 UTC 2006

   Modified Files:
	pkgsrc/graphics/netpbm: distinfo
   Added Files:
	pkgsrc/graphics/netpbm/patches: patch-ca

   Log Message:
   On FreeBSD 4.x, <netinet/in.h> needs <sys/types.h> to be included first.
---
   Module Name:	pkgsrc
   Committed By:	minskim
   Date:		Sun Jun 18 16:18:11 UTC 2006

   Modified Files:
	pkgsrc/graphics/netpbm: Makefile distinfo
	pkgsrc/graphics/netpbm/patches: patch-aa

   Log Message:
   Build .dylib instead of .so on Darwin.  Bump PKGREVISION.
---
   Module Name:	pkgsrc
   Committed By:	adam
   Date:		Sun Jun 25 06:35:58 UTC 2006

   Modified Files:
	pkgsrc/graphics/netpbm: Makefile distinfo
	pkgsrc/graphics/netpbm/patches: patch-aa patch-ab
   Removed Files:
	pkgsrc/graphics/netpbm/patches: patch-ac patch-ag patch-ai patch-aj

   Log Message:
   This is a security update, which fixes a buffer overflow vulnerability.

   Changes 10.34:
   * Add pamthreshold, pamx, pamtoxvmini.
   * pammasksharpen: Add -threshold.
   * pnmtopng: make "N colors found" message verbose-only.
   * pnmtopng: make "no room in palette" message non-verbose.
   * picttoppm: Tolerate various PICT file corruptions.
   * picttoppm: Don't issue warning message when file named
     'fontdir' doesn't exist.
   * libnetpbm: Add ppmd_fill_path().
   * ppmtobmp: Fix for PBM input.
   * bmptopnm: Don't crash on BMP with no color map.
   * bmptopnm: Fix wrong file name in error messages.
   * ppmtogif: fix bug: always produces garbage output.
   * ppmtompeg: fix input from Standard Input.
   * pnmflip: fix bug: -rotate90, -rotate180, and -rotate270
     (and synonyms) don't work when followed by other rotation options.
   * ppmtoilbm: Fig bug: generates more planes than necessary.
   * pamtofits: fix buffer overflow in asembling header.
   * picttoppm: fix bug - interprets some images wrong because of
     bogus "rowBytes" value.
   * Redo asprintfN(), etc. so as not to use va_list in a way
     that doesn't work on some machines.
   * cameratopam: remove definition of memmem() so it doesn't collide
     with same in some C libraries.  Add memmemN() and MEMEQ to libnetpbm.
   * Fix build of filename.o.

1 files changed, 3 insertions, 3 deletions

diff --git a/graphics/netpbm/patches/patch-ab b/graphics/netpbm/patches/patch-ab
index edb42533900..f1b2dda3168 100644
--- a/graphics/netpbm/patches/patch-ab
+++ b/graphics/netpbm/patches/patch-ab
@@ -1,8 +1,8 @@
-$NetBSD: patch-ab,v 1.19 2006/02/27 22:01:16 adam Exp $
+$NetBSD: patch-ab,v 1.19.2.1 2006/06/26 07:06:35 ghen Exp $
 
---- converter/other/Makefile.orig	2006-02-25 20:15:20.000000000 +0100
+--- converter/other/Makefile.orig	2006-05-28 01:16:09.000000000 +0200
 +++ converter/other/Makefile
-@@ -108,6 +108,13 @@ all:	$(BINARIES) $(SUBDIRS:%=%/all)
+@@ -126,6 +126,13 @@ all:	$(BINARIES) $(SUBDIRS:%=%/all)
  
  include $(SRCDIR)/Makefile.common