[PATCH 0/7] Recipes upgrade

[PATCH 0/7] Recipes upgrade

[Robert Yang]

The following changes since commit 1314a6953aa647706107557faaba8574e307d2bd:

  patch: fix CVE-2018-6952 (2018-08-23 07:45:32 +0100)

are available in the git repository at:

  git://git.openembedded.org/openembedded-core-contrib rbt/pu
  http://cgit.openembedded.org/openembedded-core-contrib/log/?h=rbt/pu

Robert Yang (7):
  strace: 4.23 -> 4.24
  diffstat: 1.61 -> 1.62
  pciutils: 3.6.1 -> 3.6.2
  dbus: 1.12.8 -> 1.12.10
  dbus-test: 1.12.8 -> 1.12.10
  elfutils: 0.172 -> 0.173
  distcc: 3.3 -> 3.3.2

 .../{pciutils_3.6.1.bb => pciutils_3.6.2.bb}       |  4 +--
 .../{dbus-test_1.12.8.bb => dbus-test_1.12.10.bb}  |  4 +--
 .../dbus/{dbus_1.12.8.bb => dbus_1.12.10.bb}       |  4 +--
 .../diffstat/avoid-check-user-break-cc.patch       | 12 +++++--
 .../{diffstat_1.61.bb => diffstat_1.62.bb}         |  4 +--
 .../distcc/{distcc_3.3.bb => distcc_3.3.2.bb}      |  2 +-
 .../{elfutils_0.172.bb => elfutils_0.173.bb}       |  5 +--
 .../0001-tests-fix-build-with-fresh-glibc.patch    | 42 ----------------------
 .../strace/{strace_4.23.bb => strace_4.24.bb}      |  5 ++-
 9 files changed, 23 insertions(+), 59 deletions(-)
 rename meta/recipes-bsp/pciutils/{pciutils_3.6.1.bb => pciutils_3.6.2.bb} (92%)
 rename meta/recipes-core/dbus/{dbus-test_1.12.8.bb => dbus-test_1.12.10.bb} (95%)
 rename meta/recipes-core/dbus/{dbus_1.12.8.bb => dbus_1.12.10.bb} (97%)
 rename meta/recipes-devtools/diffstat/{diffstat_1.61.bb => diffstat_1.62.bb} (84%)
 rename meta/recipes-devtools/distcc/{distcc_3.3.bb => distcc_3.3.2.bb} (97%)
 rename meta/recipes-devtools/elfutils/{elfutils_0.172.bb => elfutils_0.173.bb} (95%)
 delete mode 100644 meta/recipes-devtools/strace/strace/0001-tests-fix-build-with-fresh-glibc.patch
 rename meta/recipes-devtools/strace/{strace_4.23.bb => strace_4.24.bb} (90%)

-- 
2.7.4

[PATCH 1/7] strace: 4.23 -> 4.24

[Robert Yang]

Remove backported patch 0001-tests-fix-build-with-fresh-glibc.patch.

Signed-off-by: Robert Yang <liezhi.yang@windriver.com>
---
 .../0001-tests-fix-build-with-fresh-glibc.patch    | 42 ----------------------
 .../strace/{strace_4.23.bb => strace_4.24.bb}      |  5 ++-
 2 files changed, 2 insertions(+), 45 deletions(-)
 delete mode 100644 meta/recipes-devtools/strace/strace/0001-tests-fix-build-with-fresh-glibc.patch
 rename meta/recipes-devtools/strace/{strace_4.23.bb => strace_4.24.bb} (90%)

