update to 1.2.6rc1,

fixes some security issues, see
http://scary.beasts.org/security/CESA-2004-001.txt

6 files changed, 20 insertions, 100 deletions

diff --git a/graphics/png/Makefile b/graphics/png/Makefile
index 8011afa694a..e49fd383f23 100644
--- a/graphics/png/Makefile
+++ b/graphics/png/Makefile
@@ -1,10 +1,9 @@
-# $NetBSD: Makefile,v 1.62 2004/07/10 01:11:18 wiz Exp $
+# $NetBSD: Makefile,v 1.63 2004/08/06 09:25:18 drochner Exp $
 
 # On update, don't forget to increase shared library major/minor's in
 # accordance with changes (patch-aa).
-DISTNAME=	libpng-1.2.5
+DISTNAME=	libpng-1.2.6rc1
 PKGNAME=	${DISTNAME:S/lib//}
-PKGREVISION=	6
 CATEGORIES=	graphics
 MASTER_SITES=	${MASTER_SITE_SOURCEFORGE:=libpng/} \
 		http://www.libpng.org/pub/png/src/ \
diff --git a/graphics/png/distinfo b/graphics/png/distinfo
index d2485d0d4b4..4241b75a4fb 100644
--- a/graphics/png/distinfo
+++ b/graphics/png/distinfo
@@ -1,10 +1,8 @@
-$NetBSD: distinfo,v 1.18 2004/05/10 01:15:14 fredb Exp $
+$NetBSD: distinfo,v 1.19 2004/08/06 09:25:18 drochner Exp $
 
-SHA1 (libpng-1.2.5.tar.bz2) = 6752eaf1a604edbbb0149b781155ef9cb47d80c3
-Size (libpng-1.2.5.tar.bz2) = 378030 bytes
+SHA1 (libpng-1.2.6rc1.tar.bz2) = ac2ffd8dd3d2deeff427784bc843eab90a262bed
+Size (libpng-1.2.6rc1.tar.bz2) = 377757 bytes
 SHA1 (patch-aa) = 0b3d28e526f8d1530e82c30be46aea19e5a32d6a
 SHA1 (patch-ab) = be7dc4a3e21c0056a913c5f1488528558024e6ea
-SHA1 (patch-ac) = 96e42c626b9aec1f2d68f920f147463ca77da27c
-SHA1 (patch-ad) = edfe5d2c827939eba9d62f426f5dca51979be245
-SHA1 (patch-ae) = 8556ab8a0f3d2dab1f83a8aa7dcc6b5e6728f2a2
-SHA1 (patch-af) = 47ee1f744dc629d9160cbce239d1ec80a970d9be
+SHA1 (patch-ad) = 609bf8f97d4d4a36340685b95ff84f7960d8706f
+SHA1 (patch-ae) = d5be0cdcfdd6c30a17b9633e28afb868911195aa
diff --git a/graphics/png/patches/patch-ac b/graphics/png/patches/patch-ac
deleted file mode 100644
index 72fe92534b9..00000000000
--- a/graphics/png/patches/patch-ac
+++ /dev/null
@@ -1,48 +0,0 @@
-$NetBSD: patch-ac,v 1.2 2002/12/20 17:54:28 fredb Exp $
-
---- pngrtran.c.orig	Thu Oct  3 06:32:29 2002
-+++ pngrtran.c
-@@ -1889,8 +1889,8 @@
-          /* This changes the data from GG to GGXX */
-          if (flags & PNG_FLAG_FILLER_AFTER)
-          {
--            png_bytep sp = row + (png_size_t)row_width;
--            png_bytep dp = sp  + (png_size_t)row_width;
-+            png_bytep sp = row + (png_size_t)row_width * 2;
-+            png_bytep dp = sp  + (png_size_t)row_width * 2;
-             for (i = 1; i < row_width; i++)
-             {
-                *(--dp) = hi_filler;
-@@ -1907,8 +1907,8 @@
-          /* This changes the data from GG to XXGG */
-          else
-          {
--            png_bytep sp = row + (png_size_t)row_width;
--            png_bytep dp = sp  + (png_size_t)row_width;
-+            png_bytep sp = row + (png_size_t)row_width * 2;
-+            png_bytep dp = sp  + (png_size_t)row_width * 2;
-             for (i = 0; i < row_width; i++)
-             {
-                *(--dp) = *(--sp);
-@@ -1965,8 +1965,8 @@
-          /* This changes the data from RRGGBB to RRGGBBXX */
-          if (flags & PNG_FLAG_FILLER_AFTER)
-          {
--            png_bytep sp = row + (png_size_t)row_width * 3;
--            png_bytep dp = sp  + (png_size_t)row_width;
-+            png_bytep sp = row + (png_size_t)row_width * 6;
-+            png_bytep dp = sp  + (png_size_t)row_width * 2;
-             for (i = 1; i < row_width; i++)
-             {
-                *(--dp) = hi_filler;
-@@ -1987,8 +1987,8 @@
-          /* This changes the data from RRGGBB to XXRRGGBB */
-          else
-          {
--            png_bytep sp = row + (png_size_t)row_width * 3;
--            png_bytep dp = sp  + (png_size_t)row_width;
-+            png_bytep sp = row + (png_size_t)row_width * 6;
-+            png_bytep dp = sp  + (png_size_t)row_width * 2;
-             for (i = 0; i < row_width; i++)
-             {
-                *(--dp) = *(--sp);
diff --git a/graphics/png/patches/patch-ad b/graphics/png/patches/patch-ad
index 5b1842cfe9b..15c645e4bc7 100644
--- a/graphics/png/patches/patch-ad
+++ b/graphics/png/patches/patch-ad
@@ -1,11 +1,11 @@
-$NetBSD: patch-ad,v 1.1 2004/03/29 16:02:08 ben Exp $
+$NetBSD: patch-ad,v 1.2 2004/08/06 09:25:18 drochner Exp $
 
---- scripts/libpng.pc.in.orig	Thu Oct  3 04:32:33 2002
+--- scripts/libpng.pc.in.orig	2004-08-04 13:34:51.000000000 +0200
 +++ scripts/libpng.pc.in
 @@ -7,5 +7,5 @@ includedir=${exec_prefix}/include
  Name: libpng12
  Description: Loads and saves PNG files
- Version: 1.2.5
+ Version: 1.2.6rc1
 -Libs: -L${libdir} -lpng12 -lz -lm
 -Cflags: -I${includedir}/libpng12
 +Libs: -L${libdir} -lpng -lz -lm
diff --git a/graphics/png/patches/patch-ae b/graphics/png/patches/patch-ae
index 50b107fb3b6..82f0af80a01 100644
--- a/graphics/png/patches/patch-ae
+++ b/graphics/png/patches/patch-ae
@@ -1,31 +1,15 @@
-$NetBSD: patch-ae,v 1.2 2004/05/10 01:15:14 fredb Exp $
+$NetBSD: patch-ae,v 1.3 2004/08/06 09:25:18 drochner Exp $
 
---- pngconf.h.orig	2002-10-03 06:32:27.000000000 -0500
+--- pngconf.h.orig	2004-08-04 13:34:47.000000000 +0200
 +++ pngconf.h
-@@ -252,8 +252,8 @@
- #      undef _BSD_SOURCE
- #    endif
- #    ifdef _SETJMP_H
--      __png.h__ already includes setjmp.h;
--      __dont__ include it again.;
-+#warning      __png.h__ already includes setjmp.h;
-+#warning      __dont__ include it again.;
+@@ -260,8 +260,8 @@
+      /* If you encounter a compiler error here, see the explanation
+       * near the end of INSTALL.
+       */
+-         __png.h__ already includes setjmp.h;
+-         __dont__ include it again.;
++#warning         __png.h__ already includes setjmp.h;
++#warning         __dont__ include it again.;
  #    endif
  #  endif /* __linux__ */
  
-@@ -1280,6 +1280,7 @@
- #  define CVT_PTR(ptr) (png_far_to_near(png_ptr,ptr,CHECK))
- #  define CVT_PTR_NOCHECK(ptr) (png_far_to_near(png_ptr,ptr,NOCHECK))
- #  define png_strcpy _fstrcpy
-+#  define png_strncpy _fstrncpy    /* Added to v 1.2.6 */
- #  define png_strlen _fstrlen
- #  define png_memcmp _fmemcmp      /* SJT: added */
- #  define png_memcpy _fmemcpy
-@@ -1288,6 +1289,7 @@
- #  define CVT_PTR(ptr)         (ptr)
- #  define CVT_PTR_NOCHECK(ptr) (ptr)
- #  define png_strcpy strcpy
-+#  define png_strncpy strncpy   /* Added to v 1.2.6 */
- #  define png_strlen strlen
- #  define png_memcmp memcmp     /* SJT: added */
- #  define png_memcpy memcpy
diff --git a/graphics/png/patches/patch-af b/graphics/png/patches/patch-af
deleted file mode 100644
index 9c35717cacc..00000000000
--- a/graphics/png/patches/patch-af
+++ /dev/null
@@ -1,13 +0,0 @@
-$NetBSD: patch-af,v 1.1 2004/05/10 01:15:14 fredb Exp $
-
---- pngerror.c.orig	2002-10-03 06:32:27.000000000 -0500
-+++ pngerror.c
-@@ -137,7 +137,7 @@ png_format_buffer(png_structp png_ptr, p
-    {
-       buffer[iout++] = ':';
-       buffer[iout++] = ' ';
--      png_memcpy(buffer+iout, error_message, 64);
-+      png_strncpy(buffer+iout, error_message, 63);
-       buffer[iout+63] = 0;
-    }
- }