[PATCH 00/25] Version updates and upstream check fixes

[PATCH 00/25] Version updates and upstream check fixes

[Alexander Kanavin]

A bunch of version updates for recipes where I'm listed as maintainer.
I have also moved gobject-introspection recipe to Python 3, as it required
first updating the recipe to latest version, and that required updating glib
to latest version.

The following changes since commit dcbfc72303d6782d9108538c830cf2ee7849bf59:

  poky: Add Ubuntu 16.04 to tested/supported list since I run it myself (2016-06-02 10:37:05 +0100)

are available in the git repository at:

  git://git.yoctoproject.org/poky-contrib akanavin/package-version-updates
  http://git.yoctoproject.org/cgit.cgi/poky-contrib/log/?h=akanavin/package-version-updates

Alexander Kanavin (25):
  gdbm: upgrade to 1.12
  rt-tests, hwlatdetect: upgrade to 2.0
  webkitgtk: upgrade to 2.12.3
  cups: fix upstream version check
  tzcode, tzdata: fix upstream version check
  cantarell-fonts: fix upstream check
  boost: update to 1.61.0
  btrfs-tools: update to 4.5.3
  build-appliance-image: update version to 15.0.0
  ffmpeg: update to 3.0.2
  cantarell-fonts: update to 0.0.24
  gcc: fix upstream check for 5.x version
  gdb: fix upstream check
  gnome-desktop3: update to 3.20.2
  gobject-introspection: update to 1.48.0
  gobject-introspection: move to Python 3
  mc: update to 4.8.17
  icu: update to 57.1
  iso-codes: update to 3.68
  kexec-tools: update to 2.0.12
  libksba: update to 1.3.4
  libxslt: update to 1.1.29
  msmtp: update to 1.6.5
  systemtap: update to 3.0
  watchdog: update to 5.15

 ...e_14.0.0.bb => build-appliance-image_15.0.0.bb} |  0
 .../fix-symlink-creation-multiple-times.patch      | 46 ----------
 .../{btrfs-tools_4.4.bb => btrfs-tools_4.5.3.bb}   |  3 +-
 meta/recipes-devtools/gcc/gcc-5.3.inc              |  1 +
 meta/recipes-devtools/gdb/gdb-common.inc           |  2 +
 meta/recipes-extended/cups/cups.inc                |  2 +-
 .../mc/{mc_4.8.16.bb => mc_4.8.17.bb}              |  4 +-
 .../msmtp/{msmtp_1.6.4.bb => msmtp_1.6.5.bb}       |  4 +-
 .../recipes-extended/tzcode/tzcode-native_2016d.bb |  1 +
 meta/recipes-extended/tzdata/tzdata_2016d.bb       |  1 +
 ...d-issues-found-with-non-glibc-C-libraries.patch | 99 ----------------------
 .../watchdog/watchdog/fix-ping-failure.patch       | 79 -----------------
 .../watchdog/watchdog/fixsepbuild.patch            | 27 ------
 .../{watchdog_5.14.bb => watchdog_5.15.bb}         |  7 +-
 ...desktop3_3.18.2.bb => gnome-desktop3_3.20.2.bb} |  4 +-
 ...ncomplete-upstream-attempt-at-cross-compi.patch | 50 +++++++++++
 ...-add-host-gi-gi-cross-wrapper-gi-ldd-wra.patch} | 15 ++--
 ...-giscanner-add-use-binary-wrapper-option.patch} | 17 ++--
 ...4-giscanner-add-a-use-ldd-wrapper-option.patch} | 15 ++--
 ...onfig-paths-with-PKG_CONFIG_SYSROOT_DIR-.patch} | 13 ++-
 ...n_1.46.0.bb => gobject-introspection_1.48.0.bb} | 28 +++---
 .../cantarell-fonts/cantarell-fonts_git.bb         |  5 +-
 meta/recipes-kernel/kexec/kexec-tools.inc          |  4 +
 ...kexec-tools-Refine-kdump-device_tree-sort.patch | 48 -----------
 ...kexec-tools_2.0.11.bb => kexec-tools_2.0.12.bb} |  6 +-
 .../systemtap/systemtap/docproc-build-fix.patch    | 19 -----
 meta/recipes-kernel/systemtap/systemtap_git.bb     |  2 +-
 meta/recipes-kernel/systemtap/systemtap_git.inc    |  5 +-
 .../ffmpeg/{ffmpeg_3.0.bb => ffmpeg_3.0.2.bb}      |  4 +-
 ...t-CC-AR-variable-only-if-it-doesn-t-have-.patch | 30 -------
 .../{hwlatdetect_0.96.bb => hwlatdetect_2.0.bb}    |  0
 meta/recipes-rt/rt-tests/rt-tests.inc              |  3 +-
 .../rt-tests/{rt-tests_0.96.bb => rt-tests_2.0.bb} |  2 +-
 .../{webkitgtk_2.12.1.bb => webkitgtk_2.12.3.bb}   |  4 +-
 ...bjam-native_1.60.0.bb => bjam-native_1.61.0.bb} |  0
 .../boost/{boost-1.60.0.inc => boost-1.61.0.inc}   |  4 +-
 ...qualify-fenv.h-names-that-might-be-macros.patch | 45 ----------
 .../boost/{boost_1.60.0.bb => boost_1.61.0.bb}     |  1 -
 .../gdbm/{gdbm_1.11.bb => gdbm_1.12.bb}            |  4 +-
 .../icu/icu/icu-release-56-1-flagparser-fix.patch  | 24 ------
 .../icu/{icu_56.1.bb => icu_57.1.bb}               |  7 +-
 .../{iso-codes_3.65.bb => iso-codes_3.68.bb}       |  6 +-
 .../libksba/{libksba_1.3.3.bb => libksba_1.3.4.bb} |  4 +-
 ...se-pkg-config-to-find-gcrypt-and-libxml2.patch} | 42 +++++----
 .../libxslt/libxslt/CVE-2015-7995.patch            | 34 --------
 .../{libxslt_1.1.28.bb => libxslt_1.1.29.bb}       |  8 +-
 46 files changed, 171 insertions(+), 558 deletions(-)
 rename meta/recipes-core/images/{build-appliance-image_14.0.0.bb => build-appliance-image_15.0.0.bb} (100%)
 delete mode 100644 meta/recipes-devtools/btrfs-tools/btrfs-tools/fix-symlink-creation-multiple-times.patch
 rename meta/recipes-devtools/btrfs-tools/{btrfs-tools_4.4.bb => btrfs-tools_4.5.3.bb} (89%)
 rename meta/recipes-extended/mc/{mc_4.8.16.bb => mc_4.8.17.bb} (93%)
 rename meta/recipes-extended/msmtp/{msmtp_1.6.4.bb => msmtp_1.6.5.bb} (86%)
 delete mode 100644 meta/recipes-extended/watchdog/watchdog/0001-Fix-build-issues-found-with-non-glibc-C-libraries.patch
 delete mode 100644 meta/recipes-extended/watchdog/watchdog/fix-ping-failure.patch
 delete mode 100644 meta/recipes-extended/watchdog/watchdog/fixsepbuild.patch
 rename meta/recipes-extended/watchdog/{watchdog_5.14.bb => watchdog_5.15.bb} (79%)
 rename meta/recipes-gnome/gnome-desktop/{gnome-desktop3_3.18.2.bb => gnome-desktop3_3.20.2.bb} (84%)
 create mode 100644 meta/recipes-gnome/gobject-introspection/gobject-introspection/0001-Revert-an-incomplete-upstream-attempt-at-cross-compi.patch
 rename meta/recipes-gnome/gobject-introspection/gobject-introspection/{0001-configure.ac-add-host-gi-gi-cross-wrapper-and-gi-ldd.patch => 0002-configure.ac-add-host-gi-gi-cross-wrapper-gi-ldd-wra.patch} (95%)
 rename meta/recipes-gnome/gobject-introspection/gobject-introspection/{0001-giscanner-add-use-binary-wrapper-option.patch => 0003-giscanner-add-use-binary-wrapper-option.patch} (85%)
 rename meta/recipes-gnome/gobject-introspection/gobject-introspection/{0001-giscanner-add-a-use-ldd-wrapper-option.patch => 0004-giscanner-add-a-use-ldd-wrapper-option.patch} (85%)
 rename meta/recipes-gnome/gobject-introspection/gobject-introspection/{0001-Prefix-pkg-config-paths-with-PKG_CONFIG_SYSROOT_DIR-.patch => 0005-Prefix-pkg-config-paths-with-PKG_CONFIG_SYSROOT_DIR-.patch} (91%)
 rename meta/recipes-gnome/gobject-introspection/{gobject-introspection_1.46.0.bb => gobject-introspection_1.48.0.bb} (88%)
 delete mode 100644 meta/recipes-kernel/kexec/kexec-tools/kexec-tools-Refine-kdump-device_tree-sort.patch
 rename meta/recipes-kernel/kexec/{kexec-tools_2.0.11.bb => kexec-tools_2.0.12.bb} (84%)
 delete mode 100644 meta/recipes-kernel/systemtap/systemtap/docproc-build-fix.patch
 rename meta/recipes-multimedia/ffmpeg/{ffmpeg_3.0.bb => ffmpeg_3.0.2.bb} (97%)
 delete mode 100644 meta/recipes-rt/rt-tests/files/0001-Makefile-Set-CC-AR-variable-only-if-it-doesn-t-have-.patch
 rename meta/recipes-rt/rt-tests/{hwlatdetect_0.96.bb => hwlatdetect_2.0.bb} (100%)
 rename meta/recipes-rt/rt-tests/{rt-tests_0.96.bb => rt-tests_2.0.bb} (93%)
 rename meta/recipes-sato/webkit/{webkitgtk_2.12.1.bb => webkitgtk_2.12.3.bb} (96%)
 rename meta/recipes-support/boost/{bjam-native_1.60.0.bb => bjam-native_1.61.0.bb} (100%)
 rename meta/recipes-support/boost/{boost-1.60.0.inc => boost-1.61.0.inc} (83%)
 delete mode 100644 meta/recipes-support/boost/boost/0001-Do-not-qualify-fenv.h-names-that-might-be-macros.patch
 rename meta/recipes-support/boost/{boost_1.60.0.bb => boost_1.61.0.bb} (59%)
 rename meta/recipes-support/gdbm/{gdbm_1.11.bb => gdbm_1.12.bb} (88%)
 delete mode 100644 meta/recipes-support/icu/icu/icu-release-56-1-flagparser-fix.patch
 rename meta/recipes-support/icu/{icu_56.1.bb => icu_57.1.bb} (72%)
 rename meta/recipes-support/iso-codes/{iso-codes_3.65.bb => iso-codes_3.68.bb} (64%)
 rename meta/recipes-support/libksba/{libksba_1.3.3.bb => libksba_1.3.4.bb} (86%)
 rename meta/recipes-support/libxslt/libxslt/{pkgconfig.patch => 0001-Use-pkg-config-to-find-gcrypt-and-libxml2.patch} (78%)
 delete mode 100644 meta/recipes-support/libxslt/libxslt/CVE-2015-7995.patch
 rename meta/recipes-support/libxslt/{libxslt_1.1.28.bb => libxslt_1.1.29.bb} (85%)

-- 
2.8.1

[PATCH 01/25] gdbm: upgrade to 1.12

[Alexander Kanavin]

Signed-off-by: Alexander Kanavin <alexander.kanavin@linux.intel.com>
---
 meta/recipes-support/gdbm/{gdbm_1.11.bb => gdbm_1.12.bb} | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)
 rename meta/recipes-support/gdbm/{gdbm_1.11.bb => gdbm_1.12.bb} (88%)

diff --git a/meta/recipes-support/gdbm/gdbm_1.11.bb b/meta/recipes-support/gdbm/gdbm_1.12.bb
similarity index 88%
rename from meta/recipes-support/gdbm/gdbm_1.11.bb
rename to meta/recipes-support/gdbm/gdbm_1.12.bb
index adf8c5b..c380073 100644
--- a/meta/recipes-support/gdbm/gdbm_1.11.bb
+++ b/meta/recipes-support/gdbm/gdbm_1.12.bb
@@ -10,8 +10,8 @@ SRC_URI = "${GNU_MIRROR}/gdbm/gdbm-${PV}.tar.gz \
            file://ptest.patch \
           "
 
-SRC_URI[md5sum] = "72c832680cf0999caedbe5b265c8c1bd"
-SRC_URI[sha256sum] = "8d912f44f05d0b15a4a5d96a76f852e905d051bb88022fcdfd98b43be093e3c3"
+SRC_URI[md5sum] = "9ce96ff4c99e74295ea19040931c8fb9"
+SRC_URI[sha256sum] = "d97b2166ee867fd6ca5c022efee80702d6f30dd66af0e03ed092285c3af9bcea"
 
 inherit autotools gettext texinfo lib_package ptest
 
-- 
2.8.1

[PATCH 02/25] rt-tests, hwlatdetect: upgrade to 2.0

[Alexander Kanavin]

0001-Makefile-Set-CC-AR-variable-only-if-it-doesn-t-have-.patch has been merged upstream

Signed-off-by: Alexander Kanavin <alexander.kanavin@linux.intel.com>
---
 ...t-CC-AR-variable-only-if-it-doesn-t-have-.patch | 30 ----------------------
 .../{hwlatdetect_0.96.bb => hwlatdetect_2.0.bb}    |  0
 meta/recipes-rt/rt-tests/rt-tests.inc              |  3 +--
 .../rt-tests/{rt-tests_0.96.bb => rt-tests_2.0.bb} |  2 +-
 4 files changed, 2 insertions(+), 33 deletions(-)
 delete mode 100644 meta/recipes-rt/rt-tests/files/0001-Makefile-Set-CC-AR-variable-only-if-it-doesn-t-have-.patch
 rename meta/recipes-rt/rt-tests/{hwlatdetect_0.96.bb => hwlatdetect_2.0.bb} (100%)
 rename meta/recipes-rt/rt-tests/{rt-tests_0.96.bb => rt-tests_2.0.bb} (93%)