diff --git a/meta/recipes-devtools/strace/strace/0001-tests-fix-build-with-fresh-glibc.patch b/meta/recipes-devtools/strace/strace/0001-tests-fix-build-with-fresh-glibc.patch
deleted file mode 100644
index ce6e567..0000000
--- a/meta/recipes-devtools/strace/strace/0001-tests-fix-build-with-fresh-glibc.patch
+++ /dev/null
@@ -1,42 +0,0 @@
-From bba1b0085f2a2c83839647fee48628ee054aceb7 Mon Sep 17 00:00:00 2001
-From: "Dmitry V. Levin" <ldv@altlinux.org>
-Date: Sun, 15 Jul 2018 22:14:29 +0000
-Subject: [PATCH] tests: fix build with fresh glibc
-
-Workaround additional incompatibility between <sys/stat.h> and
-<asm/stat.h> introduced by glibc-2.27.9000-566-gfd70af4.
-
-* tests/xstatx.c (statx, statx_timestamp): Redefine before the inclusion
-of <sys/stat.h> to avoid conflicts between definitions provided by the
-linux kernel headers and the GNU libc.
-
-Upstream-Status: Backport [https://gitlab.com/strace/strace/commit/3dbffb7]
-Signed-off-by: Khem Raj <raj.khem@gmail.com>
----
-
- tests/xstatx.c | 6 +++++-
- 1 file changed, 5 insertions(+), 1 deletion(-)
-
-diff --git a/tests/xstatx.c b/tests/xstatx.c
-index 7fb9326..441f4a8 100644
---- a/tests/xstatx.c
-+++ b/tests/xstatx.c
-@@ -64,10 +64,14 @@ typedef off_t libc_off_t;
- 
- # define stat libc_stat
- # define stat64 libc_stat64
-+# define statx libc_statx
-+# define statx_timestamp libc_statx_timestamp
- # include <fcntl.h>
- # include <sys/stat.h>
--# undef stat
-+# undef statx_timestamp
-+# undef statx
- # undef stat64
-+# undef stat
- 
- # undef st_atime
- # undef st_mtime
--- 
-2.18.0
-
diff --git a/meta/recipes-devtools/strace/strace_4.23.bb b/meta/recipes-devtools/strace/strace_4.24.bb
similarity index 90%
rename from meta/recipes-devtools/strace/strace_4.23.bb
rename to meta/recipes-devtools/strace/strace_4.24.bb
index d30d440..e6f7e9c 100644
--- a/meta/recipes-devtools/strace/strace_4.23.bb
+++ b/meta/recipes-devtools/strace/strace_4.24.bb
@@ -14,10 +14,9 @@ SRC_URI = "https://strace.io/files/${PV}/strace-${PV}.tar.xz \
            file://mips-SIGEMT.patch \
            file://0001-caps-abbrev.awk-fix-gawk-s-path.patch \
            file://0001-tests-sigaction-Check-for-mips-and-alpha-before-usin.patch \
-           file://0001-tests-fix-build-with-fresh-glibc.patch \
            "
-SRC_URI[md5sum] = "fad4bba0947553cef34d46a9fd78f039"
-SRC_URI[sha256sum] = "7860a6965f1dd832747bd8281a04738274398d32c56e9fbd0a68b1bb9ec09aad"
+SRC_URI[md5sum] = "8780136849c85acf76ad3a522aa4462a"
+SRC_URI[sha256sum] = "1f4e59fc1edfa2bfb4adf2a748623dc25b105ec79713dd84404199f91b0b0634"
 
 inherit autotools ptest bluetooth
 
-- 
2.7.4

[PATCH 2/7] diffstat: 1.61 -> 1.62

[Robert Yang]

Refresh avoid-check-user-break-cc.patch to fix fuzz warning.

Signed-off-by: Robert Yang <liezhi.yang@windriver.com>
---
 .../diffstat/diffstat/avoid-check-user-break-cc.patch        | 12 +++++++++---
 .../diffstat/{diffstat_1.61.bb => diffstat_1.62.bb}          |  4 ++--
 2 files changed, 11 insertions(+), 5 deletions(-)
 rename meta/recipes-devtools/diffstat/{diffstat_1.61.bb => diffstat_1.62.bb} (84%)

diff --git a/meta/recipes-devtools/diffstat/diffstat/avoid-check-user-break-cc.patch b/meta/recipes-devtools/diffstat/diffstat/avoid-check-user-break-cc.patch
index 2df2d00..811faa4 100644
--- a/meta/recipes-devtools/diffstat/diffstat/avoid-check-user-break-cc.patch
+++ b/meta/recipes-devtools/diffstat/diffstat/avoid-check-user-break-cc.patch
@@ -1,3 +1,8 @@
+From 1046593aacb74ff888a0d68c0ff89b20c4bc9ed4 Mon Sep 17 00:00:00 2001
+From: Kai Kang <kai.kang@windriver.com>
+Date: Tue, 15 May 2018 17:17:01 +0800
+Subject: [PATCH] diffstat: fix wrong evaluation of CC
+
 Upstream-Status: Inappropriate [oe specific]
 
 m4 function CF_CC_ENV_FLAGS checks whether variable CC contains options '-I', '-U'
@@ -7,15 +12,16 @@ be included in CC. And then CC will be wrongly filtered.
 So comment out CF_CC_ENV_FLAGS from function CF_PROG_CC.
 
 Signed-off-by: Kai Kang <kai.kang@windriver.com>
+
 ---
  aclocal.m4 | 2 +-
  1 file changed, 1 insertion(+), 1 deletion(-)
 
 diff --git a/aclocal.m4 b/aclocal.m4
-index 420fe83..eb73ea9 100644
+index 9281aa8..dd57b7a 100644
 --- a/aclocal.m4
 +++ b/aclocal.m4
-@@ -1114,7 +1114,7 @@ CF_GCC_VERSION
+@@ -1239,7 +1239,7 @@ CF_GCC_VERSION
  CF_ACVERSION_CHECK(2.52,
  	[AC_PROG_CC_STDC],
  	[CF_ANSI_CC_REQD])
@@ -23,4 +29,4 @@ index 420fe83..eb73ea9 100644
 +dnl CF_CC_ENV_FLAGS
  ])dnl
  dnl ---------------------------------------------------------------------------
