diff options
author | Brad Bishop <bradleyb@fuzziesquirrel.com> | 2019-10-29 16:48:15 +0300 |
---|---|---|
committer | Brad Bishop <bradleyb@fuzziesquirrel.com> | 2019-10-29 16:48:21 +0300 |
commit | 93c3acf56fcecefef579497263e98c15b6b0e34a (patch) | |
tree | b2b86526293298bb30af7587d17d62405832b930 /meta-openembedded/meta-oe | |
parent | b350a87270ee007fb1da2c564c050184abd5ba1e (diff) | |
download | openbmc-93c3acf56fcecefef579497263e98c15b6b0e34a.tar.xz |
meta-openembedded: subtree update:18506b797b..c986cbed93
Adrian Bunk (7):
gpsd: Backport a memory leak fix
gpsd: Stop depending on chrpath-native
klibc: Upgrade 2.0.6 -> 2.0.7
gerbera: Upgrade 1.3.0 -> 1.3.2
gstd: Fix the version number
webrtc-audio-processing: Upgrade 0.3 -> 0.3.1
vlc: Upgrade 3.0.6 -> 3.0.8
Andreas Müller (15):
itstool: rework native shebang and add class to make native itstool work
yelp-tools: use itstools.bbclass
yelp-xsl: use itstool.bbclass
yelp: use itstool.bbclass
gnome-help.bbclass: Handle gnome-help files with new distro feature 'helpfiles'
zenity: rework recipe
dconf: extend to native build for upcoming gdm
dconf-editor: upgrade 3.32.0 -> 3.34.0
gtksourceview4: upgrade 4.2.0 -> 4.4.0
gnome-menus3: upgrade 3.10.1 -> 3.32.0
gnome-desktop3: upgrade 3.34.0 -> 3.34.1
gnome-bluetooth: upgrade 3.32.1 -> 3.34.0
gspell: upgrade 1.8.1 -> 1.8.2
gnome-system-monitor: upgrade 3.32.0 -> 3.32.1
network-manager-applet: upgrade 1.8.22 -> 1.8.23 / build with meson / cleanup
Luca Boccassi (4):
dbus-broker: 19 -> 21
dbus-broker: backport patches from master
dbus-broker: build with SELinux if it's enabled via DISTRO_FEATURES
dbus-broker: add patch to fix build with musl libc
Trevor Gamblin (1):
rsyslog: upgrade from v8.1908.0 to v8.1910.0
Zang Ruochen (4):
python-bitarray: upgrade 0.8.3 -> 1.0.1
python-can: upgrade 2.2.1 -> 3.3.2
python-daemonize: upgrade 2.4.7 -> 2.5.0
xmlsec1: upgrade 1.2.28 -> 1.2.29
Zheng Ruoqin (2):
keepalived: upgrade 2.0.16 -> 2.0.19
postfix: upgrade 3.4.5 -> 3.4.7
Change-Id: Ibff272f163bb42473022825cfb17a284a0019e83
Signed-off-by: Brad Bishop <bradleyb@fuzziesquirrel.com>
Diffstat (limited to 'meta-openembedded/meta-oe')
16 files changed, 372 insertions, 107 deletions
diff --git a/meta-openembedded/meta-oe/classes/itstool.bbclass b/meta-openembedded/meta-oe/classes/itstool.bbclass new file mode 100644 index 000000000..45e3fb839 --- /dev/null +++ b/meta-openembedded/meta-oe/classes/itstool.bbclass @@ -0,0 +1,5 @@ +# helper class to prepare correct environment for native itstool + +inherit python3native + +DEPENDS_append = " itstool-native" diff --git a/meta-openembedded/meta-oe/recipes-core/dbus/dbus-broker/0001-launch-improve-error-handling-for-opendir.patch b/meta-openembedded/meta-oe/recipes-core/dbus/dbus-broker/0001-launch-improve-error-handling-for-opendir.patch new file mode 100644 index 000000000..ccc175bb8 --- /dev/null +++ b/meta-openembedded/meta-oe/recipes-core/dbus/dbus-broker/0001-launch-improve-error-handling-for-opendir.patch @@ -0,0 +1,48 @@ +From f42d5e38859c65a186acd0da94bbeeca12faf7a2 Mon Sep 17 00:00:00 2001 +From: David Rheinsberg <david.rheinsberg@gmail.com> +Date: Thu, 2 May 2019 17:33:34 +0200 +Subject: [PATCH] launch: improve error handling for opendir() + +This improves the error-handling of opendir() by always printing +diagnostics. Furthermore, it aligns the behavior with dbus-deamon and +ignores EACCES. + +Signed-off-by: David Rheinsberg <david.rheinsberg@gmail.com> +Upstream-Status: dbus-broker@f42d5e38859c65a186acd0da94bbeeca12faf7a2 +--- + src/launch/launcher.c | 17 +++++++++++++++-- + 1 file changed, 15 insertions(+), 2 deletions(-) + +diff --git a/src/launch/launcher.c b/src/launch/launcher.c +index 31a5364..2ec4bda 100644 +--- a/src/launch/launcher.c ++++ b/src/launch/launcher.c +@@ -749,10 +749,23 @@ static int launcher_load_service_dir(Launcher *launcher, const char *dirpath, NS + + dir = opendir(dirpath); + if (!dir) { +- if (errno == ENOENT || errno == ENOTDIR) ++ if (errno == ENOENT || errno == ENOTDIR) { + return 0; +- else ++ } else if (errno == EACCES) { ++ log_append_here(&launcher->log, LOG_ERR, 0, NULL); ++ r = log_commitf(&launcher->log, "Access denied to service directory '%s'\n", dirpath); ++ if (r) ++ return error_fold(r); ++ ++ return 0; ++ } else { ++ log_append_here(&launcher->log, LOG_ERR, errno, NULL); ++ r = log_commitf(&launcher->log, "Unable to open service directory '%s': %m\n", dirpath); ++ if (r) ++ return error_fold(r); ++ + return error_origin(-errno); ++ } + } + + r = dirwatch_add(launcher->dirwatch, dirpath); +-- +2.20.1 + diff --git a/meta-openembedded/meta-oe/recipes-core/dbus/dbus-broker/0002-metrics-change-the-constant-used-for-invalid-timesta.patch b/meta-openembedded/meta-oe/recipes-core/dbus/dbus-broker/0002-metrics-change-the-constant-used-for-invalid-timesta.patch new file mode 100644 index 000000000..67a2dc46f --- /dev/null +++ b/meta-openembedded/meta-oe/recipes-core/dbus/dbus-broker/0002-metrics-change-the-constant-used-for-invalid-timesta.patch @@ -0,0 +1,86 @@ +From 3570b3e9ba367f10718b56336ce32d5254f66575 Mon Sep 17 00:00:00 2001 +From: Tom Gundersen <teg@jklm.no> +Date: Thu, 9 May 2019 13:00:37 +0200 +Subject: [PATCH] metrics: change the constant used for invalid timestamps + +Use (uint64_t)-1 rather than 0 to indicate an invalid timestamp. It +should not be possible for the kernel to return 0 from +clock_gettime(), but we have received some reports of our asserts +triggering, so avoid the issue entirely by using -1 instead (which +really can never be returned). + +See https://retrace.fedoraproject.org/faf/reports/2539484/ + +Signed-off-by: Tom Gundersen <teg@jklm.no> +Upstream-Status: dbus-broker@3570b3e9ba367f10718b56336ce32d5254f66575 +--- + src/util/metrics.c | 8 ++++---- + src/util/metrics.h | 9 ++++++--- + 2 files changed, 10 insertions(+), 7 deletions(-) + +diff --git a/src/util/metrics.c b/src/util/metrics.c +index b5a7182..eef94eb 100644 +--- a/src/util/metrics.c ++++ b/src/util/metrics.c +@@ -26,7 +26,7 @@ void metrics_init(Metrics *metrics, clockid_t id) { + } + + void metrics_deinit(Metrics *metrics) { +- c_assert(!metrics->timestamp); ++ c_assert(metrics->timestamp == METRICS_TIMESTAMP_INVALID); + metrics_init(metrics, metrics->id); + } + +@@ -82,7 +82,7 @@ void metrics_sample_add(Metrics *metrics, uint64_t timestamp) { + * a sample is not currently running. + */ + void metrics_sample_start(Metrics *metrics) { +- c_assert(!metrics->timestamp); ++ c_assert(metrics->timestamp == METRICS_TIMESTAMP_INVALID); + metrics->timestamp = metrics_get_time(metrics); + } + +@@ -93,11 +93,11 @@ void metrics_sample_start(Metrics *metrics) { + * End a currently running sample, and update the internal state. + */ + void metrics_sample_end(Metrics *metrics) { +- c_assert(metrics->timestamp); ++ c_assert(metrics->timestamp != METRICS_TIMESTAMP_INVALID); + + metrics_sample_add(metrics, metrics->timestamp); + +- metrics->timestamp = 0; ++ metrics->timestamp = METRICS_TIMESTAMP_INVALID; + } + + /** +diff --git a/src/util/metrics.h b/src/util/metrics.h +index a8ee915..b00dee6 100644 +--- a/src/util/metrics.h ++++ b/src/util/metrics.h +@@ -8,6 +8,8 @@ + #include <stdlib.h> + #include <time.h> + ++#define METRICS_TIMESTAMP_INVALID ((uint64_t) -1) ++ + typedef struct Metrics Metrics; + + struct Metrics { +@@ -23,9 +25,10 @@ struct Metrics { + uint64_t sum_of_squares; + }; + +-#define METRICS_INIT(_id) { \ +- .minimum = (uint64_t) -1, \ +- .id = (_id), \ ++#define METRICS_INIT(_id) { \ ++ .minimum = (uint64_t) -1, \ ++ .id = (_id), \ ++ .timestamp = METRICS_TIMESTAMP_INVALID, \ + } + + void metrics_init(Metrics *metrics, clockid_t id); +-- +2.21.0 + diff --git a/meta-openembedded/meta-oe/recipes-core/dbus/dbus-broker/0003-dbus-socket-treat-MSG_CTRUNC-gracefully.patch b/meta-openembedded/meta-oe/recipes-core/dbus/dbus-broker/0003-dbus-socket-treat-MSG_CTRUNC-gracefully.patch new file mode 100644 index 000000000..53f9e71aa --- /dev/null +++ b/meta-openembedded/meta-oe/recipes-core/dbus/dbus-broker/0003-dbus-socket-treat-MSG_CTRUNC-gracefully.patch @@ -0,0 +1,83 @@ +From 520c47c53deeb893e03194fefaf3c5b9223ede27 Mon Sep 17 00:00:00 2001 +From: David Rheinsberg <david.rheinsberg@gmail.com> +Date: Fri, 10 May 2019 10:58:06 +0200 +Subject: [PATCH] dbus/socket: treat MSG_CTRUNC gracefully + +As it turns out, LSMs allow clients to trigger a MSG_CTRUNC on the +remote side of a unix socket. Whenever LSMs reject the transmission of +an FD, they will simply drop the FD and set MSG_CTRUNC, without any +other error notification. + +Therefore, we must assume any occurance of MSG_CTRUNC is trigger by a +client. This makes it impossible to consider MSG_CTRUNC for any other +error handling, and as such we are left to disconnecting the client and +ignoring the flag. + +Luckily, MSG_CTRUNC is expected for any other event, so we only used it +for diagnostics so far. + +Signed-off-by: David Rheinsberg <david.rheinsberg@gmail.com> +Upstream-Status: dbus-broker@520c47c53deeb893e03194fefaf3c5b9223ede27 +--- + src/dbus/socket.c | 44 +++++++++++++++++++++++++++++++++----------- + 1 file changed, 33 insertions(+), 11 deletions(-) + +diff --git a/src/dbus/socket.c b/src/dbus/socket.c +index cacdff2..6e6ba10 100644 +--- a/src/dbus/socket.c ++++ b/src/dbus/socket.c +@@ -593,18 +593,40 @@ static int socket_recvmsg(Socket *socket, + + if (msg.msg_flags & MSG_CTRUNC) { + /* +- * This flag means the control-buffer was too small to retrieve +- * all data. If this can be triggered remotely, it means a peer +- * can cause us to miss FDs. Hence, we really must protect +- * against this. +- * We do provide suitably sized buffers to be prepared for any +- * possible scenario. So if this happens, something is fishy +- * and we better report it. +- * Note that this is also reported by the kernel if we exceeded +- * our NOFILE limit. Since this implies resource +- * misconfiguration as well, we treat it the same way. ++ * Our control-buffer-size is carefully calculated to be big ++ * enough for any possible ancillary data we expect. Therefore, ++ * the kernel should never be required to truncate it, and thus ++ * MSG_CTRUNC will never be set. This is also foward compatible ++ * to future extensions to the ancillary data, since these must ++ * be enabled explicitly before the kernel considers forwarding ++ * them. ++ * ++ * Unfortunately, the SCM_RIGHTS implementation might set this ++ * flag as well. In particular, if not all FDs can be returned ++ * to user-space, MSG_CTRUNC will be set (signalling that the ++ * FD-set is non-complete). No other error is returned or ++ * signalled, though. There are several reasons why the FD ++ * transmission can fail. Most importantly, if we exhaust our ++ * FD limit, further FDs will simply be discarded. We are ++ * protected against this by our accounting-quotas, but we ++ * would still like to catch this condition and warn loudly. ++ * However, FDs are also dropped if the security layer refused ++ * the transmission of the FD in question. This means, if an ++ * LSM refuses the D-Bus client to send us an FD, the FD is ++ * just dropped and MSG_CTRUNC will be set. This can be ++ * triggered by clients. ++ * ++ * To summarize: In an ideal world, we would expect this flag ++ * to never be set, and we would just use ++ * `error_origin(-ENOTRECOVERABLE)` to provide diagnostics. ++ * Unfortunately, the gross misuse of this flag for LSM ++ * security enforcements means we have to assume any occurence ++ * of MSG_CTRUNC means the client was refused to send a ++ * specific message. Our only possible way to deal with this is ++ * to disconnect the client. + */ +- r = error_origin(-ENOTRECOVERABLE); ++ socket_close(socket); ++ r = SOCKET_E_LOST_INTEREST; + goto error; + } + +-- +2.21.0 + diff --git a/meta-openembedded/meta-oe/recipes-core/dbus/dbus-broker/0004-launcher-fix-build-with-musl-libc.patch b/meta-openembedded/meta-oe/recipes-core/dbus/dbus-broker/0004-launcher-fix-build-with-musl-libc.patch new file mode 100644 index 000000000..0348d9722 --- /dev/null +++ b/meta-openembedded/meta-oe/recipes-core/dbus/dbus-broker/0004-launcher-fix-build-with-musl-libc.patch @@ -0,0 +1,38 @@ +From fc1d26dd08c48c04fc9883b36a94c219aba2091c Mon Sep 17 00:00:00 2001 +From: Luca Boccassi <luca.boccassi@microsoft.com> +Date: Mon, 28 Oct 2019 14:31:38 +0000 +Subject: [PATCH] launcher: fix build with musl libc +MIME-Version: 1.0 +Content-Type: text/plain; charset=UTF-8 +Content-Transfer-Encoding: 8bit + +../src/launch/launcher.c: In function ‘launcher_fork’: +../src/launch/launcher.c:378:60: error: ‘WEXITED’ undeclared (first use in this function); did you mean ‘WIFEXITED’? + r = sd_event_add_child(launcher->event, NULL, pid, WEXITED, launcher_on_child_exit, launcher); + ^~~~~~~ + WIFEXITED + +Include sys/wait.h which defines it. + +Signed-off-by: Luca Boccassi <luca.boccassi@microsoft.com> +Suggested-by: Khem Raj <raj.khem@gmail.com> +Upstream-Status: pending https://github.com/bus1/dbus-broker/pull/214 +--- + src/launch/launcher.c | 1 + + 1 file changed, 1 insertion(+) + +diff --git a/src/launch/launcher.c b/src/launch/launcher.c +index 2ec4bda..1f38fcf 100644 +--- a/src/launch/launcher.c ++++ b/src/launch/launcher.c +@@ -10,6 +10,7 @@ + #include <stdlib.h> + #include <sys/prctl.h> + #include <sys/un.h> ++#include <sys/wait.h> + #include <systemd/sd-bus.h> + #include <systemd/sd-daemon.h> + #include <systemd/sd-event.h> +-- +2.20.1 + diff --git a/meta-openembedded/meta-oe/recipes-core/dbus/dbus-broker_19.bb b/meta-openembedded/meta-oe/recipes-core/dbus/dbus-broker_19.bb deleted file mode 100644 index 82d8b8ba6..000000000 --- a/meta-openembedded/meta-oe/recipes-core/dbus/dbus-broker_19.bb +++ /dev/null @@ -1,21 +0,0 @@ -SUMMARY = "dbus broker" -DESCRIPTION = "Drop-in replacement for dbus-daemon." - -SECTION = "base" - -LICENSE = "Apache-2.0" -LIC_FILES_CHKSUM = "file://LICENSE;md5=7b486c2338d225a1405d979ed2c15ce8" - -SRC_URI = "https://github.com/bus1/dbus-broker/releases/download/v${PV}/dbus-broker-${PV}.tar.xz" -SRC_URI[sha256sum] = "1648227f5a347d4f38d8a29bb9295a73a25c3feb4f3e79e3f04cc847343da3ed" - -inherit meson pkgconfig systemd distro_features_check - -DEPENDS = "expat systemd" - -REQUIRED_DISTRO_FEATURES = "systemd" - -SYSTEMD_SERVICE_${PN} = "${BPN}.service" - -FILES_${PN} += "${systemd_system_unitdir}" -FILES_${PN} += "${systemd_user_unitdir}" diff --git a/meta-openembedded/meta-oe/recipes-core/dbus/dbus-broker_21.bb b/meta-openembedded/meta-oe/recipes-core/dbus/dbus-broker_21.bb new file mode 100644 index 000000000..d2d051070 --- /dev/null +++ b/meta-openembedded/meta-oe/recipes-core/dbus/dbus-broker_21.bb @@ -0,0 +1,30 @@ +SUMMARY = "dbus broker" +DESCRIPTION = "Drop-in replacement for dbus-daemon." + +SECTION = "base" + +LICENSE = "Apache-2.0" +LIC_FILES_CHKSUM = "file://LICENSE;md5=7b486c2338d225a1405d979ed2c15ce8" + +SRC_URI = "https://github.com/bus1/dbus-broker/releases/download/v${PV}/dbus-broker-${PV}.tar.xz" +SRC_URI += " file://0001-launch-improve-error-handling-for-opendir.patch" +SRC_URI += " file://0002-metrics-change-the-constant-used-for-invalid-timesta.patch" +SRC_URI += " file://0003-dbus-socket-treat-MSG_CTRUNC-gracefully.patch" +SRC_URI += " file://0004-launcher-fix-build-with-musl-libc.patch" +SRC_URI[md5sum] = "a17886a92ab1e0bc2e4b1a274339e388" +SRC_URI[sha256sum] = "6fff9a831a514659e2c7d704e76867ce31ebcf43e8d7a62e080c6656f64cd39e" + +inherit meson pkgconfig systemd distro_features_check + +DEPENDS = "expat systemd" +DEPENDS += " ${@bb.utils.contains('DISTRO_FEATURES', 'selinux', 'libselinux', '', d)}" + +REQUIRED_DISTRO_FEATURES = "systemd" + +SYSTEMD_SERVICE_${PN} = "${BPN}.service" + +FILES_${PN} += "${systemd_system_unitdir}" +FILES_${PN} += "${systemd_user_unitdir}" +FILES_${PN} += "${libdir}/systemd/catalog" + +EXTRA_OEMESON += " -Dselinux=${@bb.utils.contains('DISTRO_FEATURES', 'selinux', 'true', 'false', d)}" diff --git a/meta-openembedded/meta-oe/recipes-extended/rsyslog/rsyslog/0001-Out-of-bounds-issue.patch b/meta-openembedded/meta-oe/recipes-extended/rsyslog/rsyslog/0001-Out-of-bounds-issue.patch deleted file mode 100644 index b494ca687..000000000 --- a/meta-openembedded/meta-oe/recipes-extended/rsyslog/rsyslog/0001-Out-of-bounds-issue.patch +++ /dev/null @@ -1,31 +0,0 @@ -From b0894088b680666035a3418326e13bc99d4fed49 Mon Sep 17 00:00:00 2001 -From: Philippe Duveau <pduveau@users.noreply.github.com> -Date: Tue, 24 Sep 2019 20:45:25 +0200 -Subject: [PATCH] Out of bounds issue - -Add a new sanity check after determining the level len. ---- - contrib/pmdb2diag/pmdb2diag.c | 4 ++++ - 1 file changed, 4 insertions(+) - -Upstream-Status: Backport [https://github.com/rsyslog/rsyslog/commit/b0894088b6] -CVE: CVE-2019-17040 -Signed-off-by: Trevor Gamblin <trevor.gamblin@windriver.com> -diff --git a/contrib/pmdb2diag/pmdb2diag.c b/contrib/pmdb2diag/pmdb2diag.c -index 2b5916301..5810eb4df 100644 ---- a/contrib/pmdb2diag/pmdb2diag.c -+++ b/contrib/pmdb2diag/pmdb2diag.c -@@ -134,6 +134,10 @@ CODESTARTparse2 - ABORT_FINALIZE(0); - } - -+ /* let recheck with the real level len */ -+ if(pMsg->iLenRawMsg - (int)pMsg->offAfterPRI < pInst->levelpos+lvl_len) -+ ABORT_FINALIZE(RS_RET_COULD_NOT_PARSE); -+ - DBGPRINTF("db2parse Level %d\n", pMsg->iSeverity); - - end = (char*)pMsg->pszRawMsg + pMsg->iLenRawMsg ; --- -2.17.1 - diff --git a/meta-openembedded/meta-oe/recipes-extended/rsyslog/rsyslog/0001-pmaixforwardedfrom-bugfix-potential-misadressing.patch b/meta-openembedded/meta-oe/recipes-extended/rsyslog/rsyslog/0001-pmaixforwardedfrom-bugfix-potential-misadressing.patch deleted file mode 100644 index 0b32766a5..000000000 --- a/meta-openembedded/meta-oe/recipes-extended/rsyslog/rsyslog/0001-pmaixforwardedfrom-bugfix-potential-misadressing.patch +++ /dev/null @@ -1,43 +0,0 @@ -From 10549ba915556c557b22b3dac7e4cb73ad22d3d8 Mon Sep 17 00:00:00 2001 -From: Rainer Gerhards <rgerhards@adiscon.com> -Date: Fri, 27 Sep 2019 13:36:02 +0200 -Subject: [PATCH] pmaixforwardedfrom bugfix: potential misadressing - ---- - contrib/pmaixforwardedfrom/pmaixforwardedfrom.c | 9 +++++++++ - 1 file changed, 9 insertions(+) - -Upstream-Status: Backport [https://github.com/rsyslog/rsyslog/pull/3884] -CVE: CVE-2019-17041 -Signed-off-by: Trevor Gamblin <trevor.gamblin@windriver.com> - -diff --git a/contrib/pmaixforwardedfrom/pmaixforwardedfrom.c b/contrib/pmaixforwardedfrom/pmaixforwardedfrom.c -index 37157c7d4..ebf12ebbe 100644 ---- a/contrib/pmaixforwardedfrom/pmaixforwardedfrom.c -+++ b/contrib/pmaixforwardedfrom/pmaixforwardedfrom.c -@@ -109,6 +109,10 @@ CODESTARTparse - /* bump the message portion up by skipLen(23 or 5) characters to overwrite the "Message forwarded from - " or "From " with the hostname */ - lenMsg -=skipLen; -+ if(lenMsg < 2) { -+ dbgprintf("not a AIX message forwarded from message has nothing after header\n"); -+ ABORT_FINALIZE(RS_RET_COULD_NOT_PARSE); -+ } - memmove(p2parse, p2parse + skipLen, lenMsg); - *(p2parse + lenMsg) = '\n'; - *(p2parse + lenMsg + 1) = '\0'; -@@ -120,6 +124,11 @@ really an AIX log, but has a similar preamble */ - --lenMsg; - ++p2parse; - } -+ if (lenMsg < 1) { -+ dbgprintf("not a AIX message forwarded from message has nothing after colon " -+ "or no colon at all\n"); -+ ABORT_FINALIZE(RS_RET_COULD_NOT_PARSE); -+ } - if (lenMsg && *p2parse != ':') { - DBGPRINTF("not a AIX message forwarded from mangled log but similar enough that the preamble has " - "been removed\n"); --- -2.17.1 - diff --git a/meta-openembedded/meta-oe/recipes-extended/rsyslog/rsyslog_8.1908.0.bb b/meta-openembedded/meta-oe/recipes-extended/rsyslog/rsyslog_8.1910.0.bb index f9e44421d..f50f9a34b 100644 --- a/meta-openembedded/meta-oe/recipes-extended/rsyslog/rsyslog_8.1908.0.bb +++ b/meta-openembedded/meta-oe/recipes-extended/rsyslog/rsyslog_8.1910.0.bb @@ -23,16 +23,14 @@ SRC_URI = "http://www.rsyslog.com/download/files/download/rsyslog/${BPN}-${PV}.t file://rsyslog.logrotate \ file://use-pkgconfig-to-check-libgcrypt.patch \ file://run-ptest \ - file://0001-Out-of-bounds-issue.patch \ - file://0001-pmaixforwardedfrom-bugfix-potential-misadressing.patch \ " SRC_URI_append_libc-musl = " \ file://0001-Include-sys-time-h.patch \ " -SRC_URI[md5sum] = "6e9aa4ef4cad8ae49affa0a786cc9e2f" -SRC_URI[sha256sum] = "f8c8e53b651e03a011667c60bd2d4dba7a7cb6ec04b247c8ea8514115527863b" +SRC_URI[md5sum] = "6d4d94359d083f449f089b8dbb93c423" +SRC_URI[sha256sum] = "0219ee692f31a39743acb62aaf4196b644ce94edf386df4605fd6a11a4fe0c93" UPSTREAM_CHECK_URI = "https://github.com/rsyslog/rsyslog/releases" UPSTREAM_CHECK_REGEX = "(?P<pver>\d+(\.\d+)+)" diff --git a/meta-openembedded/meta-oe/recipes-navigation/gpsd/gpsd/0001-gps_shm_close-Free-privdata.patch b/meta-openembedded/meta-oe/recipes-navigation/gpsd/gpsd/0001-gps_shm_close-Free-privdata.patch new file mode 100644 index 000000000..9b3801580 --- /dev/null +++ b/meta-openembedded/meta-oe/recipes-navigation/gpsd/gpsd/0001-gps_shm_close-Free-privdata.patch @@ -0,0 +1,37 @@ +From 2a4b3bcde0d73a3a4a6644d5f944ac9d16023ba9 Mon Sep 17 00:00:00 2001 +From: Adrian Bunk <bunk@stusta.de> +Date: Mon, 21 Oct 2019 13:53:25 +0300 +Subject: gps_shm_close: Free privdata + +Previously every open/close cycle leaked privdata. + +Signed-off-by: Adrian Bunk <bunk@stusta.de> +Signed-off-by: Gary E. Miller <gem@rellim.com> + +Upstream-Status: Backport +--- + libgps_shm.c | 8 ++++++-- + 1 file changed, 6 insertions(+), 2 deletions(-) + +diff --git a/libgps_shm.c b/libgps_shm.c +index d93972bba..12bb3760b 100644 +--- a/libgps_shm.c ++++ b/libgps_shm.c +@@ -163,8 +163,12 @@ int gps_shm_read(struct gps_data_t *gpsdata) + + void gps_shm_close(struct gps_data_t *gpsdata) + { +- if (PRIVATE(gpsdata) && PRIVATE(gpsdata)->shmseg != NULL) +- (void)shmdt((const void *)PRIVATE(gpsdata)->shmseg); ++ if (PRIVATE(gpsdata)) { ++ if (PRIVATE(gpsdata)->shmseg != NULL) ++ (void)shmdt((const void *)PRIVATE(gpsdata)->shmseg); ++ free(PRIVATE(gpsdata)); ++ gpsdata->privdata = NULL; ++ } + } + + int gps_shm_mainloop(struct gps_data_t *gpsdata, int timeout, +-- +2.20.1 + diff --git a/meta-openembedded/meta-oe/recipes-navigation/gpsd/gpsd_3.19.bb b/meta-openembedded/meta-oe/recipes-navigation/gpsd/gpsd_3.19.bb index a28d59dce..6834bd45a 100644 --- a/meta-openembedded/meta-oe/recipes-navigation/gpsd/gpsd_3.19.bb +++ b/meta-openembedded/meta-oe/recipes-navigation/gpsd/gpsd_3.19.bb @@ -2,13 +2,12 @@ SUMMARY = "A TCP/IP Daemon simplifying the communication with GPS devices" SECTION = "console/network" LICENSE = "BSD-2-Clause" LIC_FILES_CHKSUM = "file://COPYING;md5=01764c35ae34d9521944bb6ab312af53" -DEPENDS = "dbus ncurses python python3 libusb1 chrpath-replacement-native pps-tools" +DEPENDS = "dbus ncurses python python3 libusb1 pps-tools" PROVIDES = "virtual/gpsd" -EXTRANATIVEPATH += "chrpath-native" - SRC_URI = "${SAVANNAH_GNU_MIRROR}/${BPN}/${BP}.tar.gz \ file://0001-SConstruct-prefix-includepy-with-sysroot-and-drop-sy.patch \ + file://0001-gps_shm_close-Free-privdata.patch \ " SRC_URI[md5sum] = "b3bf88706794eb8e5f2c2543bf7ba87b" SRC_URI[sha256sum] = "27dd24d45b2ac69baab7933da2bf6ae5fb0be90130f67e753c110a3477155f39" @@ -32,7 +31,6 @@ EXTRA_OESCONS = " \ libQgpsmm='false' \ debug='false' \ nostrip='true' \ - chrpath='yes' \ systemd='${SYSTEMD_OESCONS}' \ libdir='${libdir}' \ manbuild='false' \ diff --git a/meta-openembedded/meta-oe/recipes-support/itstool/itstool/0001-Native-Don-t-use-build-time-hardcoded-python-binary-.patch b/meta-openembedded/meta-oe/recipes-support/itstool/itstool/0001-Native-Don-t-use-build-time-hardcoded-python-binary-.patch new file mode 100644 index 000000000..19a858bd7 --- /dev/null +++ b/meta-openembedded/meta-oe/recipes-support/itstool/itstool/0001-Native-Don-t-use-build-time-hardcoded-python-binary-.patch @@ -0,0 +1,35 @@ +From 335ef14fc801c9dfbe7e5692dc71cfbe72049d2b Mon Sep 17 00:00:00 2001 +From: =?UTF-8?q?Andreas=20M=C3=BCller?= <schnitzeltony@gmail.com> +Date: Sun, 27 Oct 2019 16:38:52 +0100 +Subject: [PATCH] Native: Don't use build time hardcoded python binary path. +MIME-Version: 1.0 +Content-Type: text/plain; charset=UTF-8 +Content-Transfer-Encoding: 8bit + +This is same patch as used for target build except that we do not use the +'-S' and '-s' option because '-S' is relatively young [1] and elder build-host +don't support it [2] + +[1] https://github.com/coreutils/coreutils/commit/668306ed86c8c79b0af0db8b9c882654ebb66db2#diff-83d9d52b1f12ac589739ab1334ae4f30 +[2] https://errors.yoctoproject.org/Errors/Details/274743/ + +Upstream-Status: Inappropriate [OE specific] + +Signed-off-by: Andreas Müller <schnitzeltony@gmail.com> +--- + itstool.in | 2 +- + 1 file changed, 1 insertion(+), 1 deletion(-) + +diff --git a/itstool.in b/itstool.in +index e64cd34..05d264f 100755 +--- a/itstool.in ++++ b/itstool.in +@@ -1,4 +1,4 @@ +-#!@PYTHON@ -s ++#!/usr/bin/env python3 + # + # Copyright (c) 2010-2018 Shaun McCance <shaunm@gnome.org> + # +-- +2.21.0 + diff --git a/meta-openembedded/meta-oe/recipes-support/itstool/itstool/0001-Don-t-use-build-time-hardcoded-python-binary-path.patch b/meta-openembedded/meta-oe/recipes-support/itstool/itstool/0002-Don-t-use-build-time-hardcoded-python-binary-path.patch index b91105330..b91105330 100644 --- a/meta-openembedded/meta-oe/recipes-support/itstool/itstool/0001-Don-t-use-build-time-hardcoded-python-binary-path.patch +++ b/meta-openembedded/meta-oe/recipes-support/itstool/itstool/0002-Don-t-use-build-time-hardcoded-python-binary-path.patch diff --git a/meta-openembedded/meta-oe/recipes-support/itstool/itstool_2.0.6.bb b/meta-openembedded/meta-oe/recipes-support/itstool/itstool_2.0.6.bb index b4b37aa01..8290c5e58 100644 --- a/meta-openembedded/meta-oe/recipes-support/itstool/itstool_2.0.6.bb +++ b/meta-openembedded/meta-oe/recipes-support/itstool/itstool_2.0.6.bb @@ -7,8 +7,10 @@ inherit autotools python3native DEPENDS = "libxml2-native" -SRC_URI = "http://files.itstool.org/${BPN}/${BPN}-${PV}.tar.bz2 \ - file://0001-Don-t-use-build-time-hardcoded-python-binary-path.patch" +SRC_URI = "http://files.itstool.org/${BPN}/${BPN}-${PV}.tar.bz2" +SRC_URI_append_class-native = " file://0001-Native-Don-t-use-build-time-hardcoded-python-binary-.patch" +SRC_URI_append_class-target = " file://0002-Don-t-use-build-time-hardcoded-python-binary-path.patch" + SRC_URI[md5sum] = "4306eeba4f4aee6b393d14f9c3c57ca1" SRC_URI[sha256sum] = "6233cc22726a9a5a83664bf67d1af79549a298c23185d926c3677afa917b92a9" diff --git a/meta-openembedded/meta-oe/recipes-support/xmlsec1/xmlsec1_1.2.28.bb b/meta-openembedded/meta-oe/recipes-support/xmlsec1/xmlsec1_1.2.29.bb index 0a4c56aa0..40c585ee1 100644 --- a/meta-openembedded/meta-oe/recipes-support/xmlsec1/xmlsec1_1.2.28.bb +++ b/meta-openembedded/meta-oe/recipes-support/xmlsec1/xmlsec1_1.2.29.bb @@ -20,8 +20,8 @@ SRC_URI = "http://www.aleksey.com/xmlsec/download/${BP}.tar.gz \ file://run-ptest \ " -SRC_URI[md5sum] = "69b8d95c009a404462e19f335e650241" -SRC_URI[sha256sum] = "13eec4811ea30e3f0e16a734d1dbf7f9d246a71d540b48d143a07b489f6222d4" +SRC_URI[md5sum] = "4755621ff2a7150e208de6bd7decca10" +SRC_URI[sha256sum] = "b1d1deba966019930f608d1f2b95c40ca3450f1393bcd3a3c001a8ba1d2839ab" inherit autotools-brokensep ptest pkgconfig |