diff --git a/meta/recipes-rt/rt-tests/files/0001-Makefile-Set-CC-AR-variable-only-if-it-doesn-t-have-.patch b/meta/recipes-rt/rt-tests/files/0001-Makefile-Set-CC-AR-variable-only-if-it-doesn-t-have-.patch
deleted file mode 100644
index 00fcc7d..0000000
--- a/meta/recipes-rt/rt-tests/files/0001-Makefile-Set-CC-AR-variable-only-if-it-doesn-t-have-.patch
+++ /dev/null
@@ -1,30 +0,0 @@
-From 9640dde4241e1314b8e8ea35b0c8dab0b30ae51f Mon Sep 17 00:00:00 2001
-From: Khem Raj <raj.khem@gmail.com>
-Date: Sun, 3 Jan 2016 10:50:56 -0800
-Subject: [PATCH] Makefile: Set CC/AR variable only if it doesn't have a value
-
-This helps it compile with clang or any other compilers besides gcc
-
-Signed-off-by: Khem Raj <raj.khem@gmail.com>
----
-Upstream-Status: Submitted
-
- Makefile | 4 ++--
- 1 file changed, 2 insertions(+), 2 deletions(-)
-
-diff --git a/Makefile b/Makefile
-index 1e4b7d1..2c2d396 100644
---- a/Makefile
-+++ b/Makefile
-@@ -1,6 +1,6 @@
- VERSION = 0.96
--CC=$(CROSS_COMPILE)gcc
--AR=$(CROSS_COMPILE)ar
-+CC?=$(CROSS_COMPILE)gcc
-+AR?=$(CROSS_COMPILE)ar
- 
- OBJDIR = bld
- 
--- 
-2.6.4
-
diff --git a/meta/recipes-rt/rt-tests/hwlatdetect_0.96.bb b/meta/recipes-rt/rt-tests/hwlatdetect_2.0.bb
similarity index 100%
rename from meta/recipes-rt/rt-tests/hwlatdetect_0.96.bb
rename to meta/recipes-rt/rt-tests/hwlatdetect_2.0.bb
diff --git a/meta/recipes-rt/rt-tests/rt-tests.inc b/meta/recipes-rt/rt-tests/rt-tests.inc
index 76f9b3a..fd6500b 100644
--- a/meta/recipes-rt/rt-tests/rt-tests.inc
+++ b/meta/recipes-rt/rt-tests/rt-tests.inc
@@ -1,6 +1,5 @@
 # Version v0.96
-PV = "0.96"
-SRCREV = "24f8c0175e04bab78e7555698e34d7002b01c87f"
+SRCREV = "e1b1537a20b35af75a49bf55dcf70296f8a62467"
 
 SRC_URI = "git://git.kernel.org/pub/scm/utils/rt-tests/rt-tests.git"
 
diff --git a/meta/recipes-rt/rt-tests/rt-tests_0.96.bb b/meta/recipes-rt/rt-tests/rt-tests_2.0.bb
similarity index 93%
rename from meta/recipes-rt/rt-tests/rt-tests_0.96.bb
rename to meta/recipes-rt/rt-tests/rt-tests_2.0.bb
index 2f96fea..21780d1 100644
--- a/meta/recipes-rt/rt-tests/rt-tests_0.96.bb
+++ b/meta/recipes-rt/rt-tests/rt-tests_2.0.bb
@@ -10,7 +10,7 @@ LIC_FILES_CHKSUM = "file://COPYING;md5=751419260aa954499f7abaabaa882bbe \
 require rt-tests.inc
 inherit ptest
 
-SRC_URI += "file://0001-Makefile-Set-CC-AR-variable-only-if-it-doesn-t-have-.patch \
+SRC_URI += " \
             file://run-ptest \
             file://rt_bmark.py \
            "
-- 
2.8.1

[PATCH 03/25] webkitgtk: upgrade to 2.12.3

[Alexander Kanavin]

Signed-off-by: Alexander Kanavin <alexander.kanavin@linux.intel.com>
---
 meta/recipes-sato/webkit/{webkitgtk_2.12.1.bb => webkitgtk_2.12.3.bb} | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)
 rename meta/recipes-sato/webkit/{webkitgtk_2.12.1.bb => webkitgtk_2.12.3.bb} (96%)

diff --git a/meta/recipes-sato/webkit/webkitgtk_2.12.1.bb b/meta/recipes-sato/webkit/webkitgtk_2.12.3.bb
similarity index 96%
rename from meta/recipes-sato/webkit/webkitgtk_2.12.1.bb
rename to meta/recipes-sato/webkit/webkitgtk_2.12.3.bb
index 23ead72..9a2387e 100644
--- a/meta/recipes-sato/webkit/webkitgtk_2.12.1.bb
+++ b/meta/recipes-sato/webkit/webkitgtk_2.12.3.bb
@@ -18,8 +18,8 @@ SRC_URI = "\
   file://0001-WebKitMacros-Append-to-I-and-not-to-isystem.patch \
   file://musl-fixes.patch \
   "
-SRC_URI[md5sum] = "adcbee440d81acfb1ead9ada91bd5e79"
-SRC_URI[sha256sum] = "5b1a2d5227553f3cecbdb258c68b384f9235747b2c07c15afb555fe4fa6ae896"
+SRC_URI[md5sum] = "aebb4029c09dd81664aa830e4a584c85"
+SRC_URI[sha256sum] = "173cbb9a2eca23eee52e99965483ab25aa9c0569ef5b57041fc0c129cc26c307"
 
 inherit cmake lib_package pkgconfig perlnative pythonnative distro_features_check upstream-version-is-even gobject-introspection
 
-- 
2.8.1

[PATCH 04/25] cups: fix upstream version check

[Alexander Kanavin]

Signed-off-by: Alexander Kanavin <alexander.kanavin@linux.intel.com>
---
 meta/recipes-extended/cups/cups.inc | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/meta/recipes-extended/cups/cups.inc b/meta/recipes-extended/cups/cups.inc
index da70b87..9a12a78 100644
--- a/meta/recipes-extended/cups/cups.inc
+++ b/meta/recipes-extended/cups/cups.inc
@@ -9,7 +9,7 @@ SRC_URI = "https://www.cups.org/software/${PV}/${BP}-source.tar.bz2 \
            file://cups_serverbin.patch \
 	  "
 
-UPSTREAM_CHECK_URI = "http://www.cups.org/software.php"
+UPSTREAM_CHECK_URI = "https://github.com/apple/cups/releases"
 UPSTREAM_CHECK_REGEX = "cups-(?P<pver>\d+\.\d+(\.\d+)?)-source.tar"
 
 LEAD_SONAME = "libcupsdriver.so"
-- 
2.8.1

[PATCH 05/25] tzcode, tzdata: fix upstream version check

[Alexander Kanavin]

Signed-off-by: Alexander Kanavin <alexander.kanavin@linux.intel.com>
---
 meta/recipes-extended/tzcode/tzcode-native_2016d.bb | 1 +
 meta/recipes-extended/tzdata/tzdata_2016d.bb        | 1 +
 2 files changed, 2 insertions(+)

diff --git a/meta/recipes-extended/tzcode/tzcode-native_2016d.bb b/meta/recipes-extended/tzcode/tzcode-native_2016d.bb
index 647ce2d..4b5ab86 100644
--- a/meta/recipes-extended/tzcode/tzcode-native_2016d.bb
+++ b/meta/recipes-extended/tzcode/tzcode-native_2016d.bb
@@ -7,6 +7,7 @@ LIC_FILES_CHKSUM = "file://LICENSE;md5=76ae2becfcb9a685041c6f166b44c2c2"
 
 SRC_URI =" http://www.iana.org/time-zones/repository/releases/tzcode${PV}.tar.gz;name=tzcode \
            http://www.iana.org/time-zones/repository/releases/tzdata${PV}.tar.gz;name=tzdata"
+UPSTREAM_CHECK_URI = "http://www.iana.org/time-zones"
 
 SRC_URI[tzcode.md5sum] = "06fc6fc111cd8dd681abdc5326529afd"
 SRC_URI[tzcode.sha256sum] = "a8f33d6f87aef7e109e4769fc7f6e63637d52d07ddf6440a1a50df3d9a34e0ca"
diff --git a/meta/recipes-extended/tzdata/tzdata_2016d.bb b/meta/recipes-extended/tzdata/tzdata_2016d.bb
index 627a31a..a525c8c 100644
--- a/meta/recipes-extended/tzdata/tzdata_2016d.bb
+++ b/meta/recipes-extended/tzdata/tzdata_2016d.bb
@@ -7,6 +7,7 @@ LIC_FILES_CHKSUM = "file://LICENSE;md5=76ae2becfcb9a685041c6f166b44c2c2"
 DEPENDS = "tzcode-native"
 
 SRC_URI = "http://www.iana.org/time-zones/repository/releases/tzdata${PV}.tar.gz;name=tzdata"
+UPSTREAM_CHECK_URI = "http://www.iana.org/time-zones"
 
 SRC_URI[tzdata.md5sum] = "14bf84b6c2cdab0a9428991e0150ebe6"
 SRC_URI[tzdata.sha256sum] = "d9554dfba0efd76053582bd89e8c7036ef12eee14fdd506675b08a5b59f0a1b4"
-- 
2.8.1

[PATCH 06/25] cantarell-fonts: fix upstream check

[Alexander Kanavin]

Signed-off-by: Alexander Kanavin <alexander.kanavin@linux.intel.com>
---
 meta/recipes-graphics/cantarell-fonts/cantarell-fonts_git.bb | 3 ++-
 1 file changed, 2 insertions(+), 1 deletion(-)

diff --git a/meta/recipes-graphics/cantarell-fonts/cantarell-fonts_git.bb b/meta/recipes-graphics/cantarell-fonts/cantarell-fonts_git.bb
index 127f0a1..5183628 100644
--- a/meta/recipes-graphics/cantarell-fonts/cantarell-fonts_git.bb
+++ b/meta/recipes-graphics/cantarell-fonts/cantarell-fonts_git.bb
@@ -10,10 +10,11 @@ SECTION = "fonts"
 LICENSE = "OFL-1.1"
 LIC_FILES_CHKSUM = "file://COPYING;md5=df91e3ffcab8cfb972a66bf11255188d"
 
-PV = "0.0.21+git${SRCPV}"
+PV = "0.0.21"
 
 SRCREV = "611c169df5287c059d63b0c8f0570647c75c9189"
 SRC_URI = "git://git.gnome.org/cantarell-fonts;protocol=git;branch=master"
+UPSTREAM_CHECK_GITTAGREGEX = "(?P<pver>(?!0\.13)(?!0\.10\.1)\d+\.\d+(\.\d+)+)"
 
 S = "${WORKDIR}/git"
 
-- 
2.8.1

[PATCH 07/25] boost: update to 1.61.0

[Alexander Kanavin]

0001-Do-not-qualify-fenv.h-names-that-might-be-macros.patch has been merged upstream.

Signed-off-by: Alexander Kanavin <alexander.kanavin@linux.intel.com>
---
 ...bjam-native_1.60.0.bb => bjam-native_1.61.0.bb} |  0
 .../boost/{boost-1.60.0.inc => boost-1.61.0.inc}   |  4 +-
 ...qualify-fenv.h-names-that-might-be-macros.patch | 45 ----------------------
 .../boost/{boost_1.60.0.bb => boost_1.61.0.bb}     |  1 -
 4 files changed, 2 insertions(+), 48 deletions(-)
 rename meta/recipes-support/boost/{bjam-native_1.60.0.bb => bjam-native_1.61.0.bb} (100%)
 rename meta/recipes-support/boost/{boost-1.60.0.inc => boost-1.61.0.inc} (83%)
 delete mode 100644 meta/recipes-support/boost/boost/0001-Do-not-qualify-fenv.h-names-that-might-be-macros.patch
 rename meta/recipes-support/boost/{boost_1.60.0.bb => boost_1.61.0.bb} (59%)

diff --git a/meta/recipes-support/boost/bjam-native_1.60.0.bb b/meta/recipes-support/boost/bjam-native_1.61.0.bb
similarity index 100%
rename from meta/recipes-support/boost/bjam-native_1.60.0.bb
rename to meta/recipes-support/boost/bjam-native_1.61.0.bb
diff --git a/meta/recipes-support/boost/boost-1.60.0.inc b/meta/recipes-support/boost/boost-1.61.0.inc
similarity index 83%
rename from meta/recipes-support/boost/boost-1.60.0.inc
rename to meta/recipes-support/boost/boost-1.61.0.inc
index a38693e..4553677 100644
--- a/meta/recipes-support/boost/boost-1.60.0.inc
+++ b/meta/recipes-support/boost/boost-1.61.0.inc
@@ -13,7 +13,7 @@ BOOST_P = "boost_${BOOST_VER}"
 
 SRC_URI = "${SOURCEFORGE_MIRROR}/boost/${BOOST_P}.tar.bz2"
 
-SRC_URI[md5sum] = "65a840e1a0b13a558ff19eeb2c4f0cbe"
-SRC_URI[sha256sum] = "686affff989ac2488f79a97b9479efb9f2abae035b5ed4d8226de6857933fd3b"
+SRC_URI[md5sum] = "6095876341956f65f9d35939ccea1a9f"
+SRC_URI[sha256sum] = "a547bd06c2fd9a71ba1d169d9cf0339da7ebf4753849a8f7d6fdb8feee99b640"
 
 S = "${WORKDIR}/${BOOST_P}"