- dnl CF_PROG_GROFF version: 2 updated: 2015/07/04 11:16:27
+ dnl CF_PROG_GROFF version: 3 updated: 2018/01/07 13:16:19
diff --git a/meta/recipes-devtools/diffstat/diffstat_1.61.bb b/meta/recipes-devtools/diffstat/diffstat_1.62.bb
similarity index 84%
rename from meta/recipes-devtools/diffstat/diffstat_1.61.bb
rename to meta/recipes-devtools/diffstat/diffstat_1.62.bb
index 1a76e78..93d7779 100644
--- a/meta/recipes-devtools/diffstat/diffstat_1.61.bb
+++ b/meta/recipes-devtools/diffstat/diffstat_1.62.bb
@@ -12,8 +12,8 @@ SRC_URI = "http://invisible-mirror.net/archives/${BPN}/${BP}.tgz \
            file://avoid-check-user-break-cc.patch \
 "
 
-SRC_URI[md5sum] = "c048a32d55d8bd6724f382baf41f325f"
-SRC_URI[sha256sum] = "25359e0c27183f997b36c9202583b5dc2df390c20e22a92606af4bf7856a55ee"
+SRC_URI[md5sum] = "91e106bb34cb097750db7ddc0ba1d8fc"
+SRC_URI[sha256sum] = "7f09183644ed77a156b15346bbad4e89c93543e140add9dab18747e30522591f"
 
 S = "${WORKDIR}/diffstat-${PV}"
 
-- 
2.7.4

[PATCH 3/7] pciutils: 3.6.1 -> 3.6.2

[Robert Yang]

Signed-off-by: Robert Yang <liezhi.yang@windriver.com>
---
 meta/recipes-bsp/pciutils/{pciutils_3.6.1.bb => pciutils_3.6.2.bb} | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)
 rename meta/recipes-bsp/pciutils/{pciutils_3.6.1.bb => pciutils_3.6.2.bb} (92%)

