meta-openembedded: subtree update:4599fea881..fd123c9bb2

Adrian (1):
      networkmanager: add missing readline depends

Adrian Freihofer (2):
      nftables: upgrade 0.9.7 -> 0.9.8
      firewalld: upgrade 0.9.2 -> 0.9.3

Adrian Herrera (2):
      cppunit: add support for native version
      protobuf: apply fix for pkg-config pthread flags

Alejandro Enedino Hernandez Samaniego (2):
      remmina: Update to 1.4.10
      imapfilter: Upgrade 2.6.16 -> 2.7.5

Anatol Belski (1):
      xmlsec1: Fix configure QA error caused by host lookup path

Andreas Müller (24):
      libunique: remove
      xfce4-screenshooter: replace gtk+ -> gtk+3 in DEPENDS
      libxfce4ui: Fix sporadic install error
      poppler: upgrade 20.12.1 -> 21.01.0
      dconf: upgrade 0.36.0 -> 0.38.0
      dconf-editor: upgrade 3.36.2 -> 3.38.2
      amtk: upgrade 5.1.1 -> 5.2.0
      evince: upgrade 3.36.7 -> 3.38.0
      catfish: upgrade 1.4.13 -> 4.16.0
      xfwm4: upgrade 4.16.0 -> 4.16.1
      parole: upgrade 1.0.5 -> 4.16.0
      garcon: upgrade 0.8.0 -> 4.16.1
      xfce4-whiskermenu-plugin: upgrade 2.5.1 -> 2.5.2
      thunar: upgrade 4.16.0 -> 4.16.2
      jack: upgrade 1.19.16 -> 1.19.17
      networkmanager: upgrade 1.22.14 -> 1.28.0
      appstream-glib: upgrade 0.7.17 -> 0.7.18
      vlc: upgrade 3.0.11.1 -> 3.0.12
      python3-mypy-extensions: Initial add 0.4.3
      python3-mypy: initial add 0.800
      python3-send2trash_ initial add 1.5.0
      python3-asttokens: initial add 2.0.4
      python3-typed-ast: Initial add 1.4.1
      packagegroup-meta-python: Add asttokens/mypy/mypy-extensions/typed-ast/send2trash

Andrew Jeffery (2):
      meta-python: Add hexdump package
      meta-python: Add jstyleson

Armin Kuster (3):
      wireshark: Several securtiy fixes
      ipset: add recipe
      lua: update to 5.3.6

Clément Péron (2):
      re2: Add recipe for Google RE2 library
      abseil-cpp: bump to LTS 2020_09_23 Patch Release 3

Daniel Gomez (2):
      zbar: Add support for mchehab/zbar
      zbar: Remove support for 0.10 version

Diego Santa Cruz (1):
      net-snmp: control smux via PACKAGECONFIG

Gianfranco (2):
      vboxguestdrivers: upgrade 6.1.16 -> 6.1.18
      vboxguestdrivers: Add patch proposed upstream to fix a build failure on i386

Gianfranco Costamagna (1):
      dlt-daemon: update to new release 2.18.6

Harpritkaur Bhandari (1):
      rapidjson: Upgrade SRCREV to latest

He Zhe (2):
      lmbench: Fix webpage-lm and manual page typos
      lmbench: lat_fifo: Fix cleanup sequence

Junjie Mao (1):
      python3-xmlschema: Yocto recipes for validating against XSD 1.1

Kai Kang (4):
      xfce4-panel-profiles: fix do install failure with dash
      xfce4-panel-profiles: update remove-bashisms.patch for centos 7
      blueman: refresh patch
      mariadb: add package config zstd

Khem Raj (6):
      influxdb: Fix build on mips
      packagegroup-meta-oe: Add new package influxdb
      packagegroup-meta-networking: Add ipset
      packagegroup-meta-oe: Add re2
      autoconf-2.13-native,xserver-xorg-cvt-native: Move inheriting native to the end
      dfu-util-native: Adjust Inherit order

