head 1.6; access; symbols pkgsrc-2013Q2:1.6.0.8 pkgsrc-2013Q2-base:1.6 pkgsrc-2012Q4:1.6.0.6 pkgsrc-2012Q4-base:1.6 pkgsrc-2011Q4:1.6.0.4 pkgsrc-2011Q4-base:1.6 pkgsrc-2011Q2:1.6.0.2 pkgsrc-2011Q2-base:1.6 pkgsrc-2009Q4:1.5.0.4 pkgsrc-2009Q4-base:1.5 pkgsrc-2009Q3:1.5.0.2 pkgsrc-2009Q3-base:1.5 pkgsrc-2008Q4:1.4.0.44 pkgsrc-2008Q4-base:1.4 pkgsrc-2008Q3:1.4.0.42 pkgsrc-2008Q3-base:1.4 cube-native-xorg:1.4.0.40 cube-native-xorg-base:1.4 pkgsrc-2008Q2:1.4.0.38 pkgsrc-2008Q2-base:1.4 pkgsrc-2008Q1:1.4.0.36 pkgsrc-2008Q1-base:1.4 pkgsrc-2007Q4:1.4.0.34 pkgsrc-2007Q4-base:1.4 pkgsrc-2007Q3:1.4.0.32 pkgsrc-2007Q3-base:1.4 pkgsrc-2007Q2:1.4.0.30 pkgsrc-2007Q2-base:1.4 pkgsrc-2007Q1:1.4.0.28 pkgsrc-2007Q1-base:1.4 pkgsrc-2006Q4:1.4.0.26 pkgsrc-2006Q4-base:1.4 pkgsrc-2006Q3:1.4.0.24 pkgsrc-2006Q3-base:1.4 pkgsrc-2006Q2:1.4.0.22 pkgsrc-2006Q2-base:1.4 pkgsrc-2006Q1:1.4.0.20 pkgsrc-2006Q1-base:1.4 pkgsrc-2005Q4:1.4.0.18 pkgsrc-2005Q4-base:1.4 pkgsrc-2005Q3:1.4.0.16 pkgsrc-2005Q3-base:1.4 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-4-PATCH002:1.3 comdex-fall-1999:1.3 netbsd-1-4-PATCH001:1.3 netbsd-1-4-RELEASE:1.3 netbsd-1-3-PATCH003:1.2; locks; strict; comment @# @; 1.6 date 2010.02.19.18.25.44; author drochner; state dead; branches; next 1.5; 1.5 date 2009.08.27.09.18.06; author dholland; state Exp; branches 1.5.4.1; next 1.4; 1.4 date 2000.05.17.10.13.23; author tron; state dead; branches; next 1.3; 1.3 date 99.01.10.23.52.17; author tron; state Exp; branches; next 1.2; 1.2 date 98.08.07.10.40.50; author agc; state Exp; branches; next 1.1; 1.1 date 98.07.15.19.52.55; author tron; state Exp; branches; next ; 1.5.4.1 date 2010.02.25.08.43.28; author spz; state dead; branches; next ; desc @@ 1.6 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-ba,v 1.5 2009/08/27 09:18:06 dholland Exp $ Upstream patch to fix build with jpeg 7. --- converter/ppm/ppmtompeg/jpeg.c 2009/07/24 02:59:59 959 +++ converter/ppm/ppmtompeg/jpeg.c 2009/07/31 02:21:47 960 @@@@ -53,6 +53,17 @@@@ #define HEADER_SIZE 607 /*JFIF header size used on output images*/ +static int +minDctVScaledSize(struct jpeg_decompress_struct const cinfo) { + +#if JPEG_LIB_VERSION >= 70 + return cinfo.min_DCT_v_scaled_size; +#else + return cinfo.min_DCT_scaled_size; +#endif +} + + /*=======================================================================* * * @@@@ -417,11 +428,7 @@@@ */ /* set parameters for decompression */ -#ifdef JPEG4 - cinfo.want_raw_output = TRUE; -#else cinfo.raw_data_out = TRUE; -#endif cinfo.out_color_space = JCS_YCbCr; /* calculate image output dimensions */ @@@@ -467,11 +474,7 @@@@ /* Make an 8-row-high sample array that will go away when done with image */ -#ifdef JPEG4 - buffer_height = 8; /* could be 2, 4,8 rows high */ -#else - buffer_height = cinfo.max_v_samp_factor * cinfo.min_DCT_scaled_size; -#endif + buffer_height = cinfo.max_v_samp_factor * minDctVScaledSize(cinfo); for(cp=0,compptr = cinfo.comp_info;cp 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-ba,v 1.5 2009/08/27 09:18:06 dholland Exp $ @ 1.4 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-ba,v 1.3 1999/01/10 23:52:17 tron Exp $ d3 59 a61 11 --- ppm/ppmtogif.1.orig Fri Nov 12 10:18:30 1993 +++ ppm/ppmtogif.1 Sun Jan 10 23:48:41 1999 @@@@ -54,7 +54,7 @@@@ .PP All flags can be abbreviated to their shortest unique prefix. .SH "SEE ALSO" -giftoppm(1), ppmquant(1), ppm(5) +giftopnm(1), ppmquant(1), ppm(5) .SH AUTHOR Based on GIFENCOD by David Rowley . Lempel-Ziv compression based on "compress". @ 1.3 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$ @ 1.2 log @Add NetBSD RCS Ids. @ text @d3 11 a13 50 --- ./pnm/anytopnm.orig Mon Oct 4 05:11:29 1993 +++ ./pnm/anytopnm Sat Jul 20 22:19:05 1996 @@@@ -53,7 +53,7 @@@@ ;; *GIF* ) - giftoppm "$file" + giftopnm "$file" break ;; @@@@ -82,6 +82,15 @@@@ break ;; + *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 @Add well known fixes for "netpbm-1mar1994" supplied by John F. Woods in PR pkg/5723. @ text @d1 2 @