diff --git a/meta/recipes-support/boost/boost/0001-Do-not-qualify-fenv.h-names-that-might-be-macros.patch b/meta/recipes-support/boost/boost/0001-Do-not-qualify-fenv.h-names-that-might-be-macros.patch
deleted file mode 100644
index df7e71f..0000000
--- a/meta/recipes-support/boost/boost/0001-Do-not-qualify-fenv.h-names-that-might-be-macros.patch
+++ /dev/null
@@ -1,45 +0,0 @@
-From f50e7bc9fed323c5705c0ed992c03e80eeec1dd6 Mon Sep 17 00:00:00 2001
-From: Jonathan Wakely <jwakely@redhat.com>
-Date: Mon, 14 Sep 2015 15:05:24 +0100
-Subject: [PATCH] Do not qualify <fenv.h> names that might be macros.
-
-The patch was imported from the boost-test git repository
-(https://github.com/boostorg/test) as of commit id
-f50e7bc9fed323c5705c0ed992c03e80eeec1dd6.
-  
-Upstream-Status: Accepted [commit f50e7bc9fed in develop branch]
-
-Signed-off-by: Lukas Bulwahn <lukas.bulwahn@oss.bmw-carit.de>
----
- include/boost/test/impl/execution_monitor.ipp | 8 ++++----
- 1 file changed, 4 insertions(+), 4 deletions(-)
-
-diff --git a/include/boost/test/impl/execution_monitor.ipp b/include/boost/test/impl/execution_monitor.ipp
-index b3e873e..a7bdce2 100644
---- a/include/boost/test/impl/execution_monitor.ipp
-+++ b/include/boost/test/impl/execution_monitor.ipp
-@@ -1380,8 +1380,8 @@ enable( unsigned mask )
- 
-     return ~old_cw & BOOST_FPE_ALL;
- #elif defined(__GLIBC__) && defined(__USE_GNU) && !defined(BOOST_CLANG) && !defined(BOOST_NO_FENV_H)
--    ::feclearexcept(BOOST_FPE_ALL);
--    int res = ::feenableexcept( mask );
-+    feclearexcept(BOOST_FPE_ALL);
-+    int res = feenableexcept( mask );
-     return res == -1 ? (unsigned)BOOST_FPE_INV : (unsigned)res;
- #else
-     /* Not Implemented  */
-@@ -1417,8 +1417,8 @@ disable( unsigned mask )
- 
-     return ~old_cw & BOOST_FPE_ALL;
- #elif defined(__GLIBC__) && defined(__USE_GNU) && !defined(BOOST_CLANG) && !defined(BOOST_NO_FENV_H)
--    ::feclearexcept(BOOST_FPE_ALL);
--    int res = ::fedisableexcept( mask );
-+    feclearexcept(BOOST_FPE_ALL);
-+    int res = fedisableexcept( mask );
-     return res == -1 ? (unsigned)BOOST_FPE_INV : (unsigned)res;
- #else
-     /* Not Implemented */
--- 
-1.9.1
-
diff --git a/meta/recipes-support/boost/boost_1.60.0.bb b/meta/recipes-support/boost/boost_1.61.0.bb
similarity index 59%
rename from meta/recipes-support/boost/boost_1.60.0.bb
rename to meta/recipes-support/boost/boost_1.61.0.bb
index 4d824c8..d8b14fe 100644
--- a/meta/recipes-support/boost/boost_1.60.0.bb
+++ b/meta/recipes-support/boost/boost_1.61.0.bb
@@ -3,6 +3,5 @@ include boost.inc
 
 SRC_URI += "\
     file://arm-intrinsics.patch \
-    file://0001-Do-not-qualify-fenv.h-names-that-might-be-macros.patch;striplevel=2 \
     file://consider-hardfp.patch \
 "
-- 
2.8.1

[PATCH 08/25] btrfs-tools: update to 4.5.3

[Alexander Kanavin]

Drop fix-symlink-creation-multiple-times.patch (merged upstream).

Signed-off-by: Alexander Kanavin <alexander.kanavin@linux.intel.com>
---
 .../fix-symlink-creation-multiple-times.patch      | 46 ----------------------
 .../{btrfs-tools_4.4.bb => btrfs-tools_4.5.3.bb}   |  3 +-
 2 files changed, 1 insertion(+), 48 deletions(-)
 delete mode 100644 meta/recipes-devtools/btrfs-tools/btrfs-tools/fix-symlink-creation-multiple-times.patch
 rename meta/recipes-devtools/btrfs-tools/{btrfs-tools_4.4.bb => btrfs-tools_4.5.3.bb} (89%)

diff --git a/meta/recipes-devtools/btrfs-tools/btrfs-tools/fix-symlink-creation-multiple-times.patch b/meta/recipes-devtools/btrfs-tools/btrfs-tools/fix-symlink-creation-multiple-times.patch
deleted file mode 100644
index a945496..0000000
--- a/meta/recipes-devtools/btrfs-tools/btrfs-tools/fix-symlink-creation-multiple-times.patch
+++ /dev/null
@@ -1,46 +0,0 @@
-From 05ab78e9183575e38f342e05a056cb7bcd1e52e1 Mon Sep 17 00:00:00 2001
-From: Hongxu Jia <hongxu.jia@windriver.com>
-Date: Thu, 18 Feb 2016 20:41:28 -0500
-Subject: [PATCH] btrfs-progs: fix symlink creation multiple times
-
-The rule to create symlink in Makefile caused parallel issue:
-$ make -j 40 DESTDIR=/image install BUILD_VERBOSE=1
-...
-  1     [LN]     libbtrfs.so.0
-  2     [LN]     libbtrfs.so
-  3 ln -s -f libbtrfs.so.0.1 libbtrfs.so.0
-  4 ln -s -f libbtrfs.so.0.1 libbtrfs.so.0
-  5 ln -s -f libbtrfs.so.0.1 libbtrfs.so
-  6 ln -s -f libbtrfs.so.0.1 libbtrfs.so
-...
-
-It failed occasionally:
-...
-|symlinkat: couldn't stat 'git/libbtrfs.so' even though symlink
-creation succeeded (No such file or directory).
-|ln: failed to create symbolic link 'libbtrfs.so': No such file or directory
-...
-
-Upstream-Status: Submitted [linux-btrfs@vger.kernel.org]
-Signed-off-by: Hongxu Jia <hongxu.jia@windriver.com>
----
- Makefile.in | 3 +--
- 1 file changed, 1 insertion(+), 2 deletions(-)
-
-diff --git a/Makefile.in b/Makefile.in
-index 1f4002e..16eeaf9 100644
---- a/Makefile.in
-+++ b/Makefile.in
-@@ -236,8 +236,7 @@ $(libs_static): $(libbtrfs_objects)
- 
- $(lib_links):
- 	@echo "    [LN]     $@"
--	$(Q)$(LN_S) -f libbtrfs.so.0.1 libbtrfs.so.0
--	$(Q)$(LN_S) -f libbtrfs.so.0.1 libbtrfs.so
-+	$(Q)$(LN_S) -f libbtrfs.so.0.1 $@
- 
- # keep intermediate files from the below implicit rules around
- .PRECIOUS: $(addsuffix .o,$(progs))
--- 
-1.9.1
-
diff --git a/meta/recipes-devtools/btrfs-tools/btrfs-tools_4.4.bb b/meta/recipes-devtools/btrfs-tools/btrfs-tools_4.5.3.bb
similarity index 89%
rename from meta/recipes-devtools/btrfs-tools/btrfs-tools_4.4.bb
rename to meta/recipes-devtools/btrfs-tools/btrfs-tools_4.5.3.bb
index 32e7bae..50fe66e 100644
--- a/meta/recipes-devtools/btrfs-tools/btrfs-tools_4.4.bb
+++ b/meta/recipes-devtools/btrfs-tools/btrfs-tools_4.5.3.bb
@@ -13,10 +13,9 @@ SECTION = "base"
 DEPENDS = "util-linux attr e2fsprogs lzo acl"
 RDEPENDS_${PN} = "libgcc"
 
-SRCREV = "21258fab2caeade405a15ba932d373b364aa6e8c"
+SRCREV = "b72438362b2dbce880cefe9427ffe0947a94e060"
 SRC_URI = "git://git.kernel.org/pub/scm/linux/kernel/git/kdave/btrfs-progs.git \
            file://fix-parallel.patch \
-           file://fix-symlink-creation-multiple-times.patch \
 "
 
 inherit autotools-brokensep pkgconfig
-- 
2.8.1

[PATCH 09/25] build-appliance-image: update version to 15.0.0

[Alexander Kanavin]

Signed-off-by: Alexander Kanavin <alexander.kanavin@linux.intel.com>
---
 .../{build-appliance-image_14.0.0.bb => build-appliance-image_15.0.0.bb}  | 0
 1 file changed, 0 insertions(+), 0 deletions(-)
 rename meta/recipes-core/images/{build-appliance-image_14.0.0.bb => build-appliance-image_15.0.0.bb} (100%)

diff --git a/meta/recipes-core/images/build-appliance-image_14.0.0.bb b/meta/recipes-core/images/build-appliance-image_15.0.0.bb
similarity index 100%
rename from meta/recipes-core/images/build-appliance-image_14.0.0.bb
rename to meta/recipes-core/images/build-appliance-image_15.0.0.bb
-- 
2.8.1

[PATCH 10/25] ffmpeg: update to 3.0.2

[Alexander Kanavin]

Signed-off-by: Alexander Kanavin <alexander.kanavin@linux.intel.com>
---
 meta/recipes-multimedia/ffmpeg/{ffmpeg_3.0.bb => ffmpeg_3.0.2.bb} | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)
 rename meta/recipes-multimedia/ffmpeg/{ffmpeg_3.0.bb => ffmpeg_3.0.2.bb} (97%)

diff --git a/meta/recipes-multimedia/ffmpeg/ffmpeg_3.0.bb b/meta/recipes-multimedia/ffmpeg/ffmpeg_3.0.2.bb
similarity index 97%
rename from meta/recipes-multimedia/ffmpeg/ffmpeg_3.0.bb
rename to meta/recipes-multimedia/ffmpeg/ffmpeg_3.0.2.bb
index 1dfbb9b..17a6562 100644
--- a/meta/recipes-multimedia/ffmpeg/ffmpeg_3.0.bb
+++ b/meta/recipes-multimedia/ffmpeg/ffmpeg_3.0.2.bb
@@ -15,8 +15,8 @@ LIC_FILES_CHKSUM = "file://COPYING.GPLv2;md5=b234ee4d69f5fce4486a80fdaf4a4263 \
 
 SRC_URI = "https://www.ffmpeg.org/releases/${BP}.tar.xz"
 
-SRC_URI[md5sum] = "ef9b6634bb7c920efc940b4d55adf7b2"
-SRC_URI[sha256sum] = "12f32cee41c74435f608c30793fd616bdf53467bb513278e273e135a4c58e470"
+SRC_URI[md5sum] = "beb5c69c671aba1386e7156fc2af1ab6"
+SRC_URI[sha256sum] = "82943cc7b0c4d14b612404de0dd7b24cd8ca3511d51e4fd3ae36b2d71bb95223"
 
 # Build fails when thumb is enabled: https://bugzilla.yoctoproject.org/show_bug.cgi?id=7717
 ARM_INSTRUCTION_SET = "arm"
-- 
2.8.1

[PATCH 11/25] cantarell-fonts: update to 0.0.24

[Alexander Kanavin]

Signed-off-by: Alexander Kanavin <alexander.kanavin@linux.intel.com>
---
 meta/recipes-graphics/cantarell-fonts/cantarell-fonts_git.bb | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/meta/recipes-graphics/cantarell-fonts/cantarell-fonts_git.bb b/meta/recipes-graphics/cantarell-fonts/cantarell-fonts_git.bb
index 5183628..e3e4cde 100644
--- a/meta/recipes-graphics/cantarell-fonts/cantarell-fonts_git.bb
+++ b/meta/recipes-graphics/cantarell-fonts/cantarell-fonts_git.bb
@@ -10,9 +10,9 @@ SECTION = "fonts"
 LICENSE = "OFL-1.1"
 LIC_FILES_CHKSUM = "file://COPYING;md5=df91e3ffcab8cfb972a66bf11255188d"
 
-PV = "0.0.21"
+PV = "0.0.24"
 
-SRCREV = "611c169df5287c059d63b0c8f0570647c75c9189"
+SRCREV = "07b6ea2cbbebfc360aa4668612a376be5e214eaa"
 SRC_URI = "git://git.gnome.org/cantarell-fonts;protocol=git;branch=master"
 UPSTREAM_CHECK_GITTAGREGEX = "(?P<pver>(?!0\.13)(?!0\.10\.1)\d+\.\d+(\.\d+)+)"
 
-- 
2.8.1

[PATCH 12/25] gcc: fix upstream check for 5.x version

[Alexander Kanavin]

Signed-off-by: Alexander Kanavin <alexander.kanavin@linux.intel.com>
---
 meta/recipes-devtools/gcc/gcc-5.3.inc | 1 +
 1 file changed, 1 insertion(+)

diff --git a/meta/recipes-devtools/gcc/gcc-5.3.inc b/meta/recipes-devtools/gcc/gcc-5.3.inc
index c54fa68..8613a10 100644
--- a/meta/recipes-devtools/gcc/gcc-5.3.inc
+++ b/meta/recipes-devtools/gcc/gcc-5.3.inc
@@ -101,6 +101,7 @@ BACKPORTS = ""
 
 SRC_URI[md5sum] = "c9616fd448f980259c31de613e575719"
 SRC_URI[sha256sum] = "b84f5592e9218b73dbae612b5253035a7b34a9a1f7688d2e1bfaaf7267d5c4db"
+UPSTREAM_CHECK_REGEX = "gcc-(?P<pver>5\.\d+\.\d+).tar"
 
 #S = "${TMPDIR}/work-shared/gcc-${PV}-${PR}/gcc-${SNAP}"
 S = "${TMPDIR}/work-shared/gcc-${PV}-${PR}/gcc-${PV}"
-- 
2.8.1

[PATCH 13/25] gdb: fix upstream check

[Alexander Kanavin]

Signed-off-by: Alexander Kanavin <alexander.kanavin@linux.intel.com>
---
 meta/recipes-devtools/gdb/gdb-common.inc | 2 ++
 1 file changed, 2 insertions(+)

diff --git a/meta/recipes-devtools/gdb/gdb-common.inc b/meta/recipes-devtools/gdb/gdb-common.inc
index 3e00a2e..cdb7054 100644
--- a/meta/recipes-devtools/gdb/gdb-common.inc
+++ b/meta/recipes-devtools/gdb/gdb-common.inc
@@ -39,6 +39,8 @@ SRC_URI = "git://sourceware.org/git/binutils-gdb.git;branch=gdb-7.11-branch \
            file://0011-avx_mpx.patch \
 "
 
+UPSTREAM_CHECK_GITTAGREGEX = "gdb\-(?P<pver>.+)\-release"
+
 S = "${WORKDIR}/git"
 
 B = "${WORKDIR}/build-${TARGET_SYS}"
-- 
2.8.1

[PATCH 14/25] gnome-desktop3: update to 3.20.2

[Alexander Kanavin]

Signed-off-by: Alexander Kanavin <alexander.kanavin@linux.intel.com>
---
 .../{gnome-desktop3_3.18.2.bb => gnome-desktop3_3.20.2.bb}            | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)
 rename meta/recipes-gnome/gnome-desktop/{gnome-desktop3_3.18.2.bb => gnome-desktop3_3.20.2.bb} (84%)

diff --git a/meta/recipes-gnome/gnome-desktop/gnome-desktop3_3.18.2.bb b/meta/recipes-gnome/gnome-desktop/gnome-desktop3_3.20.2.bb
similarity index 84%
rename from meta/recipes-gnome/gnome-desktop/gnome-desktop3_3.18.2.bb
rename to meta/recipes-gnome/gnome-desktop/gnome-desktop3_3.20.2.bb
index 75a99a6..dd1cee5 100644
--- a/meta/recipes-gnome/gnome-desktop/gnome-desktop3_3.18.2.bb
+++ b/meta/recipes-gnome/gnome-desktop/gnome-desktop3_3.20.2.bb
@@ -7,8 +7,8 @@ LIC_FILES_CHKSUM = "file://COPYING;md5=b234ee4d69f5fce4486a80fdaf4a4263 \
 BPN = "gnome-desktop"
 
 inherit gnome pkgconfig upstream-version-is-even gobject-introspection
-SRC_URI[archive.md5sum] = "9a5875247abdb99bad93f1c4230d1d6d"
-SRC_URI[archive.sha256sum] = "ddd46d022de137543a71f50c7392b32f9b98d5d3f2b53040b35f5802de2e7b56"
+SRC_URI[archive.md5sum] = "8354ed38624f5eb6b5d34267b658a9c9"
+SRC_URI[archive.sha256sum] = "492c2da7aa8c3a8b65796e8171fc8f0dfb5d322dd2799c0d76392e1fb061e2b2"
 
 DEPENDS += "intltool-native gsettings-desktop-schemas gconf libxrandr virtual/libx11 gtk+3 glib-2.0 gnome-doc-utils startup-notification xkeyboard-config iso-codes"
 
-- 
2.8.1

[PATCH 15/25] gobject-introspection: update to 1.48.0

[Alexander Kanavin]