Leon Anavi (75):
      python3-aiohttp: Upgrade 3.7.2 -> 3.7.3
      python3-coloredlogs: Upgrade 14.0 -> 15.0
      python3-jsonrpcserver: Upgrade 4.1.3 -> 4.2.0
      python3-pymisp: Upgrade 2.4.133 -> 2.4.135.3
      python3-parso: Upgrade 0.8.0 -> 0.8.1
      python3-pillow: Upgrade 7.2.0 -> 8.1.0
      python3-croniter: Upgrade 0.3.37 -> 1.0.1
      python3-pychromecast: Upgrade 7.7.1 -> 7.7.2
      python3-hyperlink: Upgrade 20.0.1 -> 21.0.0
      python3-dnspython: Upgrade 2.0.0 -> 2.1.0
      python3-prompt-toolkit: Upgrade 3.0.9 -> 3.0.10
      python3-ptyprocess: Upgrade 0.6.0 -> 0.7.0
      python3-certifi: Upgrade 2020.11.8 -> 2020.12.5
      python3-jedi: Upgrade 0.17.2 -> 0.18.0
      python3-mock: Upgrade 4.0.2 -> 4.0.3
      python3-pyscaffold: Upgrade 3.2.3 -> 3.3
      python3-cffi: Upgrade 1.14.3 -> 1.14.4
      python3-rsa: Upgrade 4.6 -> 4.7
      python3-pyjwt: Upgrade 1.7.1 -> 2.0.0
      python3-isort: Upgrade 5.6.4 -> 5.7.0
      python3-lz4: Upgrade 3.1.0 -> 3.1.1
      python3-msgpack: Upgrade 1.0.0 -> 1.0.2
      python3-pyopenssl: Upgrade 19.1.0 -> 20.0.1
      python3-ecdsa: Upgrade 0.16.0 -> 0.16.1
      python3-regex: Upgrade 2020.10.28 -> 2020.11.13
      python3-cryptography: Upgrade 3.2 -> 3.3.1
      python3-cryptography-vectors: Upgrade 3.2 -> 3.3.1
      python3-wheel: Upgrade 0.35.1 -> 0.36.2
      python3-pyzmq: Upgrade 19.0.2 -> 20.0.0
      python3-greenlet: Upgrade 0.4.17 -> 1.0.0
      python3-parse: Upgrade 1.18.0 -> 1.19.0
      python3-colorlog: Upgrade 4.6.2 -> 4.7.2
      python3-pyephem: Upgrade 3.7.7.0 -> 3.7.7.1
      python3-pyperf: Upgrade 2.0.0 -> 2.1.0
      python3-cheetah: Upgrade 3.2.5 -> 3.2.6
      python3-pyscaffold: Upgrade 3.3 -> 3.3.1
      python3-lxml: Upgrade 4.6.1 -> 4.6.2
      python3-openpyxl: Upgrade 3.0.5 -> 3.0.6
      python3-pymysql: Upgrade 0.10.1 -> 1.0.2
      python3-dbus-next: Upgrade 0.1.4 -> 0.2.2
      python3-yappi: Upgrade 1.3.0 -> 1.3.2
      python3-pyyaml: Upgrade 5.3.1 -> 5.4
      python3-google-api-python-client: Upgrade 1.12.5 -> 1.12.8
      python3-evdev: Upgrade 1.3.0 -> 1.4.0
      python3-pyusb: Upgrade 1.1.0 -> 1.1.1
      python3-pyserial: Upgrade 3.4 -> 3.5
      python3-pandas: Upgrade 1.2.0 -> 1.2.1
      python3-alembic: Upgrade 1.4.3 -> 1.5.1
      python3-coverage: Upgrade 5.3 -> 5.3.1
      python3-lz4: Upgrade 3.1.1 -> 3.1.3
      python3-bitarray: Upgrade 1.6.1 -> 1.6.3
      python3-pykwalify: Upgrade 1.7.0 -> 1.8.0
      python3-croniter: Upgrade 1.0.1 -> 1.0.2
      python3-ujson: Upgrade 4.0.1 -> 4.0.2
      python3-smbus2: Upgrade 0.4.0 -> 0.4.1
      python3-pyzmq: Upgrade 20.0.0 -> 21.0.1
      python3-alembic: Upgrade 1.5.1 -> 1.5.2
      python3-prompt-toolkit: Upgrade 3.0.10 -> 3.0.11
      python3-pyjwt: Upgrade 2.0.0 -> 2.0.1
      python3-pyyaml: Upgrade 5.4 -> 5.4.1
      python3-natsort: Upgrade 7.1.0 -> 7.1.1
      python3-pymisp: Upgrade 2.4.135.3 -> 2.4.137.1
      python3-socketio: Upgrade 4.6.0 -> 5.0.4
      python3-lazy-object-proxy: Upgrade 1.5.1 -> 1.5.2
      python3-custom-inherit: Upgrade 2.3.0 -> 2.3.1
      python3-cachetools: Upgrade 4.2.0 -> 4.2.1
      python3-coverage: Upgrade 5.3.1 -> 5.4
      python3-diskcache: Upgrade 5.1.0 -> 5.2.1
      python3-aenum: Upgrade 2.2.6 -> 3.0.0
      python3-xmlschema: Upgrade 1.4.1 -> 1.4.2
      python3-intervals: Upgrade 1.10.0 -> 1.10.0.post1
      python3-portion: Add recipe
      python3-pako: Upgrade 0.2.3 -> 0.3.0
      python3-typed-ast: Upgrade 1.4.1 -> 1.4.2
      python3-pyzmq: Upgrade 21.0.1 -> 21.0.2

