[gnome-continuous-yocto/gnomeostree-3.28-rocko: 327/8267] expat: Upgrade 2.1.0 -> 2.1.1

[Emmanuele Bassi <ebassi src gnome org>]

commit d4099e1042a71993d0368b4b846947b7a06ea742
Author: Jussi Kukkonen <jussi kukkonen intel com>
Date:   Mon May 16 16:22:46 2016 +0300

    expat: Upgrade 2.1.0 -> 2.1.1
    
    * Remove backported CVE patch
    * Update autotools patch
    * Update SRC_URI to match current archive type
    
    (From OE-Core rev: 8a5a90aa6a7f398803f432038d56cdfea1651aaa)
    
    Signed-off-by: Jussi Kukkonen <jussi kukkonen intel com>
    Signed-off-by: Richard Purdie <richard purdie linuxfoundation org>

 .../expat/expat-2.1.0/expat-CVE-2015-1283.patch    |   62 --------------------
 meta/recipes-core/expat/expat.inc                  |    3 +-
 .../expat/{expat-2.1.0 => expat}/autotools.patch   |    4 +-
 meta/recipes-core/expat/expat_2.1.0.bb             |    5 --
 meta/recipes-core/expat/expat_2.1.1.bb             |    5 ++
 5 files changed, 8 insertions(+), 71 deletions(-)
---
diff --git a/meta/recipes-core/expat/expat.inc b/meta/recipes-core/expat/expat.inc
index 4bd60a2..fe9d7e7 100644
--- a/meta/recipes-core/expat/expat.inc
+++ b/meta/recipes-core/expat/expat.inc
@@ -4,9 +4,8 @@ HOMEPAGE = "http://expat.sourceforge.net/";
 SECTION = "libs"
 LICENSE = "MIT"
 
-SRC_URI = "${SOURCEFORGE_MIRROR}/expat/expat-${PV}.tar.gz \
+SRC_URI = "${SOURCEFORGE_MIRROR}/expat/expat-${PV}.tar.bz2 \
            file://autotools.patch \
-           file://expat-CVE-2015-1283.patch \
          "
 
 inherit autotools lib_package gzipnative
diff --git a/meta/recipes-core/expat/expat-2.1.0/autotools.patch 
b/meta/recipes-core/expat/expat/autotools.patch
similarity index 79%
rename from meta/recipes-core/expat/expat-2.1.0/autotools.patch
rename to meta/recipes-core/expat/expat/autotools.patch
index 0e59969..3d3c5ba 100644
--- a/meta/recipes-core/expat/expat-2.1.0/autotools.patch
+++ b/meta/recipes-core/expat/expat/autotools.patch
@@ -11,8 +11,8 @@ Updated to apply over expat 2.1.0
 Signed-off-by: Marko Lindqvist <cazfi74 gmail com>
 
 diff -Nurd expat-2.1.0/configure.in expat-2.1.0/configure.in
---- expat-2.1.0/configure.in   2012-03-04 01:45:53.000000000 +0200
-+++ expat-2.1.0/configure.in   2012-05-10 21:04:44.000000000 +0300
+--- expat-2.1.0/configure.ac   2012-03-04 01:45:53.000000000 +0200
++++ expat-2.1.0/configure.ac   2012-05-10 21:04:44.000000000 +0300
 @@ -51,8 +51,6 @@
  
  AC_CONFIG_HEADER(expat_config.h)
diff --git a/meta/recipes-core/expat/expat_2.1.1.bb b/meta/recipes-core/expat/expat_2.1.1.bb
new file mode 100644
index 0000000..75c80de
--- /dev/null
+++ b/meta/recipes-core/expat/expat_2.1.1.bb
@@ -0,0 +1,5 @@
+require expat.inc
+LIC_FILES_CHKSUM = "file://COPYING;md5=1b71f681713d1256e1c23b0890920874"
+
+SRC_URI[md5sum] = "7380a64a8e3a9d66a9887b01d0d7ea81"
+SRC_URI[sha256sum] = "aff584e5a2f759dcfc6d48671e9529f6afe1e30b0cd6a4cec200cbe3f793de67"