Add a patch that reverts an incomplete upstream attempt at cross-compile support;
upstream has been notified:
https://bugzilla.gnome.org/show_bug.cgi?id=696773

Signed-off-by: Alexander Kanavin <alexander.kanavin@linux.intel.com>
---
 ...ncomplete-upstream-attempt-at-cross-compi.patch | 50 ++++++++++++++++++++++
 ...-add-host-gi-gi-cross-wrapper-gi-ldd-wra.patch} | 15 +++----
 ...-giscanner-add-use-binary-wrapper-option.patch} | 13 +++---
 ...4-giscanner-add-a-use-ldd-wrapper-option.patch} | 15 +++----
 ...onfig-paths-with-PKG_CONFIG_SYSROOT_DIR-.patch} | 13 +++---
 ...n_1.46.0.bb => gobject-introspection_1.48.0.bb} | 15 ++++---
 6 files changed, 84 insertions(+), 37 deletions(-)
 create mode 100644 meta/recipes-gnome/gobject-introspection/gobject-introspection/0001-Revert-an-incomplete-upstream-attempt-at-cross-compi.patch
 rename meta/recipes-gnome/gobject-introspection/gobject-introspection/{0001-configure.ac-add-host-gi-gi-cross-wrapper-and-gi-ldd.patch => 0002-configure.ac-add-host-gi-gi-cross-wrapper-gi-ldd-wra.patch} (95%)
 rename meta/recipes-gnome/gobject-introspection/gobject-introspection/{0001-giscanner-add-use-binary-wrapper-option.patch => 0003-giscanner-add-use-binary-wrapper-option.patch} (88%)
 rename meta/recipes-gnome/gobject-introspection/gobject-introspection/{0001-giscanner-add-a-use-ldd-wrapper-option.patch => 0004-giscanner-add-a-use-ldd-wrapper-option.patch} (85%)
 rename meta/recipes-gnome/gobject-introspection/gobject-introspection/{0001-Prefix-pkg-config-paths-with-PKG_CONFIG_SYSROOT_DIR-.patch => 0005-Prefix-pkg-config-paths-with-PKG_CONFIG_SYSROOT_DIR-.patch} (91%)
 rename meta/recipes-gnome/gobject-introspection/{gobject-introspection_1.46.0.bb => gobject-introspection_1.48.0.bb} (93%)

diff --git a/meta/recipes-gnome/gobject-introspection/gobject-introspection/0001-Revert-an-incomplete-upstream-attempt-at-cross-compi.patch b/meta/recipes-gnome/gobject-introspection/gobject-introspection/0001-Revert-an-incomplete-upstream-attempt-at-cross-compi.patch
new file mode 100644
index 0000000..9abaea7
--- /dev/null
+++ b/meta/recipes-gnome/gobject-introspection/gobject-introspection/0001-Revert-an-incomplete-upstream-attempt-at-cross-compi.patch
@@ -0,0 +1,50 @@
+From 3a9d1e5ee0aae56fafec0beba2014c19e4ff310c Mon Sep 17 00:00:00 2001
+From: Alexander Kanavin <alex.kanavin@gmail.com>
+Date: Wed, 23 Mar 2016 17:07:28 +0200
+Subject: [PATCH 1/5] Revert an incomplete upstream attempt at cross-compile
+ support
+
+Upstream-Status: Pending
+Signed-off-by: Alexander Kanavin <alex.kanavin@gmail.com>
+---
+ common.mk                | 4 ----
+ giscanner/gdumpparser.py | 6 ------
+ 2 files changed, 10 deletions(-)
+
+diff --git a/common.mk b/common.mk
+index b778f7a..e26c637 100644
+--- a/common.mk
++++ b/common.mk
+@@ -24,12 +24,8 @@ INTROSPECTION_SCANNER_ARGS = \
+     --add-include-path=$(top_builddir) \
+     --add-include-path=$(top_builddir)/gir
+ 
+-# GI_CROSS_LAUNCHER is the command to use for executing g-ir-compiler.
+-# Normally will be undefined but can be set (e.g. to wine or qemu)
+-# when cross-compiling
+ INTROSPECTION_COMPILER = \
+     env PATH=".libs:$(PATH)" \
+-        $(GI_CROSS_LAUNCHER) \
+         $(top_builddir)/g-ir-compiler$(EXEEXT)
+ 
+ INTROSPECTION_COMPILER_ARGS = \
+diff --git a/giscanner/gdumpparser.py b/giscanner/gdumpparser.py
+index 1134f33..9bdc2bc 100644
+--- a/giscanner/gdumpparser.py
++++ b/giscanner/gdumpparser.py
+@@ -162,12 +162,6 @@ blob containing data gleaned from GObject's primitive introspection."""
+         out_path = os.path.join(self._binary.tmpdir, 'dump.xml')
+ 
+         args = []
+-
+-        # Prepend the launcher command and arguments, if defined
+-        launcher = os.environ.get('GI_CROSS_LAUNCHER')
+-        if launcher:
+-            args.extend(launcher.split())
+-
+         args.extend(self._binary.args)
+         args.append('--introspect-dump=%s,%s' % (in_path, out_path))
+ 
+-- 
+2.7.0
+
diff --git a/meta/recipes-gnome/gobject-introspection/gobject-introspection/0001-configure.ac-add-host-gi-gi-cross-wrapper-and-gi-ldd.patch b/meta/recipes-gnome/gobject-introspection/gobject-introspection/0002-configure.ac-add-host-gi-gi-cross-wrapper-gi-ldd-wra.patch
similarity index 95%
rename from meta/recipes-gnome/gobject-introspection/gobject-introspection/0001-configure.ac-add-host-gi-gi-cross-wrapper-and-gi-ldd.patch
rename to meta/recipes-gnome/gobject-introspection/gobject-introspection/0002-configure.ac-add-host-gi-gi-cross-wrapper-gi-ldd-wra.patch
index 6afefab..48a0c85 100644
--- a/meta/recipes-gnome/gobject-introspection/gobject-introspection/0001-configure.ac-add-host-gi-gi-cross-wrapper-and-gi-ldd.patch
+++ b/meta/recipes-gnome/gobject-introspection/gobject-introspection/0002-configure.ac-add-host-gi-gi-cross-wrapper-gi-ldd-wra.patch
@@ -1,8 +1,8 @@
-From c6e4f83c373b577166a7e46130ce8ff025ee8515 Mon Sep 17 00:00:00 2001
+From b1503fe2693d602b3e24e4b832dc0934960d5d22 Mon Sep 17 00:00:00 2001
 From: Alexander Kanavin <alex.kanavin@gmail.com>
 Date: Mon, 19 Oct 2015 18:29:21 +0300
-Subject: [PATCH] configure.ac: add host-gi, gi-cross-wrapper, gi-ldd-wrapper
- and introspection-data options
+Subject: [PATCH 2/5] configure.ac: add host-gi, gi-cross-wrapper,
+ gi-ldd-wrapper and introspection-data options
 
 With the first option, gobject-introspection tools (g-ir-doc-tool and g-ir-scanner)
 that are already installed in the host system will be used for building the source tree.
@@ -25,7 +25,6 @@ These options are useful when cross-compiling for a different target architectur
 
 Upstream-Status: Pending [review on oe-core list]
 Signed-off-by: Alexander Kanavin <alex.kanavin@gmail.com>
-
 ---
  Makefile.am       |  2 ++
  common.mk         | 39 +++++++++++++++++++++++++++++++++++++++
@@ -34,7 +33,7 @@ Signed-off-by: Alexander Kanavin <alex.kanavin@gmail.com>
  4 files changed, 87 insertions(+), 1 deletion(-)
 
 diff --git a/Makefile.am b/Makefile.am
-index 437c673..1eb3545 100644
+index b080a89..ce8d29b 100644
 --- a/Makefile.am
 +++ b/Makefile.am
 @@ -21,7 +21,9 @@ include Makefile-cmph.am
@@ -132,10 +131,10 @@ index e26c637..9f3a65f 100644
  INTROSPECTION_DOCTOOL_ARGS = \
      --add-include-path=$(srcdir) \
 diff --git a/configure.ac b/configure.ac
-index b11596b..d78ae52 100644
+index 6c91fa5..21340a5 100644
 --- a/configure.ac
 +++ b/configure.ac
-@@ -347,6 +347,48 @@ fi
+@@ -360,6 +360,48 @@ fi
  
  AC_SUBST(EXTRA_LINK_FLAGS)
  
@@ -200,5 +199,5 @@ index bdd0fa7..75dd3c9 100644
  EXTRA_DIST=
  BUILT_SOURCES=
 -- 
-2.6.2
+2.7.0
 
diff --git a/meta/recipes-gnome/gobject-introspection/gobject-introspection/0001-giscanner-add-use-binary-wrapper-option.patch b/meta/recipes-gnome/gobject-introspection/gobject-introspection/0003-giscanner-add-use-binary-wrapper-option.patch
similarity index 88%
rename from meta/recipes-gnome/gobject-introspection/gobject-introspection/0001-giscanner-add-use-binary-wrapper-option.patch
rename to meta/recipes-gnome/gobject-introspection/gobject-introspection/0003-giscanner-add-use-binary-wrapper-option.patch
index e1241a9..b0d098c 100644
--- a/meta/recipes-gnome/gobject-introspection/gobject-introspection/0001-giscanner-add-use-binary-wrapper-option.patch
+++ b/meta/recipes-gnome/gobject-introspection/gobject-introspection/0003-giscanner-add-use-binary-wrapper-option.patch
@@ -1,7 +1,7 @@
-From 2322f36056265f809aaffb74fcf5ac0c83129752 Mon Sep 17 00:00:00 2001
+From 704b888d0abfb01067352c40156f49f655691c7c Mon Sep 17 00:00:00 2001
 From: Alexander Kanavin <alex.kanavin@gmail.com>
 Date: Mon, 19 Oct 2015 18:26:40 +0300
-Subject: [PATCH 2/4] giscanner: add --use-binary-wrapper option
+Subject: [PATCH 3/5] giscanner: add --use-binary-wrapper option
 
 With this option, giscanner will use a wrapper executable to run
 binaries it's producing, instead of running them directly. This
@@ -10,16 +10,15 @@ but they can be run using for example QEMU emulation.
 
 Upstream-Status: Pending [review on oe-core list]
 Signed-off-by: Alexander Kanavin <alex.kanavin@gmail.com>
-
 ---
  giscanner/scannermain.py | 14 ++++++++++++++
  1 file changed, 14 insertions(+)
 
 diff --git a/giscanner/scannermain.py b/giscanner/scannermain.py
-index b36284d..e37d3e3 100755
+index 633496f..d684cd0 100755
 --- a/giscanner/scannermain.py
 +++ b/giscanner/scannermain.py
-@@ -118,6 +118,9 @@ def _get_option_parser():
+@@ -124,6 +124,9 @@ def _get_option_parser():
      parser.add_option("", "--program",
                        action="store", dest="program", default=None,
                        help="program to execute")
@@ -29,7 +28,7 @@ index b36284d..e37d3e3 100755
      parser.add_option("", "--program-arg",
                        action="append", dest="program_args", default=[],
                        help="extra arguments to program")
-@@ -406,6 +409,17 @@ def create_binary(transformer, options, args):
+@@ -419,6 +422,17 @@ def create_binary(transformer, options, args):
                                                gdump_parser.get_error_quark_functions())
  
      shlibs = resolve_shlibs(options, binary, options.libraries)
@@ -48,5 +47,5 @@ index b36284d..e37d3e3 100755
      gdump_parser.parse()
      return shlibs
 -- 
-2.1.4
+2.7.0
 
diff --git a/meta/recipes-gnome/gobject-introspection/gobject-introspection/0001-giscanner-add-a-use-ldd-wrapper-option.patch b/meta/recipes-gnome/gobject-introspection/gobject-introspection/0004-giscanner-add-a-use-ldd-wrapper-option.patch
similarity index 85%
rename from meta/recipes-gnome/gobject-introspection/gobject-introspection/0001-giscanner-add-a-use-ldd-wrapper-option.patch
rename to meta/recipes-gnome/gobject-introspection/gobject-introspection/0004-giscanner-add-a-use-ldd-wrapper-option.patch
index f923dcc..afb71e7 100644
--- a/meta/recipes-gnome/gobject-introspection/gobject-introspection/0001-giscanner-add-a-use-ldd-wrapper-option.patch
+++ b/meta/recipes-gnome/gobject-introspection/gobject-introspection/0004-giscanner-add-a-use-ldd-wrapper-option.patch
@@ -1,24 +1,23 @@
-From 291a92f200981a772b2d03739dffb5926a82c5a5 Mon Sep 17 00:00:00 2001
+From d4ad57fd4a32c4f0d2f0522a3090ef940746431b Mon Sep 17 00:00:00 2001
 From: Alexander Kanavin <alex.kanavin@gmail.com>
 Date: Fri, 30 Oct 2015 16:28:46 +0200
-Subject: [PATCH 1/2] giscanner: add a --use-ldd-wrapper option
+Subject: [PATCH 4/5] giscanner: add a --use-ldd-wrapper option
 
 This is useful in cross-compile environments where system's ldd
 command does not work on binaries built for a different architecture
 
 Upstream-Status: Pending [review in oe-core]
 Signed-off-by: Alexander Kanavin <alex.kanavin@gmail.com>
-
 ---
  giscanner/scannermain.py | 3 +++
  giscanner/shlibs.py      | 4 +++-
  2 files changed, 6 insertions(+), 1 deletion(-)
 
 diff --git a/giscanner/scannermain.py b/giscanner/scannermain.py
-index e37d3e3..b8fff5f 100755
+index d684cd0..1b3b369 100755
 --- a/giscanner/scannermain.py
 +++ b/giscanner/scannermain.py
-@@ -121,6 +121,9 @@ def _get_option_parser():
+@@ -127,6 +127,9 @@ def _get_option_parser():
      parser.add_option("", "--use-binary-wrapper",
                        action="store", dest="wrapper", default=None,
                        help="wrapper to use for running programs (useful when cross-compiling)")
@@ -29,10 +28,10 @@ index e37d3e3..b8fff5f 100755
                        action="append", dest="program_args", default=[],
                        help="extra arguments to program")
 diff --git a/giscanner/shlibs.py b/giscanner/shlibs.py
-index 1ad75ee..41117c6 100644
+index c93d20c..c5b5942 100644
 --- a/giscanner/shlibs.py
 +++ b/giscanner/shlibs.py
-@@ -100,7 +100,9 @@ def _resolve_non_libtool(options, binary, libraries):
+@@ -105,7 +105,9 @@ def _resolve_non_libtool(options, binary, libraries):
              args.extend(libtool)
              args.append('--mode=execute')
          platform_system = platform.system()
@@ -44,5 +43,5 @@ index 1ad75ee..41117c6 100644
          else:
              args.extend(['ldd', binary.args[0]])
 -- 
-2.1.4
+2.7.0
 
