[PATCH 00/15] Version updates and webkitgtk build race fix

[PATCH 00/15] Version updates and webkitgtk build race fix

[Alexander Kanavin]

A bunch of version updates patches; I've also added a fix for the build
race in webkit that was occasionally seen on autobuilders.

The following changes since commit 2fedd226c3385f1ac160b3aa0bfadbded85e288c:

  ref-manual: Fixed small wording in PKGR in the glossary (2016-08-25 23:09:29 +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 (15):
  libwebp: upgrade to 0.5.1
  btrfs-tools: update to 4.7.1
  iso-codes: upgrade to 3.69
  bash-completion: update to 2.4
  bdwgc: update to 7.6.0
  ffmpeg: update to 3.1.2
  gobject-introspection: odd versions are development snapshots
  gnutls: update to 3.5.3
  kexec-tools: update to 2.0.13
  lighttpd: update to 1.4.41
  mpg123: update to 1.23.6
  nss: update to 3.25
  asciidoc: fix upstream version check
  webkitgtk: upgrade to 2.12.4
  webkitgtk: fix racy double build of WebKit2-4.0.gir

 .../{btrfs-tools_4.6.1.bb => btrfs-tools_4.7.1.bb} |  2 +-
 meta/recipes-extended/asciidoc/asciidoc_8.6.9.bb   |  1 +
 ...fig-for-pcre-dependency-instead-of-config.patch | 37 +++++++++++
 .../lighttpd/lighttpd/pkgconfig.patch              | 33 ----------
 .../{lighttpd_1.4.39.bb => lighttpd_1.4.41.bb}     |  6 +-
 .../gobject-introspection_1.48.0.bb                |  2 +-
 ...kexec-tools_2.0.12.bb => kexec-tools_2.0.13.bb} |  4 +-
 .../ffmpeg/{ffmpeg_3.1.1.bb => ffmpeg_3.1.2.bb}    |  4 +-
 .../mpg123/{mpg123_1.23.5.bb => mpg123_1.23.6.bb}  |  4 +-
 .../webp/{libwebp_0.5.0.bb => libwebp_0.5.1.bb}    |  4 +-
 ...ix-racy-parallel-build-of-WebKit2-4.0.gir.patch | 48 +++++++++++++++
 .../{webkitgtk_2.12.3.bb => webkitgtk_2.12.4.bb}   |  5 +-
 ...sh-completion_2.3.bb => bash-completion_2.4.bb} |  4 +-
 .../bdwgc/bdwgc/0002-Altera-NIOS2-support.patch    | 71 ----------------------
 .../bdwgc/{bdwgc_7.4.4.bb => bdwgc_7.6.0.bb}       |  7 +--
 .../gnutls/{gnutls_3.5.1.bb => gnutls_3.5.3.bb}    |  4 +-
 .../{iso-codes_3.68.bb => iso-codes_3.69.bb}       |  4 +-
 .../nss/{nss_3.24.bb => nss_3.25.bb}               |  6 +-
 18 files changed, 114 insertions(+), 132 deletions(-)
 rename meta/recipes-devtools/btrfs-tools/{btrfs-tools_4.6.1.bb => btrfs-tools_4.7.1.bb} (94%)
 create mode 100644 meta/recipes-extended/lighttpd/lighttpd/0001-Use-pkg-config-for-pcre-dependency-instead-of-config.patch
 delete mode 100644 meta/recipes-extended/lighttpd/lighttpd/pkgconfig.patch
 rename meta/recipes-extended/lighttpd/{lighttpd_1.4.39.bb => lighttpd_1.4.41.bb} (91%)
 rename meta/recipes-kernel/kexec/{kexec-tools_2.0.12.bb => kexec-tools_2.0.13.bb} (88%)
 rename meta/recipes-multimedia/ffmpeg/{ffmpeg_3.1.1.bb => ffmpeg_3.1.2.bb} (97%)
 rename meta/recipes-multimedia/mpg123/{mpg123_1.23.5.bb => mpg123_1.23.6.bb} (95%)
 rename meta/recipes-multimedia/webp/{libwebp_0.5.0.bb => libwebp_0.5.1.bb} (92%)
 create mode 100644 meta/recipes-sato/webkit/files/0001-Fix-racy-parallel-build-of-WebKit2-4.0.gir.patch
 rename meta/recipes-sato/webkit/{webkitgtk_2.12.3.bb => webkitgtk_2.12.4.bb} (96%)
 rename meta/recipes-support/bash-completion/{bash-completion_2.3.bb => bash-completion_2.4.bb} (88%)
 delete mode 100644 meta/recipes-support/bdwgc/bdwgc/0002-Altera-NIOS2-support.patch
 rename meta/recipes-support/bdwgc/{bdwgc_7.4.4.bb => bdwgc_7.6.0.bb} (85%)
 rename meta/recipes-support/gnutls/{gnutls_3.5.1.bb => gnutls_3.5.3.bb} (60%)
 rename meta/recipes-support/iso-codes/{iso-codes_3.68.bb => iso-codes_3.69.bb} (76%)
 rename meta/recipes-support/nss/{nss_3.24.bb => nss_3.25.bb} (97%)

-- 
2.9.3

[PATCH 01/15] libwebp: upgrade to 0.5.1

[Alexander Kanavin]

Signed-off-by: Alexander Kanavin <alexander.kanavin@linux.intel.com>
---
 meta/recipes-multimedia/webp/{libwebp_0.5.0.bb => libwebp_0.5.1.bb} | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)
 rename meta/recipes-multimedia/webp/{libwebp_0.5.0.bb => libwebp_0.5.1.bb} (92%)

diff --git a/meta/recipes-multimedia/webp/libwebp_0.5.0.bb b/meta/recipes-multimedia/webp/libwebp_0.5.1.bb
similarity index 92%
rename from meta/recipes-multimedia/webp/libwebp_0.5.0.bb
rename to meta/recipes-multimedia/webp/libwebp_0.5.1.bb
index c89adac..222bd56 100644
--- a/meta/recipes-multimedia/webp/libwebp_0.5.0.bb
+++ b/meta/recipes-multimedia/webp/libwebp_0.5.1.bb
@@ -14,8 +14,8 @@ LIC_FILES_CHKSUM = "file://COPYING;md5=6e8dee932c26f2dab503abf70c96d8bb \
                     file://PATENTS;md5=c6926d0cb07d296f886ab6e0cc5a85b7"
 
 SRC_URI = "http://downloads.webmproject.org/releases/webp/${BP}.tar.gz"
