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, 32 insertions, 13 deletions

diff --git a/graphics/netpbm/patches/patch-aa b/graphics/netpbm/patches/patch-aa
index 14309465732..0e42e6bb92b 100644
--- a/graphics/netpbm/patches/patch-aa
+++ b/graphics/netpbm/patches/patch-aa
@@ -1,7 +1,7 @@
-$NetBSD: patch-aa,v 1.35 2006/02/27 22:01:16 adam Exp $
+$NetBSD: patch-aa,v 1.35.2.1 2006/06/26 07:06:35 ghen Exp $
 
---- Makefile.config.in.orig	2006-01-03 01:15:17.000000000 +0100
-+++ Makefile.config.in
+--- Makefile.config.in.orig	2006-06-18 21:23:40.000000000 +0200
++++ Makefile.config.in	2006-06-25 17:21:17.000000000 +0200
 @@ -24,7 +24,7 @@ DEFAULT_TARGET = nonmerge
  # and skip it on those systems unless you want to debug it and fix it.
  # OpenBSD:
@@ -51,7 +51,7 @@ $NetBSD: patch-aa,v 1.35 2006/02/27 22:01:16 adam Exp $
  # Solaris:
  # LEX = flex -e
  # Or just skip parts that need Lex:
-@@ -219,7 +221,7 @@ EXE =
+@@ -220,7 +222,7 @@ EXE =
  
  # Here, $(SONAME) resolves to the soname for the shared library being created.
  # The following are gcc options.  This works on GNU libc systems.
@@ -60,7 +60,7 @@ $NetBSD: patch-aa,v 1.35 2006/02/27 22:01:16 adam Exp $
  # You need -nostart instead of -shared on BeOS.  Though the BeOS compiler is
  # ostensibly gcc, it has the -nostart option, which is not mentioned in gcc
  # documentation and doesn't exist in at least one non-BeOS installation.
-@@ -252,6 +254,18 @@ LDRELOC = NONE
+@@ -253,6 +255,19 @@ LDRELOC = NONE
  #LDRELOC = ld --reloc
  #LDRELOC = ld -r
  
@@ -69,7 +69,8 @@ $NetBSD: patch-aa,v 1.35 2006/02/27 22:01:16 adam Exp $
 +endif
 +
 +ifeq ($(OPSYS),Darwin)
-+LDSHLIB = -dynamiclib -install_name $(NETPBM_RUNTIME_PATH)/libnetpbm.$(MAJ).dylib
++LDSHLIB = -dynamiclib -install_name $(PREFIX)/lib/libnetpbm.$(MAJ).dylib \
++	-compatibility_version $(MAJ) -current_version $(MAJ).$(MIN)
 +endif
 +
 +ifeq ($(OPSYS),Interix)
@@ -79,7 +80,7 @@ $NetBSD: patch-aa,v 1.35 2006/02/27 22:01:16 adam Exp $
  
  # On older systems, you have to make shared libraries out of position
  # independent code, so you need -fpic or fPIC here.  (The rule is: if
-@@ -274,11 +288,23 @@ LDRELOC = NONE
+@@ -275,11 +290,23 @@ LDRELOC = NONE
  CFLAGS_SHLIB = 
  # Solaris or SunOS with gcc, and NetBSD:
  #CFLAGS_SHLIB = -fpic
@@ -104,7 +105,7 @@ $NetBSD: patch-aa,v 1.35 2006/02/27 22:01:16 adam Exp $
  # SHLIB_CLIB is the link option to include the C library in a shared library,
  # normally "-lc".  On typical systems, this serves no purpose.  On some,
  # though, it causes information about which C library to use to be recorded
-@@ -347,8 +373,8 @@ TIFFHDR_DIR =
+@@ -348,8 +375,8 @@ TIFFHDR_DIR =
  #TIFFLIB = libtiff.so
  #TIFFHDR_DIR = /usr/include/libtiff
  #NetBSD:
@@ -115,7 +116,7 @@ $NetBSD: patch-aa,v 1.35 2006/02/27 22:01:16 adam Exp $
  # OSF, Tru64:
  #TIFFLIB = /usr/local1/DEC/lib/libtiff.so
  #TIFFHDR_DIR = /usr/local1/DEC/include
-@@ -378,8 +404,8 @@ JPEGHDR_DIR =
+@@ -379,8 +406,8 @@ JPEGHDR_DIR =
  #JPEGLIB = libjpeg.so
  #JPEGHDR_DIR = /usr/include/jpeg
  # Netbsd:
@@ -126,7 +127,7 @@ $NetBSD: patch-aa,v 1.35 2006/02/27 22:01:16 adam Exp $
  # OSF, Tru64:
  #JPEGLIB = /usr/local1/DEC/libjpeg.so
  #JPEGHDR_DIR = /usr/local1/DEC/include
-@@ -403,8 +429,8 @@ PNGVER = 
+@@ -404,8 +431,8 @@ PNGVER = 
  #PNGLIB = libpng$(PNGVER).so
  #PNGHDR_DIR = /usr/include/libpng$(PNGVER)
  # NetBSD:
@@ -137,7 +138,7 @@ $NetBSD: patch-aa,v 1.35 2006/02/27 22:01:16 adam Exp $
  # OSF/Tru64:
  #PNGLIB = /usr/local1/DEC/lib/libpng$(PNGVER).so
  #PNGHDR_DIR = /usr/local1/DEC/include
-@@ -414,8 +440,8 @@ PNGVER = 
+@@ -415,8 +442,8 @@ PNGVER = 
  # NONE for the PNG library, it doesn't matter what you specify here --
  # it won't get used.
  
@@ -148,7 +149,7 @@ $NetBSD: patch-aa,v 1.35 2006/02/27 22:01:16 adam Exp $
  #ZLIB = libz.so
  
  # The JBIG lossless image compression library (aka JBIG-KIT):
-@@ -424,8 +450,8 @@ JBIGLIB = $(BUILDDIR)/converter/other/jb
+@@ -425,8 +452,8 @@ JBIGLIB = $(BUILDDIR)/converter/other/jb
  JBIGHDR_DIR = $(SRCDIR)/converter/other/jbig
  
  # The Jasper JPEG-2000 image compression library (aka JasPer):
@@ -159,7 +160,7 @@ $NetBSD: patch-aa,v 1.35 2006/02/27 22:01:16 adam Exp $
  # JASPERDEPLIBS is the libraries (-l options or file names) on which
  # The Jasper library depends -- i.e. what you have to link into any
  # executable that links in the Jasper library.
-@@ -461,7 +487,7 @@ OMIT_NETWORK =
+@@ -471,7 +498,7 @@ OMIT_NETWORK =
  # built into the standard C library, so this can be null.  This is irrelevant
  # if OMIT_NETWORK is "y".
  
@@ -168,3 +169,21 @@ $NetBSD: patch-aa,v 1.35 2006/02/27 22:01:16 adam Exp $
  # Solaris, SunOS:
  #NETWORKLD = -lsocket -lnsl
  # SCO:
+@@ -525,7 +552,7 @@ SUFFIXMANUALS5 = 5
+ #Netpbm library functions.  The value is used only in make file tests.
+ # "unixshared" means a unix-style shared library, typically named like 
+ # libxyz.so.2.3
+-NETPBMLIBTYPE = unixshared
++NETPBMLIBTYPE? = unixshared
+ # "unixstatic" means a unix-style static library, (like libxyz.a)
+ #NETPBMLIBTYPE = unixstatic
+ # "dll" means a Windows DLL shared library
+@@ -536,7 +563,7 @@ NETPBMLIBTYPE = unixshared
+ #NETPBMLIBSUFFIX is the suffix used on whatever kind of library is 
+ #selected above.  All this is used for is to construct library names.
+ #The make files never examine the actual value.
+-NETPBMLIBSUFFIX = so
++NETPBMLIBSUFFIX?= so
+ 
+ # "a" is the suffix for unix-style static libraries.  It is also
+ # traditionally used for shared libraries on AIX.  The Visual Age C