From 3df821277dd8111aa5a582885d8d405537c21624 Mon Sep 17 00:00:00 2001
From: Scott Garman <scott.a.garman@intel.com>
Date: Tue, 24 Apr 2012 22:13:12 -0700
Subject: libpng: upgrade to 1.2.49

License hasn't changed, just updated the md5 checksums due to trivial
date changes within the text (and the position of the license text
within png.h).

Addresses CVE-2011-3045

Fixes [YOCTO #2352]

(From OE-Core rev: 6e2235a4d769b16ebf68d6bbed56d8bcc0e0c83f)

Signed-off-by: Scott Garman <scott.a.garman@intel.com>
Signed-off-by: Richard Purdie <richard.purdie@linuxfoundation.org>
---
 meta/recipes-multimedia/libpng/libpng_1.2.46.bb | 25 -------------------------
 meta/recipes-multimedia/libpng/libpng_1.2.49.bb | 25 +++++++++++++++++++++++++
 2 files changed, 25 insertions(+), 25 deletions(-)
 delete mode 100644 meta/recipes-multimedia/libpng/libpng_1.2.46.bb
 create mode 100644 meta/recipes-multimedia/libpng/libpng_1.2.49.bb

(limited to 'meta/recipes-multimedia')

diff --git a/meta/recipes-multimedia/libpng/libpng_1.2.46.bb b/meta/recipes-multimedia/libpng/libpng_1.2.46.bb
deleted file mode 100644
index 142f2b90fe..0000000000
--- a/meta/recipes-multimedia/libpng/libpng_1.2.46.bb
+++ /dev/null
@@ -1,25 +0,0 @@
-SUMMARY = "PNG Library"
-DESCRIPTION = "PNG Library"
-HOMEPAGE = "http://www.libpng.org/"
-SECTION = "libs"
-LICENSE = "Libpng"
-LIC_FILES_CHKSUM = "file://LICENSE;md5=21b4b6e3523afa9f03f00b43b991dad0 \
-                    file://png.h;startline=172;endline=261;md5=996460063a9bf2de35b2d61d2776dabc"
-DEPENDS = "zlib"
-PR = "r4"
-
-SRC_URI = "${SOURCEFORGE_MIRROR}/project/libpng/libpng12/${PV}/libpng-${PV}.tar.bz2"
-
-SRC_URI[md5sum] = "e8b43dc78ef95b3949af7f961d76874b"
-SRC_URI[sha256sum] = "a5e796e1802b2e221498bda09ff9850bc7ec9068b6788948cc2c42af213914d8"
-
-inherit autotools binconfig pkgconfig
-
-PACKAGES =+ "${PN}12"
-
-FILES_${PN}12 = "${libdir}/libpng12${SOLIBS}"
-FILES_${PN} = "${libdir}/lib*${SOLIBS}"
-FILES_${PN}-dev += " ${bindir} ${sbindir}"
-RPROVIDES_${PN}-dev += "${PN}12-dev"
-
-BBCLASSEXTEND = "native"
diff --git a/meta/recipes-multimedia/libpng/libpng_1.2.49.bb b/meta/recipes-multimedia/libpng/libpng_1.2.49.bb
new file mode 100644
index 0000000000..c24e6913db
--- /dev/null
+++ b/meta/recipes-multimedia/libpng/libpng_1.2.49.bb
@@ -0,0 +1,25 @@
+SUMMARY = "PNG Library"
+DESCRIPTION = "PNG Library"
+HOMEPAGE = "http://www.libpng.org/"
+SECTION = "libs"
+LICENSE = "Libpng"
+LIC_FILES_CHKSUM = "file://LICENSE;md5=20110633230abd47fe8680afa75f1492 \
+                    file://png.h;startline=308;endline=422;md5=edd1c552386a8c3773d90e278ae30891"
+DEPENDS = "zlib"
+PR = "r0"
+
+SRC_URI = "${SOURCEFORGE_MIRROR}/project/libpng/libpng12/${PV}/libpng-${PV}.tar.bz2"
+
+SRC_URI[md5sum] = "d5106b70b4f8b464a7da66bffe4565fb"
+SRC_URI[sha256sum] = "fbf8faa70ebca2ed2ee6df6f2249f4722517b581af5b6c3c71bbdaf925d5954e"
+
+inherit autotools binconfig pkgconfig
+
+PACKAGES =+ "${PN}12"
+
+FILES_${PN}12 = "${libdir}/libpng12${SOLIBS}"
+FILES_${PN} = "${libdir}/lib*${SOLIBS}"
+FILES_${PN}-dev += " ${bindir} ${sbindir}"
+RPROVIDES_${PN}-dev += "${PN}12-dev"
+
+BBCLASSEXTEND = "native"
-- 
cgit v1.2.3-54-g00ecf