-SRC_URI[md5sum] = "ba81eb9bf23e3c69a2f5cc8dcdb5938f"
-SRC_URI[sha256sum] = "5cd3bb7b623aff1f4e70bd611dc8dbabbf7688fd5eb225b32e02e09e37dfb274"
+SRC_URI[md5sum] = "3d7db92ebba5b4f679413d25c6040881"
+SRC_URI[sha256sum] = "6ad66c6fcd60a023de20b6856b03da8c7d347269d76b1fd9c3287e8b5e8813df"
 
 UPSTREAM_CHECK_URI = "http://downloads.webmproject.org/releases/webp/index.html"
 
-- 
2.9.3

[PATCH 02/15] btrfs-tools: update to 4.7.1

[Alexander Kanavin]

Signed-off-by: Alexander Kanavin <alexander.kanavin@linux.intel.com>
---
 .../btrfs-tools/{btrfs-tools_4.6.1.bb => btrfs-tools_4.7.1.bb}          | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)
 rename meta/recipes-devtools/btrfs-tools/{btrfs-tools_4.6.1.bb => btrfs-tools_4.7.1.bb} (94%)

diff --git a/meta/recipes-devtools/btrfs-tools/btrfs-tools_4.6.1.bb b/meta/recipes-devtools/btrfs-tools/btrfs-tools_4.7.1.bb
similarity index 94%
rename from meta/recipes-devtools/btrfs-tools/btrfs-tools_4.6.1.bb
rename to meta/recipes-devtools/btrfs-tools/btrfs-tools_4.7.1.bb
index cede73e..becf093 100644
--- a/meta/recipes-devtools/btrfs-tools/btrfs-tools_4.6.1.bb
+++ b/meta/recipes-devtools/btrfs-tools/btrfs-tools_4.7.1.bb
@@ -13,7 +13,7 @@ SECTION = "base"
 DEPENDS = "util-linux attr e2fsprogs lzo acl"
 RDEPENDS_${PN} = "libgcc"
 
-SRCREV = "40650bf1694bbc833a40afa239a81627ef4fb5c6"
+SRCREV = "6819fbcdcab63c2d95da1a2997e37be9a71ca533"
 SRC_URI = "git://git.kernel.org/pub/scm/linux/kernel/git/kdave/btrfs-progs.git \
            file://fix-parallel.patch \
 "
-- 
2.9.3

[PATCH 03/15] iso-codes: upgrade to 3.69

[Alexander Kanavin]

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

diff --git a/meta/recipes-support/iso-codes/iso-codes_3.68.bb b/meta/recipes-support/iso-codes/iso-codes_3.69.bb
similarity index 76%
rename from meta/recipes-support/iso-codes/iso-codes_3.68.bb
rename to meta/recipes-support/iso-codes/iso-codes_3.69.bb
index f8bcc48..105949f 100644
--- a/meta/recipes-support/iso-codes/iso-codes_3.68.bb
+++ b/meta/recipes-support/iso-codes/iso-codes_3.69.bb
@@ -3,8 +3,8 @@ LICENSE = "LGPLv2.1"
 LIC_FILES_CHKSUM = "file://COPYING;md5=4fbd65380cdd255951079008b364516c"
 
 SRC_URI = "https://pkg-isocodes.alioth.debian.org/downloads/iso-codes-${PV}.tar.xz"
-SRC_URI[md5sum] = "a5ce7d78b80f6d29150883d892f2e185"
-SRC_URI[sha256sum] = "5881cf7caa5adfffb14ade99138949324c28a277babe8d07dafbff521acef9d1"
+SRC_URI[md5sum] = "33ed5ea7eed84a7609f041c838fc96d7"
+SRC_URI[sha256sum] = "3f285d3c13f4dccfbdb9e432f172403ac1a54ab432616f10556eb18c23a1c0b2"
 
 # inherit gettext cannot be used, because it adds gettext-native to BASEDEPENDS which
 # are inhibited by allarch
-- 
2.9.3

[PATCH 04/15] bash-completion: update to 2.4

[Alexander Kanavin]

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

diff --git a/meta/recipes-support/bash-completion/bash-completion_2.3.bb b/meta/recipes-support/bash-completion/bash-completion_2.4.bb
similarity index 88%
rename from meta/recipes-support/bash-completion/bash-completion_2.3.bb
rename to meta/recipes-support/bash-completion/bash-completion_2.4.bb
index 5e6c1d8..42719f1 100644
--- a/meta/recipes-support/bash-completion/bash-completion_2.3.bb
+++ b/meta/recipes-support/bash-completion/bash-completion_2.4.bb
@@ -9,8 +9,8 @@ SECTION = "console/utils"
 
 SRC_URI = "https://github.com/scop/bash-completion/releases/download/${PV}/${BPN}-${PV}.tar.xz"
 
-SRC_URI[md5sum] = "6697dc47adfe70cab5023b7b8186ad57"
-SRC_URI[sha256sum] = "b2e081af317f3da4fff3a332bfdbebeb5514ebc6c2d2a9cf781180acab15e8e9"
+SRC_URI[md5sum] = "1ea94864fb2b2446fbbdf82f10bd25df"
+SRC_URI[sha256sum] = "c0f76b5202fec9ef8ffba82f5605025ca003f27cfd7a85115f838ba5136890f6"
 UPSTREAM_CHECK_REGEX = "bash-completion-(?P<pver>(?!2008).+)\.tar"
 UPSTREAM_CHECK_URI = "https://github.com/scop/bash-completion/releases"
 
-- 
2.9.3

[PATCH 05/15] bdwgc: update to 7.6.0

[Alexander Kanavin]

Remove backported NIOS2 patch.
README.QUICK checksum updated; the license part of the file is unchaged.

Signed-off-by: Alexander Kanavin <alexander.kanavin@linux.intel.com>
---
 .../bdwgc/bdwgc/0002-Altera-NIOS2-support.patch    | 71 ----------------------
 .../bdwgc/{bdwgc_7.4.4.bb => bdwgc_7.6.0.bb}       |  7 +--
 2 files changed, 3 insertions(+), 75 deletions(-)
 delete mode 100644 meta/recipes-support/bdwgc/bdwgc/0002-Altera-NIOS2-support.patch
 rename meta/recipes-support/bdwgc/{bdwgc_7.4.4.bb => bdwgc_7.6.0.bb} (85%)

