commit 217bbccea4c9417d6dea8ed78447a6ed6396d923
Author: Jakub Bogusz <[email protected]>
Date: Wed Mar 19 15:51:44 2014 +0100
- updated to 1.6.10 (fixes CVE-2014-0333)
crossmingw32-libpng.spec | 8 ++++----
libpng-pngminus.patch | 13 +++++++------
2 files changed, 11 insertions(+), 10 deletions(-)
---
diff --git a/crossmingw32-libpng.spec b/crossmingw32-libpng.spec
index bdd9230..3d7496d 100644
--- a/crossmingw32-libpng.spec
+++ b/crossmingw32-libpng.spec
@@ -2,15 +2,15 @@
Summary: PNG library - MinGW32 cross version
Summary(pl.UTF-8): Biblioteka PNG - wersja skrośna dla MinGW32
Name: crossmingw32-%{realname}
-Version: 1.6.6
+Version: 1.6.10
Release: 1
License: distributable
Group: Development/Libraries
Source0:
http://downloads.sourceforge.net/libpng/%{realname}-%{version}.tar.xz
-# Source0-md5: 3a41dcd58bcac7cc191c2ec80c7fb2ac
+# Source0-md5: 5f414b20f683b1d96b163c89e3eff768
Patch0: %{realname}-pngminus.patch
-Patch1:
http://downloads.sourceforge.net/libpng-apng/%{realname}-1.6.5-apng.patch.gz
-# Patch1-md5: e05f0ba9534e0331bf499d63811cbf93
+Patch1:
http://downloads.sourceforge.net/libpng-apng/%{realname}-%{version}-apng.patch.gz
+# Patch1-md5: 3404257f66d4a118b26ccc3fc4788810
URL: http://www.libpng.org/pub/png/libpng.html
BuildRequires: crossmingw32-gcc
BuildRequires: crossmingw32-zlib
diff --git a/libpng-pngminus.patch b/libpng-pngminus.patch
index 5cf2f74..d929f9f 100644
--- a/libpng-pngminus.patch
+++ b/libpng-pngminus.patch
@@ -1,11 +1,11 @@
--- 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 @@
- #PNGLIB = -L$(PNGPATH)/lib -lpng15
- #PNGLIBS = $(PNGPATH)/lib/libpng15.a
+@@ -12,21 +12,21 @@
+ #PNGLIB = -L$(PNGPATH)/lib -lpng16
+ #PNGLIBS = $(PNGPATH)/lib/libpng16.a
PNGINC = -I../..
-PNGLIB = -L../.. -lpng
-+PNGLIB = -L../.. -L../../.libs -lpng15
++PNGLIB = -L../.. -L../../.libs -lpng16
PNGLIBS = ../../libpng.a
#ZPATH = /usr/local
@@ -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/crossmingw32-libpng.git/commitdiff/217bbccea4c9417d6dea8ed78447a6ed6396d923
_______________________________________________
pld-cvs-commit mailing list
[email protected]
http://lists.pld-linux.org/mailman/listinfo/pld-cvs-commit