diff --git a/meta/recipes-gnome/gobject-introspection/gobject-introspection/0001-Prefix-pkg-config-paths-with-PKG_CONFIG_SYSROOT_DIR-.patch b/meta/recipes-gnome/gobject-introspection/gobject-introspection/0005-Prefix-pkg-config-paths-with-PKG_CONFIG_SYSROOT_DIR-.patch
similarity index 91%
rename from meta/recipes-gnome/gobject-introspection/gobject-introspection/0001-Prefix-pkg-config-paths-with-PKG_CONFIG_SYSROOT_DIR-.patch
rename to meta/recipes-gnome/gobject-introspection/gobject-introspection/0005-Prefix-pkg-config-paths-with-PKG_CONFIG_SYSROOT_DIR-.patch
index 5026d81..47a18ec 100644
--- a/meta/recipes-gnome/gobject-introspection/gobject-introspection/0001-Prefix-pkg-config-paths-with-PKG_CONFIG_SYSROOT_DIR-.patch
+++ b/meta/recipes-gnome/gobject-introspection/gobject-introspection/0005-Prefix-pkg-config-paths-with-PKG_CONFIG_SYSROOT_DIR-.patch
@@ -1,7 +1,7 @@
-From a57604e205e6535acd9989444ad1f5f5038f4fba Mon Sep 17 00:00:00 2001
+From e08b3677dd04d6ec407ba8f74f601b2d51310eff Mon Sep 17 00:00:00 2001
 From: Alexander Kanavin <alex.kanavin@gmail.com>
 Date: Thu, 8 Oct 2015 18:30:35 +0300
-Subject: [PATCH 1/4] Prefix pkg-config paths with PKG_CONFIG_SYSROOT_DIR
+Subject: [PATCH 5/5] Prefix pkg-config paths with PKG_CONFIG_SYSROOT_DIR
  environment variable
 
 This environment variable sets the location of sysroot directory in cross-compilation
@@ -9,14 +9,13 @@ environments; if the variable is not set, the prefix will be empty.
 
 Upstream-Status: Pending [review on oe-core list]
 Signed-off-by: Alexander Kanavin <alex.kanavin@gmail.com>
-
 ---
  Makefile-gir.am     | 18 +++++++++---------
  m4/introspection.m4 |  8 ++++----
  2 files changed, 13 insertions(+), 13 deletions(-)
 
 diff --git a/Makefile-gir.am b/Makefile-gir.am
-index 9aca664..09b9360 100644
+index a09260a..ba6e89e 100644
 --- a/Makefile-gir.am
 +++ b/Makefile-gir.am
 @@ -55,8 +55,8 @@ else
@@ -64,11 +63,11 @@ index 9aca664..09b9360 100644
  GIO_LIBRARY=gio-2.0
  
  if HAVE_GIO_UNIX
--GIO_UNIX_HDRS=$(shell "${PKG_CONFIG}" --variable=includedir gio-unix-2.0)/gio-unix-2.0/gio/*.h
-+GIO_UNIX_HDRS=$(PKG_CONFIG_SYSROOT_DIR)$(shell "${PKG_CONFIG}" --variable=includedir gio-unix-2.0)/gio-unix-2.0/gio/*.h
+-GIO_UNIX_INCLUDEDIR = $(shell "${PKG_CONFIG}" --variable=includedir gio-unix-2.0)/gio-unix-2.0
++GIO_UNIX_INCLUDEDIR = $(PKG_CONFIG_SYSROOT_DIR)$(shell "${PKG_CONFIG}" --variable=includedir gio-unix-2.0)/gio-unix-2.0
+ GIO_UNIX_HDRS = $(GIO_UNIX_INCLUDEDIR)/gio/*.h
  GIO_UNIX_PACKAGES = gio-unix-2.0
  else
- GIO_UNIX_HDRS=
 diff --git a/m4/introspection.m4 b/m4/introspection.m4
 index d89c3d9..b562266 100644
 --- a/m4/introspection.m4
diff --git a/meta/recipes-gnome/gobject-introspection/gobject-introspection_1.46.0.bb b/meta/recipes-gnome/gobject-introspection/gobject-introspection_1.48.0.bb
similarity index 93%
rename from meta/recipes-gnome/gobject-introspection/gobject-introspection_1.46.0.bb
rename to meta/recipes-gnome/gobject-introspection/gobject-introspection_1.48.0.bb
index 1937626..f368814 100644
--- a/meta/recipes-gnome/gobject-introspection/gobject-introspection_1.46.0.bb
+++ b/meta/recipes-gnome/gobject-introspection/gobject-introspection_1.48.0.bb
@@ -8,14 +8,15 @@ LIC_FILES_CHKSUM = "file://COPYING;md5=90d577535a3898e1ae5dbf0ae3509a8c \
                     file://giscanner/sourcescanner.c;endline=22;md5=194d6e0c1d00662f32d030ce44de8d39 \
                     file://girepository/giregisteredtypeinfo.c;endline=21;md5=661847611ae6979465415f31a759ba27"
 
-SRC_URI = "${GNOME_MIRROR}/${BPN}/1.46/${BPN}-${PV}.tar.xz \
-           file://0001-Prefix-pkg-config-paths-with-PKG_CONFIG_SYSROOT_DIR-.patch \
-           file://0001-giscanner-add-use-binary-wrapper-option.patch \
-           file://0001-giscanner-add-a-use-ldd-wrapper-option.patch \
-           file://0001-configure.ac-add-host-gi-gi-cross-wrapper-and-gi-ldd.patch \
+SRC_URI = "${GNOME_MIRROR}/${BPN}/1.48/${BPN}-${PV}.tar.xz \
+           file://0001-Revert-an-incomplete-upstream-attempt-at-cross-compi.patch \
+           file://0002-configure.ac-add-host-gi-gi-cross-wrapper-gi-ldd-wra.patch \
+           file://0003-giscanner-add-use-binary-wrapper-option.patch \
+           file://0004-giscanner-add-a-use-ldd-wrapper-option.patch \
+           file://0005-Prefix-pkg-config-paths-with-PKG_CONFIG_SYSROOT_DIR-.patch \
            "
-SRC_URI[md5sum] = "adb40a31c7c80b65b0f4c8fd71b493dc"
-SRC_URI[sha256sum] = "6658bd3c2b8813eb3e2511ee153238d09ace9d309e4574af27443d87423e4233"
+SRC_URI[md5sum] = "01301fa9019667d48e927353e08bc218"
+SRC_URI[sha256sum] = "fa275aaccdbfc91ec0bc9a6fd0562051acdba731e7d584b64a277fec60e75877"
 
 inherit autotools pkgconfig gtk-doc pythonnative qemu gobject-introspection-data
 BBCLASSEXTEND = "native"
-- 
2.8.1

[PATCH 16/25] gobject-introspection: move to Python 3

[Alexander Kanavin]

Signed-off-by: Alexander Kanavin <alexander.kanavin@linux.intel.com>
---
 .../0003-giscanner-add-use-binary-wrapper-option.patch      |  4 ++--
 .../gobject-introspection/gobject-introspection_1.48.0.bb   | 13 ++++++++-----
 2 files changed, 10 insertions(+), 7 deletions(-)

diff --git a/meta/recipes-gnome/gobject-introspection/gobject-introspection/0003-giscanner-add-use-binary-wrapper-option.patch b/meta/recipes-gnome/gobject-introspection/gobject-introspection/0003-giscanner-add-use-binary-wrapper-option.patch
index b0d098c..f21eaca 100644
--- a/meta/recipes-gnome/gobject-introspection/gobject-introspection/0003-giscanner-add-use-binary-wrapper-option.patch
+++ b/meta/recipes-gnome/gobject-introspection/gobject-introspection/0003-giscanner-add-use-binary-wrapper-option.patch
@@ -36,11 +36,11 @@ index 633496f..d684cd0 100755
 +        # The wrapper needs the binary itself, not the libtool wrapper script,
 +        # so we check if libtool has sneaked the binary into .libs subdirectory
 +        # and adjust the path accordingly
-+	import os.path
++        import os.path
 +        dir_name, binary_name  = os.path.split(binary.args[0])
 +        libtool_binary = os.path.join(dir_name, '.libs', binary_name)
 +        if os.path.exists(libtool_binary):
-+	    binary.args[0] = libtool_binary
++            binary.args[0] = libtool_binary
 +	# Then prepend the wrapper to the command line to execute
 +        binary.args = [options.wrapper] + binary.args
      gdump_parser.set_introspection_binary(binary)
diff --git a/meta/recipes-gnome/gobject-introspection/gobject-introspection_1.48.0.bb b/meta/recipes-gnome/gobject-introspection/gobject-introspection_1.48.0.bb
index f368814..8adede6 100644
--- a/meta/recipes-gnome/gobject-introspection/gobject-introspection_1.48.0.bb
+++ b/meta/recipes-gnome/gobject-introspection/gobject-introspection_1.48.0.bb
@@ -18,18 +18,21 @@ SRC_URI = "${GNOME_MIRROR}/${BPN}/1.48/${BPN}-${PV}.tar.xz \
 SRC_URI[md5sum] = "01301fa9019667d48e927353e08bc218"
 SRC_URI[sha256sum] = "fa275aaccdbfc91ec0bc9a6fd0562051acdba731e7d584b64a277fec60e75877"
 
-inherit autotools pkgconfig gtk-doc pythonnative qemu gobject-introspection-data
+inherit autotools pkgconfig gtk-doc python3native qemu gobject-introspection-data
 BBCLASSEXTEND = "native"
 
 # necessary to let the call for python-config from configure.ac succeed
 export STAGING_INCDIR
 export STAGING_LIBDIR
 
+# autoconf macros otherwise will default to Python 2
+export PYTHON
+
 # needed for writing out the qemu wrapper script
 export STAGING_DIR_HOST
 export B
 
-DEPENDS_append = " libffi zlib glib-2.0 python flex-native bison-native"
+DEPENDS_append = " libffi zlib glib-2.0 python3 flex-native bison-native"
 
 # target build needs qemu to run temporary introspection binaries created
 # on the fly by g-ir-scanner and a native version of itself to run
@@ -44,7 +47,7 @@ do_configure_prepend_class-native() {
         # Tweak the native python scripts so that they don't refer to the
         # full path of native python binary (the solution is taken from glib-2.0 recipe)
         # This removes the risk of exceeding Linux kernel's shebang line limit (128 bytes)
-        sed -i -e '1s,#!.*,#!${USRBINPATH}/env nativepython,' ${S}/tools/g-ir-tool-template.in
+        sed -i -e '1s,#!.*,#!${USRBINPATH}/env python3,' ${S}/tools/g-ir-tool-template.in
 }
 
 do_configure_prepend_class-target() {
@@ -97,7 +100,7 @@ EOF
 
         # Also tweak the target python scripts so that they don't refer to the
         # native version of python binary (the solution is taken from glib-2.0 recipe)
-        sed -i -e '1s,#!.*,#!${USRBINPATH}/env python,' ${S}/tools/g-ir-tool-template.in
+        sed -i -e '1s,#!.*,#!${USRBINPATH}/env python3,' ${S}/tools/g-ir-tool-template.in
 }
 
 # Configure target build to use native tools of itself and to use a qemu wrapper
@@ -109,7 +112,7 @@ EXTRA_OECONF_class-target += "--enable-host-gi \
                              "
 
 PACKAGECONFIG ?= ""
-PACKAGECONFIG[doctool] = "--enable-doctool,--disable-doctool,python-mako,"
+PACKAGECONFIG[doctool] = "--enable-doctool,--disable-doctool,python3-mako,"
 
 do_compile_prepend_class-target() {
         # This prevents g-ir-scanner from writing cache data to $HOME
-- 
2.8.1

[PATCH 17/25] mc: update to 4.8.17

[Alexander Kanavin]

Signed-off-by: Alexander Kanavin <alexander.kanavin@linux.intel.com>
---
 meta/recipes-extended/mc/{mc_4.8.16.bb => mc_4.8.17.bb} | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)
 rename meta/recipes-extended/mc/{mc_4.8.16.bb => mc_4.8.17.bb} (93%)

diff --git a/meta/recipes-extended/mc/mc_4.8.16.bb b/meta/recipes-extended/mc/mc_4.8.17.bb
similarity index 93%
rename from meta/recipes-extended/mc/mc_4.8.16.bb
rename to meta/recipes-extended/mc/mc_4.8.17.bb
index 16ed6a9..a5c4ece 100644
--- a/meta/recipes-extended/mc/mc_4.8.16.bb
+++ b/meta/recipes-extended/mc/mc_4.8.17.bb
@@ -8,8 +8,8 @@ RDEPENDS_${PN} = "ncurses-terminfo"
 
 SRC_URI = "http://www.midnight-commander.org/downloads/${BPN}-${PV}.tar.bz2 \
            "
-SRC_URI[md5sum] = "b93706dfe66ffe4f61c1a2650798d207"
-SRC_URI[sha256sum] = "c37ea495df93f6d375a3ce59cdcf0f3a3690338526205347b03a316daebdaaf8"
+SRC_URI[md5sum] = "6e9c07066e40af06b263a13fad17a07f"
+SRC_URI[sha256sum] = "66d0cb37baaed8ef930f8ad25a634adad4f264eb61820893920ac87b9dfb783b"
 
 inherit autotools gettext pkgconfig
 
-- 
2.8.1

[PATCH 18/25] icu: update to 57.1

[Alexander Kanavin]

Point to the actual license file in the recipe.
Drop icu-release-56-1-flagparser-fix.patch, merged upstream.

Signed-off-by: Alexander Kanavin <alexander.kanavin@linux.intel.com>
---
 .../icu/icu/icu-release-56-1-flagparser-fix.patch  | 24 ----------------------
 .../icu/{icu_56.1.bb => icu_57.1.bb}               |  7 +++----
 2 files changed, 3 insertions(+), 28 deletions(-)
 delete mode 100644 meta/recipes-support/icu/icu/icu-release-56-1-flagparser-fix.patch
 rename meta/recipes-support/icu/{icu_56.1.bb => icu_57.1.bb} (72%)

diff --git a/meta/recipes-support/icu/icu/icu-release-56-1-flagparser-fix.patch b/meta/recipes-support/icu/icu/icu-release-56-1-flagparser-fix.patch
deleted file mode 100644
index 1519d84..0000000
--- a/meta/recipes-support/icu/icu/icu-release-56-1-flagparser-fix.patch
+++ /dev/null
@@ -1,24 +0,0 @@
-icu: Ticket #11959: pkgdata dies when compiled with lots'o'flags
-
-See: http://bugs.icu-project.org/trac/ticket/11959
-
-The patch avoids premature failure which results in a segfault.
-
-Upstream-Status: Backport of r38081
-Signed-off-by: Mike Crowe <mac@mcrowe.com>
-
-Index: source/tools/toolutil/flagparser.c
-===================================================================
---- source/tools/toolutil/flagparser.c	(revision 38046)
-+++ source/tools/toolutil/flagparser.c	(working copy)
-@@ -96,8 +96,8 @@
-     uprv_free(buffer);
- 
-     T_FileStream_close(f);
--    
--    if (U_FAILURE(*status)) {
-+
-+    if (U_FAILURE(*status) && *status != U_BUFFER_OVERFLOW_ERROR) {
-         return -1;
-     }
- 
diff --git a/meta/recipes-support/icu/icu_56.1.bb b/meta/recipes-support/icu/icu_57.1.bb
similarity index 72%
rename from meta/recipes-support/icu/icu_56.1.bb
rename to meta/recipes-support/icu/icu_57.1.bb
index db0de10..90c2b82 100644
--- a/meta/recipes-support/icu/icu_56.1.bb
+++ b/meta/recipes-support/icu/icu_57.1.bb
@@ -1,6 +1,6 @@
 require icu.inc
 
-LIC_FILES_CHKSUM = "file://../license.html;md5=64eff4aadff4d104d6d437c4fde0e6d7"
+LIC_FILES_CHKSUM = "file://../LICENSE;md5=787d3b37867445c1cdd6f6167bd0e347"
 
 def icu_download_version(d):
     pvsplit = d.getVar('PV', True).split('.')
@@ -16,14 +16,13 @@ BASE_SRC_URI = "http://download.icu-project.org/files/icu4c/${PV}/icu4c-${ICU_PV
 SRC_URI = "${BASE_SRC_URI} \
            file://icu-pkgdata-large-cmd.patch \
            file://fix-install-manx.patch \
-           file://icu-release-56-1-flagparser-fix.patch \
           "
 
 SRC_URI_append_class-target = "\
            file://0001-Disable-LDFLAGSICUDT-for-Linux.patch \
           "
-SRC_URI[md5sum] = "c4a2d71ff56aec5ebfab2a3f059be99d"
-SRC_URI[sha256sum] = "3a64e9105c734dcf631c0b3ed60404531bce6c0f5a64bfe1a6402a4cc2314816"
+SRC_URI[md5sum] = "976734806026a4ef8bdd17937c8898b9"
+SRC_URI[sha256sum] = "ff8c67cb65949b1e7808f2359f2b80f722697048e90e7cfc382ec1fe229e9581"
 
 UPSTREAM_CHECK_REGEX = "(?P<pver>\d+(\.\d+)+)/"
 UPSTREAM_CHECK_URI = "http://download.icu-project.org/files/icu4c/"
-- 
2.8.1

[PATCH 19/25] iso-codes: update to 3.68

[Alexander Kanavin]

License file has been renamed, but still contains LGPLv2.1

Signed-off-by: Alexander Kanavin <alexander.kanavin@linux.intel.com>
---
 .../iso-codes/{iso-codes_3.65.bb => iso-codes_3.68.bb}              | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)
 rename meta/recipes-support/iso-codes/{iso-codes_3.65.bb => iso-codes_3.68.bb} (64%)

diff --git a/meta/recipes-support/iso-codes/iso-codes_3.65.bb b/meta/recipes-support/iso-codes/iso-codes_3.68.bb
similarity index 64%
rename from meta/recipes-support/iso-codes/iso-codes_3.65.bb
rename to meta/recipes-support/iso-codes/iso-codes_3.68.bb
index 0b78dc4..f8bcc48 100644
--- a/meta/recipes-support/iso-codes/iso-codes_3.65.bb
+++ b/meta/recipes-support/iso-codes/iso-codes_3.68.bb
@@ -1,10 +1,10 @@
 SUMMARY = "ISO language, territory, currency, script codes and their translations"
 LICENSE = "LGPLv2.1"
-LIC_FILES_CHKSUM = "file://LICENSE;md5=fbc093901857fcd118f065f900982c24"
+LIC_FILES_CHKSUM = "file://COPYING;md5=4fbd65380cdd255951079008b364516c"
 
 SRC_URI = "https://pkg-isocodes.alioth.debian.org/downloads/iso-codes-${PV}.tar.xz"
-SRC_URI[md5sum] = "890a08d4f962748e0a0758a8aa471896"
-SRC_URI[sha256sum] = "834de5193c8489eedeaf6509457a9b13476702386ae1f3ed4f391a349d630320"
+SRC_URI[md5sum] = "a5ce7d78b80f6d29150883d892f2e185"
+SRC_URI[sha256sum] = "5881cf7caa5adfffb14ade99138949324c28a277babe8d07dafbff521acef9d1"
 
 # inherit gettext cannot be used, because it adds gettext-native to BASEDEPENDS which
 # are inhibited by allarch
-- 
2.8.1

[PATCH 20/25] kexec-tools: update to 2.0.12

[Alexander Kanavin]

Drop kexec-tools-Refine-kdump-device_tree-sort.patch, it's
merged upstream.

Signed-off-by: Alexander Kanavin <alexander.kanavin@linux.intel.com>
---
 meta/recipes-kernel/kexec/kexec-tools.inc          |  4 ++
 ...kexec-tools-Refine-kdump-device_tree-sort.patch | 48 ----------------------
 ...kexec-tools_2.0.11.bb => kexec-tools_2.0.12.bb} |  6 +--
 3 files changed, 7 insertions(+), 51 deletions(-)
 delete mode 100644 meta/recipes-kernel/kexec/kexec-tools/kexec-tools-Refine-kdump-device_tree-sort.patch
 rename meta/recipes-kernel/kexec/{kexec-tools_2.0.11.bb => kexec-tools_2.0.12.bb} (84%)

diff --git a/meta/recipes-kernel/kexec/kexec-tools.inc b/meta/recipes-kernel/kexec/kexec-tools.inc
index 758a3a7..bdfe024 100644
--- a/meta/recipes-kernel/kexec/kexec-tools.inc
+++ b/meta/recipes-kernel/kexec/kexec-tools.inc
@@ -22,6 +22,10 @@ COMPATIBLE_HOST = '(x86_64.*|i.86.*|arm.*|aarch64.*|powerpc.*|mips.*)-(linux|fre
 INSANE_SKIP_${PN} = "arch"
 
 do_compile_prepend() {
+    # Remove the prepackaged config.h from the source tree as it overrides
+    # the same file generated by configure and placed in the build tree
+    rm -f ${S}/include/config.h
+
     # Remove the '*.d' file to make sure the recompile is OK
     for dep in `find ${B} -type f -name '*.d'`; do
         dep_no_d="`echo $dep | sed 's#.d$##'`"
diff --git a/meta/recipes-kernel/kexec/kexec-tools/kexec-tools-Refine-kdump-device_tree-sort.patch b/meta/recipes-kernel/kexec/kexec-tools/kexec-tools-Refine-kdump-device_tree-sort.patch
deleted file mode 100644
index e198eb6..0000000
--- a/meta/recipes-kernel/kexec/kexec-tools/kexec-tools-Refine-kdump-device_tree-sort.patch
+++ /dev/null
@@ -1,48 +0,0 @@
-kexec-tools: Refine kdump device_tree sort
-
-The commit b02d735bf was to rearrange the device-tree entries, and
-assumed that these entries are sorted in the ascending order. but
-acctually when I was validating kexec and kdump, the order of
-serial node still is changed. So the patch is to sort these entries
-by the directory name in ascending order.
-
-Upstream-Status: Pending
-
-Signed-off-by: Yang Wei <Wei.Yang@windriver.com>
-Signed-off-by: Chong Lu <Chong.Lu@windriver.com>
----
- kexec/arch/ppc/fs2dt.c |   13 ++++++++++---
- kexec/fs2dt.c          |   13 ++++++++++---
- 2 files changed, 20 insertions(+), 6 deletions(-)
-
-Index: kexec-tools-2.0.10/kexec/arch/ppc/fs2dt.c
-===================================================================
---- kexec-tools-2.0.10.orig/kexec/arch/ppc/fs2dt.c
-+++ kexec-tools-2.0.10/kexec/arch/ppc/fs2dt.c
-@@ -296,6 +296,9 @@ static int comparefunc(const void *dentr
- {
- 	char *str1 = (*(struct dirent **)dentry1)->d_name;
- 	char *str2 = (*(struct dirent **)dentry2)->d_name;
-+	char* ptr1 = strchr(str1, '@');
-+	char* ptr2 = strchr(str2, '@');
-+	int len1, len2;
- 
- 	/*
- 	 * strcmp scans from left to right and fails to idetify for some
-@@ -303,9 +306,13 @@ static int comparefunc(const void *dentr
- 	 * Therefore, we get the wrong sorted order like memory@10000000 and
- 	 * memory@f000000.
- 	 */
--	if (strchr(str1, '@') && strchr(str2, '@') &&
--		(strlen(str1) > strlen(str2)))
--		return 1;
-+	if (ptr1 && ptr2) {
-+		len1 = ptr1 - str1;
-+		len2 = ptr2 - str2;
-+		if (!strncmp(str1, str2, len1 >len2 ? len1: len2) &&
-+					(strlen(str1) > strlen(str2)))
-+				return 1;
-+	}
- 
- 	return strcmp(str1, str2);
- }
diff --git a/meta/recipes-kernel/kexec/kexec-tools_2.0.11.bb b/meta/recipes-kernel/kexec/kexec-tools_2.0.12.bb
similarity index 84%
rename from meta/recipes-kernel/kexec/kexec-tools_2.0.11.bb
rename to meta/recipes-kernel/kexec/kexec-tools_2.0.12.bb
index c1c97af..59376c8 100644
--- a/meta/recipes-kernel/kexec/kexec-tools_2.0.11.bb
+++ b/meta/recipes-kernel/kexec/kexec-tools_2.0.12.bb
@@ -2,7 +2,7 @@ require kexec-tools.inc
 export LDFLAGS = "-L${STAGING_LIBDIR}"
 EXTRA_OECONF = " --with-zlib=yes"
 
