[libpng] Update to libpng 1.5.12

[Tom Lane]

commit 814373a82eda8839ed33bdf6f68e16a2ca7340e3
Author: Tom Lane <tgl at redhat.com>
Date:   Sat Aug 4 12:22:43 2012 -0400

    Update to libpng 1.5.12

 .gitignore  |    2 +-
 libpng.spec |   15 ++++++++++++---
 pngusr.dfa  |    6 ++++++
 sources     |    2 +-
 4 files changed, 20 insertions(+), 5 deletions(-)
---
diff --git a/.gitignore b/.gitignore
index 73622ad..e507a3c 100644
--- a/.gitignore
+++ b/.gitignore
@@ -1 +1 @@
-/libpng-1.5.10.tar.bz2
+/libpng-1.5.12.tar.bz2
diff --git a/libpng.spec b/libpng.spec
index caffd2b..4f2b8d6 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.5.10
-Release: 3%{?dist}
+Version: 1.5.12
+Release: 1%{?dist}
 License: zlib
 Group: System Environment/Libraries
 URL: http://www.libpng.org/pub/png/
@@ -11,6 +11,8 @@ URL: http://www.libpng.org/pub/png/
 # so look there if you fail to retrieve the version you want
 Source0: ftp://ftp.simplesystems.org/pub/png/src/libpng-%{version}.tar.bz2
 
+Source1: pngusr.dfa
+
 Patch0: libpng-multilib.patch
 
 BuildRequires: zlib-devel, pkgconfig
@@ -52,11 +54,14 @@ necessary for some boot packages.
 %prep
 %setup -q
 
+# Provide pngusr.dfa for build.
+cp -p %{SOURCE1} .
+
 %patch0 -p1
 
 %build
 %configure
-make %{?_smp_mflags}
+make %{?_smp_mflags} DFA_XTRA=pngusr.dfa
 
 %install
 make DESTDIR=$RPM_BUILD_ROOT install
@@ -84,6 +89,10 @@ rm -rf $RPM_BUILD_ROOT%{_libdir}/*.la
 %{_libdir}/libpng*.a
 
 %changelog
+* Sat Aug  4 2012 Tom Lane <tgl at redhat.com> 2:1.5.12-1
+- Update to libpng 1.5.12 for minor bug fixes
+- Activate chunk size limits by default, with a very generous default limit
+
 * Wed Aug  1 2012 Tom Lane <tgl at redhat.com> 2:1.5.10-3
 - Remove compat subpackage (it's now a separate package "libpng12")
 - Minor specfile cleanup per suggestions from Tom Callaway
diff --git a/pngusr.dfa b/pngusr.dfa
new file mode 100644
index 0000000..2eca9f6
--- /dev/null
+++ b/pngusr.dfa
@@ -0,0 +1,6 @@
+# Enable use of "safe" default limits on image size and chunk size.
+option SAFE_LIMITS on
+# However, the default defaults seem a tad too restrictive for general
+# purpose use, so back them off a little.
+setting USER_CHUNK_CACHE_MAX default 1000
+setting USER_CHUNK_MALLOC_MAX default 1000000000
diff --git a/sources b/sources
index d6aa44d..08e9b77 100644
--- a/sources
+++ b/sources
@@ -1 +1 @@
-f4395eaf426bdd870446c246df307aae  libpng-1.5.10.tar.bz2
+d87f9c34ccab8242c00e41925839f6c9  libpng-1.5.12.tar.bz2