pkgsrc-Changes-HG archive
[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index][Old Index]
[pkgsrc/pkgsrc-2005Q2]: pkgsrc/graphics/netpbm Pullup ticket 666 - requested ...
details: https://anonhg.NetBSD.org/pkgsrc/rev/a03092be0c60
branches: pkgsrc-2005Q2
changeset: 495961:a03092be0c60
user: snj <snj%pkgsrc.org@localhost>
date: Sun Aug 07 05:03:33 2005 +0000
description:
Pullup ticket 666 - requested by Lubomir Sedlacik
security update for netpbm
Revisions pulled up:
- pkgsrc/graphics/netpbm/Makefile 1.116, 1.119, 1.120
- pkgsrc/graphics/netpbm/distinfo 1.36, 1.38, 1.39
- pkgsrc/graphics/netpbm/patches/patch-ad removed
- pkgsrc/graphics/netpbm/patches/patch-af 1.9
- pkgsrc/graphics/netpbm/patches/patch-ag 1.8
- pkgsrc/graphics/netpbm/buildlink3.mk 1.6
Module Name: pkgsrc
Committed By: adam
Date: Thu Jun 30 14:55:13 UTC 2005
Modified Files:
pkgsrc/graphics/netpbm: Makefile distinfo
Removed Files:
pkgsrc/graphics/netpbm/patches: patch-ad
Log Message:
Changes 10.26.11:
* Fixed memory problem in pamcomp
Changes 10.26.10:
* Fixed: jpeg2ktopam, rle_open: ppmtompeg
----
Module Name: pkgsrc
Committed By: adam
Date: Tue Jul 26 14:34:53 UTC 2005
Modified Files:
pkgsrc/graphics/netpbm: Makefile distinfo
Log Message:
Changes 10.26.12:
* ppmtompeg: fix uname() rc test (sometimes > 0 is success)
* Fix bytesToWordInt()
----
Module Name: pkgsrc
Committed By: salo
Date: Sat Aug 6 14:07:07 UTC 2005
Modified Files:
pkgsrc/graphics/netpbm: Makefile buildlink3.mk distinfo
Added Files:
pkgsrc/graphics/netpbm/patches: patch-af patch-ag
Log Message:
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
diffstat:
graphics/netpbm/Makefile | 8 +++-----
graphics/netpbm/buildlink3.mk | 4 ++--
graphics/netpbm/distinfo | 11 ++++++-----
graphics/netpbm/patches/patch-ad | 12 ------------
graphics/netpbm/patches/patch-af | 22 ++++++++++++++++++++++
graphics/netpbm/patches/patch-ag | 20 ++++++++++++++++++++
6 files changed, 53 insertions(+), 24 deletions(-)
diffs (127 lines):
diff -r 91c6ace15beb -r a03092be0c60 graphics/netpbm/Makefile
--- a/graphics/netpbm/Makefile Sat Aug 06 22:18:19 2005 +0000
+++ b/graphics/netpbm/Makefile Sun Aug 07 05:03:33 2005 +0000
@@ -1,7 +1,6 @@
-# $NetBSD: Makefile,v 1.113.2.2 2005/07/02 07:12:05 snj Exp $
+# $NetBSD: Makefile,v 1.113.2.3 2005/08/07 05:03:33 snj Exp $
-DISTNAME= netpbm-10.26.9
-PKGREVISION= 2
+DISTNAME= netpbm-10.28
CATEGORIES= graphics
MASTER_SITES= ${MASTER_SITE_SOURCEFORGE:=netpbm/}
EXTRACT_SUFX= .tgz
@@ -12,8 +11,7 @@
PKG_INSTALLATION_TYPES= overwrite pkgviews
-USE_TOOLS+= gmake lex
-USE_PERL5= yes
+USE_TOOLS+= gmake lex perl
INSTALL_TARGET= install-dev install-run
MAKE_ENV+= INSTALL="${INSTALL}" STRIPFLAG="${_STRIPFLAG_INSTALL}" \
diff -r 91c6ace15beb -r a03092be0c60 graphics/netpbm/buildlink3.mk
--- a/graphics/netpbm/buildlink3.mk Sat Aug 06 22:18:19 2005 +0000
+++ b/graphics/netpbm/buildlink3.mk Sun Aug 07 05:03:33 2005 +0000
@@ -1,4 +1,4 @@
-# $NetBSD: buildlink3.mk,v 1.5 2004/12/28 23:18:17 reed Exp $
+# $NetBSD: buildlink3.mk,v 1.5.4.1 2005/08/07 05:03:33 snj Exp $
BUILDLINK_DEPTH:= ${BUILDLINK_DEPTH}+
NETPBM_BUILDLINK3_MK:= ${NETPBM_BUILDLINK3_MK}+
@@ -12,7 +12,7 @@
.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 -r 91c6ace15beb -r a03092be0c60 graphics/netpbm/distinfo
--- a/graphics/netpbm/distinfo Sat Aug 06 22:18:19 2005 +0000
+++ b/graphics/netpbm/distinfo Sun Aug 07 05:03:33 2005 +0000
@@ -1,10 +1,11 @@
-$NetBSD: distinfo,v 1.35.2.1 2005/07/02 07:12:05 snj Exp $
+$NetBSD: distinfo,v 1.35.2.2 2005/08/07 05:03:33 snj Exp $
-SHA1 (netpbm-10.26.9.tgz) = 1c7e57663066f8ce46b0cf7da4e186393f98fd14
-RMD160 (netpbm-10.26.9.tgz) = 5a23d08bcf1fa0fbd12c85b83b98ae9dd0681c85
-Size (netpbm-10.26.9.tgz) = 2538187 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-ad) = 624ee6327fa05cae52f95a2eb6f6e8a9a74f26a5
SHA1 (patch-ae) = 33a5be2843dd85b530f5e6ba496cd0380cd5edd1
+SHA1 (patch-af) = 46628beae66aae69db29d3e06d7d751e6a0f9e68
+SHA1 (patch-ag) = 155547027efb0390ac898c63bcec657fa311bbac
diff -r 91c6ace15beb -r a03092be0c60 graphics/netpbm/patches/patch-ad
--- a/graphics/netpbm/patches/patch-ad Sat Aug 06 22:18:19 2005 +0000
+++ /dev/null Thu Jan 01 00:00:00 1970 +0000
@@ -1,12 +0,0 @@
-$NetBSD: patch-ad,v 1.16 2005/05/24 07:53:54 adam Exp $
-
---- urt/rle_open_f.c.orig 2005-05-24 09:41:44.000000000 +0000
-+++ urt/rle_open_f.c
-@@ -35,7 +35,6 @@ my_popen(const char * const cmd,
- int thepid = 0;
- int pipefd[2];
- int i;
-- extern int errno;
-
- /* Check args. */
- if ( *mode != 'r' && *mode != 'w' )
diff -r 91c6ace15beb -r a03092be0c60 graphics/netpbm/patches/patch-af
--- /dev/null Thu Jan 01 00:00:00 1970 +0000
+++ b/graphics/netpbm/patches/patch-af Sun Aug 07 05:03:33 2005 +0000
@@ -0,0 +1,22 @@
+$NetBSD: patch-af,v 1.8.4.1 2005/08/07 05:03:33 snj 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 -r 91c6ace15beb -r a03092be0c60 graphics/netpbm/patches/patch-ag
--- /dev/null Thu Jan 01 00:00:00 1970 +0000
+++ b/graphics/netpbm/patches/patch-ag Sun Aug 07 05:03:33 2005 +0000
@@ -0,0 +1,20 @@
+$NetBSD: patch-ag,v 1.7.4.1 2005/08/07 05:03:33 snj 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));
Home |
Main Index |
Thread Index |
Old Index