-SRC_URI += "file://kexec-tools-Refine-kdump-device_tree-sort.patch \
+SRC_URI += " \
             file://kexec-aarch64.patch \
             file://kexec-x32.patch \
             file://0002-powerpc-change-the-memory-size-limit.patch \
@@ -10,8 +10,8 @@ SRC_URI += "file://kexec-tools-Refine-kdump-device_tree-sort.patch \
             file://0001-vmcore-dmesg-Define-_GNU_SOURCE.patch \
          "
 
-SRC_URI[md5sum] = "86de066859f289048f1b286af6f03f78"
-SRC_URI[sha256sum] = "84f652ebf1de3f7b9de757a50cdbf6d5639d88c1d5b5ef9f525edde5ef9590c2"
+SRC_URI[md5sum] = "10ddaae0e86af54407b164a1f5a39cc3"
+SRC_URI[sha256sum] = "cc7b60dad0da202004048a6179d8a53606943062dd627a2edba45a8ea3a85135"
 
 PACKAGES =+ "kexec kdump vmcore-dmesg"
 
-- 
2.8.1

[PATCH 21/25] libksba: update to 1.3.4

[Alexander Kanavin]

Signed-off-by: Alexander Kanavin <alexander.kanavin@linux.intel.com>
---
 meta/recipes-support/libksba/{libksba_1.3.3.bb => libksba_1.3.4.bb} | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)
 rename meta/recipes-support/libksba/{libksba_1.3.3.bb => libksba_1.3.4.bb} (86%)

diff --git a/meta/recipes-support/libksba/libksba_1.3.3.bb b/meta/recipes-support/libksba/libksba_1.3.4.bb
similarity index 86%
rename from meta/recipes-support/libksba/libksba_1.3.3.bb
rename to meta/recipes-support/libksba/libksba_1.3.4.bb
index 9c901f6..e68255c 100644
--- a/meta/recipes-support/libksba/libksba_1.3.3.bb
+++ b/meta/recipes-support/libksba/libksba_1.3.4.bb
@@ -17,8 +17,8 @@ UPSTREAM_CHECK_URI = "https://gnupg.org/download/index.html"
 SRC_URI = "${GNUPG_MIRROR}/${BPN}/${BPN}-${PV}.tar.bz2 \
            file://ksba-add-pkgconfig-support.patch"
 
-SRC_URI[md5sum] = "a5dd3c57fca254935f5cf8db26e39065"
-SRC_URI[sha256sum] = "0c7f5ffe34d0414f6951d9880a46fcc2985c487f7c36369b9f11ad41131c7786"
+SRC_URI[md5sum] = "2bfc3d69053db7b6983b5627706033f4"
+SRC_URI[sha256sum] = "f6c2883cebec5608692d8730843d87f237c0964d923bbe7aa89c05f20558ad4f"
 
 do_configure_prepend () {
 	# Else these could be used in preference to those in aclocal-copy
-- 
2.8.1

[PATCH 22/25] libxslt: update to 1.1.29

[Alexander Kanavin]

Drop upstreamed CVE-2015-7995.patch
Rebase pkgconfig.patch

Signed-off-by: Alexander Kanavin <alexander.kanavin@linux.intel.com>
---
 ...se-pkg-config-to-find-gcrypt-and-libxml2.patch} | 42 ++++++++++++++--------
 .../libxslt/libxslt/CVE-2015-7995.patch            | 34 ------------------
 .../{libxslt_1.1.28.bb => libxslt_1.1.29.bb}       |  8 ++---
 3 files changed, 31 insertions(+), 53 deletions(-)
 rename meta/recipes-support/libxslt/libxslt/{pkgconfig.patch => 0001-Use-pkg-config-to-find-gcrypt-and-libxml2.patch} (78%)
 delete mode 100644 meta/recipes-support/libxslt/libxslt/CVE-2015-7995.patch
 rename meta/recipes-support/libxslt/{libxslt_1.1.28.bb => libxslt_1.1.29.bb} (85%)

diff --git a/meta/recipes-support/libxslt/libxslt/pkgconfig.patch b/meta/recipes-support/libxslt/libxslt/0001-Use-pkg-config-to-find-gcrypt-and-libxml2.patch
similarity index 78%
rename from meta/recipes-support/libxslt/libxslt/pkgconfig.patch
rename to meta/recipes-support/libxslt/libxslt/0001-Use-pkg-config-to-find-gcrypt-and-libxml2.patch
index 89d14c9..7186706 100644
--- a/meta/recipes-support/libxslt/libxslt/pkgconfig.patch
+++ b/meta/recipes-support/libxslt/libxslt/0001-Use-pkg-config-to-find-gcrypt-and-libxml2.patch
@@ -1,14 +1,22 @@
-Use pkg-config to find gcrypt and libxml2.
+From ed71ac9548a2bb6ecd2dc5ad880c604975f872b0 Mon Sep 17 00:00:00 2001
+From: Alexander Kanavin <alex.kanavin@gmail.com>
+Date: Thu, 2 Jun 2016 14:20:04 +0300
+Subject: [PATCH] Use pkg-config to find gcrypt and libxml2.
 
 Upstream-Status: Pending [libxml2 is upstreamable]
 
 RP 2014/5/22
 
