From 221b066e93851dcfc5b5d65fcaa83618587993a6 Mon Sep 17 00:00:00 2001
From: Petr Hracek <phracek@redhat.com>
Date: Nov 19 2015 10:13:45 +0000
Subject: Merge branch 'master' into f23


Signed-off-by: Petr Hracek <phracek@redhat.com>

---

diff --git a/.gitignore b/.gitignore
index f04166d..b133d83 100644
--- a/.gitignore
+++ b/.gitignore
@@ -8,3 +8,5 @@
 /libpng-1.6.14.tar.gz
 /libpng-1.6.16.tar.gz
 /libpng-1.6.17.tar.gz
+/libpng-1.6.18.tar.gz
+/libpng-1.6.19.tar.gz
diff --git a/libpng-fix-arm-neon.patch b/libpng-fix-arm-neon.patch
index ee8b3e1..e424957 100644
--- a/libpng-fix-arm-neon.patch
+++ b/libpng-fix-arm-neon.patch
@@ -1,5 +1,5 @@
 diff --git a/configure.ac b/configure.ac
-index d60a5ab..df399e2 100644
+index 4fb0778..930bf50 100644
 --- a/configure.ac
 +++ b/configure.ac
 @@ -283,17 +283,21 @@ AC_ARG_ENABLE([arm-neon],
@@ -25,12 +25,12 @@ index d60a5ab..df399e2 100644
                     [Enable ARM Neon optimizations])
           AC_MSG_WARN([--enable-arm-neon: please specify 'check' or 'api', if]
 diff --git a/pngpriv.h b/pngpriv.h
-index aa63cfa..a5f72b1 100644
+index 1997503..789206f 100644
 --- a/pngpriv.h
 +++ b/pngpriv.h
-@@ -123,7 +123,7 @@
-     * Note that gcc-4.9 defines __ARM_NEON instead of __ARM_NEON__, so we
-     * check both variants.
+@@ -125,7 +125,7 @@
+     * associated assembler code, pass --enable-arm-neon=no to configure
+     * or put -DPNG_ARM_NEON_OPT=0 in CPPFLAGS.
      */
 -#  if (defined(__ARM_NEON__) || defined(__ARM_NEON)) && \
 +#  if defined(PNG_ARM_NEON) && (defined(__ARM_NEON__) || defined(__ARM_NEON)) && \
diff --git a/libpng.spec b/libpng.spec
index 8e03f1a..1894c0d 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.6.17
-Release:       4%{?dist}
+Version:       1.6.19
+Release:       1%{?dist}
 License:       zlib
 Group:         System Environment/Libraries
 URL:           http://www.libpng.org/pub/png/
@@ -13,7 +13,7 @@ Source0:       ftp://ftp.simplesystems.org/pub/libpng/png/src/libpng16/libpng-%{
 Source1:       pngusr.dfa
 Patch0:        libpng-multilib.patch
 Patch1:        libpng-fix-arm-neon.patch
-Patch2:        libpng-CVE-2015-8126.patch
+
 
 BuildRequires: zlib-devel
 BuildRequires: autoconf automake libtool
@@ -67,7 +67,6 @@ cp -p %{SOURCE1} .
 
 %patch0 -p1
 %patch1 -p1 -b .arm
-%patch2 -p1 -b .CVE-2015-8126
 
 %build
 autoreconf -vif
@@ -111,6 +110,9 @@ make check
 %{_bindir}/pngfix
 
 %changelog
+* Thu Nov 19 2015 Petr Hracek <phracek@redhat.com> - 2:1.6.19-1
+- new upstream release 1.6.19 (#1282193)
+
 * Wed Nov 18 2015 Petr Hracek <phracek@redhat.com> - 2:1.6.17-4
 - Security fix for CVE-2015-8126 (#1281757, #1281756). Proper patch
 
diff --git a/sources b/sources
index cd3ef03..c98b60f 100644
--- a/sources
+++ b/sources
@@ -1 +1 @@
-134282f1752dcf4cd81a37b8ff421cef  libpng-1.6.17.tar.gz
+3121bdc77c365a87e054b9f859f421fe  libpng-1.6.19.tar.gz