head 1.11; access; symbols pkgsrc-2014Q2:1.9.0.28 pkgsrc-2014Q2-base:1.9 pkgsrc-2014Q1:1.9.0.26 pkgsrc-2014Q1-base:1.9 pkgsrc-2013Q4:1.9.0.24 pkgsrc-2013Q4-base:1.9 pkgsrc-2013Q3:1.9.0.22 pkgsrc-2013Q3-base:1.9 pkgsrc-2013Q2:1.9.0.20 pkgsrc-2013Q2-base:1.9 pkgsrc-2013Q1:1.9.0.18 pkgsrc-2013Q1-base:1.9 pkgsrc-2012Q4:1.9.0.16 pkgsrc-2012Q4-base:1.9 pkgsrc-2012Q3:1.9.0.14 pkgsrc-2012Q3-base:1.9 pkgsrc-2012Q2:1.9.0.12 pkgsrc-2012Q2-base:1.9 pkgsrc-2012Q1:1.9.0.10 pkgsrc-2012Q1-base:1.9 pkgsrc-2011Q4:1.9.0.8 pkgsrc-2011Q4-base:1.9 pkgsrc-2011Q3:1.9.0.6 pkgsrc-2011Q3-base:1.9 pkgsrc-2011Q2:1.9.0.4 pkgsrc-2011Q2-base:1.9 pkgsrc-2011Q1:1.9.0.2 pkgsrc-2011Q1-base:1.9 pkgsrc-2009Q4:1.7.0.30 pkgsrc-2009Q4-base:1.7 pkgsrc-2009Q3:1.7.0.28 pkgsrc-2009Q3-base:1.7 pkgsrc-2009Q2:1.7.0.26 pkgsrc-2009Q2-base:1.7 pkgsrc-2009Q1:1.7.0.24 pkgsrc-2009Q1-base:1.7 pkgsrc-2008Q4:1.7.0.22 pkgsrc-2008Q4-base:1.7 pkgsrc-2008Q3:1.7.0.20 pkgsrc-2008Q3-base:1.7 cube-native-xorg:1.7.0.18 cube-native-xorg-base:1.7 pkgsrc-2008Q2:1.7.0.16 pkgsrc-2008Q2-base:1.7 cwrapper:1.7.0.14 pkgsrc-2008Q1:1.7.0.12 pkgsrc-2008Q1-base:1.7 pkgsrc-2007Q4:1.7.0.10 pkgsrc-2007Q4-base:1.7 pkgsrc-2007Q3:1.7.0.8 pkgsrc-2007Q3-base:1.7 pkgsrc-2007Q2:1.7.0.6 pkgsrc-2007Q2-base:1.7 pkgsrc-2007Q1:1.7.0.4 pkgsrc-2007Q1-base:1.7 pkgsrc-2006Q4:1.7.0.2 pkgsrc-2006Q4-base:1.7 pkgsrc-2006Q3:1.6.0.8 pkgsrc-2006Q3-base:1.6 pkgsrc-2006Q2:1.6.0.6 pkgsrc-2006Q2-base:1.6 pkgsrc-2006Q1:1.6.0.4 pkgsrc-2006Q1-base:1.6 pkgsrc-2005Q4:1.6.0.2 pkgsrc-2005Q4-base:1.6 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.11 date 2014.09.08.21.22.28; author wiz; state dead; branches; next 1.10; commitid 0IuhkyUPMU5rtAPx; 1.10 date 2014.08.25.08.23.22; author wiz; state Exp; branches; next 1.9; commitid JZNX8Fr2LhvjCINx; 1.9 date 2011.01.14.21.51.59; author tron; state Exp; branches; next 1.8; 1.8 date 2010.02.19.18.25.44; author drochner; state dead; branches; next 1.7; 1.7 date 2006.10.03.22.56.51; author schwarz; state Exp; branches 1.7.30.1; next 1.6; 1.6 date 2005.10.19.09.30.09; author adam; state dead; branches; next 1.5; 1.5 date 2005.09.20.05.04.11; author schmonz; 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.23; 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.7.30.1 date 2010.02.25.08.43.28; author spz; state dead; branches; next ; desc @@ 1.11 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-ak,v 1.10 2014/08/25 08:23:22 wiz Exp $ Fix build with png-1.5. Already included in Advanced release. --- converter/other/pngtxt.c.orig 2006-08-19 04:12:28.000000000 +0100 +++ converter/other/pngtxt.c 2011-01-14 21:28:09.000000000 +0000 @@@@ -240,7 +240,8 @@@@ void -pnmpng_read_text (png_info * const info_ptr, +pnmpng_read_text (png_struct * png_ptr, + png_info * info_ptr, FILE * const tfp, bool const ztxt, bool const verbose) { @@@@ -250,6 +251,7 @@@@ unsigned int commentIdx; bool noCommentsYet; bool eof; + png_textp text_ptr; unsigned int allocatedComments; /* Number of entries currently allocated for the info_ptr->text array @@@@ -257,8 +259,8 @@@@ allocatedComments = 256; /* initial value */ - MALLOCARRAY(info_ptr->text, allocatedComments); - if (info_ptr->text == NULL) + MALLOCARRAY(text_ptr, allocatedComments); + if (text_ptr == NULL) pm_error("unable to allocate memory for comment array"); commentIdx = 0; @@@@ -273,7 +275,7 @@@@ if (lineLength == 0) { /* skip this empty line */ } else { - handleArrayAllocation(&info_ptr->text, &allocatedComments, + handleArrayAllocation(&text_ptr, &allocatedComments, commentIdx); if ((textline[0] != ' ') && (textline[0] != '\t')) { /* Line doesn't start with white space, which @@@@ -285,7 +287,7 @@@@ ++commentIdx; noCommentsYet = FALSE; - startComment(&info_ptr->text[commentIdx], + startComment(&text_ptr[commentIdx], textline, lineLength, ztxt); } else { /* Line starts with whitespace, which means it is @@@@ -295,20 +297,20 @@@@ pm_error("Invalid comment file format: " "first line is a continuation line! " "(It starts with whitespace)"); - continueComment(&info_ptr->text[commentIdx], + continueComment(&text_ptr[commentIdx], textline, lineLength); } } strfree(textline); } } - if (noCommentsYet) - info_ptr->num_text = 0; - else - info_ptr->num_text = commentIdx + 1; + if (!noCommentsYet) + png_set_text(png_ptr, info_ptr, text_ptr, commentIdx + 1); if (verbose) - pm_message("%d comments placed in text chunk", info_ptr->num_text); + pm_message("%d comments placed in text chunk", commentIdx + 1); + + free(text_ptr); } @ 1.10 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-ak,v 1.9 2011/01/14 21:51:59 tron Exp $ @ 1.9 log @Get "pnmtopng" to build with new "png" package. "pngtopnm" still fails. @ text @d1 1 a1 1 $NetBSD$ d4 1 @ 1.8 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-ak,v 1.7 2006/10/03 22:56:51 schwarz Exp $ d3 76 a78 26 --- converter/ppm/ppmtompeg/headers/frame.h.orig 2005-12-24 04:23:55.000000000 +0100 +++ converter/ppm/ppmtompeg/headers/frame.h 2006-09-27 00:02:16.000000000 +0200 @@@@ -131,17 +131,17 @@@@ int const outsize_y); -extern void Frame_Free _ANSI_ARGS_((MpegFrame *frame)); +extern void Frame_Free _ANSI_ARGS_((MpegFrame * const frame)); extern void Frame_Exit _ANSI_ARGS_((void)); extern void Frame_AllocPPM _ANSI_ARGS_((MpegFrame * frame)); -extern void Frame_AllocYCC _ANSI_ARGS_((MpegFrame * mf)); -extern void Frame_AllocDecoded _ANSI_ARGS_((MpegFrame *frame, - boolean makeReference)); -extern void Frame_AllocHalf _ANSI_ARGS_((MpegFrame *frame)); -extern void Frame_AllocBlocks _ANSI_ARGS_((MpegFrame *mf)); -extern void Frame_Resize _ANSI_ARGS_((MpegFrame *omf, MpegFrame *mf, - int insize_x, int insize_y, - int outsize_x, int outsize_y)); +extern void Frame_AllocYCC _ANSI_ARGS_((MpegFrame * const mf)); +extern void Frame_AllocDecoded _ANSI_ARGS_((MpegFrame * const frame, + boolean const makeReference)); +extern void Frame_AllocHalf _ANSI_ARGS_((MpegFrame * const frame)); +extern void Frame_AllocBlocks _ANSI_ARGS_((MpegFrame * const mf)); +extern void Frame_Resize _ANSI_ARGS_((MpegFrame * const omf, MpegFrame * const mf, + int const insize_x, int const insize_y, + int const outsize_x, int const outsize_y)); a80 1 #endif /* FRAME_INCLUDED */ @ 1.7 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.7.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-ak,v 1.7 2006/10/03 22:56:51 schwarz Exp $ @ 1.6 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-ak,v 1.5 2005/09/20 05:04:11 schmonz Exp $ d3 4 a6 5 --- editor/pnmhisteq.c.orig 2004-09-17 23:25:46.000000000 -0400 +++ editor/pnmhisteq.c @@@@ -275,6 +275,8 @@@@ int main(argc, argv) luminosity mapping table which gives the histogram-equalized luminosity for each original luminosity. */ a7 3 + if (rmap == NULL) { + /* Calculate initial histogram equalisation curve. */ d9 20 a28 4 for (i = 0; i <= (int) maxval; i++) { @@@@ -301,6 +303,8 @@@@ int main(argc, argv) MIN(((long) maxval), ((long) (lumamap[0][i] * lscale + 0.5))); } a29 3 + } + /* If requested, print the luminosity map and original histogram. */ d31 1 a31 1 if (verbose) { @ 1.5 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.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-ak,v 1.3 2001/01/10 14:07:23 bad Exp $ d3 5 a7 4 --- pnm/fiasco/output/Makefile.orig Fri Jul 7 00:23:22 2000 +++ pnm/fiasco/output/Makefile Wed Jan 10 14:50:07 2001 @@@@ -8,7 +8,8 @@@@ all: libfiasco_output.a d9 3 a11 4 libfiasco_output.a: $(OBJECTS) - ar -rc $@@ $(OBJECTS) + $(AR) -rc $@@ $(OBJECTS) + $(RANLIB) $@@ d13 4 a16 1 all: $(OBJECTS) d18 5 @ 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-ak,v 1.1 1999/01/10 23:52:16 tron Exp $ d3 4 a6 4 --- pnm/anytopnm.orig Mon Oct 4 10:11:29 1993 +++ pnm/anytopnm Sun Jan 10 23:48:40 1999 @@@@ -53,7 +53,7 @@@@ ;; d8 4 a11 5 *GIF* ) - giftoppm "$file" + giftopnm "$file" break ;; d13 1 a13 3 @@@@ -82,6 +82,15 @@@@ break ;; a14 35 + *JPEG* | *JFIF* ) + djpeg "$file" + ;; + + *PNG* ) + pngtopnm "$file" + break + ;; + * ) # Can't figure out the file type from the magic number, # try the extension. @@@@ -130,7 +139,7 @@@@ fitstopgm "$file" ;; *.gif | *.gif.* ) - giftoppm "$file" + giftopnm "$file" ;; *.iff | *.iff.* | *.ilbm | *.ilbm.* ) ilbmtoppm "$file" @@@@ -168,6 +177,13 @@@@ *.ybm | *.ybm.* | *.face | *.face.* ) ybmtopbm "$file" ;; + *.JPEG | *.jpeg | *.jpg | *.JPG ) + djpeg "$file" + ;; + *.png | *.PNG ) + pngtopnm "$file" + break + ;; * ) echo "$0: unknown file type" 1>&2 exit 1 @ 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$ @