[Armadeus-commitlog] armadeus branch, master, updated. armadeus-6.0-316-g4128330
Brought to you by:
sszy
Menu
▾
▴
[Armadeus-commitlog] armadeus branch, master, updated. armadeus-6.0-316-g4128330
|
From: Sébastien S. <ss...@us...> - 2017-08-10 13:37:29
|
This is an automated email from the git hooks/post-receive script. It was
generated because a ref change was pushed to the repository containing
the project "armadeus".
The branch, master has been updated
via 4128330005cfe02702ed59d25da222a8678e6b41 (commit)
from 102abb4f4b5df7d4f0f4a5cfa464690a51253717 (commit)
Those revisions listed above that are new to this repository have
not appeared on any other notification email; so we list those
revisions in full, below.
- Log -----------------------------------------------------------------
commit 4128330005cfe02702ed59d25da222a8678e6b41
Author: Sébastien Szymanski <seb...@ar...>
Date: Thu Aug 10 15:43:06 2017 +0200
[BUILDROOT] 2017.02: backport patches to fix dbus hang at startup
-----------------------------------------------------------------------
Summary of changes:
.../2017.02/229-dbus-bump-version-to-1.10.22.patch | 47 +++++++
...stream-patch-to-fix-startup-hang-with-wit.patch | 139 +++++++++++++++++++++
patches/buildroot/2017.02/cleanup_buildroot.sh | 4 +-
3 files changed, 189 insertions(+), 1 deletion(-)
create mode 100644 patches/buildroot/2017.02/229-dbus-bump-version-to-1.10.22.patch
create mode 100644 patches/buildroot/2017.02/230-dbus-add-upstream-patch-to-fix-startup-hang-with-wit.patch
diff --git a/patches/buildroot/2017.02/229-dbus-bump-version-to-1.10.22.patch b/patches/buildroot/2017.02/229-dbus-bump-version-to-1.10.22.patch
new file mode 100644
index 0000000..2047f2b
--- /dev/null
+++ b/patches/buildroot/2017.02/229-dbus-bump-version-to-1.10.22.patch
@@ -0,0 +1,47 @@
+From 32c744c62da4ec88bb3de3098f15264c4507132e Mon Sep 17 00:00:00 2001
+From: Adam Duskett <Adu...@gm...>
+Date: Fri, 28 Jul 2017 08:50:26 -0400
+Subject: [PATCH/2017.02.x 1/2] dbus: bump version to 1.10.22
+MIME-Version: 1.0
+Content-Type: text/plain; charset=UTF-8
+Content-Transfer-Encoding: 8bit
+
+Signed-off-by: Adam Duskett <adu...@gm...>
+Signed-off-by: Arnout Vandecappelle (Essensium/Mind) <ar...@mi...>
+
+(cherry picked from commit 29f0bd345bde90fcf0060c33623ade34fa9c288c)
+Change site to https to avoid a redirection.
+
+Signed-off-by: Sébastien Szymanski <seb...@ar...>
+---
+ package/dbus/dbus.hash | 3 ++-
+ package/dbus/dbus.mk | 4 ++--
+ 2 files changed, 4 insertions(+), 3 deletions(-)
+
+diff --git a/package/dbus/dbus.hash b/package/dbus/dbus.hash
+index af8143d..b005242 100644
+--- a/package/dbus/dbus.hash
++++ b/package/dbus/dbus.hash
+@@ -1,2 +1,3 @@
+ # Locally calculated after checking pgp signature
+-sha256 a7b0ba6ea3e8d0e08afec5e3030d0245614268276620c536726f8fa6e5c43388 dbus-1.10.16.tar.gz
++# http://dbus.freedesktop.org/releases/dbus/dbus-1.10.22.tar.gz.asc
++sha256 e2b1401e3eedc7b5c9a2034d31254c886e1fcbc7858006e0a1c59158fe4b7b97 dbus-1.10.22.tar.gz
+diff --git a/package/dbus/dbus.mk b/package/dbus/dbus.mk
+index 66b90bc..e05fbff 100644
+--- a/package/dbus/dbus.mk
++++ b/package/dbus/dbus.mk
+@@ -4,8 +4,8 @@
+ #
+ ################################################################################
+
+-DBUS_VERSION = 1.10.16
+-DBUS_SITE = http://dbus.freedesktop.org/releases/dbus
++DBUS_VERSION = 1.10.22
++DBUS_SITE = https://dbus.freedesktop.org/releases/dbus
+ DBUS_LICENSE = AFLv2.1 or GPLv2+ (library, tools), GPLv2+ (tools)
+ DBUS_LICENSE_FILES = COPYING
+ DBUS_INSTALL_STAGING = YES
+--
+2.7.3
+
diff --git a/patches/buildroot/2017.02/230-dbus-add-upstream-patch-to-fix-startup-hang-with-wit.patch b/patches/buildroot/2017.02/230-dbus-add-upstream-patch-to-fix-startup-hang-with-wit.patch
new file mode 100644
index 0000000..9f4dad4
--- /dev/null
+++ b/patches/buildroot/2017.02/230-dbus-add-upstream-patch-to-fix-startup-hang-with-wit.patch
@@ -0,0 +1,139 @@
+From 515df8f93851d0c9556d7add5422041e2e5a1ae7 Mon Sep 17 00:00:00 2001
+From: Marcus Hoffmann <m.h...@ca...>
+Date: Fri, 4 Aug 2017 18:58:32 +0200
+Subject: [PATCH/2017.02.x 2/2] dbus: add upstream patch to fix startup hang
+ with with expat >= 2.2.1
+MIME-Version: 1.0
+Content-Type: text/plain; charset=UTF-8
+Content-Transfer-Encoding: 8bit
+
+After c0ad6ded018ffbc33f7f5 expat: security bump to version 2.2.1
+the system can hang on startup under certain circumstances.
+
+This happens when:
+ * we use systemd as init system
+ * the random nonblocking pool takes a while to initialize
+ * this apparently doesn't happen on qemu, so this would not have
+ been caught by the runtime testing infrastructure
+ * it also doesn't seem to happen when network booting
+
+For a more detailed description of the bug see here:
+https://bugs.freedesktop.org/show_bug.cgi?id=101858
+
+The patch should be in next dbus version 1.10.24
+
+Set DBUS_AUTORECONF = YES because configure.ac is changed.
+
+Signed-off-by: Marcus Hoffmann <m.h...@ca...>
+[Arnout: add upstream commit sha + Marcus's Sob to the patch]
+Signed-off-by: Arnout Vandecappelle (Essensium/Mind) <ar...@mi...>
+(cherry picked from commit 5a5e76381f8b000baa09c902ca89d45725c47f04)
+
+Signed-off-by: Sébastien Szymanski <seb...@ar...>
+---
+ ...er-expat-Tell-Expat-not-to-defend-against.patch | 78 ++++++++++++++++++++++
+ package/dbus/dbus.mk | 3 +
+ 2 files changed, 81 insertions(+)
+ create mode 100644 package/dbus/0001-config-loader-expat-Tell-Expat-not-to-defend-against.patch
+
+diff --git a/package/dbus/0001-config-loader-expat-Tell-Expat-not-to-defend-against.patch b/package/dbus/0001-config-loader-expat-Tell-Expat-not-to-defend-against.patch
+new file mode 100644
+index 0000000..fd9e01d
+--- /dev/null
++++ b/package/dbus/0001-config-loader-expat-Tell-Expat-not-to-defend-against.patch
+@@ -0,0 +1,78 @@
++From 1252dc1d1f465b8ab6b36ff7252e395e66a040cf Mon Sep 17 00:00:00 2001
++From: Simon McVittie <sm...@de...>
++Date: Fri, 21 Jul 2017 10:46:39 +0100
++Subject: [PATCH 1/2] config-loader-expat: Tell Expat not to defend against
++ hash collisions
++
++By default, Expat uses cryptographic-quality random numbers as a salt for
++its hash algorithm, and since 2.2.1 it gets them from the getrandom
++syscall on Linux. That syscall refuses to return any entropy until the
++kernel's CSPRNG (random pool) has been initialized. Unfortunately, this
++can take as long as 40 seconds on embedded devices with few entropy
++sources, which is too long: if the system dbus-daemon blocks for that
++length of time, important D-Bus clients like systemd and systemd-logind
++time out and fail to connect to it.
++
++We're parsing small configuration files here, and we trust them
++completely, so we don't need to defend against hash collisions: nobody
++is going to be crafting them to cause pathological performance.
++
++Bug: https://bugs.freedesktop.org/show_bug.cgi?id=101858
++Signed-off-by: Simon McVittie <sm...@de...>
++Tested-by: Christopher Hewitt <he...@ie...>
++Reviewed-by: Philip Withnall <wit...@en...>
++
++Upstream commit 1252dc1d1f465b8ab6b36ff7252e395e66a040cf
++Signed-off-by: Marcus Hoffmann <m.h...@ca...>
++---
++ bus/config-loader-expat.c | 14 ++++++++++++++
++ configure.ac | 8 ++++++++
++ 2 files changed, 22 insertions(+)
++
++diff --git a/bus/config-loader-expat.c b/bus/config-loader-expat.c
++index b571fda3..27cbe2d0 100644
++--- a/bus/config-loader-expat.c
+++++ b/bus/config-loader-expat.c
++@@ -203,6 +203,20 @@ bus_config_load (const DBusString *file,
++ goto failed;
++ }
++
+++ /* We do not need protection against hash collisions (CVE-2012-0876)
+++ * because we are only parsing trusted XML; and if we let Expat block
+++ * waiting for the CSPRNG to be initialized, as it does by default to
+++ * defeat CVE-2012-0876, it can cause timeouts during early boot on
+++ * entropy-starved embedded devices.
+++ *
+++ * TODO: When Expat gets a more explicit API for this than
+++ * XML_SetHashSalt, check for that too, and use it preferentially.
+++ * https://github.com/libexpat/libexpat/issues/91 */
+++#if defined(HAVE_XML_SETHASHSALT)
+++ /* Any nonzero number will do. https://xkcd.com/221/ */
+++ XML_SetHashSalt (expat, 4);
+++#endif
+++
++ if (!_dbus_string_get_dirname (file, &dirname))
++ {
++ dbus_set_error (error, DBUS_ERROR_NO_MEMORY, NULL);
++diff --git a/configure.ac b/configure.ac
++index 52da11fb..c4022ed7 100644
++--- a/configure.ac
+++++ b/configure.ac
++@@ -938,6 +938,14 @@ XML_CFLAGS=
++ AC_SUBST([XML_CFLAGS])
++ AC_SUBST([XML_LIBS])
++
+++save_cflags="$CFLAGS"
+++save_libs="$LIBS"
+++CFLAGS="$CFLAGS $XML_CFLAGS"
+++LIBS="$LIBS $XML_LIBS"
+++AC_CHECK_FUNCS([XML_SetHashSalt])
+++CFLAGS="$save_cflags"
+++LIBS="$save_libs"
+++
++ # Thread lib detection
++ AC_ARG_VAR([THREAD_LIBS])
++ save_libs="$LIBS"
++--
++2.11.0
++
+diff --git a/package/dbus/dbus.mk b/package/dbus/dbus.mk
+index e05fbff..f2974f2 100644
+--- a/package/dbus/dbus.mk
++++ b/package/dbus/dbus.mk
+@@ -6,6 +6,9 @@
+
+ DBUS_VERSION = 1.10.22
+ DBUS_SITE = https://dbus.freedesktop.org/releases/dbus
++
++# 0001-config-loader-expat-Tell-Expat-not-to-defend-against.patch
++DBUS_AUTORECONF = YES
+ DBUS_LICENSE = AFLv2.1 or GPLv2+ (library, tools), GPLv2+ (tools)
+ DBUS_LICENSE_FILES = COPYING
+ DBUS_INSTALL_STAGING = YES
+--
+2.7.3
+
diff --git a/patches/buildroot/2017.02/cleanup_buildroot.sh b/patches/buildroot/2017.02/cleanup_buildroot.sh
index 3c04391..abaefe8 100755
--- a/patches/buildroot/2017.02/cleanup_buildroot.sh
+++ b/patches/buildroot/2017.02/cleanup_buildroot.sh
@@ -33,6 +33,9 @@ rm -rf buildroot/package/cmux/cmux.hash
rm -rf buildroot/package/cmux/cmux.mk
rm -rf buildroot/package/cunit/Config.in
rm -rf buildroot/package/cunit/cunit.mk
+rm -rf buildroot/package/dbus/0001-config-loader-expat-Tell-Expat-not-to-defend-against.patch
+rm -rf buildroot/package/dbus/dbus.hash
+rm -rf buildroot/package/dbus/dbus.mk
rm -rf buildroot/package/e-uae/Config.in
rm -rf buildroot/package/e-uae/e-uae.mk
rm -rf buildroot/package/fb-test-app/001-fixes-tty-vc-config-on-fb-test-exit.patch
@@ -58,7 +61,6 @@ rm -rf buildroot/package/imx-usb-loader/imx-usb-loader.hash
rm -rf buildroot/package/imx-usb-loader/imx-usb-loader.mk
rm -rf buildroot/package/kodi/Config.in
rm -rf buildroot/package/kodi/kodi.mk
-rm -rf buildroot/package/libnl/libnl.hash
rm -rf buildroot/package/libpng/0002-Don-t-append-prefix-to-symbol-names-in-version-script.patch
rm -rf buildroot/package/libpng/libpng.hash
rm -rf buildroot/package/libpng/libpng.mk
hooks/post-receive
--
armadeus
|