Skip to content
Snippets Groups Projects
Verified Commit ebc52fb6 authored by Andrei Gherzan's avatar Andrei Gherzan :penguin:
Browse files

networkmanager: Drop bbappend for version 1.22.10


This version is not provided by oniro anymore and upstream has later
versions with the patches already in place.

Signed-off-by: Andrei Gherzan's avatarAndrei Gherzan <andrei.gherzan@huawei.com>
parent 507ebb86
No related branches found
No related tags found
1 merge request!30flavours/zephyr/local.conf.sample: Bump CONF_VERSION
From c992f460c74bee491f831a21326f51c907376ebf Mon Sep 17 00:00:00 2001
From: Leo <thinkabit.ukim@gmail.com>
Date: Thu, 10 Dec 2020 08:10:40 -0300
Subject: [PATCH] build: check for reallocarray in stdlib.h
Signed-off-by: Andrei Gherzan <andrei.gherzan@huawei.com>
Upstream-status: Backport
---
configure.ac | 1 +
1 file changed, 1 insertion(+)
diff --git a/configure.ac b/configure.ac
index f86cda69ac0..8fd65d13713 100644
--- a/configure.ac
+++ b/configure.ac
@@ -83,6 +83,7 @@ AC_CHECK_DECLS([
reallocarray],
[], [], [[
#include <malloc.h>
+#include <stdlib.h>
]])
AC_CHECK_DECLS([
# SPDX-FileCopyrightText: Huawei Inc.
#
# SPDX-License-Identifier: Apache-2.0
From 18765456467af24786bc2397ca72affe42149504 Wed Sep 8 22:33:40 2021
From: Bernhard Rosenkraenzer <bernhard.rosenkraenzer.ext@huawei.com>
Date: Wed, 8 Sep 2021 22:33:40 +0200
Subject: [PATCH] Fix crash on startup when using musl
nm_strerror_native_r makes use of a glibc extension to strerror_r
when _GNU_SOURCE is defined -- even when not using glibc.
musl uses _GNU_SOURCE for some extensions, but doesn't have the
strerror_r for unknown error codes extension -- resulting in a
NULL pointer being passed to UTF-8 check functions that don't
check for it.
Use the non-glibc code path when __GLIBC__ isn't set.
Signed-off-by: Bernhard Rosenkraenzer <bernhard.rosenkraenzer.ext@huawei.com>
Upstream-status: Inappropriate [problem doesn't exist in current releases]
---
nm-errno.c | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff -up NetworkManager-1.22.10/shared/nm-glib-aux/nm-errno.c.omv~ NetworkManager-1.22.10/shared/nm-glib-aux/nm-errno.c
--- NetworkManager-1.22.10/shared/nm-glib-aux/nm-errno.c.omv~ 2021-09-08 22:10:10.753007649 +0200
+++ NetworkManager-1.22.10/shared/nm-glib-aux/nm-errno.c 2021-09-08 22:18:11.975338808 +0200
@@ -106,7 +106,7 @@ nm_strerror_native_r (int errsv, char *b
nm_assert (buf);
nm_assert (buf_size > 0);
-#if (_POSIX_C_SOURCE >= 200112L) && ! _GNU_SOURCE
+#if !defined(__GLIBC__) || ((_POSIX_C_SOURCE >= 200112L) && ! _GNU_SOURCE)
/* XSI-compliant */
{
int errno_saved = errno;
# SPDX-FileCopyrightText: Huawei Inc.
#
# SPDX-License-Identifier: Apache-2.0
# SPDX-FileCopyrightText: Huawei Inc.
#
# SPDX-License-Identifier: Apache-2.0
FILESEXTRAPATHS_prepend := "${THISDIR}/${PN}-${PV}:"
SRC_URI_append = " file://fix-reallocarray-check.patch \
file://fix-strerror_r.patch \
"
0% Loading or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment