From 613ec799d2d6abbb41fcc2861244f0ee4a677f24 Mon Sep 17 00:00:00 2001 From: adam Date: Thu, 28 May 2009 08:07:50 +0000 Subject: 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. --- graphics/optipng/Makefile | 5 ++--- graphics/optipng/distinfo | 11 ++++------- graphics/optipng/patches/patch-ab | 36 ------------------------------------ graphics/optipng/patches/patch-ad | 12 ------------ graphics/optipng/patches/patch-ae | 12 ------------ 5 files changed, 6 insertions(+), 70 deletions(-) delete mode 100644 graphics/optipng/patches/patch-ab delete mode 100644 graphics/optipng/patches/patch-ad delete mode 100644 graphics/optipng/patches/patch-ae (limited to 'graphics/optipng') diff --git a/graphics/optipng/Makefile b/graphics/optipng/Makefile index e2f1bfd7b03..ca10ccd0026 100644 --- a/graphics/optipng/Makefile +++ b/graphics/optipng/Makefile @@ -1,7 +1,6 @@ -# $NetBSD: Makefile,v 1.17 2009/03/02 06:20:33 kefren Exp $ +# $NetBSD: Makefile,v 1.18 2009/05/28 08:07:50 adam Exp $ -DISTNAME= optipng-0.6.2 -PKGNAME= ${DISTNAME}.1 +DISTNAME= optipng-0.6.3 CATEGORIES= graphics MASTER_SITES= ${MASTER_SITE_SOURCEFORGE:=optipng/} diff --git a/graphics/optipng/distinfo b/graphics/optipng/distinfo index ac11b84a2b6..3321fee63db 100644 --- a/graphics/optipng/distinfo +++ b/graphics/optipng/distinfo @@ -1,10 +1,7 @@ -$NetBSD: distinfo,v 1.13 2009/03/02 06:20:33 kefren Exp $ +$NetBSD: distinfo,v 1.14 2009/05/28 08:07:50 adam Exp $ -SHA1 (optipng-0.6.2.tar.gz) = 374b3537a262590ba2822f2b10d9241247b4da95 -RMD160 (optipng-0.6.2.tar.gz) = cd9ecfbd1c8901d14cb93fbc9f07403071cea37e -Size (optipng-0.6.2.tar.gz) = 1052509 bytes +SHA1 (optipng-0.6.3.tar.gz) = eba6e3c940588b1d02abfabc407e5c759a3fdd8a +RMD160 (optipng-0.6.3.tar.gz) = 3ef55878defee86a57b8b0b268da1a7e9eca0d14 +Size (optipng-0.6.3.tar.gz) = 1060571 bytes SHA1 (patch-aa) = 0a0c92b9786193862465646373b82c6bc47cee2c -SHA1 (patch-ab) = 7816dcfe5505695a3032bdb399b904e5db33a182 SHA1 (patch-ac) = fb4eb567b5a24b2d26bf357061be80c57b4d4a3c -SHA1 (patch-ad) = f44f5862de983da3a78529db1ba1b53d40d16dde -SHA1 (patch-ae) = cf8a80e056bc25d59e2ffda73127e71056cc8ce2 diff --git a/graphics/optipng/patches/patch-ab b/graphics/optipng/patches/patch-ab deleted file mode 100644 index a48f7cfeea6..00000000000 --- a/graphics/optipng/patches/patch-ab +++ /dev/null @@ -1,36 +0,0 @@ -$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; - } - } diff --git a/graphics/optipng/patches/patch-ad b/graphics/optipng/patches/patch-ad deleted file mode 100644 index 6223effb2bc..00000000000 --- a/graphics/optipng/patches/patch-ad +++ /dev/null @@ -1,12 +0,0 @@ -$NetBSD: patch-ad,v 1.3 2009/03/02 06:20:34 kefren Exp $ -diff -ru optipng-0.6.2/src/optipng.c optipng-0.6.2.1/src/optipng.c ---- src/optipng.c 2008-11-09 23:56:00.000000000 -0500 -+++ src/optipng.c 2008-11-11 13:57:00.000000000 -0500 -@@ -542,6 +542,7 @@ - static void - app_init(void) - { -+ setvbuf(stdout, NULL, _IONBF, 0); - if (options.log_name != NULL) - { - /* Open the log file, line-buffered. */ diff --git a/graphics/optipng/patches/patch-ae b/graphics/optipng/patches/patch-ae deleted file mode 100644 index 02b8fb70049..00000000000 --- a/graphics/optipng/patches/patch-ae +++ /dev/null @@ -1,12 +0,0 @@ -$NetBSD: patch-ae,v 1.1 2009/03/02 06:20:34 kefren Exp $ -diff -ru optipng-0.6.2/src/proginfo.h optipng-0.6.2.1/src/proginfo.h ---- src/proginfo.h 2008-11-09 23:56:00.000000000 -0500 -+++ src/proginfo.h 2009-02-22 23:38:00.000000000 -0500 -@@ -1,5 +1,5 @@ - #define PROGRAM_NAME "OptiPNG" - #define PROGRAM_DESCRIPTION "Advanced PNG optimizer" --#define PROGRAM_VERSION "0.6.2" --#define PROGRAM_COPYRIGHT "Copyright (C) 2001-2008 Cosmin Truta" -+#define PROGRAM_VERSION "0.6.2.1" -+#define PROGRAM_COPYRIGHT "Copyright (C) 2001-2009 Cosmin Truta" - #define PROGRAM_URI "http://optipng.sourceforge.net/" -- cgit v1.2.3