diff --git a/meta/recipes-support/bdwgc/bdwgc/0002-Altera-NIOS2-support.patch b/meta/recipes-support/bdwgc/bdwgc/0002-Altera-NIOS2-support.patch
deleted file mode 100644
index c73c540..0000000
--- a/meta/recipes-support/bdwgc/bdwgc/0002-Altera-NIOS2-support.patch
+++ /dev/null
@@ -1,71 +0,0 @@
-From 2571df0e30b4976d7a12dbc6fbec4f1c4027924d Mon Sep 17 00:00:00 2001
-From: Marek Vasut <marex@denx.de>
-Date: Thu, 28 Jan 2016 04:13:13 +0100
-Subject: [PATCH] Altera NIOS2 support
-
-Add simple nios2 configuration support.
-
-* include/private/gcconfig.h (NIOS2): New macro.
-* include/private/gcconfig.h (mach_type_known, CPP_WORDSZ, MACH_TYPE,
-OS_TYPE, DYNAMIC_LOADING, _end, __data_start, DATASTART, DATAEND,
-ALIGNMENT, HBLKSIZE, HBLKSIZE, LINUX_STACKBOTTOM, NO_GETCONTEXT):
-Define for NIOS2.
-
-Signed-off-by: Marek Vasut <marex@denx.de>
-Upstream-Status: Backport [ https://github.com/ivmai/bdwgc.git 2571df0e30b4976d7a12dbc6fbec4f1c4027924d ]
----
- include/private/gcconfig.h | 24 +++++++++++++++++++++++-
- 1 file changed, 23 insertions(+), 1 deletion(-)
-
-diff --git a/include/private/gcconfig.h b/include/private/gcconfig.h
-index c467c26..92d4727 100644
---- a/include/private/gcconfig.h
-+++ b/include/private/gcconfig.h
-@@ -181,6 +181,10 @@
- #    endif
- #    define mach_type_known
- # endif
-+# if defined(__NIOS2__) || defined(__NIOS2) || defined(__nios2__)
-+#   define NIOS2 /* Altera NIOS2 */
-+#   define mach_type_known
-+# endif
- # if defined(DGUX) && (defined(i386) || defined(__i386__))
- #    define I386
- #    ifndef _USING_DGUX
-@@ -1658,6 +1662,24 @@
- #   endif
- # endif
- 
-+# ifdef NIOS2
-+#  define CPP_WORDSZ 32
-+#  define MACH_TYPE "NIOS2"
-+#  ifdef LINUX
-+#    define OS_TYPE "LINUX"
-+#    define DYNAMIC_LOADING
-+     extern int _end[];
-+     extern int __data_start[];
-+#    define DATASTART ((ptr_t)(__data_start))
-+#    define DATAEND ((ptr_t)(_end))
-+#    define ALIGNMENT 4
-+#    ifndef HBLKSIZE
-+#      define HBLKSIZE 4096
-+#    endif
-+#    define LINUX_STACKBOTTOM
-+#  endif /* Linux */
-+# endif
-+
- # ifdef HP_PA
- #   define MACH_TYPE "HP_PA"
- #   ifdef __LP64__
-@@ -2622,6 +2644,7 @@
- #if ((defined(UNIX_LIKE) && (defined(DARWIN) || defined(HURD) \
-                              || defined(OPENBSD) || defined(ARM32) \
--                             || defined(MIPS) || defined(AVR32))) \
-+                             || defined(MIPS) || defined(AVR32) \
-+                             || defined(NIOS2))) \
-      || (defined(LINUX) && (defined(SPARC) || defined(M68K))) \
-      || ((defined(RTEMS) || defined(PLATFORM_ANDROID)) && defined(I386))) \
-     && !defined(NO_GETCONTEXT)
--- 
-2.7.0
-
diff --git a/meta/recipes-support/bdwgc/bdwgc_7.4.4.bb b/meta/recipes-support/bdwgc/bdwgc_7.6.0.bb
similarity index 85%
rename from meta/recipes-support/bdwgc/bdwgc_7.4.4.bb
rename to meta/recipes-support/bdwgc/bdwgc_7.6.0.bb
index 600ced7..55ea452 100644
--- a/meta/recipes-support/bdwgc/bdwgc_7.4.4.bb
+++ b/meta/recipes-support/bdwgc/bdwgc_7.6.0.bb
@@ -19,12 +19,11 @@ DESCRIPTION = "The Boehm-Demers-Weiser conservative garbage collector can be\
 HOMEPAGE = "http://www.hboehm.info/gc/"
 SECTION = "devel"
 LICENSE = "MIT"
-LIC_FILES_CHKSUM = "file://README.QUICK;md5=55f5088f90a982fed7af9a4897047ef7"
+LIC_FILES_CHKSUM = "file://README.QUICK;md5=4f81f24ec69726c312487c2ac740e9e3"
 
-SRCREV = "d8bfa89c2a9c7c86fb98acbc53b5750600b95492"
-SRC_URI = "git://github.com/ivmai/bdwgc.git;branch=release-7_4 \
+SRCREV = "8ac1d84a40eb7a431fec1b8097e3f24b48fb23fa"
+SRC_URI = "git://github.com/ivmai/bdwgc.git \
            file://0001-configure.ac-add-check-for-NO_GETCONTEXT-definition.patch \
-           file://0002-Altera-NIOS2-support.patch \
           "
 
 FILES_${PN}-doc = "${datadir}"
-- 
2.9.3

[PATCH 06/15] ffmpeg: update to 3.1.2

[Alexander Kanavin]

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

diff --git a/meta/recipes-multimedia/ffmpeg/ffmpeg_3.1.1.bb b/meta/recipes-multimedia/ffmpeg/ffmpeg_3.1.2.bb
similarity index 97%
rename from meta/recipes-multimedia/ffmpeg/ffmpeg_3.1.1.bb
rename to meta/recipes-multimedia/ffmpeg/ffmpeg_3.1.2.bb
index 8c4fed5..6aad18e 100644
--- a/meta/recipes-multimedia/ffmpeg/ffmpeg_3.1.1.bb
+++ b/meta/recipes-multimedia/ffmpeg/ffmpeg_3.1.2.bb
@@ -16,8 +16,8 @@ LIC_FILES_CHKSUM = "file://COPYING.GPLv2;md5=b234ee4d69f5fce4486a80fdaf4a4263 \
 SRC_URI = "https://www.ffmpeg.org/releases/${BP}.tar.xz \
            file://mips64_cpu_detection.patch \
           "
