From 78c7106f99efcbabc9ccc00343c87a900644cda3 Mon Sep 17 00:00:00 2001
From: Holger Hans Peter Freyther <zecke@selfish.org>
Date: Thu, 4 Mar 2010 22:06:37 +0100
Subject: expat-2.0.0: Upgrade expat library to fix various known security bugs

* Fixes CVE-2009-3720
---
 conf/checksums.ini                        | 12 ------------
 recipes/expat/expat-2.0.0/autotools.patch | 13 -------------
 recipes/expat/expat-2.0.1/autotools.patch | 13 +++++++++++++
 recipes/expat/expat.inc                   |  2 +-
 recipes/expat/expat_2.0.0.bb              | 27 ---------------------------
 recipes/expat/expat_2.0.1.bb              | 29 +++++++++++++++++++++++++++++
 6 files changed, 43 insertions(+), 53 deletions(-)
 delete mode 100644 recipes/expat/expat-2.0.0/autotools.patch
 create mode 100644 recipes/expat/expat-2.0.1/autotools.patch
 delete mode 100644 recipes/expat/expat_2.0.0.bb
 create mode 100644 recipes/expat/expat_2.0.1.bb

diff --git a/conf/checksums.ini b/conf/checksums.ini
index b183f48702..4ed537935c 100644
--- a/conf/checksums.ini
+++ b/conf/checksums.ini
@@ -6602,18 +6602,6 @@ sha256=c94817c67c8ff0d244092c19f5713ea8c76a9a19075ff6031d4ef93ec7b66256
 md5=2ff59c2a5cbdd21a285c5f343e214fa9
 sha256=c94817c67c8ff0d244092c19f5713ea8c76a9a19075ff6031d4ef93ec7b66256
 
