* [Buildroot] [PATCH/2017.02.x 1/2] dbus: bump version to 1.10.22 @ 2017-08-10 13:47 Sébastien Szymanski 2017-08-10 13:47 ` [Buildroot] [PATCH/2017.02.x 2/2] dbus: add upstream patch to fix startup hang with with expat >= 2.2.1 Sébastien Szymanski 2017-08-14 20:44 ` [Buildroot] [PATCH/2017.02.x 1/2] dbus: bump version to 1.10.22 Thomas Petazzoni 0 siblings, 2 replies; 9+ messages in thread From: Sébastien Szymanski @ 2017-08-10 13:47 UTC (permalink / raw) To: buildroot From: Adam Duskett <Aduskett@gmail.com> Signed-off-by: Adam Duskett <aduskett@gmail.com> Signed-off-by: Arnout Vandecappelle (Essensium/Mind) <arnout@mind.be> (cherry picked from commit 29f0bd345bde90fcf0060c33623ade34fa9c288c) Change site to https to avoid a redirection. Signed-off-by: S?bastien Szymanski <sebastien.szymanski@armadeus.com> --- 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 ^ permalink raw reply related [flat|nested] 9+ messages in thread
* [Buildroot] [PATCH/2017.02.x 2/2] dbus: add upstream patch to fix startup hang with with expat >= 2.2.1 2017-08-10 13:47 [Buildroot] [PATCH/2017.02.x 1/2] dbus: bump version to 1.10.22 Sébastien Szymanski @ 2017-08-10 13:47 ` Sébastien Szymanski 2017-08-13 12:56 ` Yann E. MORIN 2017-08-14 20:44 ` [Buildroot] [PATCH/2017.02.x 1/2] dbus: bump version to 1.10.22 Thomas Petazzoni 1 sibling, 1 reply; 9+ messages in thread From: Sébastien Szymanski @ 2017-08-10 13:47 UTC (permalink / raw) To: buildroot From: Marcus Hoffmann <m.hoffmann@cartelsol.com> 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.hoffmann@cartelsol.com> [Arnout: add upstream commit sha + Marcus's Sob to the patch] Signed-off-by: Arnout Vandecappelle (Essensium/Mind) <arnout@mind.be> (cherry picked from commit 5a5e76381f8b000baa09c902ca89d45725c47f04) Signed-off-by: S?bastien Szymanski <sebastien.szymanski@armadeus.com> --- ...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 <smcv@debian.org> +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 <smcv@debian.org> +Tested-by: Christopher Hewitt <hewitt@ieee.org> +Reviewed-by: Philip Withnall <withnall@endlessm.com> + +Upstream commit 1252dc1d1f465b8ab6b36ff7252e395e66a040cf +Signed-off-by: Marcus Hoffmann <m.hoffmann@cartelsol.com> +--- + 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 ^ permalink raw reply related [flat|nested] 9+ messages in thread
* [Buildroot] [PATCH/2017.02.x 2/2] dbus: add upstream patch to fix startup hang with with expat >= 2.2.1 2017-08-10 13:47 ` [Buildroot] [PATCH/2017.02.x 2/2] dbus: add upstream patch to fix startup hang with with expat >= 2.2.1 Sébastien Szymanski @ 2017-08-13 12:56 ` Yann E. MORIN 2017-08-14 8:40 ` Sébastien Szymanski 0 siblings, 1 reply; 9+ messages in thread From: Yann E. MORIN @ 2017-08-13 12:56 UTC (permalink / raw) To: buildroot S?bastien, All, On 2017-08-10 15:47 +0200, S?bastien Szymanski spake thusly: > From: Marcus Hoffmann <m.hoffmann@cartelsol.com> > 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 In the meantime. expat 2.2.3 has been released, which contrains (amongst other interesting stuff) commit 55839b633 (xmlparse.c: Read /dev/urandom if non-blocking getrandom failed), which ought to fix the boot delay. So, maybe it is beter to bumnpt expat instead, no? Or at least, backport that one commit. Or did I miss something? Regards, Yann E. MORIN. > Set DBUS_AUTORECONF = YES because configure.ac is changed. > > Signed-off-by: Marcus Hoffmann <m.hoffmann@cartelsol.com> > [Arnout: add upstream commit sha + Marcus's Sob to the patch] > Signed-off-by: Arnout Vandecappelle (Essensium/Mind) <arnout@mind.be> > > (cherry picked from commit 5a5e76381f8b000baa09c902ca89d45725c47f04) > Signed-off-by: S?bastien Szymanski <sebastien.szymanski@armadeus.com> > --- > ...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 <smcv@debian.org> > +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 <smcv@debian.org> > +Tested-by: Christopher Hewitt <hewitt@ieee.org> > +Reviewed-by: Philip Withnall <withnall@endlessm.com> > + > +Upstream commit 1252dc1d1f465b8ab6b36ff7252e395e66a040cf > +Signed-off-by: Marcus Hoffmann <m.hoffmann@cartelsol.com> > +--- > + 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 > > _______________________________________________ > buildroot mailing list > buildroot at busybox.net > http://lists.busybox.net/mailman/listinfo/buildroot -- .-----------------.--------------------.------------------.--------------------. | Yann E. MORIN | Real-Time Embedded | /"\ ASCII RIBBON | Erics' conspiracy: | | +33 662 376 056 | Software Designer | \ / CAMPAIGN | ___ | | +33 223 225 172 `------------.-------: X AGAINST | \e/ There is no | | http://ymorin.is-a-geek.org/ | _/*\_ | / \ HTML MAIL | v conspiracy. | '------------------------------^-------^------------------^--------------------' ^ permalink raw reply [flat|nested] 9+ messages in thread
* [Buildroot] [PATCH/2017.02.x 2/2] dbus: add upstream patch to fix startup hang with with expat >= 2.2.1 2017-08-13 12:56 ` Yann E. MORIN @ 2017-08-14 8:40 ` Sébastien Szymanski 2017-08-14 15:43 ` Yann E. MORIN 0 siblings, 1 reply; 9+ messages in thread From: Sébastien Szymanski @ 2017-08-14 8:40 UTC (permalink / raw) To: buildroot Yann, All, > > On 13 Aug 2017, at 14:56, Yann E. MORIN <yann.morin.1998@free.fr> wrote: > > S?bastien, All, > > On 2017-08-10 15:47 +0200, S?bastien Szymanski spake thusly: >> From: Marcus Hoffmann <m.hoffmann@cartelsol.com> >> 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 > > In the meantime. expat 2.2.3 has been released, which contrains (amongst > other interesting stuff) commit 55839b633 (xmlparse.c: Read /dev/urandom > if non-blocking getrandom failed), which ought to fix the boot delay. > > So, maybe it is beter to bumnpt expat instead, no? Or at least, backport > that one commit. expat is still at version 2.2.2 on the master branch. I guess a patch needs to be first on the master branch before it can be backported on a LTS branch, isn?t it? Regards, S?bastien Szymanski > > Or did I miss something? > > Regards, > Yann E. MORIN. > >> Set DBUS_AUTORECONF = YES because configure.ac is changed. >> >> Signed-off-by: Marcus Hoffmann <m.hoffmann@cartelsol.com> >> [Arnout: add upstream commit sha + Marcus's Sob to the patch] >> Signed-off-by: Arnout Vandecappelle (Essensium/Mind) <arnout@mind.be> >> >> (cherry picked from commit 5a5e76381f8b000baa09c902ca89d45725c47f04) >> Signed-off-by: S?bastien Szymanski <sebastien.szymanski@armadeus.com> >> --- >> ...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 <smcv@debian.org> >> +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 <smcv@debian.org> >> +Tested-by: Christopher Hewitt <hewitt@ieee.org> >> +Reviewed-by: Philip Withnall <withnall@endlessm.com> >> + >> +Upstream commit 1252dc1d1f465b8ab6b36ff7252e395e66a040cf >> +Signed-off-by: Marcus Hoffmann <m.hoffmann@cartelsol.com> >> +--- >> + 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 >> >> _______________________________________________ >> buildroot mailing list >> buildroot at busybox.net <mailto:buildroot@busybox.net> >> http://lists.busybox.net/mailman/listinfo/buildroot <http://lists.busybox.net/mailman/listinfo/buildroot> > > -- > .-----------------.--------------------.------------------.--------------------. > | Yann E. MORIN | Real-Time Embedded | /"\ ASCII RIBBON | Erics' conspiracy: | > | +33 662 376 056 | Software Designer | \ / CAMPAIGN | ___ | > | +33 223 225 172 `------------.-------: X AGAINST | \e/ There is no | > | http://ymorin.is-a-geek.org/ <http://ymorin.is-a-geek.org/> | _/*\_ | / \ HTML MAIL | v conspiracy. | > '------------------------------^-------^------------------^--------------------' -------------- next part -------------- An HTML attachment was scrubbed... URL: <http://lists.busybox.net/pipermail/buildroot/attachments/20170814/030ad7e2/attachment.html> ^ permalink raw reply [flat|nested] 9+ messages in thread
* [Buildroot] [PATCH/2017.02.x 2/2] dbus: add upstream patch to fix startup hang with with expat >= 2.2.1 2017-08-14 8:40 ` Sébastien Szymanski @ 2017-08-14 15:43 ` Yann E. MORIN 0 siblings, 0 replies; 9+ messages in thread From: Yann E. MORIN @ 2017-08-14 15:43 UTC (permalink / raw) To: buildroot S?bastien, All, On 2017-08-14 10:40 +0200, S?bastien Szymanski spake thusly: > On 13 Aug 2017, at 14:56, Yann E. MORIN < [1]yann.morin.1998@free.fr> wrote: > On 2017-08-10 15:47 +0200, S?bastien Szymanski spake thusly: > After c0ad6ded018ffbc33f7f5 expat: security bump to version 2.2.1 > the system can hang on startup under certain circumstances. [--SNIP--] > In the meantime. expat 2.2.3 has been released, which contrains (amongst > other interesting stuff) commit 55839b633 (xmlparse.c: Read /dev/urandom > if non-blocking getrandom failed), which ought to fix the boot delay. [--SNIP--] > expat is still at version 2.2.2 on the master branch. I was suggesting that expat be bumped on master, yes. > I guess a patch needs to be first on the master branch before it can be > backported on a LTS branch, isn?t it? Ah, this is for the stable branches. Then, it is OK to just add this patch for DBus, yes. > Or did I miss something? Yup, I did... ;-) Regards, Yann E. MORIN. -- .-----------------.--------------------.------------------.--------------------. | Yann E. MORIN | Real-Time Embedded | /"\ ASCII RIBBON | Erics' conspiracy: | | +33 662 376 056 | Software Designer | \ / CAMPAIGN | ___ | | +33 223 225 172 `------------.-------: X AGAINST | \e/ There is no | | http://ymorin.is-a-geek.org/ | _/*\_ | / \ HTML MAIL | v conspiracy. | '------------------------------^-------^------------------^--------------------' ^ permalink raw reply [flat|nested] 9+ messages in thread
* [Buildroot] [PATCH/2017.02.x 1/2] dbus: bump version to 1.10.22 2017-08-10 13:47 [Buildroot] [PATCH/2017.02.x 1/2] dbus: bump version to 1.10.22 Sébastien Szymanski 2017-08-10 13:47 ` [Buildroot] [PATCH/2017.02.x 2/2] dbus: add upstream patch to fix startup hang with with expat >= 2.2.1 Sébastien Szymanski @ 2017-08-14 20:44 ` Thomas Petazzoni 2017-08-15 19:01 ` Sébastien Szymanski 1 sibling, 1 reply; 9+ messages in thread From: Thomas Petazzoni @ 2017-08-14 20:44 UTC (permalink / raw) To: buildroot Hello, On Thu, 10 Aug 2017 15:47:02 +0200, S?bastien Szymanski wrote: > From: Adam Duskett <Aduskett@gmail.com> > > Signed-off-by: Adam Duskett <aduskett@gmail.com> > Signed-off-by: Arnout Vandecappelle (Essensium/Mind) <arnout@mind.be> > > (cherry picked from commit 29f0bd345bde90fcf0060c33623ade34fa9c288c) > Change site to https to avoid a redirection. > > Signed-off-by: S?bastien Szymanski <sebastien.szymanski@armadeus.com> What is the justification for bumping dbus in the 2017.02.x maintenance branch ? This seems like an invasive change. If it's just to avoid the delay issue with expat 2.2.1, why not backport the dbus patch on 1.10.16 ? Best regards, Thomas -- Thomas Petazzoni, CTO, Free Electrons Embedded Linux and Kernel engineering http://free-electrons.com ^ permalink raw reply [flat|nested] 9+ messages in thread
* [Buildroot] [PATCH/2017.02.x 1/2] dbus: bump version to 1.10.22 2017-08-14 20:44 ` [Buildroot] [PATCH/2017.02.x 1/2] dbus: bump version to 1.10.22 Thomas Petazzoni @ 2017-08-15 19:01 ` Sébastien Szymanski 2017-08-15 19:45 ` Thomas Petazzoni 0 siblings, 1 reply; 9+ messages in thread From: Sébastien Szymanski @ 2017-08-15 19:01 UTC (permalink / raw) To: buildroot Hello, > On 14 Aug 2017, at 22:44, Thomas Petazzoni <thomas.petazzoni@free-electrons.com> wrote: > > Hello, > > On Thu, 10 Aug 2017 15:47:02 +0200, S?bastien Szymanski wrote: >> From: Adam Duskett <Aduskett@gmail.com> >> >> Signed-off-by: Adam Duskett <aduskett@gmail.com> >> Signed-off-by: Arnout Vandecappelle (Essensium/Mind) <arnout@mind.be> >> >> (cherry picked from commit 29f0bd345bde90fcf0060c33623ade34fa9c288c) >> Change site to https to avoid a redirection. >> >> Signed-off-by: S?bastien Szymanski <sebastien.szymanski@armadeus.com> > > What is the justification for bumping dbus in the 2017.02.x maintenance > branch ? This seems like an invasive change. > > If it's just to avoid the delay issue with expat 2.2.1, why not > backport the dbus patch on 1.10.16 ? No particular reason, I just thought it would be easier to backport the dbus patch on the version 1.10.22 as it is applied on this version on the master branch, rather than backporting it on dbus version 1.10.16. Best regards, > > Best regards, > > Thomas > -- > Thomas Petazzoni, CTO, Free Electrons > Embedded Linux and Kernel engineering > http://free-electrons.com ^ permalink raw reply [flat|nested] 9+ messages in thread
* [Buildroot] [PATCH/2017.02.x 1/2] dbus: bump version to 1.10.22 2017-08-15 19:01 ` Sébastien Szymanski @ 2017-08-15 19:45 ` Thomas Petazzoni 2017-08-21 21:36 ` Thomas Petazzoni 0 siblings, 1 reply; 9+ messages in thread From: Thomas Petazzoni @ 2017-08-15 19:45 UTC (permalink / raw) To: buildroot Hello, On Tue, 15 Aug 2017 21:01:51 +0200, S?bastien Szymanski wrote: > No particular reason, I just thought it would be easier to backport > the dbus patch on the version 1.10.22 as it is applied on this > version on the master branch, rather than backporting it on dbus > version 1.10.16. To change things in a LTS branch such as 2017.02.x, we need a much more solid reason than just "no particular reason". So I think we need a backport of the dbus patch working around the expat related issues on top of 1.10.16, instead of bumping dbus to 1.10.22. Best regards, Thomas -- Thomas Petazzoni, CTO, Free Electrons Embedded Linux and Kernel engineering http://free-electrons.com ^ permalink raw reply [flat|nested] 9+ messages in thread
* [Buildroot] [PATCH/2017.02.x 1/2] dbus: bump version to 1.10.22 2017-08-15 19:45 ` Thomas Petazzoni @ 2017-08-21 21:36 ` Thomas Petazzoni 0 siblings, 0 replies; 9+ messages in thread From: Thomas Petazzoni @ 2017-08-21 21:36 UTC (permalink / raw) To: buildroot Hello, On Tue, 15 Aug 2017 21:45:37 +0200, Thomas Petazzoni wrote: > On Tue, 15 Aug 2017 21:01:51 +0200, S?bastien Szymanski wrote: > > > No particular reason, I just thought it would be easier to backport > > the dbus patch on the version 1.10.22 as it is applied on this > > version on the master branch, rather than backporting it on dbus > > version 1.10.16. > > To change things in a LTS branch such as 2017.02.x, we need a much more > solid reason than just "no particular reason". > > So I think we need a backport of the dbus patch working around the > expat related issues on top of 1.10.16, instead of bumping dbus to > 1.10.22. Following this discussion, I have marked your two patches as Changes Requested in patchwork. Please respin an updated version that takes into account the comment if you want such patches to be merged. Thanks a lot! Thomas -- Thomas Petazzoni, CTO, Free Electrons Embedded Linux and Kernel engineering http://free-electrons.com ^ permalink raw reply [flat|nested] 9+ messages in thread
end of thread, other threads:[~2017-08-21 21:36 UTC | newest] Thread overview: 9+ messages (download: mbox.gz follow: Atom feed -- links below jump to the message on this page -- 2017-08-10 13:47 [Buildroot] [PATCH/2017.02.x 1/2] dbus: bump version to 1.10.22 Sébastien Szymanski 2017-08-10 13:47 ` [Buildroot] [PATCH/2017.02.x 2/2] dbus: add upstream patch to fix startup hang with with expat >= 2.2.1 Sébastien Szymanski 2017-08-13 12:56 ` Yann E. MORIN 2017-08-14 8:40 ` Sébastien Szymanski 2017-08-14 15:43 ` Yann E. MORIN 2017-08-14 20:44 ` [Buildroot] [PATCH/2017.02.x 1/2] dbus: bump version to 1.10.22 Thomas Petazzoni 2017-08-15 19:01 ` Sébastien Szymanski 2017-08-15 19:45 ` Thomas Petazzoni 2017-08-21 21:36 ` Thomas Petazzoni
This is a public inbox, see mirroring instructions for how to clone and mirror all data and code used for this inbox