-SRC_URI[md5sum] = "4ba7033da5d9ac4d0391516c7e5d97e4"
-SRC_URI[sha256sum] = "71bc11f2a8202ef3fbe5e43a9a163b4b698855da39fb6216d9a4614eddd031db"
+SRC_URI[md5sum] = "cf030109b066a336fc4f7d3a123abf66"
+SRC_URI[sha256sum] = "58d2a2b69f0f46fe8aacd45e582c62e380ba611b5baf6a4dfcf2906eb2b9bd61"
 
 # Build fails when thumb is enabled: https://bugzilla.yoctoproject.org/show_bug.cgi?id=7717
 ARM_INSTRUCTION_SET = "arm"
-- 
2.9.3

[PATCH 07/15] gobject-introspection: odd versions are development snapshots

[Alexander Kanavin]

Signed-off-by: Alexander Kanavin <alexander.kanavin@linux.intel.com>
---
 .../recipes-gnome/gobject-introspection/gobject-introspection_1.48.0.bb | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

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 eca6ce0..b41a317 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,7 +18,7 @@ SRC_URI = "${GNOME_MIRROR}/${BPN}/1.48/${BPN}-${PV}.tar.xz \
 SRC_URI[md5sum] = "01301fa9019667d48e927353e08bc218"
 SRC_URI[sha256sum] = "fa275aaccdbfc91ec0bc9a6fd0562051acdba731e7d584b64a277fec60e75877"
 
-inherit autotools pkgconfig gtk-doc python3native qemu gobject-introspection-data
+inherit autotools pkgconfig gtk-doc python3native qemu gobject-introspection-data upstream-version-is-even
 BBCLASSEXTEND = "native"
 
 # needed for writing out the qemu wrapper script
-- 
2.9.3

[PATCH 08/15] gnutls: update to 3.5.3

[Alexander Kanavin]

Signed-off-by: Alexander Kanavin <alexander.kanavin@linux.intel.com>
---
 meta/recipes-support/gnutls/{gnutls_3.5.1.bb => gnutls_3.5.3.bb} | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)
 rename meta/recipes-support/gnutls/{gnutls_3.5.1.bb => gnutls_3.5.3.bb} (60%)

diff --git a/meta/recipes-support/gnutls/gnutls_3.5.1.bb b/meta/recipes-support/gnutls/gnutls_3.5.3.bb
similarity index 60%
rename from meta/recipes-support/gnutls/gnutls_3.5.1.bb
rename to meta/recipes-support/gnutls/gnutls_3.5.3.bb
index 85d9904..1d9e69b 100644
--- a/meta/recipes-support/gnutls/gnutls_3.5.1.bb
+++ b/meta/recipes-support/gnutls/gnutls_3.5.3.bb
@@ -4,5 +4,5 @@ SRC_URI += "file://correct_rpl_gettimeofday_signature.patch \
             file://0001-configure.ac-fix-sed-command.patch \
             file://use-pkg-config-to-locate-zlib.patch \
            "
-SRC_URI[md5sum] = "cb48bb0cf36d329f7321c6cdc0d7ae36"
-SRC_URI[sha256sum] = "bc4a0f80a627c3aca6e7ea59d30e50cda118c61e0e3fab367ff1451d6ec8bdbd"
+SRC_URI[md5sum] = "6c2c7f40ddf52933ee3ca474cb8cb63c"
+SRC_URI[sha256sum] = "92c4bc999a10a1b95299ebefaeea8333f19d8a98d957a35b5eae74881bdb1fef"
-- 
2.9.3

[PATCH 09/15] kexec-tools: update to 2.0.13

[Alexander Kanavin]

Signed-off-by: Alexander Kanavin <alexander.kanavin@linux.intel.com>
---
 .../kexec/{kexec-tools_2.0.12.bb => kexec-tools_2.0.13.bb}            | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)
 rename meta/recipes-kernel/kexec/{kexec-tools_2.0.12.bb => kexec-tools_2.0.13.bb} (88%)

diff --git a/meta/recipes-kernel/kexec/kexec-tools_2.0.12.bb b/meta/recipes-kernel/kexec/kexec-tools_2.0.13.bb
similarity index 88%
rename from meta/recipes-kernel/kexec/kexec-tools_2.0.12.bb
rename to meta/recipes-kernel/kexec/kexec-tools_2.0.13.bb
index 59376c8..338a7d9 100644
--- a/meta/recipes-kernel/kexec/kexec-tools_2.0.12.bb
+++ b/meta/recipes-kernel/kexec/kexec-tools_2.0.13.bb
@@ -10,8 +10,8 @@ SRC_URI += " \
             file://0001-vmcore-dmesg-Define-_GNU_SOURCE.patch \
          "
 
-SRC_URI[md5sum] = "10ddaae0e86af54407b164a1f5a39cc3"
-SRC_URI[sha256sum] = "cc7b60dad0da202004048a6179d8a53606943062dd627a2edba45a8ea3a85135"
+SRC_URI[md5sum] = "b7595eb4705e482ee6fc1121a5b6131b"
+SRC_URI[sha256sum] = "70df562d76213e54833228379710ada1afd98a86ee1ce5644eaa68c54e102e25"
 
 PACKAGES =+ "kexec kdump vmcore-dmesg"
 
-- 
2.9.3

[PATCH 10/15] lighttpd: update to 1.4.41

[Alexander Kanavin]

Rebase pkgconfig.patch

Signed-off-by: Alexander Kanavin <alexander.kanavin@linux.intel.com>
---
 ...fig-for-pcre-dependency-instead-of-config.patch | 37 ++++++++++++++++++++++
 .../lighttpd/lighttpd/pkgconfig.patch              | 33 -------------------
 .../{lighttpd_1.4.39.bb => lighttpd_1.4.41.bb}     |  6 ++--
 3 files changed, 40 insertions(+), 36 deletions(-)
 create mode 100644 meta/recipes-extended/lighttpd/lighttpd/0001-Use-pkg-config-for-pcre-dependency-instead-of-config.patch
 delete mode 100644 meta/recipes-extended/lighttpd/lighttpd/pkgconfig.patch
 rename meta/recipes-extended/lighttpd/{lighttpd_1.4.39.bb => lighttpd_1.4.41.bb} (91%)

