From 038afbfd3ddd0ee4df4e2425e5b7e50c4bf50254 Mon Sep 17 00:00:00 2001
From: Tom Lane <tgl@fedoraproject.org>
Date: Nov 02 2008 20:47:40 +0000
Subject: Update to libpng 1.2.33


---

diff --git a/.cvsignore b/.cvsignore
index 32ff627..9e7c599 100644
--- a/.cvsignore
+++ b/.cvsignore
@@ -1 +1 @@
-libpng-1.2.31.tar.bz2
+libpng-1.2.33.tar.bz2
diff --git a/libpng-ztxt-bug.patch b/libpng-ztxt-bug.patch
deleted file mode 100644
index 7168cf7..0000000
--- a/libpng-ztxt-bug.patch
+++ /dev/null
@@ -1,17 +0,0 @@
-Patch for CVE-2008-3964
-
-
-diff -ru4NwbB libpng-1.2.31/pngpread.c libpng-1.2.32beta01/pngpread.c
---- libpng-1.2.31/pngpread.c	2008-08-21 05:54:13.254898477 -0500
-+++ libpng-1.2.32beta01/pngpread.c	2008-09-06 07:03:43.043602194 -0500
-@@ -1278,9 +1278,9 @@
- 
-                tmp = text;
-                text = (png_charp)png_malloc(png_ptr, text_size +
-                   (png_uint_32)(png_ptr->zbuf_size 
--                  - png_ptr->zstream.avail_out));
-+                  - png_ptr->zstream.avail_out + 1));
-                png_memcpy(text, tmp, text_size);
-                png_free(png_ptr, tmp);
-                png_memcpy(text + text_size, png_ptr->zbuf,
-                   png_ptr->zbuf_size - png_ptr->zstream.avail_out);
diff --git a/libpng.spec b/libpng.spec
index 2cb8e2a..06e451f 100644
--- a/libpng.spec
+++ b/libpng.spec
@@ -1,8 +1,8 @@
 Summary: A library of functions for manipulating PNG image format files
 Name: libpng
 Epoch: 2
-Version: 1.2.31
-Release: 2%{?dist}
+Version: 1.2.33
+Release: 1%{?dist}
 License: zlib
 Group: System Environment/Libraries
 URL: http://www.libpng.org/pub/png/
@@ -10,7 +10,6 @@ URL: http://www.libpng.org/pub/png/
 Source: ftp://ftp.simplesystems.org/pub/png/src/libpng-%{version}.tar.bz2
 Patch0: libpng-multilib.patch
 Patch1: libpng-pngconf.patch
-Patch2: libpng-ztxt-bug.patch
 
 Buildroot: %{_tmppath}/%{name}-%{version}-%{release}-root
 BuildRequires: zlib-devel
@@ -54,7 +53,6 @@ necessary for some boot packages.
 
 %patch0 -p1
 %patch1 -p1
-%patch2 -p1
 
 %build
 %configure
@@ -93,6 +91,9 @@ rm -rf $RPM_BUILD_ROOT%{_libdir}/libpng12.la
 rm -rf $RPM_BUILD_ROOT
 
 %changelog
+* Sun Nov  2 2008 Tom Lane <tgl@redhat.com> 2:1.2.33-1
+- Update to libpng 1.2.33
+
 * Tue Sep  9 2008 Tom Lane <tgl@redhat.com> 2:1.2.31-2
 - Apply upstream patch for zTXT buffer overrun (CVE-2008-3964)
 Related: #461599
diff --git a/sources b/sources
index d7515e2..59ad2c6 100644
--- a/sources
+++ b/sources
@@ -1 +1 @@
-78d2f8c4e0d64f8948819563587302d3  libpng-1.2.31.tar.bz2
+0532c28ba1b17ee2095ad50731c2c75c  libpng-1.2.33.tar.bz2