From 74cfc40991dfb98f61c8c30ae22af130c3d07540 Mon Sep 17 00:00:00 2001
From: Marta Rybczynska <marta.rybczynska@huawei.com>
Date: Tue, 2 Nov 2021 09:47:28 +0100
Subject: [PATCH] networkmanager: update recipe to 1.22.16
Update the recipe to 1.22.16 containing CVE fixes.
This version includes an additional option by default for firewalld zones.
It changes the behavior by default, so disable it when no firewalld.
Also include a patch for fixing reallocarray usage from gatesgarth
meta-openembedded 165ad9ad4c86c9e63f3afcf3172c8e1d3629f3a5
Signed-off-by: Marta Rybczynska <marta.rybczynska@huawei.com>
---
.../fix_reallocarray_check.patch | 27 +++++++++++++++++++
...r_1.22.10.bb => networkmanager_1.22.16.bb} | 4 ++-
2 files changed, 30 insertions(+), 1 deletion(-)
create mode 100644 meta-oniro-staging/recipes-connectivity/networkmanager/networkmanager/fix_reallocarray_check.patch
rename meta-oniro-staging/recipes-connectivity/networkmanager/{networkmanager_1.22.10.bb => networkmanager_1.22.16.bb} (96%)
diff --git a/meta-oniro-staging/recipes-connectivity/networkmanager/networkmanager/fix_reallocarray_check.patch b/meta-oniro-staging/recipes-connectivity/networkmanager/networkmanager/fix_reallocarray_check.patch
new file mode 100644
index 00000000..0a8de541
--- /dev/null
+++ b/meta-oniro-staging/recipes-connectivity/networkmanager/networkmanager/fix_reallocarray_check.patch
@@ -0,0 +1,27 @@
+reallocarray() is coming from stdlib.h which maybe indirectly included
+by malloc.h but not on all libc implementations
+
+Upstream-Status: Pending
+Signed-off-by: Khem Raj <raj.khem@gmail.com>
+--- a/meson.build
++++ b/meson.build
+@@ -114,7 +114,7 @@ config_h.set10('HAVE_GETRANDOM', use_sys
+ # FIXME secure_getenv check is not useful?
+ config_h.set('HAVE_SECURE_GETENV', cc.has_function('secure_getenv'))
+ config_h.set('HAVE___SECURE_GETENV', cc.has_function('__secure_getenv'))
+-config_h.set10('HAVE_DECL_REALLOCARRAY', cc.has_function('reallocarray', prefix: '#include <malloc.h>'))
++config_h.set10('HAVE_DECL_REALLOCARRAY', cc.has_function('reallocarray', prefix: '#include <stdlib.h>'))
+ config_h.set10('HAVE_DECL_EXPLICIT_BZERO', cc.has_function('explicit_bzero', prefix: '#include <string.h>'))
+ config_h.set10('HAVE_DECL_MEMFD_CREATE', cc.has_function('memfd_create', prefix: '#include <sys/mman.h>'))
+
+--- a/configure.ac
++++ b/configure.ac
+@@ -82,7 +82,7 @@ AC_CHECK_DECLS([
+ AC_CHECK_DECLS([
+ reallocarray],
+ [], [], [[
+-#include <malloc.h>
++#include <stdlib.h>
+ ]])
+
+ AC_CHECK_DECLS([
diff --git a/meta-oniro-staging/recipes-connectivity/networkmanager/networkmanager_1.22.10.bb b/meta-oniro-staging/recipes-connectivity/networkmanager/networkmanager_1.22.16.bb
similarity index 96%
rename from meta-oniro-staging/recipes-connectivity/networkmanager/networkmanager_1.22.10.bb
rename to meta-oniro-staging/recipes-connectivity/networkmanager/networkmanager_1.22.16.bb
index 33a2b7c0..0d71d031 100644
--- a/meta-oniro-staging/recipes-connectivity/networkmanager/networkmanager_1.22.10.bb
+++ b/meta-oniro-staging/recipes-connectivity/networkmanager/networkmanager_1.22.16.bb
@@ -26,6 +26,7 @@ SRC_URI = " \
file://${BPN}.initd \
file://0001-Fixed-configure.ac-Fix-pkgconfig-sysroot-locations.patch \
file://0002-Do-not-create-settings-settings-property-documentati.patch \
+ file://fix_reallocarray_check.patch \
"
SRC_URI_append_libc-musl = " \
file://musl/0001-Fix-build-with-musl-systemd-specific.patch \
@@ -33,7 +34,7 @@ SRC_URI_append_libc-musl = " \
file://musl/0003-Fix-build-with-musl-for-n-dhcp4.patch \
file://musl/0004-Fix-build-with-musl-systemd-specific.patch \
"
-SRC_URI[sha256sum] = "2b29ccc1531ba7ebba95a97f40c22b963838e8b6833745efe8e6fb71fd8fca77"
+SRC_URI[sha256sum] = "377aa053752eaa304b72c9906f9efcd9fbd5f7f6cb4cd4ad72425a68982cffc6"
S = "${WORKDIR}/NetworkManager-${PV}"
@@ -71,6 +72,7 @@ PACKAGECONFIG[bluez5] = "--enable-bluez5-dun,--disable-bluez5-dun,bluez5"
# consolekit is not picked by shlibs, so add it to RDEPENDS too
PACKAGECONFIG[consolekit] = "--with-session-tracking=consolekit,,consolekit,consolekit"
PACKAGECONFIG[modemmanager] = "--with-modem-manager-1=yes,--with-modem-manager-1=no,modemmanager"
+PACKAGECONFIG[firewalld] = "--enable-firewalld-zone,--disable-firewalld-zone,firewalld"
PACKAGECONFIG[ppp] = "--enable-ppp,--disable-ppp,ppp,ppp"
# Use full featured dhcp client instead of internal one
PACKAGECONFIG[dhclient] = "--with-dhclient=${base_sbindir}/dhclient,,,dhcp-client"
--
GitLab