mirror of
https://github.com/openembedded/meta-openembedded.git
synced 2026-06-04 14:39:54 +00:00
dlt-daemon: upgrade 2.18.7 -> 2.18.8
317.patch removed since it is included in 2.18.8 Changelog: ========= lib: Fix wrong type alert from lgtm gtest_dlt_daemon_gateway: fix gtest build failed lib: generate dlt library internal log file tests: add stdlib to dlt_cpp_extension dlt_user: Make dlt_init thread safe remove clang-tidy analyzer warnings: incompatible pointer type debian: improve debian build package dlt-control-common: shutdown and close socket dlt_common: improve function description gtest: Bring-in changes gtest: Rework WORKING_DIRECTORY gtest: Correct data amount in gtest_dlt_common cmake: Set empty to systemd_SRCS gtest: Refactor tests/CMakeLists.txt lib: Add SOCK_CLOEXEC to socket daemon: Create parent directory for unix socket cmake: Correct added subdirectories console: Add cmake options for control and timestamp tests: Adapt to DLT_DISABLE_MACRO header: Adapt to DLT_DISABLE_MACRO include: Refactor CMakeLists.txt gtest: Change script name to gtest_dlt_daemon_offline_log.sh daemon: Enable to use FIFO on QNX tests: Add new test case with given buffer tests: Enable macro disabling lib: Add new interfaces with given buffer Implemention of tests for the dlt-qnx-system module lib: Add MaxFileSize handling client: pthread_join for deinit doc: update initial log level document dlt-system: Fix memory leak in dlt-system config dlt_common: remove duplicate stdbool header dlt-control: Add option to config port system: use signalfd for dlt-system console: provides args option to enable send/receive serial header fix malformed printf format strings (#295) cmake: Set WITH_LEGACY_INCLUDE_PATH to ON as default (#334) Make the legacy include path a CMake option (#332) daemon: Call dlt_daemon_configuration_load() properly (#330) dlt_user: Use pthread_setname_np() if available (#326) libdlt: Add legacy include path in exported CMake config file (#327) lib: Set TYLE to 1 for BOOL type (#320) file-transfer: Abort file transfer if get serial number failed dlt_user.c: fixing casting wrong type dlt-sortbytimestamp: Remove duplicated conditional statements code dlt-convert: Remove duplicated conditional statements code doc: Minor fix in dlt_for_developers.md (#321) dlt-control-common.c: Fix build failure due to out-of-bound write -Werror=stringop-truncation Extend include path in *.pc file (#319) Signed-off-by: Wang Mingyu <wangmy@fujitsu.com> Signed-off-by: Khem Raj <raj.khem@gmail.com>
This commit is contained in:
@@ -1,43 +0,0 @@
|
||||
Origin: https://github.com/GENIVI/dlt-daemon/pull/317
|
||||
From 55d31216823841a1547fe261cdf8e3b1002d5f94 Mon Sep 17 00:00:00 2001
|
||||
From: Gianfranco Costamagna <costamagnagianfranco@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 <costamagnagianfranco@yahoo.it>
|
||||
Signed-off-by: Gianfranco Costamagna <locutusofborg@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;
|
||||
+5
-6
@@ -15,11 +15,10 @@ LIC_FILES_CHKSUM = "file://LICENSE;md5=8184208060df880fe3137b93eb88aeea"
|
||||
DEPENDS = "zlib gzip-native json-c"
|
||||
|
||||
SRC_URI = "git://github.com/GENIVI/${BPN}.git;protocol=https;branch=master \
|
||||
file://0002-Don-t-execute-processes-as-a-specific-user.patch \
|
||||
file://0004-Modify-systemd-config-directory.patch \
|
||||
file://317.patch \
|
||||
"
|
||||
SRCREV = "24d197214bfdcec7430d31b42e5c87df27287aaf"
|
||||
file://0002-Don-t-execute-processes-as-a-specific-user.patch \
|
||||
file://0004-Modify-systemd-config-directory.patch \
|
||||
"
|
||||
SRCREV = "1438fcf8c88cd47b20b2984180a8457c3eb9193d"
|
||||
|
||||
S = "${WORKDIR}/git"
|
||||
|
||||
@@ -31,7 +30,7 @@ PACKAGECONFIG ?= "${@bb.utils.contains('DISTRO_FEATURES', 'systemd', ' systemd s
|
||||
PACKAGECONFIG[dlt-examples] = "-DWITH_DLT_EXAMPLES=ON,-DWITH_DLT_EXAMPLES=OFF,,dlt-daemon-systemd"
|
||||
|
||||
# Linux options
|
||||
PACKAGECONFIG[systemd] = "-DWITH_SYSTEMD=ON,-DWITH_SYSTEMD=OFF,systemd"
|
||||
PACKAGECONFIG[systemd] = "-DWITH_SYSTEMD=ON,-DWITH_SYSTEMD=OFF -DWITH_DLT_SYSTEM=OFF,systemd"
|
||||
PACKAGECONFIG[systemd-watchdog] = "-DWITH_SYSTEMD_WATCHDOG=ON,-DWITH_SYSTEMD_WATCHDOG=OFF,systemd,libsystemd"
|
||||
PACKAGECONFIG[systemd-journal] = "-DWITH_SYSTEMD_JOURNAL=ON,-DWITH_SYSTEMD_JOURNAL=OFF,systemd,libsystemd"
|
||||
PACKAGECONFIG[dlt-dbus] = "-DWITH_DLT_DBUS=ON,-DWITH_DLT_DBUS=OFF,dbus,dbus-lib"
|
||||
Reference in New Issue
Block a user