head 1.8; access; symbols pkgsrc-2013Q2:1.8.0.8 pkgsrc-2013Q2-base:1.8 pkgsrc-2012Q4:1.8.0.6 pkgsrc-2012Q4-base:1.8 pkgsrc-2011Q4:1.8.0.4 pkgsrc-2011Q4-base:1.8 pkgsrc-2011Q2:1.8.0.2 pkgsrc-2011Q2-base:1.8 pkgsrc-2010Q4:1.7.0.6 pkgsrc-2010Q4-base:1.7 pkgsrc-2010Q3:1.7.0.4 pkgsrc-2010Q3-base:1.7 pkgsrc-2010Q2:1.7.0.2 pkgsrc-2010Q2-base:1.7 pkgsrc-2009Q4:1.6.0.2 pkgsrc-2009Q4-base:1.6 pkgsrc-2009Q1:1.5.0.2 pkgsrc-2009Q1-base:1.5 pkgsrc-2008Q4:1.4.0.22 pkgsrc-2008Q4-base:1.4 pkgsrc-2008Q3:1.4.0.20 pkgsrc-2008Q3-base:1.4 cube-native-xorg:1.4.0.18 cube-native-xorg-base:1.4 pkgsrc-2008Q2:1.4.0.16 pkgsrc-2008Q2-base:1.4 pkgsrc-2008Q1:1.4.0.14 pkgsrc-2008Q1-base:1.4 pkgsrc-2007Q4:1.4.0.12 pkgsrc-2007Q4-base:1.4 pkgsrc-2007Q3:1.4.0.10 pkgsrc-2007Q3-base:1.4 pkgsrc-2007Q2:1.4.0.8 pkgsrc-2007Q2-base:1.4 pkgsrc-2007Q1:1.4.0.6 pkgsrc-2007Q1-base:1.4 pkgsrc-2006Q4:1.4.0.4 pkgsrc-2006Q4-base:1.4 pkgsrc-2006Q3:1.4.0.2 pkgsrc-2006Q3-base:1.4 pkgsrc-2006Q2:1.3.0.2 pkgsrc-2006Q2-base:1.3 pkgsrc-2006Q1:1.2.0.2 pkgsrc-2006Q1-base:1.2 pkgsrc-2005Q4:1.1.1.1.0.4 pkgsrc-2005Q4-base:1.1.1.1 pkgsrc-2005Q3:1.1.1.1.0.2 pkgsrc-2005Q3-base:1.1.1.1 pkgsrc-base:1.1.1.1 TNF:1.1.1; locks; strict; comment @# @; 1.8 date 2011.01.28.07.28.16; author adam; state dead; branches; next 1.7; 1.7 date 2010.06.13.22.44.39; author wiz; state Exp; branches; next 1.6; 1.6 date 2009.05.28.08.07.50; author adam; state dead; branches; next 1.5; 1.5 date 2009.03.02.06.20.34; author kefren; state Exp; branches; next 1.4; 1.4 date 2006.08.23.10.56.25; author adam; state dead; branches 1.4.22.1; next 1.3; 1.3 date 2006.05.06.08.48.43; author adam; state Exp; branches; next 1.2; 1.2 date 2006.01.19.11.18.41; author adam; state Exp; branches; next 1.1; 1.1 date 2005.07.13.14.52.39; author adam; state Exp; branches 1.1.1.1; next ; 1.4.22.1 date 2009.03.03.19.57.53; author tron; state Exp; branches; next ; 1.1.1.1 date 2005.07.13.14.52.39; author adam; state Exp; branches; next ; desc @@ 1.8 log @Changes 0.6.5: * Upgraded libpng to version 1.4.5-optipng [private] * Upgraded zlib to version 1.2.5-optipng [private] * Fixed the I/O states (in libpng 1.4.5); they caused incorrect file reads in some rare cases. * Fixed processing of PNG files with chunks of size 0. * Fixed a display error in the TIFF import. * Improved checking of the arguments of -f, -zc, -zm and -zs. * Removed quirks from the rangeset option argument syntax. * Fixed a build issue under the system-supplied libpng-1.4. * Resolved forward-compatibility issues regarding libpng-1.5; however, the system-supplied libpng-1.5 is not yet supported. * Added various enhancements to the configure+make build system. @ text @$NetBSD: patch-ab,v 1.7 2010/06/13 22:44:39 wiz Exp $ --- src/opngreduc.c.orig 2010-01-03 05:59:00.000000000 +0000 +++ src/opngreduc.c @@@@ -23,7 +23,11 @@@@ #define PNG_NO_PEDANTIC_WARNINGS #include "png.h" #if PNG_LIBPNG_VER >= 10400 -#include "pngpriv.h" +#define PNG_FILLER 0x8000L +#define PNG_FLAG_FILLER_AFTER 0x0080 +#ifndef png_debug +#define png_debug(l,m) +#endif #else #define trans_alpha trans #define trans_color trans_values @ 1.7 log @Bump PKGREVISION for libpng shlib name change. Also add some patches to remove use of deprecated symbols and fix other problems when looking for or compiling against libpng-1.4.x. @ text @d1 1 a1 1 $NetBSD$ @ 1.6 log @Changes 0.6.3: * Fixed a use-after-free error in the GIF reader. * Flushed the output log to display the current trial in real time. * Fixed an error in reporting unrecognized file formats. * Removed the requirement to "fix" TIFF files that contain unrecognized metadata. * Simplified the option abbreviation rules. Option names can now be abbreviated to their shortest unique prefix, as in X11 applications. @ text @d1 17 a17 36 $NetBSD: patch-ab,v 1.5 2009/03/02 06:20:34 kefren Exp $ diff -ru optipng-0.6.2/lib/pngxtern/gif/gifread.c optipng-0.6.2.1/lib/pngxtern/gif/gifread.c --- lib/pngxtern/gif/gifread.c 2006-08-10 20:17:00.000000000 -0400 +++ lib/pngxtern/gif/gifread.c 2009-02-20 03:11:00.000000000 -0500 @@@@ -219,8 +219,7 @@@@ **/ static void GIFReadNextExtension(struct GIFExtension *ext, FILE *stream) { - unsigned char *ptr; - unsigned int len; + unsigned int offset, len; int count, label; GIF_FGETC(label, stream); @@@@ -233,7 +232,7 @@@@ return; } - ptr = ext->Buffer; + offset = 0; len = ext->BufferSize; for ( ;; ) { @@@@ -243,10 +242,10 @@@@ ext->BufferSize += 1024; ext->Buffer = realloc(ext->Buffer, ext->BufferSize); } - count = ReadDataBlock(ptr, stream); + count = ReadDataBlock(ext->Buffer + offset, stream); if (count == 0) break; - ptr += count; + offset += count; len -= count; } } @ 1.5 log @ Add patches from upstream in order to update to 0.6.2.1 Changes: * Fix SA34035: Use after free error that can be used to execute arbitrary code via a specially crafted GIF image @ text @d1 1 a1 1 $NetBSD$ @ 1.4 log @Changes 0.5.4: * Added user options -out and -dir, to specify the name of the output file or directory. * Added support for builds based on the system-supplied libpng. @ text @d1 12 a12 5 $NetBSD: patch-ab,v 1.3 2006/05/06 08:48:43 adam Exp $ --- src/opng.h.orig 2006-04-15 16:45:00.000000000 +0200 +++ src/opng.h @@@@ -16,9 +16,6 @@@@ d14 4 a17 1 #include "png.h" d19 18 a36 6 -#if !(PNG_LIBPNG_BUILD_TYPE & PNG_LIBPNG_BUILD_PRIVATE) -#error This program requires the BUNDLED libpng version 1.2.x-optipng -#endif #define OPNG_IO_STATE_SUPPORTED /* implemented here */ @ 1.4.22.1 log @Pullup ticket #2714 - requested by kefren optipng: security patch Revisions pulled up: - graphics/optipng/Makefile 1.17 - graphics/optipng/distinfo 1.13 - graphics/optipng/patches/patch-ab 1.5 - graphics/optipng/patches/patch-ad 1.3 - graphics/optipng/patches/patch-ae 1.1 --- Module Name: pkgsrc Committed By: kefren Date: Mon Mar 2 06:20:34 UTC 2009 Modified Files: pkgsrc/graphics/optipng: Makefile distinfo Added Files: pkgsrc/graphics/optipng/patches: patch-ab patch-ad patch-ae Log Message: Add patches from upstream in order to update to 0.6.2.1 Changes: * Fix SA34035: Use after free error that can be used to execute arbitrary code via a specially crafted GIF image @ text @d1 5 a5 12 $NetBSD$ diff -ru optipng-0.6.2/lib/pngxtern/gif/gifread.c optipng-0.6.2.1/lib/pngxtern/gif/gifread.c --- lib/pngxtern/gif/gifread.c 2006-08-10 20:17:00.000000000 -0400 +++ lib/pngxtern/gif/gifread.c 2009-02-20 03:11:00.000000000 -0500 @@@@ -219,8 +219,7 @@@@ **/ static void GIFReadNextExtension(struct GIFExtension *ext, FILE *stream) { - unsigned char *ptr; - unsigned int len; + unsigned int offset, len; int count, label; d7 1 a7 4 GIF_FGETC(label, stream); @@@@ -233,7 +232,7 @@@@ return; } d9 6 a14 18 - ptr = ext->Buffer; + offset = 0; len = ext->BufferSize; for ( ;; ) { @@@@ -243,10 +242,10 @@@@ ext->BufferSize += 1024; ext->Buffer = realloc(ext->Buffer, ext->BufferSize); } - count = ReadDataBlock(ptr, stream); + count = ReadDataBlock(ext->Buffer + offset, stream); if (count == 0) break; - ptr += count; + offset += count; len -= count; } } @ 1.3 log @Changes 0.5.1: * Implemented bit depth reduction for palette images. * Upgraded libpng to version 1.2.10-optipng [private] * Improved the BMP support. * Added a Unix man page. * Allowed abbreviation of command-line options. * Changed user option -log to accept a file name as an argument. * Changed user option -no to -simulate. * Fixed an error in handling .bak files on Unix. * Fixed a small typo in the help screen. * Added the GUIDE and THANKS documents. * Converted some text document files to HTML. @ text @d1 1 a1 1 $NetBSD$ @ 1.2 log @Changes 0.5: ++ Added pngxtern, a libpng add-on for external image format support: BMP (uncompressed), GIF, PNM. (This was incorporated from OptiPNG-Plus.) ++ Implemented RGB(A)-to-palette reductions. + If trials are ended prematurely, detailed progression is only reported under the user option -v. - Removed reporting of some IDAT sizes that exceeded the optimum. (This was NOT a bug, but a "feature" that confused some users.) ! Fixed an RGB-to-gray reduction problem that occured under some specific background colors. + Added support for builds based on the system-supplied zlib. * Modified LICENSE. It is now a verbatim spell of the zlib license. @ text @d3 1 a3 1 --- src/opng.h.orig 2006-01-19 08:59:26.000000000 +0100 d5 2 a6 1 @@@@ -34,9 +34,6 @@@@ a7 1 #include "pngxtern.h" d14 1 a14 1 #define OPNG_IMAGE_REDUCTIONS_SUPPORTED /* implemented here */ @ 1.1 log @Initial revision @ text @d3 3 a5 4 --- opng.h.orig 2005-07-13 16:41:40.000000000 +0000 +++ opng.h @@@@ -33,9 +33,6 @@@@ d7 1 d10 1 a10 1 -#error This program requires the BUNDLED libpng version 1.0.x-optipng @ 1.1.1.1 log @OptiPNG is a PNG optimizer that recompresses the image files to a smaller size, without losing any information. The idea has been inspired from pngcrush, and is explained in detail in the PNG-Tech article: "A Guide to PNG optimization" . The implementation is carried forward in OptiPNG, which offers a faster execution per trial, and a wider search space. @ text @@