Update to version 10.28

- security fix for SA16184, patch from Debian

Changes:
- ppmtompeg: fix insecure temp file creation
- jpeg2000: don't do unsafe temporary files
- add cameratopam (Dave Coffin's dcraw)
- various other bugfixes

5 files changed, 52 insertions, 8 deletions

diff --git a/graphics/netpbm/Makefile b/graphics/netpbm/Makefile
index e47aa8944c1..2a1ba04ef88 100644
--- a/graphics/netpbm/Makefile
+++ b/graphics/netpbm/Makefile
@@ -1,6 +1,6 @@
-# $NetBSD: Makefile,v 1.119 2005/07/26 14:34:53 adam Exp $
+# $NetBSD: Makefile,v 1.120 2005/08/06 14:07:07 salo Exp $
 
-DISTNAME=	netpbm-10.26.12
+DISTNAME=	netpbm-10.28
 CATEGORIES=	graphics
 MASTER_SITES=	${MASTER_SITE_SOURCEFORGE:=netpbm/}
 EXTRACT_SUFX=	.tgz
diff --git a/graphics/netpbm/buildlink3.mk b/graphics/netpbm/buildlink3.mk
index 051864d34bb..bcc7948d621 100644
--- a/graphics/netpbm/buildlink3.mk
+++ b/graphics/netpbm/buildlink3.mk
@@ -1,4 +1,4 @@
-# $NetBSD: buildlink3.mk,v 1.5 2004/12/28 23:18:17 reed Exp $
+# $NetBSD: buildlink3.mk,v 1.6 2005/08/06 14:07:07 salo Exp $
 
 BUILDLINK_DEPTH:=	${BUILDLINK_DEPTH}+
 NETPBM_BUILDLINK3_MK:=	${NETPBM_BUILDLINK3_MK}+
@@ -12,7 +12,7 @@ BUILDLINK_PACKAGES+=	netpbm
 
 .if !empty(NETPBM_BUILDLINK3_MK:M+)
 BUILDLINK_DEPENDS.netpbm+=	netpbm>=10.11.6
-BUILDLINK_RECOMMENDED.netpbm+=	netpbm>=10.18.17nb1
+BUILDLINK_RECOMMENDED.netpbm+=	netpbm>=10.28
 BUILDLINK_PKGSRCDIR.netpbm?=	../../graphics/netpbm
 .endif	# NETPBM_BUILDLINK3_MK
 
diff --git a/graphics/netpbm/distinfo b/graphics/netpbm/distinfo
index 75b41dbc439..1db786ade2e 100644
--- a/graphics/netpbm/distinfo
+++ b/graphics/netpbm/distinfo
@@ -1,9 +1,11 @@
-$NetBSD: distinfo,v 1.38 2005/07/26 14:34:53 adam Exp $
+$NetBSD: distinfo,v 1.39 2005/08/06 14:07:07 salo Exp $
 
-SHA1 (netpbm-10.26.12.tgz) = 4be7fb246fc937c2176ac0be78e228e40210f272
-RMD160 (netpbm-10.26.12.tgz) = bcbbaa073e4cf50a75b0025b34055404c16fa8e9
-Size (netpbm-10.26.12.tgz) = 2538439 bytes
+SHA1 (netpbm-10.28.tgz) = d7800fe932c8a44f21b109f794985209976a2ef3
+RMD160 (netpbm-10.28.tgz) = b369f54352e3a4bb1515fab61aeac016a6e9f2eb
+Size (netpbm-10.28.tgz) = 2324750 bytes
 SHA1 (patch-aa) = 92a760abe800648e76a3468d1e145b51022c01aa
 SHA1 (patch-ab) = ebab5f2ec96539058a8fbd79bf7867d1a49e02fd
 SHA1 (patch-ac) = 07f109139bf30da22b05d00189cbb7b4a5f8f05a
 SHA1 (patch-ae) = 33a5be2843dd85b530f5e6ba496cd0380cd5edd1
+SHA1 (patch-af) = 46628beae66aae69db29d3e06d7d751e6a0f9e68
+SHA1 (patch-ag) = 155547027efb0390ac898c63bcec657fa311bbac
diff --git a/graphics/netpbm/patches/patch-af b/graphics/netpbm/patches/patch-af
new file mode 100644
index 00000000000..007c907b652
--- /dev/null
+++ b/graphics/netpbm/patches/patch-af
@@ -0,0 +1,22 @@
+$NetBSD: patch-af,v 1.9 2005/08/06 14:07:07 salo Exp $
+
+--- converter/other/cameratopam/identify.c.orig	2005-04-11 16:24:15.000000000 +0000
++++ converter/other/cameratopam/identify.c	2005-08-06 12:58:46.000000000 +0000
+@@ -22,7 +22,9 @@
+ 
+ static loadRawFn load_raw;
+ 
++#include <sys/param.h>
+ 
++#if !(defined(__GLIBC__) || (defined(__NetBSD__) && (__NetBSD_Version__ >= 300000000)))
+ /* This does the same as the function of the same name in the GNU C library */
+ static const char *memmem (const char *haystack, size_t haystacklen,
+                      const char *needle, size_t needlelen)
+@@ -33,6 +35,7 @@
+       return c;
+   return NULL;
+ }
++#endif
+ 
+ /*
+    Thanks to Adobe for providing these excellent CAM -> XYZ matrices!
diff --git a/graphics/netpbm/patches/patch-ag b/graphics/netpbm/patches/patch-ag
new file mode 100644
index 00000000000..a86c8e8bb7d
--- /dev/null
+++ b/graphics/netpbm/patches/patch-ag
@@ -0,0 +1,20 @@
+$NetBSD: patch-ag,v 1.8 2005/08/06 14:07:07 salo Exp $
+
+Security fix for SA16184.  Patch from Debian.
+
+--- converter/other/pstopnm.c.orig	2004-06-23 04:22:33.000000000 +0200
++++ converter/other/pstopnm.c	2005-08-06 15:57:23.000000000 +0200
+@@ -704,11 +704,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));