diff --git a/meta/recipes-bsp/pciutils/pciutils_3.6.1.bb b/meta/recipes-bsp/pciutils/pciutils_3.6.2.bb
similarity index 92%
rename from meta/recipes-bsp/pciutils/pciutils_3.6.1.bb
rename to meta/recipes-bsp/pciutils/pciutils_3.6.2.bb
index d71a29a..413421c 100644
--- a/meta/recipes-bsp/pciutils/pciutils_3.6.1.bb
+++ b/meta/recipes-bsp/pciutils/pciutils_3.6.2.bb
@@ -11,8 +11,8 @@ DEPENDS = "zlib kmod"
 SRC_URI = "${KERNELORG_MIRROR}/software/utils/pciutils/pciutils-${PV}.tar.xz \
            file://configure.patch"
 
-SRC_URI[md5sum] = "1adbcc258030ea92609100703f29c92c"
-SRC_URI[sha256sum] = "fcc0431cc951c3563f1e4f946d27c8e2161cfd81f25316e6bd783fa6118469e0"
+SRC_URI[md5sum] = "77963796d1be4f451b83e6da28ba4f82"
+SRC_URI[sha256sum] = "db452ec986edefd88af0d222d22f6102f8030a8633fdfe846c3ae4bde9bb93f3"
 
 inherit multilib_header pkgconfig
 
-- 
2.7.4

[PATCH 4/7] dbus: 1.12.8 -> 1.12.10

[Robert Yang]

Signed-off-by: Robert Yang <liezhi.yang@windriver.com>
---
 meta/recipes-core/dbus/{dbus_1.12.8.bb => dbus_1.12.10.bb} | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)
 rename meta/recipes-core/dbus/{dbus_1.12.8.bb => dbus_1.12.10.bb} (97%)

diff --git a/meta/recipes-core/dbus/dbus_1.12.8.bb b/meta/recipes-core/dbus/dbus_1.12.10.bb
similarity index 97%
rename from meta/recipes-core/dbus/dbus_1.12.8.bb
rename to meta/recipes-core/dbus/dbus_1.12.10.bb
index eec22f7..d71f7f7 100644
--- a/meta/recipes-core/dbus/dbus_1.12.8.bb
+++ b/meta/recipes-core/dbus/dbus_1.12.10.bb
@@ -18,8 +18,8 @@ SRC_URI = "http://dbus.freedesktop.org/releases/dbus/dbus-${PV}.tar.gz \
            file://clear-guid_from_server-if-send_negotiate_unix_f.patch \
 "
 
-SRC_URI[md5sum] = "2764bf150e5aa8005b7bc0d6c388756a"
-SRC_URI[sha256sum] = "e2dc99e7338303393b6663a98320aba6a63421bcdaaf571c8022f815e5896eb3"
+SRC_URI[md5sum] = "c3e12b4206e2a7da39d7cc42567790ef"
+SRC_URI[sha256sum] = "4b693d24976258c3f2fa9cc33ad9288c5fbfa7a16481dbd9a8a429f7aa8cdcf7"
 
 inherit useradd autotools pkgconfig gettext update-rc.d upstream-version-is-even
 
-- 
2.7.4

[PATCH 5/7] dbus-test: 1.12.8 -> 1.12.10

[Robert Yang]

Signed-off-by: Robert Yang <liezhi.yang@windriver.com>
---
 meta/recipes-core/dbus/{dbus-test_1.12.8.bb => dbus-test_1.12.10.bb} | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)
 rename meta/recipes-core/dbus/{dbus-test_1.12.8.bb => dbus-test_1.12.10.bb} (95%)

diff --git a/meta/recipes-core/dbus/dbus-test_1.12.8.bb b/meta/recipes-core/dbus/dbus-test_1.12.10.bb
similarity index 95%
rename from meta/recipes-core/dbus/dbus-test_1.12.8.bb
rename to meta/recipes-core/dbus/dbus-test_1.12.10.bb
index f33fbaf..e3ee608 100644
--- a/meta/recipes-core/dbus/dbus-test_1.12.8.bb
+++ b/meta/recipes-core/dbus/dbus-test_1.12.10.bb
@@ -17,8 +17,8 @@ SRC_URI = "http://dbus.freedesktop.org/releases/dbus/dbus-${PV}.tar.gz \
            file://clear-guid_from_server-if-send_negotiate_unix_f.patch \
            "
 
