Changes 1.6.12:

* Eliminated a memory leak in libpng with writing bad tEXt chunks.

3 files changed, 7 insertions, 70 deletions

diff --git a/graphics/pngcrush/Makefile b/graphics/pngcrush/Makefile
index 279bfe513de..7b0c7893e4b 100644
--- a/graphics/pngcrush/Makefile
+++ b/graphics/pngcrush/Makefile
@@ -1,7 +1,7 @@
-# $NetBSD: Makefile,v 1.29 2008/10/26 09:19:16 adam Exp $
+# $NetBSD: Makefile,v 1.30 2009/01/03 19:36:43 adam Exp $
 
-DISTNAME=	pngcrush-1.6.10-nolib
-PKGNAME=	pngcrush-1.6.10
+DISTNAME=	pngcrush-1.6.12-nolib
+PKGNAME=	pngcrush-1.6.12
 CATEGORIES=	graphics
 MASTER_SITES=	${MASTER_SITE_SOURCEFORGE:=pmt/}
 EXTRACT_SUFX=	.tar.bz2
diff --git a/graphics/pngcrush/distinfo b/graphics/pngcrush/distinfo
index 42dc31c2dc3..eb366bedb4d 100644
--- a/graphics/pngcrush/distinfo
+++ b/graphics/pngcrush/distinfo
@@ -1,6 +1,5 @@
-$NetBSD: distinfo,v 1.15 2008/10/26 09:19:16 adam Exp $
+$NetBSD: distinfo,v 1.16 2009/01/03 19:36:43 adam Exp $
 
-SHA1 (pngcrush-1.6.10-nolib.tar.bz2) = 4b3d6450d776e53408960fba9de7661b3e3e99cc
-RMD160 (pngcrush-1.6.10-nolib.tar.bz2) = 92466d6bde526e77f826b4ec7589f132c525ea39
-Size (pngcrush-1.6.10-nolib.tar.bz2) = 42633 bytes
-SHA1 (patch-aa) = 6e6949d18f5c1283ace50296d22184a211486eea
+SHA1 (pngcrush-1.6.12-nolib.tar.bz2) = ffba5b8d8d6da08deda13c19edb952c7601727f9
+RMD160 (pngcrush-1.6.12-nolib.tar.bz2) = c5c4c629881141741b101027200de20b2a361f6a
+Size (pngcrush-1.6.12-nolib.tar.bz2) = 42377 bytes
diff --git a/graphics/pngcrush/patches/patch-aa b/graphics/pngcrush/patches/patch-aa
deleted file mode 100644
index 29a2de874f8..00000000000
--- a/graphics/pngcrush/patches/patch-aa
+++ /dev/null
@@ -1,62 +0,0 @@
-$NetBSD: patch-aa,v 1.8 2008/10/26 09:19:16 adam Exp $
-
---- pngcrush.c.orig	2008-08-25 21:00:08.000000000 +0200
-+++ pngcrush.c
-@@ -632,9 +632,6 @@ void png_crc_read(png_structp png_ptr, p
- int png_crc_error(png_structp png_ptr);
- int png_crc_finish(png_structp png_ptr, png_uint_32 skip);
- 
--png_uint_32 png_get_uint_31(png_structp png_ptr, png_bytep buf);
--png_uint_32 png_get_uint_32(png_bytep buf);
--void png_save_uint_32(png_bytep buf, png_uint_32 i);
- 
- #ifdef PNG_USER_MEM_SUPPORTED
- png_voidp png_debug_malloc(png_structp png_ptr, png_uint_32 size);
-@@ -670,38 +667,6 @@ void print_usage(int retval);
-  * ============================================================
-  */
- 
--#ifndef PNG_READ_BIG_ENDIAN_SUPPORTED
--/* Grab an unsigned 32-bit integer from a buffer in big-endian format. */
--png_uint_32 /* PRIVATE */
--png_get_uint_32(png_bytep buf)
--{
--   png_uint_32 i = ((png_uint_32)(*buf) << 24) +
--      ((png_uint_32)(*(buf + 1)) << 16) +
--      ((png_uint_32)(*(buf + 2)) << 8) +
--      (png_uint_32)(*(buf + 3));
--
--   return (i);
--}
--#else
--#  define png_get_uint_32(buf) ( *((png_uint_32p) (buf)))
--#endif
--png_uint_32 /* PRIVATE */
--png_get_uint_31(png_structp png_ptr, png_bytep buf)
--{
--   png_uint_32 i = png_get_uint_32(buf);
--   if (i > PNG_UINT_31_MAX)
--     png_error(png_ptr, "PNG unsigned integer out of range.\n");
--   return (i);
--}
--void /* PRIVATE */
--png_save_uint_32(png_bytep buf, png_uint_32 i)
--{
--   buf[0] = (png_byte)((i >> 24) & 0xff);
--   buf[1] = (png_byte)((i >> 16) & 0xff);
--   buf[2] = (png_byte)((i >> 8) & 0xff);
--   buf[3] = (png_byte)(i & 0xff);
--}
--
- /* Reset the CRC variable to 32 bits of 1's.  Care must be taken
-  * in case CRC is > 32 bits to leave the top bits 0.
-  */
-@@ -2821,7 +2786,7 @@ int main(int argc, char *argv[])
- #if !defined(PNG_cHRM_SUPPORTED) || !defined(PNG_hIST_SUPPORTED) || \
-     !defined(PNG_iCCP_SUPPORTED) || !defined(PNG_sCAL_SUPPORTED) || \
-     !defined(PNG_pCAL_SUPPORTED) || !defined(PNG_sPLT_SUPPORTED) || \
--    !defined(PNG_tIME_SUPPORTED)
-+    !defined(PNG_tIME_SUPPORTED) || !defined(PNG_sTER_SUPPORTED)
-                         png_byte chunk_name[5];
-                         chunk_name[4] = '\0';
- #endif