dlt-daemon: update to new release 2.18.6

- drop patches 241 245 275: upstream

Signed-off-by: Gianfranco Costamagna <costamagnagianfranco@yahoo.it>
Signed-off-by: Gianfranco Costamagna <locutusofborg@debian.org>
Signed-off-by: Khem Raj <raj.khem@gmail.com>
Stable version, bug fix only]
(cherry picked from commit 8c17cac68473f98e663f05bc08b7505c0529e495)
[ Stable version, bug fix only
Fixup for Dunfell context]
Signed-off-by: Scott Murray <scott.murray@konsulko.com>
Signed-off-by: Armin Kuster <akuster808@gmail.com>

4 files changed, 1 insertions, 146 deletions

diff --git a/meta-oe/recipes-extended/dlt-daemon/dlt-daemon/241.patch b/meta-oe/recipes-extended/dlt-daemon/dlt-daemon/241.patch
deleted file mode 100644
index 7d8f22ec7..000000000
--- a/meta-oe/recipes-extended/dlt-daemon/dlt-daemon/241.patch
+++ /dev/null
@@ -1,30 +0,0 @@
-From b8f9919f000e642fc8970d0a42c1bdadf5a9d720 Mon Sep 17 00:00:00 2001
-From: Gianfranco Costamagna <costamagnagianfranco@yahoo.it>
-Date: Mon, 10 Aug 2020 08:30:34 +0200
-Subject: [PATCH] sd-daemon.c: Fix build with newer glibc and musl libc
-
-Reported by Khem Raj on meta-oe list
-
-TOPDIR/build/tmp/work/armv7vet2hf-neon-yoe-linux-musleabi/dlt-daemon/2.18.5-r0/recipe-sysroot/usr/include/sys/fcntl.h:1:2: error: redirecting incorrect #include <sys/fcntl.h> to <fcntl.h> [-Werror,-W#warnings]
- ^
-1 error generated.
-
-Signed-off-by: Gianfranco Costamagna <costamagnagianfranco@yahoo.it>
-Signed-off-by: Gianfranco Costamagna <locutusofborg@debian.org>
----
- systemd/3rdparty/sd-daemon.c | 2 +-
- 1 file changed, 1 insertion(+), 1 deletion(-)
-
-diff --git a/systemd/3rdparty/sd-daemon.c b/systemd/3rdparty/sd-daemon.c
-index 88936d2..de3f985 100644
---- a/systemd/3rdparty/sd-daemon.c
-+++ b/systemd/3rdparty/sd-daemon.c
-@@ -35,7 +35,7 @@
- #ifdef __BIONIC__
- #include <linux/fcntl.h>
- #else
--#include <sys/fcntl.h>
-+#include <fcntl.h>
- #endif
- #include <netinet/in.h>
- #include <stdlib.h>
diff --git a/meta-oe/recipes-extended/dlt-daemon/dlt-daemon/245.patch b/meta-oe/recipes-extended/dlt-daemon/dlt-daemon/245.patch
deleted file mode 100644
index 43057489c..000000000
--- a/meta-oe/recipes-extended/dlt-daemon/dlt-daemon/245.patch
+++ /dev/null
@@ -1,74 +0,0 @@
-From 57fd61ea5c58a4f9fcd7140b53ac6cd6e971ef47 Mon Sep 17 00:00:00 2001
-From: Gianfranco Costamagna <costamagnagianfranco@yahoo.it>
-Date: Fri, 31 Jul 2020 15:16:02 +0200
-Subject: [PATCH] dlt_offline: fix build failures with gcc-10
-
-see bug report: https://bugs.debian.org/cgi-bin/bugreport.cgi?bug=957140
-
-/usr/bin/ld: CMakeFiles/dlt-daemon.dir/dlt_daemon_client.c.o:./obj-x86_64-linux-gnu/src/daemon/./src/offlinelogstorage/dlt_offline_logstorage.h:116: multiple definition of `g_logstorage_cache_max'; CMakeFiles/dlt-daemon.dir/dlt-daemon.c.o:./obj-x86_64-linux-gnu/src/daemon/./src/offlinelogstorage/dlt_offline_logstorage.h:116: first defined here
-/usr/bin/ld: CMakeFiles/dlt-daemon.dir/dlt_daemon_common.c.o:./obj-x86_64-linux-gnu/src/daemon/./src/offlinelogstorage/dlt_offline_logstorage.h:118: multiple definition of `g_logstorage_cache_size'; CMakeFiles/dlt-daemon.dir/dlt-daemon.c.o:./obj-x86_64-linux-gnu/src/daemon/./src/offlinelogstorage/dlt_offline_logstorage.h:118: first defined here
-/usr/bin/ld: CMakeFiles/dlt-daemon.dir/dlt_daemon_common.c.o:./obj-x86_64-linux-gnu/src/daemon/./src/offlinelogstorage/dlt_offline_logstorage.h:116: multiple definition of `g_logstorage_cache_max'; CMakeFiles/dlt-daemon.dir/dlt-daemon.c.o:./obj-x86_64-linux-gnu/src/daemon/./src/offlinelogstorage/dlt_offline_logstorage.h:116: first defined here
-/usr/bin/ld: CMakeFiles/dlt-daemon.dir/dlt_daemon_connection.c.o:./obj-x86_64-linux-gnu/src/daemon/./src/offlinelogstorage/dlt_offline_logstorage.h:118: multiple definition of `g_logstorage_cache_size'; CMakeFiles/dlt-daemon.dir/dlt-daemon.c.o:./obj-x86_64-linux-gnu/src/daemon/./src/offlinelogstorage/dlt_offline_logstorage.h:118: first defined here
-/usr/bin/ld: CMakeFiles/dlt-daemon.dir/dlt_daemon_connection.c.o:./obj-x86_64-linux-gnu/src/daemon/./src/offlinelogstorage/dlt_offline_logstorage.h:116: multiple definition of `g_logstorage_cache_max'; CMakeFiles/dlt-daemon.dir/dlt-daemon.c.o:./obj-x86_64-linux-gnu/src/daemon/./src/offlinelogstorage/dlt_offline_logstorage.h:116: first defined here
-/usr/bin/ld: CMakeFiles/dlt-daemon.dir/dlt_daemon_event_handler.c.o:./obj-x86_64-linux-gnu/src/daemon/./src/offlinelogstorage/dlt_offline_logstorage.h:118: multiple definition of `g_logstorage_cache_size'; CMakeFiles/dlt-daemon.dir/dlt-daemon.c.o:./obj-x86_64-linux-gnu/src/daemon/./src/offlinelogstorage/dlt_offline_logstorage.h:118: first defined here
-/usr/bin/ld: CMakeFiles/dlt-daemon.dir/dlt_daemon_event_handler.c.o:./obj-x86_64-linux-gnu/src/daemon/./src/offlinelogstorage/dlt_offline_logstorage.h:116: multiple definition of `g_logstorage_cache_max'; CMakeFiles/dlt-daemon.dir/dlt-daemon.c.o:./obj-x86_64-linux-gnu/src/daemon/./src/offlinelogstorage/dlt_offline_logstorage.h:116: first defined here
-/usr/bin/ld: CMakeFiles/dlt-daemon.dir/dlt_daemon_offline_logstorage.c.o:./obj-x86_64-linux-gnu/src/daemon/./src/offlinelogstorage/dlt_offline_logstorage.h:116: multiple definition of `g_logstorage_cache_max'; CMakeFiles/dlt-daemon.dir/dlt-daemon.c.o:./obj-x86_64-linux-gnu/src/daemon/./src/offlinelogstorage/dlt_offline_logstorage.h:116: first defined here
----
- src/daemon/dlt_daemon_offline_logstorage.c              | 1 +
- src/offlinelogstorage/dlt_offline_logstorage.h          | 4 ++--
- src/offlinelogstorage/dlt_offline_logstorage_behavior.c | 1 +
- tests/gtest_dlt_daemon_offline_log.cpp                  | 1 +
- 4 files changed, 5 insertions(+), 2 deletions(-)
-
-diff --git a/src/daemon/dlt_daemon_offline_logstorage.c b/src/daemon/dlt_daemon_offline_logstorage.c
-index 0b3c14f..db9637e 100644
---- a/src/daemon/dlt_daemon_offline_logstorage.c
-+++ b/src/daemon/dlt_daemon_offline_logstorage.c
-@@ -56,6 +56,7 @@ DLT_STATIC DltReturnValue dlt_logstorage_split_ecuid(char *key,
-     return DLT_RETURN_OK;
- }
- 
-+unsigned int g_logstorage_cache_max;
- /**
-  * dlt_logstorage_split_ctid
-  *
-diff --git a/src/offlinelogstorage/dlt_offline_logstorage.h b/src/offlinelogstorage/dlt_offline_logstorage.h
-index b58da70..c9bc93b 100644
---- a/src/offlinelogstorage/dlt_offline_logstorage.h
-+++ b/src/offlinelogstorage/dlt_offline_logstorage.h
-@@ -114,9 +114,9 @@
- #define DLT_OFFLINE_LOGSTORAGE_IS_STRATEGY_SET(S, s) ((S)&(s))
- 
- /* logstorage max cache */
--unsigned int g_logstorage_cache_max;
-+extern unsigned int g_logstorage_cache_max;
- /* current logstorage cache size */
--unsigned int g_logstorage_cache_size;
-+extern unsigned int g_logstorage_cache_size;
- 
- typedef struct
- {
-diff --git a/src/offlinelogstorage/dlt_offline_logstorage_behavior.c b/src/offlinelogstorage/dlt_offline_logstorage_behavior.c
-index afbf8c4..edef482 100644
---- a/src/offlinelogstorage/dlt_offline_logstorage_behavior.c
-+++ b/src/offlinelogstorage/dlt_offline_logstorage_behavior.c
-@@ -32,6 +32,7 @@
- #include "dlt_offline_logstorage_behavior.h"
- #include "dlt_offline_logstorage_behavior_internal.h"
- 
-+unsigned int g_logstorage_cache_size;
- /**
-  * dlt_logstorage_log_file_name
-  *
-diff --git a/tests/gtest_dlt_daemon_offline_log.cpp b/tests/gtest_dlt_daemon_offline_log.cpp
-index b8965de..0bd4d5e 100644
---- a/tests/gtest_dlt_daemon_offline_log.cpp
-+++ b/tests/gtest_dlt_daemon_offline_log.cpp
-@@ -29,6 +29,7 @@ extern "C"
- #include <fcntl.h>
- }
- 
-+unsigned int g_logstorage_cache_max;
- /* Begin Method: dlt_logstorage::t_dlt_logstorage_list_add*/
- TEST(t_dlt_logstorage_list_add, normal)
- {
diff --git a/meta-oe/recipes-extended/dlt-daemon/dlt-daemon/275.patch b/meta-oe/recipes-extended/dlt-daemon/dlt-daemon/275.patch
deleted file mode 100644
index 75065eb05..000000000
--- a/meta-oe/recipes-extended/dlt-daemon/dlt-daemon/275.patch
+++ /dev/null
@@ -1,38 +0,0 @@
-Upstream-status: Backport
-CVE: CVE-2020-29394
-From 7f5cd5404a03fa330e192084f6bdafb2dc9bdcb7 Mon Sep 17 00:00:00 2001
-From: GwanYeong Kim <gy741.kim@gmail.com>
-Date: Sat, 28 Nov 2020 12:24:46 +0900
-Subject: [PATCH] dlt_common: Fix buffer overflow in dlt_filter_load
-
-A buffer overflow in the dlt_filter_load function in dlt_common.c in dlt-daemon allows arbitrary code execution via an unsafe usage of fscanf, because it does not limit the number of characters to be read in a format argument.
-
-Fixed: #274
-
-Signed-off-by: GwanYeong Kim <gy741.kim@gmail.com>
----
- src/shared/dlt_common.c | 4 ++--
- 1 file changed, 2 insertions(+), 2 deletions(-)
-
-diff --git a/src/shared/dlt_common.c b/src/shared/dlt_common.c
-index 254f4ce4..d15b1cec 100644
---- a/src/shared/dlt_common.c
-+++ b/src/shared/dlt_common.c
-@@ -404,7 +404,7 @@ DltReturnValue dlt_filter_load(DltFilter *filter, const char *filename, int verb
-     while (!feof(handle)) {
-         str1[0] = 0;
- 
--        if (fscanf(handle, "%s", str1) != 1)
-+        if (fscanf(handle, "%254s", str1) != 1)
-             break;
- 
-         if (str1[0] == 0)
-@@ -419,7 +419,7 @@ DltReturnValue dlt_filter_load(DltFilter *filter, const char *filename, int verb
- 
-         str1[0] = 0;
- 
--        if (fscanf(handle, "%s", str1) != 1)
-+        if (fscanf(handle, "%254s", str1) != 1)
-             break;
- 
-         if (str1[0] == 0)
diff --git a/meta-oe/recipes-extended/dlt-daemon/dlt-daemon_2.18.5.bb b/meta-oe/recipes-extended/dlt-daemon/dlt-daemon_2.18.6.bb
index c0b1750e0..b7a6cdaa2 100644
--- a/meta-oe/recipes-extended/dlt-daemon/dlt-daemon_2.18.5.bb
+++ b/meta-oe/recipes-extended/dlt-daemon/dlt-daemon_2.18.6.bb
@@ -17,11 +17,8 @@ DEPENDS = "zlib gzip-native"
 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://275.patch \
-    file://241.patch \
-    file://245.patch \
 "
-SRCREV = "f1ac087c766827b1d0ed9c3a814b3cc052e948f2"
+SRCREV = "22715aeceaa81ace2c832312529bde3a42d0814f"
 
 S = "${WORKDIR}/git"