[oe-commits] Sylvain 'GarthPS' Paré : libpng: Upgrade to version 1. 2.46 and remove old patch

[git version control]

Module: openembedded.git
Branch: master
Commit: b557ba5745aa39bb9f0a6a9b3aaca5692bf21339
URL:    http://git.openembedded.org/?p=openembedded.git&a=commit;h=b557ba5745aa39bb9f0a6a9b3aaca5692bf21339

Author: Sylvain 'GarthPS' Paré <sylvain.pare at gmail.com>
Date:   Fri Aug 19 15:39:23 2011 +0200

libpng: Upgrade to version 1.2.46 and remove old patch

This addresses the following security advisories:

* CVE-2011-2690
* CVE-2011-2692

Signed-off-by: Sylvain 'GarthPS' Paré <sylvain.pare at gmail.com>
Signed-off-by: Paul Menzel <paulepanter at users.sourceforge.net>

---

 recipes/libpng/files/makefile_fix.patch |   18 ------------------
 recipes/libpng/libpng_1.2.44.bb         |    8 --------
 recipes/libpng/libpng_1.2.46.bb         |    6 ++++++
 3 files changed, 6 insertions(+), 26 deletions(-)

diff --git a/recipes/libpng/files/makefile_fix.patch b/recipes/libpng/files/makefile_fix.patch
deleted file mode 100644
index 3fa8793..0000000
--- a/recipes/libpng/files/makefile_fix.patch
+++ /dev/null
@@ -1,18 +0,0 @@
-Old versions of libtool (1.5.10) used to set ECHO as a side effect. With
-libtool 2.2.2 we need to do this manually
-
-RP - 14/4/08
-
-Index: libpng-1.2.16/Makefile.am
-===================================================================
---- libpng-1.2.16.orig/Makefile.am	2008-04-14 14:47:21.000000000 +0100
-+++ libpng-1.2.16/Makefile.am	2008-04-14 14:47:47.000000000 +0100
-@@ -102,6 +102,8 @@
- 			>$@.new
- 	mv $@.new $@
- 
-+ECHO=echo
-+
- libpng.vers: libpng.sym
- 	rm -f $@ $@.new
- 	$(ECHO) PNG at PNGLIB_MAJOR@@PNGLIB_MINOR at _0 '{global:' > $@.new
diff --git a/recipes/libpng/libpng_1.2.44.bb b/recipes/libpng/libpng_1.2.44.bb
deleted file mode 100644
index 4ba7b20..0000000
--- a/recipes/libpng/libpng_1.2.44.bb
+++ /dev/null
@@ -1,8 +0,0 @@
-require libpng.inc
-
-PR = "${INC_PR}.0"
-
-SRC_URI += "file://makefile_fix.patch"
-
-SRC_URI[libpng.md5sum] = "e3ac7879d62ad166a6f0c7441390d12b"
-SRC_URI[libpng.sha256sum] = "b9ab20f1c2c3bf6c4448fd9bd8a4a8905b918114d5fada56c97bb758a17b7215"
diff --git a/recipes/libpng/libpng_1.2.46.bb b/recipes/libpng/libpng_1.2.46.bb
new file mode 100644
index 0000000..e036be5
--- /dev/null
+++ b/recipes/libpng/libpng_1.2.46.bb
@@ -0,0 +1,6 @@
+require libpng.inc
+
+PR = "${INC_PR}.0"
+
+SRC_URI[libpng.md5sum] = "e8b43dc78ef95b3949af7f961d76874b"
+SRC_URI[libpng.sha256sum] = "a5e796e1802b2e221498bda09ff9850bc7ec9068b6788948cc2c42af213914d8"