[vlc-commits] Contribs: update libpng to 1.6.8

[Jean-Baptiste Kempf]

vlc/vlc-2.1 | branch: master | Jean-Baptiste Kempf <jb at videolan.org> | Sat Feb  8 15:48:54 2014 +0100| [127bc9cc81488c402b7253cdcf85f556f1d353d8] | committer: Jean-Baptiste Kempf

Contribs: update libpng to 1.6.8

See CVE-2013-6954

(cherry picked from commit 4e62c1faae876d142a3430eb243df63033f6785e)
Signed-off-by: Jean-Baptiste Kempf <jb at videolan.org>

> http://git.videolan.org/gitweb.cgi/vlc/vlc-2.1.git/?a=commit;h=127bc9cc81488c402b7253cdcf85f556f1d353d8
---

 contrib/src/png/SHA512SUMS     |    2 +-
 contrib/src/png/automake.patch |    9 ++++-----
 contrib/src/png/rules.mak      |    2 +-
 3 files changed, 6 insertions(+), 7 deletions(-)

diff --git a/contrib/src/png/SHA512SUMS b/contrib/src/png/SHA512SUMS
index e0348d6..1c073fd 100644
--- a/contrib/src/png/SHA512SUMS
+++ b/contrib/src/png/SHA512SUMS
@@ -1 +1 @@
-a720e1b576958a445ccf301c3de2dbf1ea58590c23ec4edd76ee1d65ab611c941b82e173fbef1974c5efbe8bf31d8e800e34f37819d9f406db4ef704d12106df  libpng-1.6.3.tar.xz
+788da3ba1785fd9b9d1009f3b2dad5120ce330e0340b14057143957010b71920a0f524c9f77c877f359382f75f95542f6b71a81b6ee138b7b6ae1d11c318ebde  libpng-1.6.8.tar.xz
diff --git a/contrib/src/png/automake.patch b/contrib/src/png/automake.patch
index 9757dd1..ae42262 100644
--- a/contrib/src/png/automake.patch
+++ b/contrib/src/png/automake.patch
@@ -1,12 +1,11 @@
-diff -ur png/configure.ac png.new/configure.ac
---- png/configure.ac	2013-07-18 03:03:02.000000000 +0300
-+++ png.new/configure.ac	2013-08-08 19:20:12.459900241 +0300
+--- libpng-1.6.8/configure.ac.orig	2014-02-08 15:42:46.399091835 +0100
++++ libpng-1.6.8/configure.ac	2014-02-08 15:47:42.684534041 +0100
 @@ -27,7 +27,7 @@
  # dist-xz requires automake 1.11 or later
  # 1.12.2 fixes a security issue in 1.11.2 and 1.12.1
  # 1.13 is required for parallel tests
--AM_INIT_AUTOMAKE([1.13 foreign dist-xz color-tests silent-rules])
-+AM_INIT_AUTOMAKE([1.11 foreign dist-xz color-tests silent-rules])
+-AM_INIT_AUTOMAKE([1.13 foreign dist-xz color-tests silent-rules subdir-objects])
++AM_INIT_AUTOMAKE([1.11 foreign dist-xz color-tests silent-rules subdir-objects])
  # The following line causes --disable-maintainer-mode to be the default to
  # configure, this is necessary because libpng distributions cannot rely on the
  # time stamps of the autotools generated files being correct
diff --git a/contrib/src/png/rules.mak b/contrib/src/png/rules.mak
index d1adc34..468dd14 100644
--- a/contrib/src/png/rules.mak
+++ b/contrib/src/png/rules.mak
@@ -1,5 +1,5 @@
 # PNG
-PNG_VERSION := 1.6.3
+PNG_VERSION := 1.6.8
 PNG_URL := $(SF)/libpng/libpng16/$(PNG_VERSION)/libpng-$(PNG_VERSION).tar.xz
 
 PKGS += png