diff --git a/meta/recipes-extended/lighttpd/lighttpd/0001-Use-pkg-config-for-pcre-dependency-instead-of-config.patch b/meta/recipes-extended/lighttpd/lighttpd/0001-Use-pkg-config-for-pcre-dependency-instead-of-config.patch
new file mode 100644
index 0000000..b8c7f37
--- /dev/null
+++ b/meta/recipes-extended/lighttpd/lighttpd/0001-Use-pkg-config-for-pcre-dependency-instead-of-config.patch
@@ -0,0 +1,37 @@
+From e7a8c925b9316a72bdc8f32789ffe56fda5c4788 Mon Sep 17 00:00:00 2001
+From: Alexander Kanavin <alex.kanavin@gmail.com>
+Date: Fri, 26 Aug 2016 18:20:32 +0300
+Subject: [PATCH] Use pkg-config for pcre dependency instead of -config script.
+
+RP 2014/5/22
+Upstream-Status: Pending
+Signed-off-by: Alexander Kanavin <alex.kanavin@gmail.com>
+---
+ configure.ac | 11 ++++++-----
+ 1 file changed, 6 insertions(+), 5 deletions(-)
+
+diff --git a/configure.ac b/configure.ac
+index 1d172a1..a9236da 100644
+--- a/configure.ac
++++ b/configure.ac
+@@ -380,11 +380,12 @@ if test "$WITH_PCRE" != "no"; then
+ 			PCRE_LIB="-L$WITH_PCRE/lib -lpcre"
+ 			CPPFLAGS="$CPPFLAGS -I$WITH_PCRE/include"
+ 		else
+-			AC_PATH_PROG(PCRECONFIG, pcre-config)
+-			if test x"$PCRECONFIG" != x; then
+-				PCRE_LIB=`$PCRECONFIG --libs`
+-				CPPFLAGS="$CPPFLAGS `$PCRECONFIG --cflags`"
+-			fi
++			PKG_CHECK_MODULES(PCREPKG, [libpcre], [
++				PCRE_LIB=${PCREPKG_LIBS}
++				CPPFLAGS="$CPPFLAGS ${PCREPKG_CFLAGS}"
++			], [
++				AC_MSG_ERROR([pcre pkgconfig not found, install the pcre-devel package or build with --without-pcre])
++			])
+ 		fi
+ 
+   if test x"$PCRE_LIB" != x; then
+-- 
+2.9.3
+
diff --git a/meta/recipes-extended/lighttpd/lighttpd/pkgconfig.patch b/meta/recipes-extended/lighttpd/lighttpd/pkgconfig.patch
deleted file mode 100644
index e395f92..0000000
--- a/meta/recipes-extended/lighttpd/lighttpd/pkgconfig.patch
+++ /dev/null
@@ -1,33 +0,0 @@
-Use pkg-config for pcre dependency instead of -config script.
-
-Upstream-Status: Pending
-
-RP 2014/5/22
-
-
-Index: lighttpd-1.4.35/configure.ac
-===================================================================
---- lighttpd-1.4.35.orig/configure.ac	2014-03-06 14:08:00.000000000 +0000
-+++ lighttpd-1.4.35/configure.ac	2014-05-13 16:58:30.758471169 +0000
-@@ -309,16 +309,14 @@
- AC_MSG_RESULT([$WITH_PCRE])
- 
- if test "$WITH_PCRE" != "no"; then
--  AC_PATH_PROG(PCRECONFIG, pcre-config)
--
--  if test x"$PCRECONFIG" != x; then
--    PCRE_LIB=`$PCRECONFIG --libs`
--    CPPFLAGS="$CPPFLAGS `$PCRECONFIG --cflags`"
-+  PKG_CHECK_MODULES(PCREPKG, [libpcre], [
-+    PCRE_LIB=${PCREPKG_LIBS}
-+    CPPFLAGS="$CPPFLAGS ${PCREPKG_CFLAGS}"
-     AC_DEFINE([HAVE_LIBPCRE], [1], [libpcre])
-     AC_DEFINE([HAVE_PCRE_H], [1], [pcre.h])
--  else
-+  ], [
-      AC_MSG_ERROR([pcre-config not found, install the pcre-devel package or build with --without-pcre])
--  fi
-+  ])
- fi
- 
- AC_SUBST(PCRE_LIB)
diff --git a/meta/recipes-extended/lighttpd/lighttpd_1.4.39.bb b/meta/recipes-extended/lighttpd/lighttpd_1.4.41.bb
similarity index 91%
rename from meta/recipes-extended/lighttpd/lighttpd_1.4.39.bb
rename to meta/recipes-extended/lighttpd/lighttpd_1.4.41.bb
index 378accb..a74d3a1 100644
--- a/meta/recipes-extended/lighttpd/lighttpd_1.4.39.bb
+++ b/meta/recipes-extended/lighttpd/lighttpd_1.4.41.bb
@@ -20,11 +20,11 @@ SRC_URI = "http://download.lighttpd.net/lighttpd/releases-1.4.x/lighttpd-${PV}.t
         file://lighttpd.conf \
         file://lighttpd \
         file://lighttpd.service \
-        file://pkgconfig.patch \
+        file://0001-Use-pkg-config-for-pcre-dependency-instead-of-config.patch \
         "
 
-SRC_URI[md5sum] = "63c7563be1c7a7a9819a51f07f1af8b2"
-SRC_URI[sha256sum] = "7eb9a1853c3d6dd5851682b0733a729ba4158d6bdff80974d5ef5f1f6887365b"
+SRC_URI[md5sum] = "1df2e4dbc965cfe6f99f008ac3db4d8d"
+SRC_URI[sha256sum] = "4bcc383ef6d6dc7b284f68882d71a178e2986c83c4e85eeb3c8f3b882e346b6c"
 
 PACKAGECONFIG ??= "openssl"
 PACKAGECONFIG[openssl] = "--with-openssl, --without-openssl, openssl"
-- 
2.9.3

[PATCH 11/15] mpg123: update to 1.23.6

[Alexander Kanavin]

Signed-off-by: Alexander Kanavin <alexander.kanavin@linux.intel.com>
---
 meta/recipes-multimedia/mpg123/{mpg123_1.23.5.bb => mpg123_1.23.6.bb} | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)
 rename meta/recipes-multimedia/mpg123/{mpg123_1.23.5.bb => mpg123_1.23.6.bb} (95%)