-SRC_URI[md5sum] = "2764bf150e5aa8005b7bc0d6c388756a"
-SRC_URI[sha256sum] = "e2dc99e7338303393b6663a98320aba6a63421bcdaaf571c8022f815e5896eb3"
+SRC_URI[md5sum] = "c3e12b4206e2a7da39d7cc42567790ef"
+SRC_URI[sha256sum] = "4b693d24976258c3f2fa9cc33ad9288c5fbfa7a16481dbd9a8a429f7aa8cdcf7"
 
 S="${WORKDIR}/dbus-${PV}"
 FILESEXTRAPATHS =. "${FILE_DIRNAME}/dbus:"
-- 
2.7.4

[PATCH 6/7] elfutils: 0.172 -> 0.173

[Robert Yang]

Signed-off-by: Robert Yang <liezhi.yang@windriver.com>
---
 .../elfutils/{elfutils_0.172.bb => elfutils_0.173.bb}                | 5 +++--
 1 file changed, 3 insertions(+), 2 deletions(-)
 rename meta/recipes-devtools/elfutils/{elfutils_0.172.bb => elfutils_0.173.bb} (95%)

diff --git a/meta/recipes-devtools/elfutils/elfutils_0.172.bb b/meta/recipes-devtools/elfutils/elfutils_0.173.bb
similarity index 95%
rename from meta/recipes-devtools/elfutils/elfutils_0.172.bb
rename to meta/recipes-devtools/elfutils/elfutils_0.173.bb
index 1cdff40..03144dc 100644
--- a/meta/recipes-devtools/elfutils/elfutils_0.172.bb
+++ b/meta/recipes-devtools/elfutils/elfutils_0.173.bb
@@ -30,8 +30,9 @@ SRC_URI = "https://sourceware.org/elfutils/ftp/${PV}/${BP}.tar.bz2 \
            file://debian/0001-disable_werror.patch \
            "
 SRC_URI_append_libc-musl = " file://0008-build-Provide-alternatives-for-glibc-assumptions-hel.patch"
-SRC_URI[md5sum] = "01e87ab4c5a6a249c04e22a97a4221d3"
-SRC_URI[sha256sum] = "779c99e6344c4982bbab60b8d276cec3d468151c758905f9a44ba6b6edaa0e24"
+
+SRC_URI[md5sum] = "35decb1ebfb90d565e4c411bee4185cc"
+SRC_URI[sha256sum] = "b76d8c133f68dad46250f5c223482c8299d454a69430d9aa5c19123345a000ff"
 
 inherit autotools gettext
 
-- 
2.7.4

[PATCH 7/7] distcc: 3.3 -> 3.3.2

[Robert Yang]

Signed-off-by: Robert Yang <liezhi.yang@windriver.com>
---
 meta/recipes-devtools/distcc/{distcc_3.3.bb => distcc_3.3.2.bb} | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)
 rename meta/recipes-devtools/distcc/{distcc_3.3.bb => distcc_3.3.2.bb} (97%)

diff --git a/meta/recipes-devtools/distcc/distcc_3.3.bb b/meta/recipes-devtools/distcc/distcc_3.3.2.bb
similarity index 97%
rename from meta/recipes-devtools/distcc/distcc_3.3.bb
rename to meta/recipes-devtools/distcc/distcc_3.3.2.bb
index 33a64ce..0d06963 100644
--- a/meta/recipes-devtools/distcc/distcc_3.3.bb
+++ b/meta/recipes-devtools/distcc/distcc_3.3.2.bb
@@ -20,7 +20,7 @@ SRC_URI = "git://github.com/distcc/distcc.git \
            file://distccmon-gnome.desktop \
            file://distcc \
            file://distcc.service"
-SRCREV = "002e68b766ccd7ad05551e67d162b71a7a773d0d"
+SRCREV = "8600f0857dac55ea393dc11a860948692d215fc8"
 S = "${WORKDIR}/git"
 
 inherit autotools pkgconfig update-rc.d useradd systemd
-- 
2.7.4