head 1.4; access; symbols pkgsrc-2013Q2:1.4.0.8 pkgsrc-2013Q2-base:1.4 pkgsrc-2012Q4:1.4.0.6 pkgsrc-2012Q4-base:1.4 pkgsrc-2011Q4:1.4.0.4 pkgsrc-2011Q4-base:1.4 pkgsrc-2011Q2:1.4.0.2 pkgsrc-2011Q2-base:1.4 pkgsrc-2009Q4:1.3.0.30 pkgsrc-2009Q4-base:1.3 pkgsrc-2009Q3:1.3.0.28 pkgsrc-2009Q3-base:1.3 pkgsrc-2009Q2:1.3.0.26 pkgsrc-2009Q2-base:1.3 pkgsrc-2009Q1:1.3.0.24 pkgsrc-2009Q1-base:1.3 pkgsrc-2008Q4:1.3.0.22 pkgsrc-2008Q4-base:1.3 pkgsrc-2008Q3:1.3.0.20 pkgsrc-2008Q3-base:1.3 cube-native-xorg:1.3.0.18 cube-native-xorg-base:1.3 pkgsrc-2008Q2:1.3.0.16 pkgsrc-2008Q2-base:1.3 cwrapper:1.3.0.14 pkgsrc-2008Q1:1.3.0.12 pkgsrc-2008Q1-base:1.3 pkgsrc-2007Q4:1.3.0.10 pkgsrc-2007Q4-base:1.3 pkgsrc-2007Q3:1.3.0.8 pkgsrc-2007Q3-base:1.3 pkgsrc-2007Q2:1.3.0.6 pkgsrc-2007Q2-base:1.3 pkgsrc-2007Q1:1.3.0.4 pkgsrc-2007Q1-base:1.3 pkgsrc-2006Q4:1.3.0.2 pkgsrc-2006Q4-base:1.3 pkgsrc-2006Q3:1.2.0.24 pkgsrc-2006Q3-base:1.2 pkgsrc-2006Q2:1.2.0.22 pkgsrc-2006Q2-base:1.2 pkgsrc-2006Q1:1.2.0.20 pkgsrc-2006Q1-base:1.2 pkgsrc-2005Q4:1.2.0.18 pkgsrc-2005Q4-base:1.2 pkgsrc-2005Q3:1.2.0.16 pkgsrc-2005Q3-base:1.2 pkgsrc-2005Q2:1.2.0.14 pkgsrc-2005Q2-base:1.2 pkgsrc-2005Q1:1.2.0.12 pkgsrc-2005Q1-base:1.2 pkgsrc-2004Q4:1.2.0.10 pkgsrc-2004Q4-base:1.2 pkgsrc-2004Q3:1.2.0.8 pkgsrc-2004Q3-base:1.2 pkgsrc-2004Q2:1.2.0.6 pkgsrc-2004Q2-base:1.2 pkgsrc-2004Q1:1.2.0.4 pkgsrc-2004Q1-base:1.2 pkgsrc-2003Q4:1.2.0.2 pkgsrc-2003Q4-base:1.2 buildlink2-base:1.2 netbsd-1-4-PATCH002:1.1 comdex-fall-1999:1.1 netbsd-1-4-PATCH001:1.1 netbsd-1-4-RELEASE:1.1; locks; strict; comment @# @; 1.4 date 2010.02.19.18.25.44; author drochner; state dead; branches; next 1.3; 1.3 date 2006.10.03.22.56.51; author schwarz; state Exp; branches 1.3.30.1; next 1.2; 1.2 date 2000.05.17.10.13.22; author tron; state dead; branches; next 1.1; 1.1 date 99.01.10.23.52.17; author tron; state Exp; branches; next ; 1.3.30.1 date 2010.02.25.08.43.28; author spz; state dead; branches; next ; desc @@ 1.4 log @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 @ text @$NetBSD: patch-at,v 1.3 2006/10/03 22:56:51 schwarz Exp $ --- converter/other/pamtosvg/curve.h.orig 2006-09-30 19:10:27.000000000 +0200 +++ converter/other/pamtosvg/curve.h 2006-09-30 19:10:52.000000000 +0200 @@@@ -83,7 +83,7 @@@@ pm_pixelcoord const p); /* Like `append_pixel', for a point in real coordinates. */ -extern void append_point (curve_type c, float_coord p); +extern void append_point (curve_type const c, float_coord const p); /* Write some or all, respectively, of the curve C in human-readable form to the log file, if logging is enabled. */ @ 1.3 log @ added support for IRIX 5 and in particular the SGI IDO cc. patches were discussed with Bryan Henderson, maintainer of the netpbm code. @ text @d1 1 a1 1 $NetBSD$ @ 1.3.30.1 log @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 @ text @d1 1 a1 1 $NetBSD: patch-at,v 1.3 2006/10/03 22:56:51 schwarz Exp $ @ 1.2 log @Update "netpbm" package to version 9.2. There are too many changes and bug fixes to list here. Main new features are shared libraries, JPEG and JBIG support. @ text @d1 1 a1 1 $NetBSD: patch-at,v 1.1 1999/01/10 23:52:17 tron Exp $ d3 11 a13 174 --- pnm/pnmsmooth.c.orig Sun Jan 10 23:48:41 1999 +++ pnm/pnmsmooth.c Sun Jan 10 23:48:41 1999 @@@@ -0,0 +1,171 @@@@ +/* pnmsmooth.c - smooth out an image by replacing each pixel with the +** average of its width x height neighbors. +** +** Version 2.0 December 5, 1994 +** +** Copyright (C) 1994 by Mike Burns (burns@@chem.psu.edu) +** +** Permission to use, copy, modify, and distribute this software and its +** documentation for any purpose and without fee is hereby granted, provided +** that the above copyright notice appear in all copies and that both that +** copyright notice and this permission notice appear in supporting +** documentation. This software is provided "as is" without express or +** implied warranty. +*/ + +/* Version 2.0 - December 5, 1994 +** ------------------------------ +** Rewrote as a C program that accepts a few options instead of a shell +** script with no options. +** +*/ + +#include "pnm.h" +#include + +#define TRUE 1 +#define FALSE 0 + +int +main( argc, argv ) + int argc; + char* argv[]; + { + FILE *cofp; + char *tempfn; + char *pnmfn; + int argn; + int col, row; + int format, forceplain; + int cols, rows; + int newmaxval; /* normally xelval, but want int here */ + xelval g; + xel *outputrow; + int pid, status; + int DUMPFLAG = FALSE; + char *usage = "[-size width height] [-dump dumpfile] [pnmfile]"; + + pnm_init( &argc, argv ); + + /* set up defaults */ + cols = 3; + rows = 3; + format = PGM_FORMAT; + forceplain = 1; + pnmfn = (char *) 0; /* initialize to NULL just in case */ + + argn = 1; + while ( argn < argc && argv[argn][0] == '-' && argv[argn][1] != '\0' ) + { + if ( pm_keymatch( argv[argn], "-size", 2 ) ) + { + ++argn; + if ( argn+1 >= argc ) + { + pm_message( "incorrect number of arguments for -size option" ); + pm_usage( usage ); + } + else if ( argv[argn][0] == '-' || argv[argn+1][0] == '-' ) + { + pm_message( "invalid arguments to -size option: %s %s", + argv[argn], argv[argn+1] ); + pm_usage( usage ); + } + if ( (cols = atoi(argv[argn])) == 0 ) + pm_error( "invalid width size specification: %s", argv[argn] ); + ++argn; + if ( (rows = atoi(argv[argn])) == 0 ) + pm_error( "invalid height size specification: %s",argv[argn] ); + if ( cols % 2 != 1 || rows % 2 != 1 ) + pm_error( "the convolution matrix must have an odd number of rows and columns" ); + } + else if ( pm_keymatch( argv[argn], "-dump", 2 ) ) + { + ++argn; + if ( argn >= argc ) + { + pm_message( "missing argument to -dump option" ); + pm_usage( usage ); + } + else if ( argv[argn][0] == '-' ) + { + pm_message( "invalid argument to -dump option: %s", + argv[argn] ); + pm_usage( usage ); + } + cofp = pm_openw( argv[argn] ); + DUMPFLAG = TRUE; + } + else + pm_usage( usage ); + ++argn; + } + + /* Only get file name if given on command line to pass through to + ** pnmconvol. If filename is coming from stdin, pnmconvol will read it. + */ + if ( argn < argc ) + { + pnmfn = argv[argn]; + ++argn; + } + + if ( argn != argc ) + pm_usage( usage ); + + + if ( !DUMPFLAG ) + { + if ( (tempfn = tmpnam((char *) 0)) == NULL ) + pm_error( "could not create temporary file name" ); + if ( (cofp = pm_openw(tempfn)) == NULL ) + pm_error( "could not create temporary convolution file" ); + } + + /* Generate mean value for all pixels in convolution matrix. */ + g = rows * cols + 1; + + /* Make sure newmaxval is not larger than PNM_MAXMAXVAL or else + ** newmaxval will overrun its defined data size and become garbage. + */ + newmaxval = ( rows * cols ) * 2; + if ( newmaxval > PNM_MAXMAXVAL ) + pm_error( "generated maxval is too large: %d", newmaxval ); + + pnm_writepnminit( cofp, cols, rows, newmaxval, format, forceplain ); + outputrow = pnm_allocrow( cols ); + + for ( row = 0; row < rows; ++ row ) + { + for ( col = 0; col < cols; ++col ) + PNM_ASSIGN1( outputrow[col], g ); + pnm_writepnmrow( cofp, outputrow, cols, newmaxval, format, forceplain ); + } + pm_close( cofp ); + pnm_freerow( outputrow ); + + /* If we're only going to dump the file, now is the time to stop. */ + if ( DUMPFLAG ) + exit( 0 ); + + /* fork a child process */ + if ( (pid = fork()) < 0 ) + pm_error( "fork" ); + + /* child process executes following code */ + if ( pid == 0 ) + { + /* If pnmfile name is not given on command line, then pnmfn will be + ** (char *) 0 and the arglist will terminate there. + */ + execlp( "pnmconvol", "pnmconvol", tempfn, pnmfn, (char *) 0 ); + pm_error( "error executing pnmconvol command" ); + } + + /* wait for child to finish */ + while ( wait(&status) != pid ) + ; + + unlink( tempfn ); + exit( 0 ); + } @ 1.1 log @Major cleanup of "netpbm" package based on patches supply by John F. Woods in PR pkg/6763 and Rob Windsor in PR pkg/6779. @ text @d1 1 a1 1 $NetBSD$ @