head 1.22; access; symbols pkgsrc-2014Q2:1.20.0.30 pkgsrc-2014Q2-base:1.20 pkgsrc-2014Q1:1.20.0.28 pkgsrc-2014Q1-base:1.20 pkgsrc-2013Q4:1.20.0.26 pkgsrc-2013Q4-base:1.20 pkgsrc-2013Q3:1.20.0.24 pkgsrc-2013Q3-base:1.20 pkgsrc-2013Q2:1.20.0.22 pkgsrc-2013Q2-base:1.20 pkgsrc-2013Q1:1.20.0.20 pkgsrc-2013Q1-base:1.20 pkgsrc-2012Q4:1.20.0.18 pkgsrc-2012Q4-base:1.20 pkgsrc-2012Q3:1.20.0.16 pkgsrc-2012Q3-base:1.20 pkgsrc-2012Q2:1.20.0.14 pkgsrc-2012Q2-base:1.20 pkgsrc-2012Q1:1.20.0.12 pkgsrc-2012Q1-base:1.20 pkgsrc-2011Q4:1.20.0.10 pkgsrc-2011Q4-base:1.20 pkgsrc-2011Q3:1.20.0.8 pkgsrc-2011Q3-base:1.20 pkgsrc-2011Q2:1.20.0.6 pkgsrc-2011Q2-base:1.20 pkgsrc-2011Q1:1.20.0.4 pkgsrc-2011Q1-base:1.20 pkgsrc-2010Q4:1.20.0.2 pkgsrc-2010Q4-base:1.20 pkgsrc-2009Q4:1.18.0.30 pkgsrc-2009Q4-base:1.18 pkgsrc-2009Q3:1.18.0.28 pkgsrc-2009Q3-base:1.18 pkgsrc-2009Q2:1.18.0.26 pkgsrc-2009Q2-base:1.18 pkgsrc-2009Q1:1.18.0.24 pkgsrc-2009Q1-base:1.18 pkgsrc-2008Q4:1.18.0.22 pkgsrc-2008Q4-base:1.18 pkgsrc-2008Q3:1.18.0.20 pkgsrc-2008Q3-base:1.18 cube-native-xorg:1.18.0.18 cube-native-xorg-base:1.18 pkgsrc-2008Q2:1.18.0.16 pkgsrc-2008Q2-base:1.18 cwrapper:1.18.0.14 pkgsrc-2008Q1:1.18.0.12 pkgsrc-2008Q1-base:1.18 pkgsrc-2007Q4:1.18.0.10 pkgsrc-2007Q4-base:1.18 pkgsrc-2007Q3:1.18.0.8 pkgsrc-2007Q3-base:1.18 pkgsrc-2007Q2:1.18.0.6 pkgsrc-2007Q2-base:1.18 pkgsrc-2007Q1:1.18.0.4 pkgsrc-2007Q1-base:1.18 pkgsrc-2006Q4:1.18.0.2 pkgsrc-2006Q4-base:1.18 pkgsrc-2006Q3:1.17.0.4 pkgsrc-2006Q3-base:1.17 pkgsrc-2006Q2:1.17.0.2 pkgsrc-2006Q2-base:1.17 pkgsrc-2006Q1:1.14.0.2 pkgsrc-2006Q1-base:1.14 pkgsrc-2005Q4:1.11.0.2 pkgsrc-2005Q4-base:1.11 pkgsrc-2005Q3:1.10.0.2 pkgsrc-2005Q3-base:1.10 pkgsrc-2005Q2:1.7.0.4 pkgsrc-2005Q2-base:1.7 pkgsrc-2005Q1:1.7.0.2 pkgsrc-2005Q1-base:1.7 pkgsrc-2004Q4:1.6.0.4 pkgsrc-2004Q4-base:1.6 pkgsrc-2004Q3:1.6.0.2 pkgsrc-2004Q3-base:1.6 pkgsrc-2004Q2:1.5.0.6 pkgsrc-2004Q2-base:1.5 pkgsrc-2004Q1:1.5.0.4 pkgsrc-2004Q1-base:1.5 pkgsrc-2003Q4:1.5.0.2 pkgsrc-2003Q4-base:1.5 buildlink2-base:1.5 netbsd-1-5-PATCH001:1.4 netbsd-1-5-RELEASE:1.4 netbsd-1-4-PATCH003:1.4 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.22 date 2014.09.08.21.22.28; author wiz; state dead; branches; next 1.21; commitid 0IuhkyUPMU5rtAPx; 1.21 date 2014.08.25.08.23.22; author wiz; state Exp; branches; next 1.20; commitid JZNX8Fr2LhvjCINx; 1.20 date 2010.10.28.07.09.13; author adam; state Exp; branches; next 1.19; 1.19 date 2010.02.19.18.25.44; author drochner; state dead; branches; next 1.18; 1.18 date 2006.10.03.22.56.50; author schwarz; state Exp; branches 1.18.30.1; next 1.17; 1.17 date 2006.06.25.06.35.58; author adam; state dead; branches; next 1.16; 1.16 date 2006.05.14.16.39.05; author wiz; state Exp; branches; next 1.15; 1.15 date 2006.04.17.08.11.17; author adam; state dead; branches; next 1.14; 1.14 date 2006.03.02.23.17.36; author adam; state Exp; branches 1.14.2.1; next 1.13; 1.13 date 2006.02.27.22.01.16; author adam; state dead; branches; next 1.12; 1.12 date 2006.02.02.17.01.17; author joerg; state Exp; branches; next 1.11; 1.11 date 2005.10.19.09.30.09; author adam; state dead; branches 1.11.2.1; next 1.10; 1.10 date 2005.09.20.05.04.11; author schmonz; state Exp; branches; next 1.9; 1.9 date 2005.08.22.11.59.31; author adam; state dead; branches; next 1.8; 1.8 date 2005.08.06.14.07.07; author salo; state Exp; branches; next 1.7; 1.7 date 2005.01.18.14.17.07; author adam; state dead; branches 1.7.4.1; next 1.6; 1.6 date 2004.07.10.13.29.35; author grant; state Exp; branches; next 1.5; 1.5 date 2002.03.14.22.21.43; author wiz; state dead; branches 1.5.6.1; next 1.4; 1.4 date 2000.07.10.11.12.11; author wiz; state Exp; branches; next 1.3; 1.3 date 2000.06.24.01.49.03; author dmcmahill; 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.18.30.1 date 2010.02.25.08.43.28; author spz; state dead; branches; next ; 1.14.2.1 date 2006.06.26.07.06.35; author ghen; state dead; branches; next ; 1.11.2.1 date 2006.02.05.21.52.21; author salo; state Exp; branches; next ; 1.7.4.1 date 2005.08.07.05.03.33; author snj; state Exp; branches; next ; 1.5.6.1 date 2004.07.13.14.05.27; author agc; state Exp; branches; next ; desc @@ 1.22 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-ag,v 1.21 2014/08/25 08:23:22 wiz Exp $ Use LDFLAGS from environment. Similar fix already in current Advanced release. --- buildtools/Makefile.orig 2010-10-28 07:01:24.000000000 +0000 +++ buildtools/Makefile @@@@ -37,7 +37,7 @@@@ typegen.o endiangen.o:%.o:%.c $(CC_FOR_BUILD) -c $(CFLAGS_FOR_BUILD) -o $@@ $< $(PROGS):%:%.o - $(LD_FOR_BUILD) -o $@@ $< + $(LD_FOR_BUILD) $(LDFLAGS) -o $@@ $< distclean clean: cleanlocal .PHONY: cleanlocal @ 1.21 log @Remove two patches/chunks for ancient problems. Update patch status for the ones that are in upstream releases/will be included soon. @ text @d1 1 a1 1 $NetBSD: patch-ag,v 1.20 2010/10/28 07:09:13 adam Exp $ @ 1.20 log @Pass LDFLAGS when building progs; required e.g. for -isysroot on MacOSX @ text @d1 4 a4 1 $NetBSD$ @ 1.19 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-ag,v 1.18 2006/10/03 22:56:50 schwarz Exp $ d3 4 a6 3 --- lib/libppmd.c.orig 2006-10-03 17:51:58.000000000 +0200 +++ lib/libppmd.c 2006-10-03 17:53:15.000000000 +0200 @@@@ -688,7 +688,9 @@@@ d8 3 d12 2 a13 7 +#ifndef SGI_IDO_CC static qsort_compare yx_compare; +#endif static int yx_compare(const void * const c1Arg, @ 1.18 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.18.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-ag,v 1.18 2006/10/03 22:56:50 schwarz Exp $ @ 1.17 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-ag,v 1.16 2006/05/14 16:39:05 wiz Exp $ d3 3 a5 8 --- converter/ppm/picttoppm.c.orig 2005-12-22 08:51:46.000000000 +0000 +++ converter/ppm/picttoppm.c @@@@ -1715,12 +1715,12 @@@@ unpackbits(struct Rect* const bounds, rowBytes = rowBytesArg & 0x7fff; else rowBytes = rowBytesArg; - if (rowBytes == 0) - rowBytes = pixwidth; a6 1 stage = "unpacking packbits"; a7 3 pixwidth = bounds->right - bounds->left; + if (rowBytes == 0) + rowBytes = pixwidth; d9 6 a14 2 pkpixsize = 1; if (pixelSize == 16) { @ 1.16 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.15 log @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. @ text @d1 1 a1 1 $NetBSD: patch-ag,v 1.14 2006/03/02 23:17:36 adam Exp $ d3 8 a10 8 --- other/Makefile.orig 2006-03-02 22:46:54.000000000 +0100 +++ other/Makefile @@@@ -67,6 +67,6 @@@@ install.bin.local: $(PKGDIR)/bin # In February 2006, pamdepth replaced pnmdepth cd $(PKGDIR)/bin ; \ rm -f pnmsdepth ; \ - $(SYMLINK) pnmsdepth$(EXE) pnmdepth + $(SYMLINK) pamdepth$(EXE) pnmdepth d12 8 a19 1 FORCE: @ 1.14 log @Fixed symbolic link to pamdepth @ text @d1 1 a1 1 $NetBSD$ @ 1.14.2.1 log @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, needs 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. @ text @d1 1 a1 1 $NetBSD: patch-ag,v 1.14 2006/03/02 23:17:36 adam Exp $ @ 1.13 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-ag,v 1.12 2006/02/02 17:01:17 joerg Exp $ d3 8 a10 4 --- converter/other/pnmtopng.c.orig 2006-02-02 16:52:10.000000000 +0000 +++ converter/other/pnmtopng.c @@@@ -267,7 +267,7 @@@@ parseCommandLine (int argc, char ** argv unsigned int option_def_index; d12 1 a12 15 unsigned int alphaSpec, transparentSpec, backgroundSpec; - unsigned int textSpec, ztxtSpec, modtimeSpec, paletteSpec; + unsigned int textSpec, ztxtSpec, paletteSpec; unsigned int filterSpec; unsigned int nofilter, sub, up, avg, paeth, filter; @@@@ -296,7 +296,7 @@@@ parseCommandLine (int argc, char ** argv OPTENT3(0, "ztxt", OPT_STRING, &cmdlineP->ztxt, &ztxtSpec, 0); OPTENT3(0, "modtime", OPT_STRING, &modtime, - &modtimeSpec, 0); + &cmdlineP->modtimeSpec, 0); OPTENT3(0, "palette", OPT_STRING, &cmdlineP->palette, &paletteSpec, 0); OPTENT3(0, "compression", OPT_UINT, @ 1.12 log @Save a bunch of coredump message in my dmesg and allow groff to compile by fixing pnmtopng's opt parsing. Bump revision. @ text @d1 1 a1 1 $NetBSD$ @ 1.11 log @Changes 10.30: Add pambayer. Add pamrgbatopng. Add pamtilt. Thanks Gregg Townsend . pamtotiff: create from pnmtotiff. pamtofits: create from pnmtofits. pamaddnoise: crate from pnmaddnoise. pamarith: Add -divide. pammasksharpen: Add -sharpness. pnmtopng: add -comp_mem_level, -comp_strategy, -comp_method, -comp_window_bits, -comp_buffer_size. pnmtopng: use Shhopt command line processor; replace -chroma with -rgb, -phys with -size, -time with -modtime. pnmremap: Handle multiple image stream. xpmtoppm: Expand capacity from 2K character input lines to 8K character input lines. libnetpbm: improved messages for "color xxx cannot be represented precisely with maxval M" libnetpbm color specification parsing: Improve warning message about rounding. libnetpbm/everything: speed up ppm_writeppmrow() and pgm_writepgmrow() by doing one fwrite per row instead of a pgm_writerawsample() per sample. pnmtopng: fix "meaningful bits" optimization of PGM so it optimizes all the way instead of stopping at 4 bits. pnmtopng: fix crash when no -alpha option, due to dereferencing of undefined alpha_mask. pnmtopng: fix bug: arbitrary color made transparent in paletted PNG when nothing should be transparent. pnmtops: bug: selects wrong Postscript level. bmptopnm: Don't crash on BMP with no color map. bmptopnm: Fix wrong file name in error messages. ppmtowinicon: use REALLOCARRAY instead of arithmetic-overflowing realloc(). anytopnm: fix bug: fails when 'file' database doesn't have mime type but does have human-readable type. manweb: recognize directory as not executable in search of PATH. pgm_allocrow(), ppm_allocrow(), pnm_allocrow(): cure arithmetic overflow. libnetpbm: On plain formats, check for sample value exceeding maxval. libnetpbm: reject maxval > 65535 in "pam" functions. pamarith: Use normalized libnetpbm facilities to get proper accuracy. Thanks Thomas Henlich . pamarith: fix bug: shift functions don't work when maxvals are not identical. pamarith: fix rounding error on multiply. pgmtexture: correct calculation of normalizing constants for d > 1. Thanks Marc Breithecker . pnmnorm: fix divide by zero crash. pnmnorm: fix bug that doesn't let you specify -luminosity, -colorvalue, or -saturation. ilbmtoppm: fix variable used before set. pnmtofits: fix 16 bit sample values > 2**15. pnmtopsnr: minor adjustments to messages. pnmnorm: don't crash when wvalue == bvalue. Thanks Thomas . pnmnorm: fix rounding of output values. Thanks Thomas . pnmhisteq: Fix external map to have width maxval + 1 instead of maxval, so full intensity input pixels map properly. pnmhisteq: Fix -rmap. Fix typos in error messages in various programs. pgmmedian: change syntax to Netpbm standard. pammasksharpen: fix signedness bug that caused random bright pixels at edges. pammasksharpen: fix bug with maxval != 255. Clean up a bunch of function prototypes so some broken compilers don't complain about missing "const" in them. Remove dependency of pnmtops on basename(). It isn't in some C libraries and we don't want to mess with linking extra libraries. Build of ppmsvgalib: work properly when LINUXSVGALIB is a "default path" value such as "libvga.so". @ text @d1 1 a1 1 $NetBSD: patch-ag,v 1.10 2005/09/20 05:04:11 schmonz Exp $ d3 1 a3 1 --- converter/other/pnmtopng.c.orig 2005-08-06 13:26:55.000000000 -0400 d5 2 a6 7 @@@@ -1690,7 +1690,7 @@@@ writeRaster(png_struct * const p pnm_promoteformatrow(xelrow, cols, maxval, format, maxval, PPM_TYPE); - makePngLine(line, xelrow, cols, maxval, alpha, alpha_mask[row], + makePngLine(line, xelrow, cols, maxval, alpha, alpha ? alpha_mask[row] : NULL, cht, caht, info_ptr, png_maxval, depth); d8 15 a22 1 png_write_row(png_ptr, line); @ 1.11.2.1 log @Pullup ticket 1084 - requested by Joerg Sonnenberger netpbm bugfix Revisions pulled up: - pkgsrc/graphics/netpbm/Makefile patch - pkgsrc/graphics/netpbm/distinfo patch - pkgsrc/graphics/netpbm/patches/patch-ag 1.12 Module Name: pkgsrc Committed By: joerg Date: Thu Feb 2 17:01:17 UTC 2006 Modified Files: pkgsrc/graphics/netpbm: Makefile distinfo Added Files: pkgsrc/graphics/netpbm/patches: patch-ag Log Message: Save a bunch of coredump message in my dmesg and allow groff to compile by fixing pnmtopng's opt parsing. Bump revision. @ text @d1 1 a1 1 $NetBSD: patch-ag,v 1.12 2006/02/02 17:01:17 joerg Exp $ d3 1 a3 1 --- converter/other/pnmtopng.c.orig 2006-02-02 16:52:10.000000000 +0000 d5 7 a11 2 @@@@ -267,7 +267,7 @@@@ parseCommandLine (int argc, char ** argv unsigned int option_def_index; d13 1 a13 15 unsigned int alphaSpec, transparentSpec, backgroundSpec; - unsigned int textSpec, ztxtSpec, modtimeSpec, paletteSpec; + unsigned int textSpec, ztxtSpec, paletteSpec; unsigned int filterSpec; unsigned int nofilter, sub, up, avg, paeth, filter; @@@@ -296,7 +296,7 @@@@ parseCommandLine (int argc, char ** argv OPTENT3(0, "ztxt", OPT_STRING, &cmdlineP->ztxt, &ztxtSpec, 0); OPTENT3(0, "modtime", OPT_STRING, &modtime, - &modtimeSpec, 0); + &cmdlineP->modtimeSpec, 0); OPTENT3(0, "palette", OPT_STRING, &cmdlineP->palette, &paletteSpec, 0); OPTENT3(0, "compression", OPT_UINT, @ 1.10 log @Apply patches for the three 10.29 bugs listed on SourceForge we hadn't already fixed. The list: http://sourceforge.net/project/shownotes.php?group_id=5128&release_id=349291 The problems fixed in this PKGREVISION bump: * pnmtopng: can crash due to wild pointer if you don't use the -alpha option. * pammasksharpen: Multiple bugs cause it to produce incorrect output. * pnmhisteq: -rmap doesn't work. Addresses my own PR pkg/31314, with thanks to Nathan Arthur for bringing these patches to my attention. @ text @d1 1 a1 1 $NetBSD$ @ 1.9 log @Changes 10.29: Add ppmdraw. Add pammixinterlace. Thanks Bruce Guenter . Add pgmmedian. Add pnmaddnoise. pnmtopclxl: add -rendergray option. pnmtopclxl: add -jobsetup option. pstopnm: add -dSAFER Ghostscript option. pnmcrop: add -margin option. pnmcrop: add -borderfile option. pnmnorm: add -luminosity (which was already default), -colorvalue, and -saturation. pnmtopng: Don't include any alpha info if supplied alpha mask is all opaque. ppmcie: Make white point mark more visible. pamdice: Remove restriction of 100 slices in each direction. pnmtopng: Fix bug: erroneous transparent pixels when supplied alpha mask is all opaque. Fix bytesToWordInt(): converts incorrectly on a machine that has pointer size != word size and uses the general case code. libnetpbm: fix basic pm_readlittleshort() bug introduced in 10.27. Affects mdatopbm, rawtopgm, lispmtopgm, pcxtoppm, winicontoppm, bmptopnm, sirtopnm, xwdtopnm, cameratopam. pamlookup: fix universal crash. Thanks "Colley, Anthony W." pbmtolj: fix bug from 10.28: crashes with a line which is a multiple of 8 plus 7 pixels wide not counting white right margin. ppmtompeg: fix uname() rc test (sometimes > 0 is success). @ text @d1 1 a1 1 $NetBSD: patch-ag,v 1.8 2005/08/06 14:07:07 salo Exp $ d3 9 a11 11 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", "-"); } d13 1 a13 6 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)); @ 1.8 log @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 @ text @d1 1 a1 1 $NetBSD$ @ 1.7 log @These patches are no longer needed @ text @d1 1 a1 1 $NetBSD: patch-ag,v 1.6 2004/07/10 13:29:35 grant Exp $ d3 11 a13 12 --- generator/Makefile.orig 2003-09-07 12:09:53.000000000 +1000 +++ generator/Makefile @@@@ -14,9 +14,9 @@@@ include $(BUILDDIR)/Makefile.config # This package is so big, it's useful even when some parts won't # build. -PORTBINARIES = pamseq pbmmake pbmtext pbmtextps pbmupc pgmnoise pgmramp \ +PORTBINARIES = pamseq pbmmake pbmtext pbmtextps pbmupc pgmnoise \ ppmcolors ppmmake -MATHBINARIES = pbmpage pgmcrater pgmkernel \ +MATHBINARIES = pbmpage pgmcrater pgmkernel pgmramp \ ppmcie ppmforge ppmpat ppmrough ppmwheel d15 6 a20 1 # We don't include programs that have special library dependencies in the @ 1.7.4.1 log @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 @ text @d1 1 a1 1 $NetBSD: patch-ag,v 1.8 2005/08/06 14:07:07 salo Exp $ d3 12 a14 11 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", "-"); } d16 1 a16 6 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)); @ 1.6 log @the "pgmramp" program included in this package needs to be linked against libm for fabs(). this is the same fix as is already in netpbm-latest. @ text @d1 1 a1 1 $NetBSD$ @ 1.5 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-ag,v 1.4 2000/07/10 11:12:11 wiz Exp $ d3 5 a7 10 --- pbmplus.h.orig Mon Jun 19 21:24:29 2000 +++ pbmplus.h Sun Jul 9 23:51:24 2000 @@@@ -51,7 +51,7 @@@@ #define RGB_DB1 "PBMplus_Dir:RGB.TXT" #define RGB_DB2 "PBMplus_Dir:RGB.TXT" #else -#define RGB_DB1 "/usr/lib/X11/rgb.txt" +#define RGB_DB1 "@@X11BASE@@/lib/X11/rgb.txt" #define RGB_DB2 "/usr/openwin/lib/rgb.txt" #endif d9 8 @ 1.5.6.1 log @Pullup ticket 52 to the pkgsrc-2004Q2 branch, requested by Grant Beattie. Fix netpbm build on Solaris (and thereby fix a number of other packages) Module Name: pkgsrc Committed By: grant Date: Sat Jul 10 13:29:35 UTC 2004 Modified Files: pkgsrc/graphics/netpbm: distinfo Added Files: pkgsrc/graphics/netpbm/patches: patch-ag Log Message: the "pgmramp" program included in this package needs to be linked against libm for fabs(). this is the same fix as is already in netpbm-latest. @ text @d1 1 a1 1 $NetBSD$ d3 10 a12 5 --- generator/Makefile.orig 2003-09-07 12:09:53.000000000 +1000 +++ generator/Makefile @@@@ -14,9 +14,9 @@@@ include $(BUILDDIR)/Makefile.config # This package is so big, it's useful even when some parts won't # build. a13 8 -PORTBINARIES = pamseq pbmmake pbmtext pbmtextps pbmupc pgmnoise pgmramp \ +PORTBINARIES = pamseq pbmmake pbmtext pbmtextps pbmupc pgmnoise \ ppmcolors ppmmake -MATHBINARIES = pbmpage pgmcrater pgmkernel \ +MATHBINARIES = pbmpage pgmcrater pgmkernel pgmramp \ ppmcie ppmforge ppmpat ppmrough ppmwheel # We don't include programs that have special library dependencies in the @ 1.4 log @Update to netpbm-9.5. Fixes pkg/8949. Changes: o Extend formats to allow multiple images per file. Add -allimages option to pnmfile. Add pnmsplit. Extend pnmtops. o Add pbmtowbmp, wbmptopbm. Thanks Terje Sannum. o ppmtobmp: Add 24 bit (truecolor) capability. o pnmcut: easier, more expressive syntax for specifying what to cut. o pnminterp: handle maxval != 255, convert to use Netpbm libraries. o Translate pstopnm from Csh to C, eliminate dependency on the 'bc' program. o Fix bug in tiff library build which caused null soname. o Add optParseopt2() to shhopt.a so you can use long options with one hyphen instead of two. o giftopnm: fix bug with variable used before set. Fix bug (coding error -- 0=>i). Unknown impact. o bmptoppm: fix bug with 24 bit (truecolor) Windows BMPs. o xwdtopnm: fix one more bug with bits_per_item <> bits_per_pixel. o Fix ppmtompeg build bug with static libraries. o Make build clean with gcc -ansi (albeit with some files that need extensions declaring the _BSD_SOURCE etc.). o Rebase pnmtopng, pngtopnm on Pnmtopng 2.37.4. o pbmtolj: fix bug where blank lines get discarded. Thanks Charles Howes. o ppmtompeg: fix bug with "PNM" format files with maxval != 255. Get rid of built-in PPM file parsing. o Fix 'make install' where mkinstalldirs is not found. o Fix bug where rle_global.c would not compile with GNU C Library 2. @ text @d1 1 a1 1 $NetBSD$ @ 1.3 log @forgot to cvs add this file before previous commit... @ text @d3 4 a6 3 --- pbmplus.h.orig Fri May 26 14:50:50 2000 +++ pbmplus.h Fri Jun 23 21:42:25 2000 @@@@ -52,5 +52,5 @@@@ d13 1 @ 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-ag,v 1.1 1999/01/10 23:52:16 tron Exp $ d3 9 a11 137 --- pbm/pbmto10x.c.orig Mon Oct 4 10:10:42 1993 +++ pbm/pbmto10x.c Sun Jan 10 23:48:40 1999 @@@@ -1,6 +1,6 @@@@ /* pbmto10x.c - read a portable bitmap and produce a Gemini 10X printer file ** -** Copyright (C) 1990 by Ken Yap +** Copyright (C) 1990, 1994 by Ken Yap ** ** Permission to use, copy, modify, and distribute this software and its ** documentation for any purpose and without fee is hereby granted, provided @@@@ -8,6 +8,8 @@@@ ** copyright notice and this permission notice appear in supporting ** documentation. This software is provided "as is" without express or ** implied warranty. +** +** Modified to shorten stripes and eliminate blank stripes. Dec 1994. */ #include "pbm.h" @@@@ -52,15 +54,40 @@@@ } static void +outstripe(stripe, sP, reschar) + register char *stripe, *sP; + register int reschar; +{ + register int ncols; + + /* scan backwards, removing empty columns */ + while (sP != stripe) + if (*--sP != 0) + { + ++sP; + break; + } + ncols = sP - stripe; + if (ncols > 0) + { + printf("\033%c%c%c", reschar, ncols % 256, ncols / 256); + fwrite(stripe, sizeof(char), ncols, stdout); + } + putchar('\n'); /* flush buffer */ +} + +static void res_60x72() { register int i, item, npins, row, col; bit *bitrows[LOW_RES_ROWS], *bP[LOW_RES_ROWS]; + char *stripe, *sP; + stripe = malloc(cols); for (i = 0; i < LOW_RES_ROWS; ++i) bitrows[i] = pbm_allocrow(cols); printf("\033A\010"); /* '\n' = 8/72 */ - for (row = 0; row < rows; row += LOW_RES_ROWS) + for (row = 0, sP = stripe; row < rows; row += LOW_RES_ROWS, sP = stripe) { if (row + LOW_RES_ROWS <= rows) npins = LOW_RES_ROWS; @@@@ -68,17 +95,18 @@@@ npins = rows - row; for (i = 0; i < npins; ++i) pbm_readpbmrow(ifp, bP[i] = bitrows[i], cols, format); - printf("\033K%c%c", cols % 256, cols / 256); for (col = 0; col < cols; ++col) { item = 0; for (i = 0; i < npins; ++i) if (*(bP[i]++) == PBM_BLACK) item |= 1 << (7 - i); - putchar(item); + *sP++ = item; } - putchar('\n'); + outstripe(stripe, sP, 'K'); } + printf("\033@@"); + free(stripe); } static void @@@@ -86,11 +114,13 @@@@ { register int i, pin, item, npins, row, col; bit *bitrows[HIGH_RES_ROWS], *bP[HIGH_RES_ROWS]; + char *stripe, *sP; + stripe = malloc(cols); for (i = 0; i < HIGH_RES_ROWS; ++i) bitrows[i] = pbm_allocrow(cols); - putchar('\033'); putchar('3'); putchar('\0'); - for (row = 0; row < rows; row += HIGH_RES_ROWS) + printf("\0333\001"); /* \n = 1/144" */ + for (row = 0, sP = stripe; row < rows; row += HIGH_RES_ROWS, sP = stripe) { if (row + HIGH_RES_ROWS <= rows) npins = HIGH_RES_ROWS; @@@@ -98,7 +128,6 @@@@ npins = rows - row; for (i = 0; i < npins; ++i) pbm_readpbmrow(ifp, bP[i] = bitrows[i], cols, format); - printf("\033L%c%c", cols % 256, cols / 256); for (col = 0; col < cols; ++col) { item = 0; @@@@ -106,11 +135,10 @@@@ for (pin = i = 0; i < npins; i += 2, ++pin) if (*(bP[i]++) == PBM_BLACK) item |= 1 << (7 - pin); - putchar(item); + *sP++ = item; } - putchar('\n'); /* flush buffer */ - printf("\033J\001"); /* 1/144 down */ - printf("\033L%c%c", cols % 256, cols / 256); + outstripe(stripe, sP, 'L'); + sP = stripe; for (col = 0; col < cols; ++col) { item = 0; @@@@ -118,9 +146,11 @@@@ for (i = 1, pin = 0; i < npins; i += 2, ++pin) if (*(bP[i]++) == PBM_BLACK) item |= 1 << (7 - pin); - putchar(item); + *sP++ = item; } - putchar('\n'); /* flush buffer */ - printf("\033J\017"); /* 15/144 down */ + outstripe(stripe, sP, 'L'); + printf("\033J\016"); /* 14/144 down, \n did 1/144 */ } + printf("\033@@"); + free(stripe); } @ 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$ @