-Index: libxslt-1.1.28/configure.in
-===================================================================
---- libxslt-1.1.28.orig/configure.in	2014-05-13 16:46:02.278474967 +0000
-+++ libxslt-1.1.28/configure.in	2014-05-13 16:53:56.510472561 +0000
-@@ -376,6 +376,8 @@
+Signed-off-by: Alexander Kanavin <alex.kanavin@gmail.com>
+---
+ configure.in | 70 +++++++++++-------------------------------------------------
+ 1 file changed, 12 insertions(+), 58 deletions(-)
+
+diff --git a/configure.in b/configure.in
+index 8bdf45a..0b2b312 100644
+--- a/configure.in
++++ b/configure.in
+@@ -377,6 +377,8 @@ AC_SUBST(pythondir)
  AC_SUBST(PYTHON_SUBDIR)
  AC_SUBST(PYTHON_LIBS)
  
@@ -16,12 +24,12 @@ Index: libxslt-1.1.28/configure.in
 +
  AC_ARG_WITH(crypto, [  --with-crypto           Add crypto support to exslt (on)])
  WITH_CRYPTO=0
- if test "$with_crypto" = "no" ; then
-@@ -391,26 +393,13 @@
-     WITH_CRYPTO=1
+ CRYPTO_TESTDIR=
+@@ -394,27 +396,14 @@ case $host in
+     CRYPTO_TESTDIR=crypto
      ;;
    *)
--    AC_PATH_PROG(LIBGCRYPT_CONFIG, libgcrypt-config, no)
+-    AC_PATH_TOOL(LIBGCRYPT_CONFIG, libgcrypt-config, no)
 -    if test "$LIBGCRYPT_CONFIG" != "no" ; then
 -      LIBGCRYPT_VERSION=`$LIBGCRYPT_CONFIG --version`
 -      if test VERSION_TO_NUMBER(echo $LIBGCRYPT_VERSION) -lt VERSION_TO_NUMBER(echo "1.1.42")
@@ -37,20 +45,21 @@ Index: libxslt-1.1.28/configure.in
 +    PKG_CHECK_MODULES(LIBGCRYPT, [libgcrypt >= 1.1.42], [
 +          AC_DEFINE(HAVE_GCRYPT, 1, [Define if gcrypt library is available.])
 +          echo 'Crypto extensions will be available.'
- 		WITH_CRYPTO=1
+         WITH_CRYPTO=1
+         CRYPTO_TESTDIR=crypto
 -      fi
 -    else
 -      LIBGCRYPT_CFLAGS=""
 -      LIBGCRYPT_LIBS=""
 -      echo 'Crypto extensions will not be available. Install libgcrypt and reconfigure to make available.'
 -    fi
-+	], [
++       ], [
 +          echo 'Crypto extensions will not be available. Install libgcrypt >= 1.1.42 and reconfigure to make available.'
 +        ])
  esac
  fi
  AC_SUBST(WITH_CRYPTO)
-@@ -471,24 +460,8 @@
+@@ -476,24 +465,8 @@ dnl original work - Mathieu Lacage 30/03/2000
  dnl some tweaking - David Härdeman 30/10/2001
  dnl
  