Luca Boccassi (4):
      dbus-broker: enable SO_PEERSEC usage by default
      fsverity: update to 1.3
      fsverity: fix MinGW build
      dbus-broker: update to v26

Mario Schuknecht (1):
      dnsmasq: Fix systemd service

Mikko Rapeli (3):
      fuse: set CVE_PRODUCT to "fuse_project:fuse"
      flatbuffers: whitelist CVE-2020-35864
      giflib: apply patch for CVE-2019-15133 and set CVE_PRODUCT

Mingli Yu (2):
      mcelog: fix the pfa test hang
      mariadb: upgrade to 10.5.8

Nicolas Jeker (1):
      networkmanager: Add Wireless Extensions to PACKAGECONFIG[wifi]

Oleksiy Obitotskyy (1):
      libsmi: set awk as target path

Robert Joslyn (1):
      htop: Update to 3.0.4

Ross Burton (1):
      libmicrohttpd: allow native/nativesdk builds

S. Lockwood-Childs (1):
      sip3: simplify recipe

Shlomi Vaknin (1):
      python3-sh: remove python3-tests from RDEPENDS

Stefano Babic (1):
      libconfig: split package for C++

Søren Andersen (1):
      zram: fix sourcing of zram parameters

Thomas Perrot (1):
      influxdb: add new recipe

Trevor Gamblin (2):
      packagegroup-meta-python: sort package names, add notes
      packagegroup-meta-python: add ptest packages to ptest group

Wang Mingyu (1):
      dovecot: upgrade 2.2.36.4 -> 2.3.13

Yi Zhao (1):
      nss: upgrade 3.60 -> 3.60.1

Zang Ruochen (9):
      c-periphery: upgrade 2.3.0 -> 2.3.1
      htop: upgrade 3.0.4 -> 3.0.5
      hwdata: upgrade 0.342 -> 0.343
      spitools: upgrade 0.8.6 -> 0.8.7
      librole-tiny-perl: upgrade 2.001004 -> 2.002003
      python3-smbus: upgrade 4.1 -> 4.2
      python3-snappy: upgrade 0.5.4 -> 0.6.0
      python3-zopeinterface: upgrade 5.1.0 -> 5.2.0
      python3-nmap: upgrade 1.4.8 -> 1.5.0

Zheng Ruoqin (7):
      cifs-utils: upgrade 6.11 -> 6.12
      firewalld: upgrade 0.9.1 -> 0.9.2
      igmpproxy: upgrade 0.2.1 -> 0.3
      mdns: upgrade 1096.40.7 -> 1310.40.42
      opensc: Fix the wrong version number.
      python3-djangorestframework: upgrade 3.12.1 -> 3.12.2
      python3-ipy: upgrade 1.00 -> 1.01

changqing.li@windriver.com (1):
      celt051: update SRC_URI

zangrc (6):
      libnftnl: upgrade 1.1.8 -> 1.1.9
      czmq: upgrade 4.2.0 -> 4.2.1
      dialog: upgrade 1.3-20201126 -> 1.3-20210117
      modemanager: upgrade 1.14.8 -> 1.14.10
      monit: upgrade 5.27.1 -> 5.27.2
      python3-networkmanager: upgrade 2.1 -> 2.2

zhengruoqin (3):
      openldap: upgrade 2.4.56 -> 2.4.57
      satyr: upgrade 0.35 -> 0.36
      zeromq: upgrade 4.3.3 -> 4.3.4

Signed-off-by: Andrew Geissler <geissonator@yahoo.com>
Change-Id: I2469d162f1db8072fec106f629872618082bbeac

7 files changed, 8 insertions, 149 deletions

diff --git a/meta-openembedded/meta-oe/recipes-extended/dialog/dialog_1.3-20201126.bb b/meta-openembedded/meta-oe/recipes-extended/dialog/dialog_1.3-20210117.bb
index 5097788ed2..4f49fb9062 100644
--- a/meta-openembedded/meta-oe/recipes-extended/dialog/dialog_1.3-20201126.bb
+++ b/meta-openembedded/meta-oe/recipes-extended/dialog/dialog_1.3-20210117.bb
@@ -10,8 +10,8 @@ LIC_FILES_CHKSUM = "file://COPYING;md5=a6f89e2100d9b6cdffcea4f398e37343"
 
 SRC_URI = "ftp://ftp.invisible-island.net/${BPN}/${BP}.tgz \
           "
