From: Gianfranco <costamagna.gianfra...@gmail.com>
- add an upstream proposed patch 317.patch to fix a build failure with enabled
systemd binding
Signed-off-by: Gianfranco Costamagna <costamagnagianfra...@yahoo.it>
Signed-off-by: Gianfranco Costamagna <locutusofb...@debian.org>
Signed-off-by: Khem Raj <raj.k...@gmail.com>
(cherry picked from commit 01fa60898c2fe65f327bea2f84aaca00aef3f371)
[Stable version, bug fix only]
Signed-off-by: Scott Murray <scott.mur...@konsulko.com>
Signed-off-by: Armin Kuster <akuster...@gmail.com>
---
.../dlt-daemon/dlt-daemon/317.patch | 43 +++++++++++++++++++
...-daemon_2.18.6.bb => dlt-daemon_2.18.7.bb} | 7 +--
2 files changed, 47 insertions(+), 3 deletions(-)
create mode 100644 meta-oe/recipes-extended/dlt-daemon/dlt-daemon/317.patch
rename meta-oe/recipes-extended/dlt-daemon/{dlt-daemon_2.18.6.bb =>
dlt-daemon_2.18.7.bb} (93%)
diff --git a/meta-oe/recipes-extended/dlt-daemon/dlt-daemon/317.patch
b/meta-oe/recipes-extended/dlt-daemon/dlt-daemon/317.patch
new file mode 100644
index 0000000000..fe40334b65
--- /dev/null
+++ b/meta-oe/recipes-extended/dlt-daemon/dlt-daemon/317.patch
@@ -0,0 +1,43 @@
+Origin: https://github.com/GENIVI/dlt-daemon/pull/317
+From 55d31216823841a1547fe261cdf8e3b1002d5f94 Mon Sep 17 00:00:00 2001
+From: Gianfranco Costamagna <costamagnagianfra...@yahoo.it>
+Date: Thu, 1 Jul 2021 12:58:20 +0200
+Subject: [PATCH] dlt-control-common.c: Fix build failure due to out-of-bound
+ write -Werror=stringop-truncation
+
+cd /build/dlt-daemon-2.18.7/obj-x86_64-linux-gnu/src/console/logstorage &&
/usr/bin/cc -DCONFIGURATION_FILES_DIR=\"/etc\" -DDLT_DAEMON_USE_FIFO_IPC
-DDLT_LIB_USE_FIFO_IPC -DDLT_NETWORK_TRACE_ENABLE -DDLT_SYSTEMD_ENABLE
-DDLT_SYSTEMD_JOURNAL_ENABLE -DDLT_UNIT_TESTS -DDLT_USER_IPC_PATH=\"/tmp\"
-DDLT_USE_IPv6 -DEXTENDED_FILTERING -D_GNU_SOURCE -I/build/dlt-daemon-2.18.7
-I/build/dlt-daemon-2.18.7/obj-x86_64-linux-gnu/include/dlt
-I/build/dlt-daemon-2.18.7/include/dlt -I/build/dlt-daemon-2.18.7/src/shared
-I/build/dlt-daemon-2.18.7/src/core_dump_handler
-I/build/dlt-daemon-2.18.7/src/offlinelogstorage
-I/build/dlt-daemon-2.18.7/src/lib -I/build/dlt-daemon-2.18.7/src/daemon
-I/build/dlt-daemon-2.18.7/src/console -I/build/dlt-daemon-2.18.7/src/gateway
-I/build/dlt-daemon-2.18.7/systemd/3rdparty -g -O2
-ffile-prefix-map=/build/dlt-daemon-2.18.7=. -fstack-protector-strong -Wformat
-Werror=format-security -Wdate-time -D_FORTIFY_SOURCE=2 -Werror -std=gnu99
-Wall -Wextra -Wno-variadic-macros -Wno-strict-aliasing -o
CMakeFiles/dlt-logstorage-ctrl.dir/__/dlt-control-common.c.o -c
/build/dlt-daemon-2.18.7/src/console/dlt-control-common.c
+make[3]: Leaving directory '/build/dlt-daemon-2.18.7/obj-x86_64-linux-gnu'
+In file included from /usr/include/string.h:495,
+ from
/build/dlt-daemon-2.18.7/src/console/dlt-control-common.c:56:
+In function 'strncpy',
+ inlined from 'dlt_json_filter_load' at
/build/dlt-daemon-2.18.7/src/console/dlt-control-common.c:716:13:
+/usr/include/x86_64-linux-gnu/bits/string_fortified.h:106:10: error:
'__builtin_strncpy' specified bound 4 equals destination size
[-Werror=stringop-truncation]
+ 106 | return __builtin___strncpy_chk (__dest, __src, __len, __bos
(__dest));
+ | ^~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~
+In function 'strncpy',
+ inlined from 'dlt_json_filter_load' at
/build/dlt-daemon-2.18.7/src/console/dlt-control-common.c:721:13:
+/usr/include/x86_64-linux-gnu/bits/string_fortified.h:106:10: error:
'__builtin_strncpy' specified bound 4 equals destination size
[-Werror=stringop-truncation]
+ 106 | return __builtin___strncpy_chk (__dest, __src, __len, __bos
(__dest));
+ | ^~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~
+
+Signed-off-by: Gianfranco Costamagna <costamagnagianfra...@yahoo.it>
+Signed-off-by: Gianfranco Costamagna <locutusofb...@debian.org>
+---
+ src/console/dlt-control-common.c | 4 ++--
+ 1 file changed, 2 insertions(+), 2 deletions(-)
+
+diff --git a/src/console/dlt-control-common.c
b/src/console/dlt-control-common.c
+index 8a9d29f0..f58d8268 100644
+--- a/src/console/dlt-control-common.c
++++ b/src/console/dlt-control-common.c
+@@ -671,8 +671,8 @@ DltReturnValue dlt_json_filter_load(DltFilter *filter,
const char *filename, int
+ struct json_object *j_payload_max;
+ enum json_tokener_error jerr;
+
+- char app_id[DLT_ID_SIZE] = "";
+- char context_id[DLT_ID_SIZE] = "";
++ char app_id[DLT_ID_SIZE + 1] = "";
++ char context_id[DLT_ID_SIZE + 1] = "";
+ int32_t log_level = 0;
+ int32_t payload_max = INT32_MAX;
+ int32_t payload_min = 0;
diff --git a/meta-oe/recipes-extended/dlt-daemon/dlt-daemon_2.18.6.bb
b/meta-oe/recipes-extended/dlt-daemon/dlt-daemon_2.18.7.bb
similarity index 93%
rename from meta-oe/recipes-extended/dlt-daemon/dlt-daemon_2.18.6.bb
rename to meta-oe/recipes-extended/dlt-daemon/dlt-daemon_2.18.7.bb
index b7a6cdaa29..842652889c 100644
--- a/meta-oe/recipes-extended/dlt-daemon/dlt-daemon_2.18.6.bb
+++ b/meta-oe/recipes-extended/dlt-daemon/dlt-daemon_2.18.7.bb
@@ -12,13 +12,14 @@ SECTION = "console/utils"
LICENSE = "MPLv2"
LIC_FILES_CHKSUM = "file://LICENSE;md5=8184208060df880fe3137b93eb88aeea"
-DEPENDS = "zlib gzip-native"
+DEPENDS = "zlib gzip-native json-c"
SRC_URI = "git://github.com/GENIVI/${BPN}.git;protocol=https \
file://0002-Don-t-execute-processes-as-a-specific-user.patch \
file://0004-Modify-systemd-config-directory.patch \
+ file://317.patch \
"
-SRCREV = "22715aeceaa81ace2c832312529bde3a42d0814f"
+SRCREV = "24d197214bfdcec7430d31b42e5c87df27287aaf"
S = "${WORKDIR}/git"
@@ -40,7 +41,7 @@ PACKAGECONFIG[dlt-console] =
"-DWITH_DLT_CONSOLE=ON,-DWITH_DLT_CONSOLE=OFF,,dlt-
inherit autotools gettext cmake systemd
-EXTRA_OECMAKE += "-DSYSTEMD_UNITDIR=${systemd_system_unitdir}"
+EXTRA_OECMAKE += "-DWITH_EXTENDED_FILTERING=ON
-DSYSTEMD_UNITDIR=${systemd_system_unitdir}"
PACKAGES += "${PN}-systemd"
SYSTEMD_PACKAGES = "${PN} ${PN}-systemd"
--
2.25.1
-=-=-=-=-=-=-=-=-=-=-=-
Links: You receive all messages sent to this group.
View/Reply Online (#92858):
https://lists.openembedded.org/g/openembedded-devel/message/92858
Mute This Topic: https://lists.openembedded.org/mt/85398112/21656
Group Owner: openembedded-devel+ow...@lists.openembedded.org
Unsubscribe: https://lists.openembedded.org/g/openembedded-devel/unsub
[arch...@mail-archive.com]
-=-=-=-=-=-=-=-=-=-=-=-
