[libpng10] Update to 1.0.55

[Paul Howarth]

commit ec201f1fe9c911a363e43157e1bd8c70c504084a
Author: Paul Howarth <paul at city-fan.org>
Date:   Thu Jul 7 16:34:25 2011 +0100

    Update to 1.0.55
    
    - New upstream release 1.0.55
      - Fixed uninitialized memory read in png_format_buffer()
        (CVE-2011-2501, related to CVE-2004-0421)
      - Pass "" instead of '\0' to png_default_error() in png_err()
      - Check for up->location !PNG_AFTER_IDAT when writing unknown chunks before
        IDAT
      - Ported bugfix in pngrtran.c from 1.5.3: when expanding a paletted image,
        always expand to RGBA if transparency is present
      - Check for integer overflow in png_set_rgb_to_gray()
      - Check for sCAL chunk too short
    - Drop upstreamed patch for CVE-2011-2501
    - Add patch to fix build failure due to regression in libpng.sym creation

 .gitignore                        |    2 +-
 libpng-1.0.54-CVE-2011-2501.patch |   21 ---------------------
 libpng-1.0.55-sym.patch           |   24 ++++++++++++++++++++++++
 libpng10.spec                     |   25 +++++++++++++++++++------
 sources                           |    2 +-
 5 files changed, 45 insertions(+), 29 deletions(-)
---
diff --git a/.gitignore b/.gitignore
index 9fade54..8b6b33c 100644
--- a/.gitignore
+++ b/.gitignore
@@ -1 +1 @@
-libpng-1.0.54.tar.bz2
+/libpng-1\.0\.[0-9]*\.tar\.bz2
diff --git a/libpng-1.0.55-sym.patch b/libpng-1.0.55-sym.patch
new file mode 100644
index 0000000..cde1507
--- /dev/null
+++ b/libpng-1.0.55-sym.patch
@@ -0,0 +1,24 @@
+--- libpng-1.0.55/Makefile.am.sym	2011-07-07 15:23:22.659538757 +0100
++++ libpng-1.0.55/Makefile.am	2011-07-07 15:24:49.704384813 +0100
+@@ -102,8 +102,7 @@
+ 
+ libpng.sym: png.h pngconf.h
+ 	rm -f $@ $@.new
+-	$(CPP) @LIBPNG_DEFINES@ $(CPPFLAGS) -DPNG_BUILDSYMS $(srcdir)/png.h $(srcdir)/$@
+-	cat $(srcdir)/$@ | \
++	$(CPP) @LIBPNG_DEFINES@ $(CPPFLAGS) -DPNG_BUILDSYMS $(srcdir)/png.h | \
+ 		$(SED) -n -e \
+ 		's|^.*PNG_FUNCTION_EXPORT[ 	]*\([$(AN)]*\).*$$|$(SYMBOL_PREFIX)\1|p' \
+ 		-e 's|^.*PNG_DATA_EXPORT[ 	]*\([$(AN)]*\).*$$|$(SYMBOL_PREFIX)\1|p' \
+--- libpng-1.0.55/Makefile.in.sym	2011-07-07 15:23:22.660538755 +0100
++++ libpng-1.0.55/Makefile.in	2011-07-07 15:23:22.664538750 +0100
+@@ -1354,8 +1354,7 @@
+ 
+ libpng.sym: png.h pngconf.h
+ 	rm -f $@ $@.new
+-	$(CPP) @LIBPNG_DEFINES@ $(CPPFLAGS) -DPNG_BUILDSYMS $(srcdir)/png.h $(srcdir)/$@
+-	cat $(srcdir)/$@ | \
++	$(CPP) @LIBPNG_DEFINES@ $(CPPFLAGS) -DPNG_BUILDSYMS $(srcdir)/png.h | \
+ 		$(SED) -n -e \
+ 		's|^.*PNG_FUNCTION_EXPORT[ 	]*\([$(AN)]*\).*$$|$(SYMBOL_PREFIX)\1|p' \
+ 		-e 's|^.*PNG_DATA_EXPORT[ 	]*\([$(AN)]*\).*$$|$(SYMBOL_PREFIX)\1|p' \
diff --git a/libpng10.spec b/libpng10.spec
index d0e8370..a96a052 100644
--- a/libpng10.spec
+++ b/libpng10.spec
@@ -1,13 +1,13 @@
 Summary:	Old version of libpng, needed to run old binaries
 Name:		libpng10
-Version:	1.0.54
-Release:	3%{?dist}
+Version:	1.0.55
+Release:	1%{?dist}
 License:	zlib
 Group:		System Environment/Libraries
 URL:		http://www.libpng.org/pub/png/libpng.html
 Source:		ftp://ftp.simplesystems.org/pub/libpng/png/src/libpng-%{version}.tar.bz2
 Patch0:		libpng-1.0.51-soname.patch
-Patch1:		libpng-1.0.54-CVE-2011-2501.patch
+Patch1:		libpng-1.0.55-sym.patch
 Buildroot:	%{_tmppath}/%{name}-%{version}-%{release}-root-%(id -nu)
 BuildRequires:	zlib-devel
 Conflicts:	libpng < 2:1.2.0
@@ -39,9 +39,8 @@ libpng10-devel.
 # We want an soname of 2.%%{version}
 %patch0 -p1 -b .soname
 
-# Fix 1-byte uninitialized memory reference in png_format_buffer()
-# (CVE-2011-2501, related to CVE-2004-0421)
-%patch1 -p1
+# Fix regression in libpng.sym creation
+%patch1 -p1 -b .sym
 
 %build
 %configure \
@@ -116,6 +115,20 @@ rm -rf %{buildroot}
 %{_libdir}/pkgconfig/libpng10.pc
 
 %changelog
+* Thu Jul  7 2011 Paul Howarth <paul at city-fan.org> 1.0.55-1
+- update to 1.0.55
+  - fixed uninitialized memory read in png_format_buffer()
+    (CVE-2011-2501, related to CVE-2004-0421)
+  - pass "" instead of '\0' to png_default_error() in png_err()
+  - check for up->location !PNG_AFTER_IDAT when writing unknown chunks before
+    IDAT
+  - ported bugfix in pngrtran.c from 1.5.3: when expanding a paletted image,
+    always expand to RGBA if transparency is present
+  - check for integer overflow in png_set_rgb_to_gray()
+  - check for sCAL chunk too short
+- drop upstreamed patch for CVE-2011-2501
+- add patch to fix build failure due to regression in libpng.sym creation
+
 * Wed Jun 29 2011 Paul Howarth <paul at city-fan.org> 1.0.54-3
 - fix 1-byte uninitialized memory reference in png_format_buffer()
   (CVE-2011-2501, related to CVE-2004-0421)
diff --git a/sources b/sources
index c2f08fe..1e8c945 100644
--- a/sources
+++ b/sources
@@ -1 +1 @@
-cfd76e484cf37ee7edc1eb9fb13ef9d1  libpng-1.0.54.tar.bz2
+39fee4bc0ebbad5388308199c783719f  libpng-1.0.55.tar.bz2