[packages/libpng] - up to 1.6.10, fixes CVE-2014-0333

[baggins]

commit bd3c1796c43fa0cb83d0c1731de0616a5c6ff868
Author: Jan Rękorajski <baggins at pld-linux.org>
Date:   Tue Mar 18 20:17:37 2014 +0100

    - up to 1.6.10, fixes CVE-2014-0333

 libpng-pngminus.patch | 7 ++++---
 libpng.spec           | 8 ++++----
 2 files changed, 8 insertions(+), 7 deletions(-)
---
diff --git a/libpng.spec b/libpng.spec
index 2d66da0..107d86b 100644
--- a/libpng.spec
+++ b/libpng.spec
@@ -10,16 +10,16 @@ Summary(pl.UTF-8):	Biblioteka PNG
 Summary(pt_BR.UTF-8):	Biblioteca PNG
 Summary(tr.UTF-8):	PNG kitaplığı
 Name:		libpng
-Version:	1.6.6
+Version:	1.6.10
 Release:	1
 Epoch:		2
 License:	distributable
 Group:		Libraries
 Source0:	http://downloads.sourceforge.net/libpng/%{name}-%{version}.tar.xz
-# Source0-md5:	3a41dcd58bcac7cc191c2ec80c7fb2ac
+# Source0-md5:	5f414b20f683b1d96b163c89e3eff768
 Patch0:		%{name}-pngminus.patch
-Patch1:		http://downloads.sourceforge.net/libpng-apng/%{name}-1.6.5-apng.patch.gz
-# Patch1-md5:	e05f0ba9534e0331bf499d63811cbf93
+Patch1:		http://downloads.sourceforge.net/libpng-apng/%{name}-1.6.10-apng.patch.gz
+# Patch1-md5:	3404257f66d4a118b26ccc3fc4788810
 URL:		http://www.libpng.org/pub/png/libpng.html
 BuildRequires:	rpmbuild(macros) >= 1.213
 BuildRequires:	tar >= 1:1.22
diff --git a/libpng-pngminus.patch b/libpng-pngminus.patch
index 715b82f..d929f9f 100644
--- a/libpng-pngminus.patch
+++ b/libpng-pngminus.patch
@@ -1,6 +1,6 @@
 --- libpng-1.5.7/contrib/pngminus/makefile.std.orig	2011-12-15 16:45:32.000000000 +0100
 +++ libpng-1.5.7/contrib/pngminus/makefile.std	2011-12-18 16:24:38.099367091 +0100
-@@ -12,20 +12,20 @@
+@@ -12,21 +12,21 @@
  #PNGLIB = -L$(PNGPATH)/lib -lpng16
  #PNGLIBS = $(PNGPATH)/lib/libpng16.a
  PNGINC = -I../..
@@ -19,8 +19,9 @@
 +ZLIB = -lz
 +ZLIBS = -lz
  
--CFLAGS=$(PNGINC) $(ZINC)
-+CFLAGS=$(OPT_FLAGS) $(PNGINC) $(ZINC)
+-CPPFLAGS=$(PNGINC) $(ZINC)
++CPPFLAGS=$(OPT_FLAGS) $(PNGINC) $(ZINC)
+ CFLAGS=
  LDLIBS=$(PNGLIB) $(ZLIB)
 -LDLIBSS=$(PNGLIBS) $(ZLIBS)
 +LDLIBSS=$(LD_FLAGS) $(PNGLIBS) $(ZLIBS)
================================================================

---- gitweb:

http://git.pld-linux.org/gitweb.cgi/packages/libpng.git/commitdiff/bd3c1796c43fa0cb83d0c1731de0616a5c6ff868