-[http://downloads.sourceforge.net/expat/expat-2.0.0.tar.gz]
-md5=d945df7f1c0868c5c73cf66ba9596f3f
-sha256=c4280eb80fa8e14b3f204b1d0ec67af66fa04c4f9dae9c78a1a8ee4c6f485ddd
-
-[http://heanet.dl.sourceforge.net/expat/expat-2.0.0.tar.gz]
-md5=d945df7f1c0868c5c73cf66ba9596f3f
-sha256=c4280eb80fa8e14b3f204b1d0ec67af66fa04c4f9dae9c78a1a8ee4c6f485ddd
-
-[http://qa.debian.org/watch/sf.php/expat/expat-2.0.0.tar.gz]
-md5=d945df7f1c0868c5c73cf66ba9596f3f
-sha256=c4280eb80fa8e14b3f204b1d0ec67af66fa04c4f9dae9c78a1a8ee4c6f485ddd
-
 [http://www.rpsys.net/openzaurus/patches/archive/export_atags-r0.patch]
 md5=fe38d8a308c47dad87977f19631d73d5
 sha256=316f69529608abb6cb378bd705b784e176e36b3c1979ef8ddf14b4bffe5498b9
diff --git a/recipes/expat/expat-2.0.0/autotools.patch b/recipes/expat/expat-2.0.0/autotools.patch
deleted file mode 100644
index 77aee3a833..0000000000
--- a/recipes/expat/expat-2.0.0/autotools.patch
+++ /dev/null
@@ -1,13 +0,0 @@
-diff -bur expat-2.0.0~orig/configure.in expat-2.0.0/configure.in
---- expat-2.0.0~orig/configure.in	2006-01-10 19:10:46.000000000 -0600
-+++ expat-2.0.0/configure.in	2006-02-10 19:12:24.000000000 -0600
-@@ -50,9 +50,6 @@
- 
- AC_CONFIG_HEADER(expat_config.h)
- 
--sinclude(conftools/libtool.m4)
--sinclude(conftools/ac_c_bigendian_cross.m4)
--
- AC_LIBTOOL_WIN32_DLL
- AC_PROG_LIBTOOL
- 
diff --git a/recipes/expat/expat-2.0.1/autotools.patch b/recipes/expat/expat-2.0.1/autotools.patch
new file mode 100644
index 0000000000..77aee3a833
--- /dev/null
+++ b/recipes/expat/expat-2.0.1/autotools.patch
@@ -0,0 +1,13 @@
+diff -bur expat-2.0.0~orig/configure.in expat-2.0.0/configure.in
+--- expat-2.0.0~orig/configure.in	2006-01-10 19:10:46.000000000 -0600
++++ expat-2.0.0/configure.in	2006-02-10 19:12:24.000000000 -0600
+@@ -50,9 +50,6 @@
+ 
+ AC_CONFIG_HEADER(expat_config.h)
+ 
+-sinclude(conftools/libtool.m4)
+-sinclude(conftools/ac_c_bigendian_cross.m4)
+-
+ AC_LIBTOOL_WIN32_DLL
+ AC_PROG_LIBTOOL
+ 
diff --git a/recipes/expat/expat.inc b/recipes/expat/expat.inc
index 6d27b77b19..b254f08b74 100644
--- a/recipes/expat/expat.inc
+++ b/recipes/expat/expat.inc
@@ -3,7 +3,7 @@ HOMEPAGE = "http://expat.sf.net/"
 SECTION = "libs"
 LICENSE = "MIT"
 
-SRC_URI = "${SOURCEFORGE_MIRROR}/expat/expat-${PV}.tar.gz \
+SRC_URI = "${SOURCEFORGE_MIRROR}/expat/expat-${PV}.tar.gz;name=src \
 	  "
 S = "${WORKDIR}/expat-${PV}"
 
diff --git a/recipes/expat/expat_2.0.0.bb b/recipes/expat/expat_2.0.0.bb
deleted file mode 100644
index 0fd825ee24..0000000000
--- a/recipes/expat/expat_2.0.0.bb
+++ /dev/null
@@ -1,27 +0,0 @@
-require expat.inc
-PR = "r2"
-
-SRC_URI += "file://autotools.patch;patch=1"
-
-inherit lib_package
-
-do_configure() {
-	rm -f ${S}/conftools/libtool.m4
-	touch ${S}/conftools/libtool.m4
-	autotools_do_configure
-}
-
-do_stage() {
-	install -m 0644 ${S}/lib/expat.h ${STAGING_INCDIR}/
-	install -m 0644 ${S}/lib/expat_external.h ${STAGING_INCDIR}/
-	oe_libinstall -so libexpat ${STAGING_LIBDIR}
-}
-
-do_install() {
-	oe_runmake prefix="${D}${prefix}" \
-		bindir="${D}${bindir}" \
-		libdir="${D}${libdir}" \
-		includedir="${D}${includedir}" \
-		man1dir="${D}${mandir}/man1" \
-		install
-}
diff --git a/recipes/expat/expat_2.0.1.bb b/recipes/expat/expat_2.0.1.bb
new file mode 100644
index 0000000000..41739e8889
--- /dev/null
+++ b/recipes/expat/expat_2.0.1.bb
@@ -0,0 +1,29 @@
+require expat.inc
+PR = "r2"
+
+SRC_URI += "file://autotools.patch;patch=1"
+SRC_URI[src.md5sum] = "ee8b492592568805593f81f8cdf2a04c"
+SRC_URI[src.sha256sum] = "847660b4df86e707c9150e33cd8c25bc5cd828f708c7418e765e3e983a2e5e93"
+
+inherit lib_package
+
+do_configure() {
+	rm -f ${S}/conftools/libtool.m4
+	touch ${S}/conftools/libtool.m4
+	autotools_do_configure
+}
+
+do_stage() {
+	install -m 0644 ${S}/lib/expat.h ${STAGING_INCDIR}/
+	install -m 0644 ${S}/lib/expat_external.h ${STAGING_INCDIR}/
+	oe_libinstall -so libexpat ${STAGING_LIBDIR}
+}
+
+do_install() {
+	oe_runmake prefix="${D}${prefix}" \
+		bindir="${D}${bindir}" \
+		libdir="${D}${libdir}" \
+		includedir="${D}${includedir}" \
+		man1dir="${D}${mandir}/man1" \
+		install
+}
-- 
cgit v1.2.3