diff --git a/meta/recipes-multimedia/mpg123/mpg123_1.23.5.bb b/meta/recipes-multimedia/mpg123/mpg123_1.23.6.bb
similarity index 95%
rename from meta/recipes-multimedia/mpg123/mpg123_1.23.5.bb
rename to meta/recipes-multimedia/mpg123/mpg123_1.23.6.bb
index dd510c0..6ee457d 100644
--- a/meta/recipes-multimedia/mpg123/mpg123_1.23.5.bb
+++ b/meta/recipes-multimedia/mpg123/mpg123_1.23.6.bb
@@ -12,8 +12,8 @@ LIC_FILES_CHKSUM = "file://COPYING;md5=1e86753638d3cf2512528b99079bc4f3"
 
 SRC_URI = "https://www.mpg123.de/download/${BP}.tar.bz2"
 
-SRC_URI[md5sum] = "6a318579dd7b52c5851bb7950af969ac"
-SRC_URI[sha256sum] = "b658df672813511ff9b68a1553917220b675067204cdb58dbb59a2b8179350b2"
+SRC_URI[md5sum] = "ed22a3e664f076fa05131a3454ef8166"
+SRC_URI[sha256sum] = "4073d9c60a43872f6f5a3a322f5ea21ab7f0869d2ed25e79c3eb8521fa3c32d4"
 
 inherit autotools pkgconfig
 
-- 
2.9.3

[PATCH 12/15] nss: update to 3.25

[Alexander Kanavin]

Signed-off-by: Alexander Kanavin <alexander.kanavin@linux.intel.com>
---
 meta/recipes-support/nss/{nss_3.24.bb => nss_3.25.bb} | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)
 rename meta/recipes-support/nss/{nss_3.24.bb => nss_3.25.bb} (97%)

diff --git a/meta/recipes-support/nss/nss_3.24.bb b/meta/recipes-support/nss/nss_3.25.bb
similarity index 97%
rename from meta/recipes-support/nss/nss_3.24.bb
rename to meta/recipes-support/nss/nss_3.25.bb
index c7c9fab..eff09eb 100644
--- a/meta/recipes-support/nss/nss_3.24.bb
+++ b/meta/recipes-support/nss/nss_3.25.bb
@@ -15,7 +15,7 @@ LIC_FILES_CHKSUM = "file://nss/COPYING;md5=3b1e88e1b9c0b5a4b2881d46cce06a18 \
                     file://nss/lib/freebl/mpi/doc/LICENSE-MPL;md5=5d425c8f3157dbf212db2ec53d9e5132"
 
 SRC_URI = "\
-    http://ftp.mozilla.org/pub/mozilla.org/security/nss/releases/NSS_3_24_RTM/src/${BP}.tar.gz \
+    http://ftp.mozilla.org/pub/mozilla.org/security/nss/releases/NSS_3_25_RTM/src/${BP}.tar.gz \
     file://nss-fix-support-cross-compiling.patch \
     file://nss-no-rpath-for-cross-compiling.patch \
     file://nss-fix-incorrect-shebang-of-perl.patch \
@@ -25,8 +25,8 @@ SRC_URI = "\
     file://nss.pc.in \
     file://signlibs.sh \
 "
-SRC_URI[md5sum] = "35854c549cb02100d0f90a6ef328e2e8"
-SRC_URI[sha256sum] = "2f0841492f91cca473b73dec6cab9cf765a485e032d48d2e8ae7261e54c419ed"
+SRC_URI[md5sum] = "23169c406adc8ac3672d34bf9ea2433d"
+SRC_URI[sha256sum] = "5d1ad475da19d0c033a716350dc5f8a747999d3eba5ac07ee0368c5bad6e2359"
 
 UPSTREAM_CHECK_URI = "https://developer.mozilla.org/en-US/docs/Mozilla/Projects/NSS/NSS_Releases"
 UPSTREAM_CHECK_REGEX = "NSS_(?P<pver>.+)_release_notes"
-- 
2.9.3

[PATCH 13/15] asciidoc: fix upstream version check

[Alexander Kanavin]

Signed-off-by: Alexander Kanavin <alexander.kanavin@linux.intel.com>
---
 meta/recipes-extended/asciidoc/asciidoc_8.6.9.bb | 1 +
 1 file changed, 1 insertion(+)

diff --git a/meta/recipes-extended/asciidoc/asciidoc_8.6.9.bb b/meta/recipes-extended/asciidoc/asciidoc_8.6.9.bb
index 7597c0e..2091eec 100644
--- a/meta/recipes-extended/asciidoc/asciidoc_8.6.9.bb
+++ b/meta/recipes-extended/asciidoc/asciidoc_8.6.9.bb
@@ -12,6 +12,7 @@ SRC_URI = "http://downloads.sourceforge.net/project/${BPN}/${BPN}/${PV}/${BP}.ta
 SRC_URI[md5sum] = "c59018f105be8d022714b826b0be130a"
 SRC_URI[sha256sum] = "78db9d0567c8ab6570a6eff7ffdf84eadd91f2dfc0a92a2d0105d323cab4e1f0"
 
+UPSTREAM_CHECK_URI = "https://sourceforge.net/projects/asciidoc/files/"
 
 inherit distutils autotools-brokensep
 
-- 
2.9.3

[PATCH 14/15] webkitgtk: upgrade to 2.12.4

[Alexander Kanavin]

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

diff --git a/meta/recipes-sato/webkit/webkitgtk_2.12.3.bb b/meta/recipes-sato/webkit/webkitgtk_2.12.4.bb
similarity index 97%
rename from meta/recipes-sato/webkit/webkitgtk_2.12.3.bb
rename to meta/recipes-sato/webkit/webkitgtk_2.12.4.bb
index d9f1c30..cb33336 100644
--- a/meta/recipes-sato/webkit/webkitgtk_2.12.3.bb
+++ b/meta/recipes-sato/webkit/webkitgtk_2.12.4.bb
@@ -19,8 +19,8 @@ SRC_URI = "\
   file://musl-fixes.patch \
   file://ppc-musl-fix.patch \
   "
-SRC_URI[md5sum] = "aebb4029c09dd81664aa830e4a584c85"
-SRC_URI[sha256sum] = "173cbb9a2eca23eee52e99965483ab25aa9c0569ef5b57041fc0c129cc26c307"
+SRC_URI[md5sum] = "0331ac714fd1a0587ffea470ef1afb20"
+SRC_URI[sha256sum] = "424d3177599abbc1eb1a1ad7928dd280a62006e992f2fada2e059375a9609a77"
 
 inherit cmake lib_package pkgconfig gobject-introspection perlnative distro_features_check upstream-version-is-even
 
-- 
2.9.3

[PATCH 15/15] webkitgtk: fix racy double build of WebKit2-4.0.gir

[Alexander Kanavin]

This occasionally triggered autobuilder errors where the .gir file
appeared truncated to introspection tools.

