- updated to 1.6.20 (fixes CVE-2015-8126)

- added sh patch (fixes sh syntax issue in test script)

diff --git a/libpng-sh.patch b/libpng-sh.patch
new file mode 100644 (file)
index 0000000..ab24a5f
--- /dev/null
+++ b/libpng-sh.patch
@@ -0,0 +1,20 @@
+--- libpng-1.6.20/tests/pngstest.orig  2015-09-26 00:48:24.000000000 +0200
++++ libpng-1.6.20/tests/pngstest       2015-12-05 18:52:37.106053733 +0100
+@@ -17,7 +17,8 @@
+ shift
+ alpha="$1"
+ shift
+-exec ./pngstest --tmpfile "${gamma}-${alpha}-" --log ${1+"$@"} $(
++
++loop() {
+    for f in "${srcdir}/contrib/testpngs/"*.png
+    do
+       g=
+@@ -49,4 +50,6 @@
+             test "$alpha" = "opaque" -o "$alpha" = "none" && echo "$g";;
+       esac
+    done
+-)
++}
++
++exec ./pngstest --tmpfile "${gamma}-${alpha}-" --log ${1+"$@"} $(loop)

diff --git a/libpng.spec b/libpng.spec
index 13b1a9fd02a9e337909bc41731f569a6a65e8d37..b3865218adfe235df53cf629fb03d88833254188 100644 (file)
--- a/libpng.spec
+++ b/libpng.spec
@@ -10,16 +10,17 @@ Summary(pl.UTF-8):  Biblioteka PNG
 Summary(pt_BR.UTF-8):  Biblioteca PNG
 Summary(tr.UTF-8):     PNG kitaplığı
 Name:          libpng
-Version:       1.6.18
+Version:       1.6.20
 Release:       1
 Epoch:         2
 License:       distributable
 Group:         Libraries
 Source0:       http://downloads.sourceforge.net/libpng/%{name}-%{version}.tar.xz
-# Source0-md5: 6a57c8e0f5469b9c9949a4b43d57b3a1
+# Source0-md5: 3968acb7c66ef81a9dab867f35d0eb4b
 Patch0:                %{name}-pngminus.patch
-Patch1:                http://downloads.sourceforge.net/libpng-apng/%{name}-1.6.18-apng.patch.gz
-# Patch1-md5:  a9c85fe3cf0347ea94356f1e70d07973
+Patch1:                http://downloads.sourceforge.net/libpng-apng/%{name}-%{version}-apng.patch.gz
+# Patch1-md5:  b2186d5e7853890e25b34b03c7f2ddde
+Patch2:                %{name}-sh.patch
 URL:           http://www.libpng.org/pub/png/libpng.html
 BuildRequires: rpmbuild(macros) >= 1.213
 BuildRequires: tar >= 1:1.22
@@ -144,6 +145,7 @@ Narzędzia do konwersji plików PNG z lub do plików PNM.
 %setup -q
 %patch0 -p1
 %patch1 -p1
+%patch2 -p1
 
 %build
 %configure