-SRC_URI[md5sum] = "14bf3b33de348838ff30aff0aa9d1c2e"
-SRC_URI[sha256sum] = "c9233a6c8ea33a59e2378e5146ae2bd13b519744cfdb647af7420adac5ad3866"
+SRC_URI[md5sum] = "c27db8bb67f71ee32ab1b54a3b3cebc3"
+SRC_URI[sha256sum] = "3c1ed08f44bcf6f159f2aa6fde765db94e8997b3eefb49d8b4c86691693c43e1"
 
 # hardcoded here for use in dialog-static recipe
 S = "${WORKDIR}/dialog-${PV}"
diff --git a/meta-openembedded/meta-oe/recipes-extended/dlt-daemon/dlt-daemon/241.patch b/meta-openembedded/meta-oe/recipes-extended/dlt-daemon/dlt-daemon/241.patch
deleted file mode 100644
index 7d8f22ec78..0000000000
--- a/meta-openembedded/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-openembedded/meta-oe/recipes-extended/dlt-daemon/dlt-daemon/245.patch b/meta-openembedded/meta-oe/recipes-extended/dlt-daemon/dlt-daemon/245.patch
deleted file mode 100644
index 43057489c9..0000000000
--- a/meta-openembedded/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-openembedded/meta-oe/recipes-extended/dlt-daemon/dlt-daemon/275.patch b/meta-openembedded/meta-oe/recipes-extended/dlt-daemon/dlt-daemon/275.patch
deleted file mode 100644
index 75065eb054..0000000000
--- a/meta-openembedded/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-openembedded/meta-oe/recipes-extended/dlt-daemon/dlt-daemon_2.18.5.bb b/meta-openembedded/meta-oe/recipes-extended/dlt-daemon/dlt-daemon_2.18.6.bb
index 5066e76d34..b3cfb4709f 100644
--- a/meta-openembedded/meta-oe/recipes-extended/dlt-daemon/dlt-daemon_2.18.5.bb
+++ b/meta-openembedded/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://241.patch \
-    file://245.patch \
-    file://275.patch \
 "
-SRCREV = "f1ac087c766827b1d0ed9c3a814b3cc052e948f2"
+SRCREV = "22715aeceaa81ace2c832312529bde3a42d0814f"
 
 S = "${WORKDIR}/git"
 
diff --git a/meta-openembedded/meta-oe/recipes-extended/libconfig/libconfig_1.7.2.bb b/meta-openembedded/meta-oe/recipes-extended/libconfig/libconfig_1.7.2.bb
index 148e85ce11..70ea82eb99 100644
--- a/meta-openembedded/meta-oe/recipes-extended/libconfig/libconfig_1.7.2.bb
+++ b/meta-openembedded/meta-oe/recipes-extended/libconfig/libconfig_1.7.2.bb
@@ -13,3 +13,7 @@ inherit autotools-brokensep pkgconfig
 
 SRC_URI[md5sum] = "6bd98ee3a6e6b9126c82c916d7a9e690"
 SRC_URI[sha256sum] = "7c3c7a9c73ff3302084386e96f903eb62ce06953bb1666235fac74363a16fad9"
+
+PACKAGE_BEFORE_PN = "${PN}++"
+FILES_${PN}++ = "${libdir}/${BPN}++*${SOLIBS}"
+
diff --git a/meta-openembedded/meta-oe/recipes-extended/zram/zram/zram-swap-init b/meta-openembedded/meta-oe/recipes-extended/zram/zram/zram-swap-init
index 0643dbca23..ccc3aafe3a 100755
--- a/meta-openembedded/meta-oe/recipes-extended/zram/zram/zram-swap-init
+++ b/meta-openembedded/meta-oe/recipes-extended/zram/zram/zram-swap-init
@@ -14,7 +14,7 @@ fi
 ZRAM_SIZE_PERCENT=100
 ZRAM_ALGORITHM=lz4
 
-[ -f /etc/default/zram ] && ./etc/default/zram || true
+[ -f /etc/default/zram ] && . /etc/default/zram || true
 
 memtotal=$(grep MemTotal /proc/meminfo | awk ' { print $2 } ')
 memzram=$(($memtotal*${ZRAM_SIZE_PERCENT}/100))