@@ -75,7 +84,7 @@ Index: libxslt-1.1.28/configure.in
  AC_ARG_WITH(libxml-src,
  	[  --with-libxml-src=[DIR]              For libxml thats not installed yet (sets all three above)],
  	LIBXML_SRC="$withval"
-@@ -551,28 +524,9 @@
+@@ -556,28 +529,9 @@ then
  	fi
  fi
  
@@ -107,7 +116,7 @@ Index: libxslt-1.1.28/configure.in
  
  AC_SUBST(CFLAGS)
  AC_SUBST(CPPFLAGS)
-@@ -597,7 +551,7 @@
+@@ -602,7 +556,7 @@ fi
  
  if test "$with_plugins" = "yes" ; then
    AC_MSG_CHECKING([libxml2 module support])
@@ -116,3 +125,6 @@ Index: libxslt-1.1.28/configure.in
    if test "${WITH_MODULES}" = "1"; then
      AC_MSG_RESULT(yes)
    else
+-- 
+2.8.1
+
diff --git a/meta/recipes-support/libxslt/libxslt/CVE-2015-7995.patch b/meta/recipes-support/libxslt/libxslt/CVE-2015-7995.patch
deleted file mode 100644
index f4113ef..0000000
--- a/meta/recipes-support/libxslt/libxslt/CVE-2015-7995.patch
+++ /dev/null
@@ -1,34 +0,0 @@
-From 7ca19df892ca22d9314e95d59ce2abdeff46b617 Mon Sep 17 00:00:00 2001
-From: Daniel Veillard <veillard@redhat.com>
-Date: Thu, 29 Oct 2015 19:33:23 +0800
-Subject: Fix for type confusion in preprocessing attributes
-
-CVE-2015-7995 http://www.openwall.com/lists/oss-security/2015/10/27/10
-We need to check that the parent node is an element before dereferencing
-its namespace
-
-Upstream-Status: Backport
-CVE: CVE-2015-7995
-
-https://git.gnome.org/browse/libxslt/commit/?id=7ca19df892ca22d9314e95d59ce2abdeff46b617
-
-Signed-off-by: Armin Kuster <akuster@mvista.com>
-
----
- libxslt/preproc.c | 3 ++-
- 1 file changed, 2 insertions(+), 1 deletion(-)
-
-Index: libxslt-1.1.28/libxslt/preproc.c
-===================================================================
---- libxslt-1.1.28.orig/libxslt/preproc.c
-+++ libxslt-1.1.28/libxslt/preproc.c
-@@ -2245,7 +2245,8 @@ xsltStylePreCompute(xsltStylesheetPtr st
- 	} else if (IS_XSLT_NAME(inst, "attribute")) {
- 	    xmlNodePtr parent = inst->parent;
- 
--	    if ((parent == NULL) || (parent->ns == NULL) ||
-+	    if ((parent == NULL) ||
-+	        (parent->type != XML_ELEMENT_NODE) || (parent->ns == NULL) ||
- 		((parent->ns != inst->ns) &&
- 		 (!xmlStrEqual(parent->ns->href, inst->ns->href))) ||
- 		(!xmlStrEqual(parent->name, BAD_CAST "attribute-set"))) {
diff --git a/meta/recipes-support/libxslt/libxslt_1.1.28.bb b/meta/recipes-support/libxslt/libxslt_1.1.29.bb
similarity index 85%
rename from meta/recipes-support/libxslt/libxslt_1.1.28.bb
rename to meta/recipes-support/libxslt/libxslt_1.1.29.bb
index 23ac599..be747e6 100644
--- a/meta/recipes-support/libxslt/libxslt_1.1.28.bb
+++ b/meta/recipes-support/libxslt/libxslt_1.1.29.bb
@@ -10,11 +10,11 @@ DEPENDS = "libxml2"
 
 SRC_URI = "ftp://xmlsoft.org/libxslt/libxslt-${PV}.tar.gz \
            file://pkgconfig_fix.patch \
-           file://pkgconfig.patch \
-           file://CVE-2015-7995.patch"
+           file://0001-Use-pkg-config-to-find-gcrypt-and-libxml2.patch \
+           "
 
-SRC_URI[md5sum] = "9667bf6f9310b957254fdcf6596600b7"
-SRC_URI[sha256sum] = "5fc7151a57b89c03d7b825df5a0fae0a8d5f05674c0e7cf2937ecec4d54a028c"
+SRC_URI[md5sum] = "a129d3c44c022de3b9dcf6d6f288d72e"
+SRC_URI[sha256sum] = "b5976e3857837e7617b29f2249ebb5eeac34e249208d31f1fbf7a6ba7a4090ce"
 
 UPSTREAM_CHECK_REGEX = "libxslt-(?P<pver>\d+(\.\d+)+)\.tar"
 
-- 
2.8.1

[PATCH 23/25] msmtp: update to 1.6.5

[Alexander Kanavin]

Signed-off-by: Alexander Kanavin <alexander.kanavin@linux.intel.com>
---
 meta/recipes-extended/msmtp/{msmtp_1.6.4.bb => msmtp_1.6.5.bb} | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)
 rename meta/recipes-extended/msmtp/{msmtp_1.6.4.bb => msmtp_1.6.5.bb} (86%)

diff --git a/meta/recipes-extended/msmtp/msmtp_1.6.4.bb b/meta/recipes-extended/msmtp/msmtp_1.6.5.bb
similarity index 86%
rename from meta/recipes-extended/msmtp/msmtp_1.6.4.bb
rename to meta/recipes-extended/msmtp/msmtp_1.6.5.bb
index fe64184..d0c39eb 100644
--- a/meta/recipes-extended/msmtp/msmtp_1.6.4.bb
+++ b/meta/recipes-extended/msmtp/msmtp_1.6.5.bb
@@ -12,8 +12,8 @@ LIC_FILES_CHKSUM = "file://COPYING;md5=d32239bcb673463ab874e80d47fae504"
 SRC_URI = "http://sourceforge.net/projects/msmtp/files/msmtp/${PV}/${BPN}-${PV}.tar.xz \
           "
 
-SRC_URI[md5sum] = "aa829b5e9faeca5139f7983e6637f0d6"
-SRC_URI[sha256sum] = "9b49c022a5440d41b6782c97ef2977d0346c3dae05aa8836243a9953e982d1cd"
+SRC_URI[md5sum] = "50a8c9bb72f8222779db6b4aae2965e0"
+SRC_URI[sha256sum] = "76a0d60693c7e65d0c7a12f01d300882d280b1e1be0202f54730ae44d44a5006"
 
 inherit gettext autotools update-alternatives pkgconfig
 
-- 
2.8.1

[PATCH 24/25] systemtap: update to 3.0

[Alexander Kanavin]

Remove docproc-build-fix.patch, as the build problem it's fixing
now happens only if building html docs is explicitly enabled
(which we do not do).

Signed-off-by: Alexander Kanavin <alexander.kanavin@linux.intel.com>
---
 .../systemtap/systemtap/docproc-build-fix.patch       | 19 -------------------
 meta/recipes-kernel/systemtap/systemtap_git.bb        |  2 +-
 meta/recipes-kernel/systemtap/systemtap_git.inc       |  5 ++---
 3 files changed, 3 insertions(+), 23 deletions(-)
 delete mode 100644 meta/recipes-kernel/systemtap/systemtap/docproc-build-fix.patch

diff --git a/meta/recipes-kernel/systemtap/systemtap/docproc-build-fix.patch b/meta/recipes-kernel/systemtap/systemtap/docproc-build-fix.patch
deleted file mode 100644
index 33a8994..0000000
--- a/meta/recipes-kernel/systemtap/systemtap/docproc-build-fix.patch
+++ /dev/null
@@ -1,19 +0,0 @@
-Upstream-Status: Inappropriate [configuration]
-
-Signed-off-by: Tom Zanussi <tom.zanussi@intel.com>
-
-Index: git/doc/SystemTap_Tapset_Reference/Makefile.am
-===================================================================
---- git.orig/doc/SystemTap_Tapset_Reference/Makefile.am	2012-04-13 08:43:46.263339003 -0500
-+++ git/doc/SystemTap_Tapset_Reference/Makefile.am	2012-04-13 09:31:22.470083915 -0500
-@@ -27,6 +27,10 @@
- noinst_PROGRAMS = docproc
- SRCTREE=$(abs_top_srcdir)/
- DOCPROC=$(abs_builddir)/docproc
-+docproc_LINK = $(CC_FOR_BUILD) $(LDFLAGS_FOR_BUILD) -o $@
-+
-+docproc.o: $(srcdir)/docproc.c
-+	$(CC_FOR_BUILD) -c $(CFLAGS_FOR_BUILD) -o $@ $(srcdir)/docproc.c
- 
- all: $(PDFDOCS) stamp-htmldocs stamp-mandocs
- tapsets.xml: docproc $(shell find $(SRCTREE)/tapset -name '*.stp')
diff --git a/meta/recipes-kernel/systemtap/systemtap_git.bb b/meta/recipes-kernel/systemtap/systemtap_git.bb
index 97064b8..b431a23 100644
--- a/meta/recipes-kernel/systemtap/systemtap_git.bb
+++ b/meta/recipes-kernel/systemtap/systemtap_git.bb
@@ -2,7 +2,7 @@ SUMMARY = "Script-directed dynamic tracing and performance analysis tool for Lin
 
 require systemtap_git.inc
 
-DEPENDS = "elfutils sqlite3 systemtap-native"
+DEPENDS = "elfutils sqlite3 systemtap-native json-c"
 DEPENDS_class-native = "elfutils-native sqlite3-native gettext-native"
 DEPENDS_class-nativesdk = "nativesdk-elfutils nativesdk-sqlite3 nativesdk-gettext"
 
diff --git a/meta/recipes-kernel/systemtap/systemtap_git.inc b/meta/recipes-kernel/systemtap/systemtap_git.inc
index 656f15f..ce976ed 100644
--- a/meta/recipes-kernel/systemtap/systemtap_git.inc
+++ b/meta/recipes-kernel/systemtap/systemtap_git.inc
@@ -1,10 +1,9 @@
 LICENSE = "GPLv2"
 LIC_FILES_CHKSUM = "file://COPYING;md5=b234ee4d69f5fce4486a80fdaf4a4263"
-SRCREV = "7009f2f782e52d6105fe68d6ea2a9820a1099c06"
-PV = "2.9"
+SRCREV = "616ec7a0b916df7785d911b824c3df6eb022b213"
+PV = "3.0"
 
 SRC_URI = "git://sourceware.org/git/systemtap.git \
-           file://docproc-build-fix.patch \
            file://obsolete_automake_macros.patch \
            file://system_map_location.patch \
            file://configure-allow-to-disable-libvirt.patch \
-- 
2.8.1

[PATCH 25/25] watchdog: update to 5.15

[Alexander Kanavin]

Removed patches are all merged upstream.

Signed-off-by: Alexander Kanavin <alexander.kanavin@linux.intel.com>
---
 ...d-issues-found-with-non-glibc-C-libraries.patch | 99 ----------------------
 .../watchdog/watchdog/fix-ping-failure.patch       | 79 -----------------
 .../watchdog/watchdog/fixsepbuild.patch            | 27 ------
 .../{watchdog_5.14.bb => watchdog_5.15.bb}         |  7 +-
 4 files changed, 2 insertions(+), 210 deletions(-)
 delete mode 100644 meta/recipes-extended/watchdog/watchdog/0001-Fix-build-issues-found-with-non-glibc-C-libraries.patch
 delete mode 100644 meta/recipes-extended/watchdog/watchdog/fix-ping-failure.patch
 delete mode 100644 meta/recipes-extended/watchdog/watchdog/fixsepbuild.patch
 rename meta/recipes-extended/watchdog/{watchdog_5.14.bb => watchdog_5.15.bb} (79%)

diff --git a/meta/recipes-extended/watchdog/watchdog/0001-Fix-build-issues-found-with-non-glibc-C-libraries.patch b/meta/recipes-extended/watchdog/watchdog/0001-Fix-build-issues-found-with-non-glibc-C-libraries.patch
deleted file mode 100644
index 8afed5c..0000000
--- a/meta/recipes-extended/watchdog/watchdog/0001-Fix-build-issues-found-with-non-glibc-C-libraries.patch
+++ /dev/null
@@ -1,99 +0,0 @@
-From 83ec34df357218a1c9cfc13a23d3367d333652c3 Mon Sep 17 00:00:00 2001
-From: Khem Raj <raj.khem@gmail.com>
-Date: Wed, 30 Dec 2015 01:01:15 +0000
-Subject: [PATCH] Fix build issues found with non glibc C libraries
-
-Add time.h for getting time_t definition
-limits.h for PATH_MAX
-linux/param.h for EXEC_PAGESIZE
-Replace deprecated MNTTAB with _PATH_MNTTAB
-include ext2_mnt.h for MNTOPT_USRQUOTA and MNTOPT_GRPQUOTA and
-MNTTYPE_EXT2
-Include sys/types.h for u_char definition
-
-Signed-off-by: Khem Raj <raj.khem@gmail.com>
----
-
-Upstream-Status: Submitted
-
- include/extern.h | 1 +
- src/configfile.c | 1 +
- src/memory.c     | 3 +++
- src/net.c        | 1 +
- src/shutdown.c   | 3 ++-
- 5 files changed, 8 insertions(+), 1 deletion(-)
-
-diff --git a/include/extern.h b/include/extern.h
-index 21db11b..04b16bc 100644
---- a/include/extern.h
-+++ b/include/extern.h
-@@ -3,6 +3,7 @@
- 
- #include <netinet/in.h>
- #include <stdio.h>
-+#include <time.h>
- 
- #include "logmessage.h"
- #include "xmalloc.h"
-diff --git a/src/configfile.c b/src/configfile.c
-index be5d7b3..7c1d1dd 100644
---- a/src/configfile.c
-+++ b/src/configfile.c
-@@ -16,6 +16,7 @@
- #include <errno.h>
- #include <string.h>
- #include <dirent.h>
-+#include <limits.h>
- #include <sys/stat.h>
- 
- #include "extern.h"
-diff --git a/src/memory.c b/src/memory.c
-index e9607e4..b5e08aa 100644
---- a/src/memory.c
-+++ b/src/memory.c
-@@ -21,6 +21,9 @@
- #include <sys/stat.h>
- #include <sys/param.h>
- #include <sys/mman.h>
-+#ifdef __linux__
-+#include <linux/param.h>
-+#endif
- 
- #include "extern.h"
- #include "watch_err.h"
-diff --git a/src/net.c b/src/net.c
-index 21823ae..8930caf 100644
---- a/src/net.c
-+++ b/src/net.c
-@@ -17,6 +17,7 @@
- #include <string.h>
- #include <unistd.h>		/* for gethostname() etc */
- #include <netdb.h>		/* for gethostbyname() */
-+#include <sys/types.h>
- #include <sys/param.h>	/* for MAXHOSTNAMELEN */
- #include <sys/socket.h>
- #include <netinet/in.h>
-diff --git a/src/shutdown.c b/src/shutdown.c
-index 74aafa5..46b99cf 100644
---- a/src/shutdown.c
-+++ b/src/shutdown.c
-@@ -25,6 +25,7 @@
- 
- #include "watch_err.h"
- #include "extern.h"
-+#include "ext2_mnt.h"
- 
- #if defined __GLIBC__
- #include "ext2_mnt.h"
-@@ -123,7 +124,7 @@ static void mnt_off()
- 	FILE *fp;
- 	struct mntent *mnt;
- 
--	fp = setmntent(MNTTAB, "r");
-+	fp = setmntent(_PATH_MNTTAB, "r");
- 	/* in some rare cases fp might be NULL so be careful */
- 	while (fp != NULL && ((mnt = getmntent(fp)) != (struct mntent *)0)) {
- 		/* First check if swap */
--- 
-2.6.4
-
diff --git a/meta/recipes-extended/watchdog/watchdog/fix-ping-failure.patch b/meta/recipes-extended/watchdog/watchdog/fix-ping-failure.patch
deleted file mode 100644
index 14ab9c5..0000000
--- a/meta/recipes-extended/watchdog/watchdog/fix-ping-failure.patch
+++ /dev/null
@@ -1,79 +0,0 @@
-Fix ping mode failure
-
-Upstream-Status: Pending  
-
-When watchdog works on ping mode, the system will be rebooted since
-watchdog can not receive the expected ECOREPLY on a setting interval.
-
-Ping mode uses a raw socket to send a ECO packet, then uses select()
-to wait and recvfrom() to receive the ECOREPLY packet, if select()
-shows the data is ready, and the data is not the expected ECOREPLY,
-and waiting time is not overdue, it will continue use select() and
-recvfrom().
-
-Problem is that the raw socket can receive any icmp packets, if we do
-not set filters, and there are many icmp packets on socket, this
-program will not find its interested ECOREPLY packet in a special
-interval, which makes the ping mode fail.
-
-
-Other program is that watchdog sometime can not reach the call of
-recvfrom to try to receive packets since tv_sec of struct timeval
-of select parameter is 0.
-
-The timeout of select() is the result of ping interval minusing the
-time of calling gettimeofday spending, when ping interval is 1 second,
-and the call of gettimeofday() spends several useconds, the tv_sec of
-struct timeval of select parameter must be 0, at that condition, we
-should it is valid of tv_sec of struct timeval of select parameter be 0 
-
-Signed-off-by: Roy.Li <rongqing.li@windriver.com>
----
- src/net.c      |    2 +-
- src/watchdog.c |    5 ++++-
- 2 files changed, 5 insertions(+), 2 deletions(-)
-
-Index: watchdog-5.14/src/watchdog.c
-===================================================================
---- watchdog-5.14.orig/src/watchdog.c
-+++ watchdog-5.14/src/watchdog.c
-@@ -24,6 +24,7 @@
- #include <sys/types.h>
- #include <sys/ioctl.h>
- #include <linux/oom.h>
-+#include <linux/icmp.h>
- #include <linux/watchdog.h>
- #include <string.h>
- 
-Index: watchdog-5.14/src/net.c
-===================================================================
---- watchdog-5.14.orig/src/net.c
-+++ watchdog-5.14/src/net.c
-@@ -11,7 +11,8 @@
- #include <errno.h>
- #include <sys/time.h>
- #include <netinet/ip.h>
--#include <netinet/ip_icmp.h>
-+#include <linux/icmp.h>
-+//#include <netinet/ip_icmp.h>
- #include <fcntl.h>
- #include <string.h>
- #include <unistd.h>		/* for gethostname() etc */
-@@ -179,6 +180,9 @@ int open_netcheck(struct list *tlist)
- {
- 	struct list *act;
- 	int hold = 0;
-+	struct icmp_filter filt;
-+	filt.data = ~(1<<ICMP_ECHOREPLY);
-+
- 
- 	if (tlist != NULL) {
- 		for (act = tlist; act != NULL; act = act->next) {
-@@ -202,6 +206,7 @@ int open_netcheck(struct list *tlist)
- 			    fatal_error(EX_SYSERR, "error opening socket (%s)", strerror(errno));
- 			}
- 
-+			setsockopt(net->sock_fp, SOL_RAW, ICMP_FILTER, (char*)&filt, sizeof(filt));
- 			/* this is necessary for broadcast pings to work */
- 			(void)setsockopt(net->sock_fp, SOL_SOCKET, SO_BROADCAST, (char *)&hold, sizeof(hold));
- 
diff --git a/meta/recipes-extended/watchdog/watchdog/fixsepbuild.patch b/meta/recipes-extended/watchdog/watchdog/fixsepbuild.patch
deleted file mode 100644
index 2fad3a1..0000000
--- a/meta/recipes-extended/watchdog/watchdog/fixsepbuild.patch
+++ /dev/null
@@ -1,27 +0,0 @@
-Fix out of tree build support:
-
-| installing /etc/watchdog.conf
-|  /bin/mkdir -p '/media/build1/poky/build/tmp/work/i586-poky-linux/watchdog/5.13-r0/image/usr/share/man/man5'
-|  /bin/mkdir -p '/media/build1/poky/build/tmp/work/i586-poky-linux/watchdog/5.13-r0/image/usr/share/man/man8'
-|  /usr/bin/install -c -m 644 /media/build1/poky/build/tmp/work/i586-poky-linux/watchdog/5.13-r0/watchdog-5.13/watchdog.conf.5 '/media/build1/poky/build/tmp/work/i586-poky-linux/watchdog/5.13-r0/image/usr/share/man/man5'
-|  /usr/bin/install -c -m 644 /media/build1/poky/build/tmp/work/i586-poky-linux/watchdog/5.13-r0/watchdog-5.13/watchdog.8 /media/build1/poky/build/tmp/work/i586-poky-linux/watchdog/5.13-r0/watchdog-5.13/wd_keepalive.8 /media/build1/poky/build/tmp/work/i586-poky-linux/watchdog/5.13-r0/watchdog-5.13/wd_identify.8 '/media/build1/poky/build/tmp/work/i586-poky-linux/watchdog/5.13-r0/image/usr/share/man/man8'
-| /usr/bin/install: cannot stat `watchdog.conf': No such file or directory
-| make[2]: *** [install-etc-local] Error 1
-
-Upstream-Status: Pending
-
-RP 2013/03/21
-
-Index: watchdog-5.13/Makefile.am
-===================================================================
---- watchdog-5.13.orig/Makefile.am	2013-02-01 11:15:44.000000000 +0000
-+++ watchdog-5.13/Makefile.am	2013-03-21 11:59:35.637139031 +0000
-@@ -16,7 +16,7 @@
- 	else \
- 	        echo "installing $(CONFIG_FILENAME)"; \
- 		$(mkinstalldirs) `dirname $(DESTDIR)$(CONFIG_FILENAME)`; \
--	        $(INSTALL_DATA) watchdog.conf $(DESTDIR)$(CONFIG_FILENAME); \
-+	        $(INSTALL_DATA) $(srcdir)/watchdog.conf $(DESTDIR)$(CONFIG_FILENAME); \
- 	fi
- 
- install-data-local: install-etc-local
diff --git a/meta/recipes-extended/watchdog/watchdog_5.14.bb b/meta/recipes-extended/watchdog/watchdog_5.15.bb
similarity index 79%
rename from meta/recipes-extended/watchdog/watchdog_5.14.bb
rename to meta/recipes-extended/watchdog/watchdog_5.15.bb
index 7330238..76a3b42 100644
--- a/meta/recipes-extended/watchdog/watchdog_5.14.bb
+++ b/meta/recipes-extended/watchdog/watchdog_5.15.bb
@@ -9,15 +9,12 @@ LICENSE = "GPL-2.0+"
 LIC_FILES_CHKSUM = "file://COPYING;md5=ecc0551bf54ad97f6b541720f84d6569"
 
 SRC_URI = "${SOURCEFORGE_MIRROR}/watchdog/watchdog-${PV}.tar.gz \
-           file://fixsepbuild.patch \
-	   file://fix-ping-failure.patch \
 	   file://watchdog-init.patch \
 	   file://watchdog-conf.patch \
-	   file://0001-Fix-build-issues-found-with-non-glibc-C-libraries.patch \
 "
 
-SRC_URI[md5sum] = "5b2dba0c593942f4acc100bca0d560c4"
-SRC_URI[sha256sum] = "620b2f49e9879f2e85c73d4c1f422f9101e6b38e824fea2414befd8bb6866ad1"
+SRC_URI[md5sum] = "678c32f6f35a0492c9c1b76b4aa88828"
+SRC_URI[sha256sum] = "ffdc865137ad5d8e53664bd22bad4de6ca136d1b4636720320cb52af0c18947c"
 
 UPSTREAM_CHECK_URI = "http://sourceforge.net/projects/watchdog/files/watchdog/"
 UPSTREAM_CHECK_REGEX = "/watchdog/(?P<pver>(\d+[\.\-_]*)+)/"
-- 
2.8.1

Re: [PATCH 00/25] Version updates and upstream check fixes

[Richard Purdie]

On Fri, 2016-06-03 at 12:14 +0300, Alexander Kanavin wrote:
> A bunch of version updates for recipes where I'm listed as
> maintainer.
> I have also moved gobject-introspection recipe to Python 3, as it
> required
> first updating the recipe to latest version, and that required
> updating glib
> to latest version.
> 
> The following changes since commit
> dcbfc72303d6782d9108538c830cf2ee7849bf59:
> 
>   poky: Add Ubuntu 16.04 to tested/supported list since I run it
> myself (2016-06-02 10:37:05 +0100)
> 
> are available in the git repository at:
> 
>   git://git.yoctoproject.org/poky-contrib akanavin/package-version
> -updates
>   http://git.yoctoproject.org/cgit.cgi/poky-contrib/log/?h=akanavin/p
> ackage-version-updates
> 
> Alexander Kanavin (25):
>   gdbm: upgrade to 1.12
>   rt-tests, hwlatdetect: upgrade to 2.0
>   webkitgtk: upgrade to 2.12.3
>   cups: fix upstream version check
>   tzcode, tzdata: fix upstream version check
>   cantarell-fonts: fix upstream check
>   boost: update to 1.61.0
>   btrfs-tools: update to 4.5.3
>   build-appliance-image: update version to 15.0.0
>   ffmpeg: update to 3.0.2
>   cantarell-fonts: update to 0.0.24
>   gcc: fix upstream check for 5.x version
>   gdb: fix upstream check
>   gnome-desktop3: update to 3.20.2
>   gobject-introspection: update to 1.48.0
>   gobject-introspection: move to Python 3
>   mc: update to 4.8.17
>   icu: update to 57.1
>   iso-codes: update to 3.68
>   kexec-tools: update to 2.0.12
>   libksba: update to 1.3.4
>   libxslt: update to 1.1.29
>   msmtp: update to 1.6.5
>   systemtap: update to 3.0
>   watchdog: update to 5.15

It looks like something introspection related broken in a test build
with the above in it:

https://autobuilder.yoctoproject.org/main/builders/nightly-no-x11/builds/157/steps/BuildImages/logs/stdio

Cheers,

Richard

Re: [PATCH 24/25] systemtap: update to 3.0

[Burton, Ross]

[-- Attachment #1: Type: text/plain, Size: 613 bytes --]

On 3 June 2016 at 10:15, Alexander Kanavin <
alexander.kanavin@linux.intel.com> wrote:

> Remove docproc-build-fix.patch, as the build problem it's fixing
> now happens only if building html docs is explicitly enabled
> (which we do not do).
>

This has some non-deterministic build dependencies:

packages/corei7-64-poky-linux/systemtap/systemtap: RDEPENDS: removed
"ncurses-libtinfo (['>= 6.0+20160213']) ncurses-libncurses (['>=
6.0+20160213']) readline (['>= 6.3']) json-c (['>= 0.12'])"

(buildhistory-diff after doing a bitbake systemtap; wipe-sysroot ; bitbake
systemtap -C unpack)

Ross

[-- Attachment #2: Type: text/html, Size: 1283 bytes --]