head 1.14; access; symbols pkgsrc-2014Q2:1.13.0.30 pkgsrc-2014Q2-base:1.13 pkgsrc-2014Q1:1.13.0.28 pkgsrc-2014Q1-base:1.13 pkgsrc-2013Q4:1.13.0.26 pkgsrc-2013Q4-base:1.13 pkgsrc-2013Q3:1.13.0.24 pkgsrc-2013Q3-base:1.13 pkgsrc-2013Q2:1.13.0.22 pkgsrc-2013Q2-base:1.13 pkgsrc-2013Q1:1.13.0.20 pkgsrc-2013Q1-base:1.13 pkgsrc-2012Q4:1.13.0.18 pkgsrc-2012Q4-base:1.13 pkgsrc-2012Q3:1.13.0.16 pkgsrc-2012Q3-base:1.13 pkgsrc-2012Q2:1.13.0.14 pkgsrc-2012Q2-base:1.13 pkgsrc-2012Q1:1.13.0.12 pkgsrc-2012Q1-base:1.13 pkgsrc-2011Q4:1.13.0.10 pkgsrc-2011Q4-base:1.13 pkgsrc-2011Q3:1.13.0.8 pkgsrc-2011Q3-base:1.13 pkgsrc-2011Q2:1.13.0.6 pkgsrc-2011Q2-base:1.13 pkgsrc-2011Q1:1.13.0.4 pkgsrc-2011Q1-base:1.13 pkgsrc-2010Q4:1.13.0.2 pkgsrc-2010Q4-base:1.13 pkgsrc-2009Q4:1.11.0.30 pkgsrc-2009Q4-base:1.11 pkgsrc-2009Q3:1.11.0.28 pkgsrc-2009Q3-base:1.11 pkgsrc-2009Q2:1.11.0.26 pkgsrc-2009Q2-base:1.11 pkgsrc-2009Q1:1.11.0.24 pkgsrc-2009Q1-base:1.11 pkgsrc-2008Q4:1.11.0.22 pkgsrc-2008Q4-base:1.11 pkgsrc-2008Q3:1.11.0.20 pkgsrc-2008Q3-base:1.11 cube-native-xorg:1.11.0.18 cube-native-xorg-base:1.11 pkgsrc-2008Q2:1.11.0.16 pkgsrc-2008Q2-base:1.11 cwrapper:1.11.0.14 pkgsrc-2008Q1:1.11.0.12 pkgsrc-2008Q1-base:1.11 pkgsrc-2007Q4:1.11.0.10 pkgsrc-2007Q4-base:1.11 pkgsrc-2007Q3:1.11.0.8 pkgsrc-2007Q3-base:1.11 pkgsrc-2007Q2:1.11.0.6 pkgsrc-2007Q2-base:1.11 pkgsrc-2007Q1:1.11.0.4 pkgsrc-2007Q1-base:1.11 pkgsrc-2006Q4:1.11.0.2 pkgsrc-2006Q4-base:1.11 pkgsrc-2006Q3:1.10.0.4 pkgsrc-2006Q3-base:1.10 pkgsrc-2006Q2:1.10.0.2 pkgsrc-2006Q2-base:1.10 pkgsrc-2006Q1:1.8.0.2 pkgsrc-2006Q1-base:1.8 pkgsrc-2005Q4:1.5.0.4 pkgsrc-2005Q4-base:1.5 pkgsrc-2005Q3:1.5.0.2 pkgsrc-2005Q3-base:1.5 pkgsrc-2005Q2:1.4.0.14 pkgsrc-2005Q2-base:1.4 pkgsrc-2005Q1:1.4.0.12 pkgsrc-2005Q1-base:1.4 pkgsrc-2004Q4:1.4.0.10 pkgsrc-2004Q4-base:1.4 pkgsrc-2004Q3:1.4.0.8 pkgsrc-2004Q3-base:1.4 pkgsrc-2004Q2:1.4.0.6 pkgsrc-2004Q2-base:1.4 pkgsrc-2004Q1:1.4.0.4 pkgsrc-2004Q1-base:1.4 pkgsrc-2003Q4:1.4.0.2 pkgsrc-2003Q4-base:1.4 buildlink2-base:1.4 netbsd-1-5-PATCH001:1.3 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.14 date 2014.09.08.21.22.28; author wiz; state dead; branches; next 1.13; commitid 0IuhkyUPMU5rtAPx; 1.13 date 2010.11.04.10.57.50; author adam; state Exp; branches; next 1.12; 1.12 date 2010.02.19.18.25.44; author drochner; state dead; branches; next 1.11; 1.11 date 2006.10.03.22.56.50; author schwarz; state Exp; branches 1.11.30.1; next 1.10; 1.10 date 2006.06.25.06.35.58; author adam; state dead; branches; next 1.9; 1.9 date 2006.05.14.16.39.05; author wiz; state Exp; branches; next 1.8; 1.8 date 2006.02.27.22.01.16; author adam; state dead; branches; next 1.7; 1.7 date 2006.02.23.17.37.01; author wiz; state Exp; branches; next 1.6; 1.6 date 2006.01.16.15.17.02; author adam; state dead; branches; next 1.5; 1.5 date 2005.08.21.04.47.24; author grant; state Exp; branches; next 1.4; 1.4 date 2002.03.14.22.21.43; author wiz; state dead; branches; next 1.3; 1.3 date 2001.01.10.14.07.22; author bad; state Exp; branches; next 1.2; 1.2 date 2000.05.17.10.13.21; author tron; state dead; branches; next 1.1; 1.1 date 99.01.10.23.52.16; author tron; state Exp; branches; next ; 1.11.30.1 date 2010.02.25.08.43.28; author spz; state dead; branches; next ; desc @@ 1.14 log @Update to 10.67.03. This is the current release of the Advanced branch of netpbm. Lots and lots of changes since our Super Stable release version. @ text @$NetBSD: patch-ai,v 1.13 2010/11/04 10:57:50 adam Exp $ --- pm_config.in.h.orig 2010-11-04 10:46:22.000000000 +0000 +++ pm_config.in.h @@@@ -68,7 +68,7 @@@@ #define RGB_DB3 "PBMplus_Dir:RGB.TXT" #else #define RGB_DB1 "/usr/lib/X11/rgb.txt" -#define RGB_DB2 "/usr/share/X11/rgb.txt" +#define RGB_DB2 "@@@@PREFIX@@@@/share/netpbm/rgb.txt" #define RGB_DB3 "/usr/X11R6/lib/X11/rgb.txt" #endif @ 1.13 log @Fix problem finding rgb.txt, PR#43934 @ text @d1 1 a1 1 $NetBSD$ @ 1.12 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 @d1 1 a1 1 $NetBSD: patch-ai,v 1.11 2006/10/03 22:56:50 schwarz Exp $ d3 4 a6 5 --- lib/pm.h.orig 2006-09-26 20:49:52.000000000 +0200 +++ lib/pm.h 2006-09-26 19:53:11.000000000 +0200 @@@@ -65,7 +65,7 @@@@ #ifdef __GNUC__ #define PM_GNU_PRINTF_ATTR(a,b) __attribute__ ((format (printf, a, b))) d8 4 a11 2 -#define PM_GNU_PRINTF_ATTR +#define PM_GNU_PRINTF_ATTR(a,b) a13 1 @ 1.11 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.11.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-ai,v 1.11 2006/10/03 22:56:50 schwarz Exp $ @ 1.10 log @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. @ text @d1 1 a1 1 $NetBSD: patch-ai,v 1.9 2006/05/14 16:39:05 wiz Exp $ d3 9 a11 10 --- converter/ppm/ppmtogif.c.orig 2006-02-15 19:46:41.000000000 +0000 +++ converter/ppm/ppmtogif.c @@@@ -705,11 +705,9 @@@@ output(code_int const code) { if we want to use the compressor more than once per invocation (e.g. we want to create a multi-image gif). */ - static unsigned long curAccum; - static int curBits; + static unsigned long curAccum = 0; + static int curBits = 0; a12 3 - curBits = 0; /* initial value */ - curAccum = 0; /* initial value */ curAccum &= masks[curBits]; a13 1 if (curBits > 0) @ 1.9 log @Add patches for some issues from the known-bugs page, including one that should fix PR 33347 by martijn (build on amd64). Bump PKGREVISION. @ text @d1 1 a1 1 $NetBSD$ @ 1.8 log @Changes 10.32: * Add rlatopam. * Add pgmmake. * bmptopnm: Understands RLE4/RLE8 compressed BMP. * pnmgamma: Add -bt709tosrgb -srgbtobt709, -bt709tolinear, -lineartobt709, -gamma, -rgamma, -ggamma, -bgamma (gammma values were formerly specified as parameters). * pnmgamma: Rename -cieramp to -bt709ramp. * ppmdraw: work on multi-image streams. * anytopnm: add mime time image/x-ms-bmp for BMP * pamchannel: works on multi-image streams. * pamstack: works on multi-image streams. * Convert pnmdepth to pamdepth. Add multi-image stream capability. * pamcut: works on multi-image streams. * pnmtops: allow -flate and -rle together. * pnmtops: overhaul of -psfilter output. * pnmrotate: fine adjustment to arithmetic (rounding, pixel quantization). * pbmtopsg3: Put currentfile ... in exec block. * pbmtopsg3: Add missing /EndOfBlock. * pnmtops: Don't claim EPSF if using setpagedevice. * giftopnm: do "reading image sequence N" message only if being verbose. * ppmtobmp, bmptopnm: major speed improvement for PBM. * other @ text @d1 1 a1 1 $NetBSD: patch-ai,v 1.7 2006/02/23 17:37:01 wiz Exp $ d3 16 a18 11 --- converter/other/xwdtopnm.c.orig 2005-12-15 03:45:59.000000000 +0000 +++ converter/other/xwdtopnm.c @@@@ -988,7 +988,7 @@@@ getpix(pixelReader * const rdrP) { (rdrP->itemBuffer >> nBitsToLeave) & bitsToTakeMask; } else { bitsToTake = rdrP->itemBuffer & bitsToTakeMask; - bitsToTake >>= nBitsToTake; + rdrP->itemBuffer >>= nBitsToTake; } /* Shift the bits into the right end of the accumulator */ pixel <<= nBitsToTake; @ 1.7 log @Fix bug in xwdtopnm. Patch from Bryan Henderson via Jukka Salmi on tech-pkg. Bump PKGREVISION. @ text @d1 1 a1 1 $NetBSD$ @ 1.6 log @Changes 10.31: * Bug fixes @ text @d1 1 a1 1 $NetBSD: patch-ai,v 1.5 2005/08/21 04:47:24 grant Exp $ d3 11 a13 18 --- converter/other/cameratopam/cameratopam.c.orig 2005-04-13 02:20:46.000000000 +1000 +++ converter/other/cameratopam/cameratopam.c @@@@ -6,6 +6,7 @@@@ information on copyright and licensing. */ +#include #define _XOPEN_SOURCE /* Make sure unistd.h contains swab() */ #define _BSD_SOURCE /* Make sure string.h containst strcasecmp() */ #include @@@@ -19,7 +20,6 @@@@ #include #include #include -#include #ifdef __CYGWIN__ #include @ 1.5 log @fix build on Solaris: - use graphics/jasper instead of built-in jasper which has little hope of building on Solaris - use putenv() instead of setenv() - fix abuse of _XOPEN_SOURCE no PKGREVISION bump as no dependency change except on Solaris, where this didn't build before. @ text @d1 1 a1 1 $NetBSD$ @ 1.4 log @Update to 9.24. pkgsrc changes: Don't use libtool any longer to reduce patches. Add USE_PERL, since 4 scripts depend on it. program changes: Lots of new converters/modification programs and scripts, e.g. pbmtonokia, ppmtolj, and pnmtopalm. Better alpha support. Also, lots of bug fixes. @ text @d1 1 a1 1 $NetBSD: patch-ai,v 1.3 2001/01/10 14:07:22 bad Exp $ d3 5 a7 4 --- pnm/fiasco/input/Makefile.orig Fri Jul 7 00:22:51 2000 +++ pnm/fiasco/input/Makefile Wed Jan 10 14:47:22 2001 @@@@ -8,7 +8,8 @@@@ all: libfiasco_input.a d9 9 a17 4 libfiasco_input.a: $(OBJECTS) - ar -rc $@@ $(OBJECTS) + $(AR) -rc $@@ $(OBJECTS) + $(RANLIB) $@@ d19 2 a20 2 .PHONY: clean clean: clean.common @ 1.3 log @The fiasco libraries need to be ranlib'ed. @ text @d1 1 a1 1 $NetBSD$ @ 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-ai,v 1.1 1999/01/10 23:52:16 tron Exp $ d3 4 a6 12 --- pgm/pgmmerge.c.orig Fri Jan 28 11:17:38 1994 +++ pgm/pgmmerge.c Sun Jan 10 23:48:40 1999 @@@@ -29,6 +29,10 @@@@ { ++argv; --argc; + if(!*argv) { + fprintf(stderr, "Usage: pgmmerge pgm_program_name [args ...]\n"); + exit(1); + } goto again; } d8 7 @ 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$ @