From 643a73122ec717fb3b2a9ca83c5bd9c74c8451af Mon Sep 17 00:00:00 2001
From: Tom Lane <tgl@redhat.com>
Date: Sat, 7 Apr 2012 14:22:12 -0400
Subject: [PATCH] Update to libpng 1.5.10 and 1.2.49

---
 .gitignore  | 4 ++--
 libpng.spec | 8 ++++++--
 sources     | 4 ++--
 3 files changed, 10 insertions(+), 6 deletions(-)

diff --git a/.gitignore b/.gitignore
index 7c7fa79..9dafcc3 100644
--- a/.gitignore
+++ b/.gitignore
@@ -1,2 +1,2 @@
-/libpng-1.5.9.tar.bz2
-/libpng-1.2.48.tar.bz2
+/libpng-1.5.10.tar.bz2
+/libpng-1.2.49.tar.bz2
diff --git a/libpng.spec b/libpng.spec
index 4f5cc5e..5ad93a2 100644
--- a/libpng.spec
+++ b/libpng.spec
@@ -1,7 +1,7 @@
 Summary: A library of functions for manipulating PNG image format files
 Name: libpng
 Epoch: 2
-Version: 1.5.9
+Version: 1.5.10
 Release: 1%{?dist}
 License: zlib
 Group: System Environment/Libraries
@@ -12,7 +12,7 @@ URL: http://www.libpng.org/pub/png/
 # be recompiled.  The compatibility library is placed in a separate
 # sub-RPM, libpng-compat.  There is no support for recompiling source code
 # against the old version.
-%global prevversion 1.2.48
+%global prevversion 1.2.49
 
 # Note: non-current tarballs get moved to the history/ subdirectory,
 # so look there if you fail to retrieve the version you want
@@ -140,6 +140,10 @@ rm -rf $RPM_BUILD_ROOT%{_libdir}/*.la
 rm -rf $RPM_BUILD_ROOT
 
 %changelog
+* Sat Apr  7 2012 Tom Lane <tgl@redhat.com> 2:1.5.10-1
+- Update to libpng 1.5.10 and 1.2.49, for minor security issues (CVE-2011-3048)
+Resolves: #809597
+
 * Sun Mar 11 2012 Tom Lane <tgl@redhat.com> 2:1.5.9-1
 - Update to libpng 1.5.9 and 1.2.48, for minor security issues (CVE-2011-3045)
 Resolves: #801667
diff --git a/sources b/sources
index 329779f..0d907f5 100644
--- a/sources
+++ b/sources
@@ -1,2 +1,2 @@
-684ba5f05da436a99c6303a83c7856d6  libpng-1.5.9.tar.bz2
-7612af5660cd4b5e8c433ce53bea01a7  libpng-1.2.48.tar.bz2
+f4395eaf426bdd870446c246df307aae  libpng-1.5.10.tar.bz2
+d5106b70b4f8b464a7da66bffe4565fb  libpng-1.2.49.tar.bz2