[vlc-devel] commit: Backport [22dbee0081c2f38a775d059175f4a9b21841d38c] and announce it ( Felix Paul Kühne )

[git version control]

vlc | branch: 0.8.6-bugfix | Felix Paul Kühne <fkuehne at videolan.org> | Wed May 14 13:57:03 2008 +0200| [7d43a66c2fce4e3804fb116528dc0d9cd0d0625b]

Backport [22dbee0081c2f38a775d059175f4a9b21841d38c] and announce it

> http://git.videolan.org/gitweb.cgi/vlc.git/?a=commit;h=7d43a66c2fce4e3804fb116528dc0d9cd0d0625b
---

 NEWS                            |    1 +
 extras/contrib/src/packages.mak |    2 +-
 2 files changed, 2 insertions(+), 1 deletions(-)

diff --git a/NEWS b/NEWS
index b5d596f..ed1b896 100644
--- a/NEWS
+++ b/NEWS
@@ -4,6 +4,7 @@ Changes between 0.8.6f and 0.8.6g:
 Security updates:
  * Removed VLC variable settings from Mozilla and ActiveX (CVE-2007-6683)
  * Removed loading plugins from the current directory (CVE-2008-2147)
+ * Updated libpng on Windows and Mac OS X (CVE-2008-1382)
 
 Various bugfixes:
  * Fixed various memory leaks, improving stability when running as a server
diff --git a/extras/contrib/src/packages.mak b/extras/contrib/src/packages.mak
index 2e7ed23..40bab1e 100644
--- a/extras/contrib/src/packages.mak
+++ b/extras/contrib/src/packages.mak
@@ -119,7 +119,7 @@ VCDIMAGER_VERSION=0.7.23
 VCDIMAGER_URL=$(GNU)/vcdimager/vcdimager-$(VCDIMAGER_VERSION).tar.gz
 CDIO_VERSION=0.77
 CDIO_URL=$(GNU)/libcdio/libcdio-$(CDIO_VERSION).tar.gz
-PNG_VERSION=1.2.12
+PNG_VERSION=1.2.29
 PNG_URL=$(SF)/libpng/libpng-$(PNG_VERSION).tar.bz2
 GPGERROR_VERSION=1.3
 #GPGERROR_URL=http://ftp.gnupg.org/gcrypt/libgpg-error/libgpg-error-$(GPGERROR_VERSION).tar.gz