Signed-off-by: Alexander Kanavin <alexander.kanavin@linux.intel.com>
---
 ...ix-racy-parallel-build-of-WebKit2-4.0.gir.patch | 48 ++++++++++++++++++++++
 meta/recipes-sato/webkit/webkitgtk_2.12.4.bb       |  1 +
 2 files changed, 49 insertions(+)
 create mode 100644 meta/recipes-sato/webkit/files/0001-Fix-racy-parallel-build-of-WebKit2-4.0.gir.patch

diff --git a/meta/recipes-sato/webkit/files/0001-Fix-racy-parallel-build-of-WebKit2-4.0.gir.patch b/meta/recipes-sato/webkit/files/0001-Fix-racy-parallel-build-of-WebKit2-4.0.gir.patch
new file mode 100644
index 0000000..615fe4f
--- /dev/null
+++ b/meta/recipes-sato/webkit/files/0001-Fix-racy-parallel-build-of-WebKit2-4.0.gir.patch
@@ -0,0 +1,48 @@
+From 5760d346b42807b596f479c81f7a6b42eb36065e Mon Sep 17 00:00:00 2001
+From: Alexander Kanavin <alex.kanavin@gmail.com>
+Date: Mon, 29 Aug 2016 16:38:11 +0300
+Subject: [PATCH] Fix racy parallel build of WebKit2-4.0.gir
+
+Upstream-Status: Pending
+Signed-off-by: Alexander Kanavin <alex.kanavin@gmail.com>
+---
+ Source/WebKit2/PlatformGTK.cmake | 9 +++++----
+ 1 file changed, 5 insertions(+), 4 deletions(-)
+
+diff --git a/Source/WebKit2/PlatformGTK.cmake b/Source/WebKit2/PlatformGTK.cmake
+index adaa010..f18cf8a 100644
+--- a/Source/WebKit2/PlatformGTK.cmake
++++ b/Source/WebKit2/PlatformGTK.cmake
+@@ -906,8 +906,9 @@ endif ()
+ string(REGEX MATCHALL "-L[^ ]*"
+     INTROSPECTION_ADDITIONAL_LINKER_FLAGS "${CMAKE_SHARED_LINKER_FLAGS}")
+ 
+-add_custom_command(
+-    OUTPUT ${CMAKE_BINARY_DIR}/WebKit2-${WEBKITGTK_API_VERSION}.gir
++# This is a target and not a command because it's used to build another .gir
++# and a .typelib, which would trigger two racy parallel builds when using command
++add_custom_target(WebKit2-${WEBKITGTK_API_VERSION}-gir
+     DEPENDS WebKit2
+     DEPENDS ${CMAKE_BINARY_DIR}/JavaScriptCore-${WEBKITGTK_API_VERSION}.gir
+     COMMAND CC=${CMAKE_C_COMPILER} CFLAGS=-Wno-deprecated-declarations\ ${CMAKE_C_FLAGS} LDFLAGS=
+@@ -950,7 +951,7 @@ add_custom_command(
+ add_custom_command(
+     OUTPUT ${CMAKE_BINARY_DIR}/WebKit2WebExtension-${WEBKITGTK_API_VERSION}.gir
+     DEPENDS ${CMAKE_BINARY_DIR}/JavaScriptCore-${WEBKITGTK_API_VERSION}.gir
+-    DEPENDS ${CMAKE_BINARY_DIR}/WebKit2-${WEBKITGTK_API_VERSION}.gir
++    DEPENDS WebKit2-${WEBKITGTK_API_VERSION}-gir
+     COMMAND CC=${CMAKE_C_COMPILER} CFLAGS=-Wno-deprecated-declarations\ ${CMAKE_C_FLAGS}
+         LDFLAGS="${INTROSPECTION_ADDITIONAL_LDFLAGS}"
+         ${LOADER_LIBRARY_PATH_VAR}="${INTROSPECTION_ADDITIONAL_LIBRARY_PATH}"
+@@ -1004,7 +1005,7 @@ add_custom_command(
+ 
+ add_custom_command(
+     OUTPUT ${CMAKE_BINARY_DIR}/WebKit2-${WEBKITGTK_API_VERSION}.typelib
+-    DEPENDS ${CMAKE_BINARY_DIR}/WebKit2-${WEBKITGTK_API_VERSION}.gir
++    DEPENDS WebKit2-${WEBKITGTK_API_VERSION}-gir
+     COMMAND ${INTROSPECTION_COMPILER} --includedir=${CMAKE_BINARY_DIR} ${CMAKE_BINARY_DIR}/WebKit2-${WEBKITGTK_API_VERSION}.gir -o ${CMAKE_BINARY_DIR}/WebKit2-${WEBKITGTK_API_VERSION}.typelib
+ )
+ 
+-- 
+2.9.3
+
diff --git a/meta/recipes-sato/webkit/webkitgtk_2.12.4.bb b/meta/recipes-sato/webkit/webkitgtk_2.12.4.bb
index cb33336..0193e17 100644
--- a/meta/recipes-sato/webkit/webkitgtk_2.12.4.bb
+++ b/meta/recipes-sato/webkit/webkitgtk_2.12.4.bb
@@ -18,6 +18,7 @@ SRC_URI = "\
   file://0001-WebKitMacros-Append-to-I-and-not-to-isystem.patch \
   file://musl-fixes.patch \
   file://ppc-musl-fix.patch \
+  file://0001-Fix-racy-parallel-build-of-WebKit2-4.0.gir.patch \
   "
 SRC_URI[md5sum] = "0331ac714fd1a0587ffea470ef1afb20"
 SRC_URI[sha256sum] = "424d3177599abbc1eb1a1ad7928dd280a62006e992f2fada2e059375a9609a77"
-- 
2.9.3

Re: [PATCH 08/15] gnutls: update to 3.5.3

[Richard Purdie]

On Mon, 2016-08-29 at 17:30 +0300, Alexander Kanavin wrote:
> Signed-off-by: Alexander Kanavin <alexander.kanavin@linux.intel.com>
> ---
>  meta/recipes-support/gnutls/{gnutls_3.5.1.bb => gnutls_3.5.3.bb} | 4
> ++--
>  1 file changed, 2 insertions(+), 2 deletions(-)
>  rename meta/recipes-support/gnutls/{gnutls_3.5.1.bb =>
> gnutls_3.5.3.bb} (60%)

http://errors.yoctoproject.org/Errors/Details/81202/

Cheers,

Richard

Re: [PATCH 09/15] kexec-tools: update to 2.0.13

[Robert Yang]

Hello,

It seems that this one causes build errors on arm AFAIK:

https://autobuilder.yoctoproject.org/main/builders/nightly-arm/builds/933/steps/BuildImages/logs/stdio

// Robert

On 08/29/2016 10:30 PM, Alexander Kanavin wrote:
> Signed-off-by: Alexander Kanavin <alexander.kanavin@linux.intel.com>
> ---
>  .../kexec/{kexec-tools_2.0.12.bb => kexec-tools_2.0.13.bb}            | 4 ++--
>  1 file changed, 2 insertions(+), 2 deletions(-)
>  rename meta/recipes-kernel/kexec/{kexec-tools_2.0.12.bb => kexec-tools_2.0.13.bb} (88%)
>
> diff --git a/meta/recipes-kernel/kexec/kexec-tools_2.0.12.bb b/meta/recipes-kernel/kexec/kexec-tools_2.0.13.bb
> similarity index 88%
> rename from meta/recipes-kernel/kexec/kexec-tools_2.0.12.bb
> rename to meta/recipes-kernel/kexec/kexec-tools_2.0.13.bb
> index 59376c8..338a7d9 100644
> --- a/meta/recipes-kernel/kexec/kexec-tools_2.0.12.bb
> +++ b/meta/recipes-kernel/kexec/kexec-tools_2.0.13.bb
> @@ -10,8 +10,8 @@ SRC_URI += " \
>              file://0001-vmcore-dmesg-Define-_GNU_SOURCE.patch \
>           "
>
> -SRC_URI[md5sum] = "10ddaae0e86af54407b164a1f5a39cc3"
> -SRC_URI[sha256sum] = "cc7b60dad0da202004048a6179d8a53606943062dd627a2edba45a8ea3a85135"
> +SRC_URI[md5sum] = "b7595eb4705e482ee6fc1121a5b6131b"
> +SRC_URI[sha256sum] = "70df562d76213e54833228379710ada1afd98a86ee1ce5644eaa68c54e102e25"
>
>  PACKAGES =+ "kexec kdump vmcore-dmesg"
>
>

[PATCHv2 08/15] gnutls: update to 3.5.3

[Jussi Kukkonen]

Add patch to fix compile without libtasn headers.

Signed-off-by: Jussi Kukkonen <jussi.kukkonen@intel.com>
---

Changes since v1:
* Add patch to fix compile without libtasn headers

Thanks,
 Jussi


 ...001-Use-correct-include-dir-with-minitasn.patch | 31 ++++++++++++++++++++++
 .../gnutls/{gnutls_3.5.1.bb => gnutls_3.5.3.bb}    |  5 ++--
 2 files changed, 34 insertions(+), 2 deletions(-)
 create mode 100644 meta/recipes-support/gnutls/gnutls/0001-Use-correct-include-dir-with-minitasn.patch
 rename meta/recipes-support/gnutls/{gnutls_3.5.1.bb => gnutls_3.5.3.bb} (50%)

diff --git a/meta/recipes-support/gnutls/gnutls/0001-Use-correct-include-dir-with-minitasn.patch b/meta/recipes-support/gnutls/gnutls/0001-Use-correct-include-dir-with-minitasn.patch
new file mode 100644
index 0000000..d7dd7cf
--- /dev/null
+++ b/meta/recipes-support/gnutls/gnutls/0001-Use-correct-include-dir-with-minitasn.patch
@@ -0,0 +1,31 @@
+From 2651b08477f42dd7a05ea7d6df410fb2c46de4fb Mon Sep 17 00:00:00 2001
+From: Jussi Kukkonen <jussi.kukkonen@intel.com>
+Date: Wed, 31 Aug 2016 11:04:06 +0300
+Subject: [PATCH] Use correct include dir with minitasn
+MIME-Version: 1.0
+Content-Type: text/plain; charset=UTF-8
+Content-Transfer-Encoding: 8bit
+
+This allows compiling certtool-cfg without libtasn headers.
+
+Upstream-Status: Submitted [https://gitlab.com/gnutls/gnutls/merge_requests/54]
+Signed-off-by: Jussi Kukkonen <jussi.kukkonen@intel.com>
+---
+ src/Makefile.am | 1 +
+ 1 file changed, 1 insertion(+)
+
+diff --git a/src/Makefile.am b/src/Makefile.am
+index 182f3a5..cf65388 100644
+--- a/src/Makefile.am
++++ b/src/Makefile.am
+@@ -146,6 +146,7 @@ libcmd_cli_debug_la_SOURCES = cli-debug-args.def cli-debug-args.c cli-debug-args
+ COMMON_LIBS = $(LIBOPTS) $(LTLIBINTL)
+ if ENABLE_MINITASN1
+ COMMON_LIBS += ../lib/minitasn1/libminitasn1.la ../gl/libgnu.la 
++AM_CPPFLAGS += -I$(top_srcdir)/lib/minitasn1
+ else
+ COMMON_LIBS += $(LIBTASN1_LIBS)
+ endif
+-- 
+2.9.3
+
diff --git a/meta/recipes-support/gnutls/gnutls_3.5.1.bb b/meta/recipes-support/gnutls/gnutls_3.5.3.bb
similarity index 50%
rename from meta/recipes-support/gnutls/gnutls_3.5.1.bb
rename to meta/recipes-support/gnutls/gnutls_3.5.3.bb
index 85d9904..1bdca6a 100644
--- a/meta/recipes-support/gnutls/gnutls_3.5.1.bb
+++ b/meta/recipes-support/gnutls/gnutls_3.5.3.bb
@@ -3,6 +3,7 @@ require gnutls.inc
 SRC_URI += "file://correct_rpl_gettimeofday_signature.patch \
             file://0001-configure.ac-fix-sed-command.patch \
             file://use-pkg-config-to-locate-zlib.patch \
+            file://0001-Use-correct-include-dir-with-minitasn.patch \
            "
-SRC_URI[md5sum] = "cb48bb0cf36d329f7321c6cdc0d7ae36"
-SRC_URI[sha256sum] = "bc4a0f80a627c3aca6e7ea59d30e50cda118c61e0e3fab367ff1451d6ec8bdbd"
+SRC_URI[md5sum] = "6c2c7f40ddf52933ee3ca474cb8cb63c"
+SRC_URI[sha256sum] = "92c4bc999a10a1b95299ebefaeea8333f19d8a98d957a35b5eae74881bdb1fef"
-- 
2.1.4