mirror of
https://git.yoctoproject.org/poky
synced 2026-05-01 06:32:11 +02:00
connman: upgrade 1.42 -> 1.43
Changlog: - Fix issue with device creation when using LTE. - Fix issue with regulatory domain when powering up. - Fix issue with resolving ISO3166 code from timezone data. - Fix issue with handling DNS proxy zero termination of buffers. - Fix issue with handling DHCP packet length in L3 mode. - Fix issue with handling DHCP upper length checks. - Fix issue with handling IPv6 and URL parsing. - Fix issue with handling online check updates. - Fix issue with handling proxy method and WISPr. - Fix issue with handling default gateway setup. - Add support for low-priority default routes. (From OE-Core rev: 467d28f5d243d821722cf8dcdbb9675a2820cd4f) Signed-off-by: Changhyeok Bae <changhyeok.bae@gmail.com> Signed-off-by: Richard Purdie <richard.purdie@linuxfoundation.org>
This commit is contained in:
Changhyeok Bae
committed by
Richard Purdie
Richard Purdie
parent
39381958e5
commit
d72b027a0a
@@ -1,55 +0,0 @@
|
||||
From cbba6638986c2de763981bf6fc59df6a86fed44f Mon Sep 17 00:00:00 2001
|
||||
From: Khem Raj <raj.khem@gmail.com>
|
||||
Date: Mon, 1 Jan 2024 17:42:21 -0800
|
||||
Subject: [PATCH v2] src/log.c: Include libgen.h for basename API
|
||||
|
||||
Use POSIX version of basename. This comes to front with latest musl
|
||||
which dropped the declaration from string.h [1] it fails to build with
|
||||
clang-17+ because it treats implicit function declaration as error.
|
||||
|
||||
Fix it by applying the basename on a copy of string since posix version
|
||||
may modify the input string.
|
||||
|
||||
[1] https://git.musl-libc.org/cgit/musl/commit/?id=725e17ed6dff4d0cd22487bb64470881e86a92e7
|
||||
|
||||
Upstream-Status: Submitted [https://lore.kernel.org/connman/20240102015917.3732089-1-raj.khem@gmail.com/T/#u]
|
||||
Signed-off-by: Khem Raj <raj.khem@gmail.com>
|
||||
---
|
||||
|
||||
src/log.c | 6 ++++--
|
||||
1 file changed, 4 insertions(+), 2 deletions(-)
|
||||
|
||||
diff --git a/src/log.c b/src/log.c
|
||||
index 554b046..2df3af7 100644
|
||||
--- a/src/log.c
|
||||
+++ b/src/log.c
|
||||
@@ -24,6 +24,7 @@
|
||||
#endif
|
||||
|
||||
#include <stdio.h>
|
||||
+#include <libgen.h>
|
||||
#include <unistd.h>
|
||||
#include <stdarg.h>
|
||||
#include <stdlib.h>
|
||||
@@ -196,6 +197,7 @@ int __connman_log_init(const char *program, const char *debug,
|
||||
const char *program_name, const char *program_version)
|
||||
{
|
||||
static char path[PATH_MAX];
|
||||
+ char* tmp = strdup(program);
|
||||
int option = LOG_NDELAY | LOG_PID;
|
||||
|
||||
program_exec = program;
|
||||
@@ -212,8 +214,8 @@ int __connman_log_init(const char *program, const char *debug,
|
||||
if (backtrace)
|
||||
signal_setup(signal_handler);
|
||||
|
||||
- openlog(basename(program), option, LOG_DAEMON);
|
||||
-
|
||||
+ openlog(basename(tmp), option, LOG_DAEMON);
|
||||
+ free(tmp);
|
||||
syslog(LOG_INFO, "%s version %s", program_name, program_version);
|
||||
|
||||
return 0;
|
||||
--
|
||||
2.43.0
|
||||
|
||||
@@ -1,152 +0,0 @@
|
||||
From af55a6a414d32c12f9ef3cab778385a361e1ad6d Mon Sep 17 00:00:00 2001
|
||||
From: =?UTF-8?q?Eivind=20N=C3=A6ss?= <eivnaes@yahoo.com>
|
||||
Date: Sat, 25 Mar 2023 20:51:52 +0000
|
||||
Subject: [PATCH] vpn: Adding support for latest pppd 2.5.0 release
|
||||
|
||||
The API has gone through a significant overhaul, and this change fixes any compile issues.
|
||||
1) Fixes to configure.ac itself
|
||||
2) Cleanup in pppd plugin itself
|
||||
|
||||
Adding a libppp-compat.h file to mask for any differences in the version.
|
||||
|
||||
Upstream-Status: Backport [https://git.kernel.org/pub/scm/network/connman/connman.git/commit/?id=a48864a2e5d2a725dfc6eef567108bc13b43857f]
|
||||
Signed-off-by: Martin Jansa <Martin.Jansa@gmail.com>
|
||||
|
||||
---
|
||||
scripts/libppp-compat.h | 127 ++++++++++++++++++++++++++++++++++++++++
|
||||
1 file changed, 127 insertions(+)
|
||||
create mode 100644 scripts/libppp-compat.h
|
||||
|
||||
diff --git a/scripts/libppp-compat.h b/scripts/libppp-compat.h
|
||||
new file mode 100644
|
||||
index 0000000..eee1d09
|
||||
--- /dev/null
|
||||
+++ b/scripts/libppp-compat.h
|
||||
@@ -0,0 +1,127 @@
|
||||
+/* Copyright (C) Eivind Naess, eivnaes@yahoo.com */
|
||||
+/* SPDX-License-Identifier: GPL-2.0-or-later */
|
||||
+
|
||||
+#ifndef __LIBPPP_COMPAT_H__
|
||||
+#define __LIBPPP_COMPAT_H__
|
||||
+
|
||||
+/* Define USE_EAPTLS compile with EAP TLS support against older pppd headers,
|
||||
+ * pppd >= 2.5.0 use PPP_WITH_EAPTLS and is defined in pppdconf.h */
|
||||
+#define USE_EAPTLS 1
|
||||
+
|
||||
+/* Define INET6 to compile with IPv6 support against older pppd headers,
|
||||
+ * pppd >= 2.5.0 use PPP_WITH_IPV6CP and is defined in pppdconf.h */
|
||||
+#define INET6 1
|
||||
+
|
||||
+/* PPP < 2.5.0 defines and exports VERSION which overlaps with current package VERSION define.
|
||||
+ * this silly macro magic is to work around that. */
|
||||
+#undef VERSION
|
||||
+#include <pppd/pppd.h>
|
||||
+
|
||||
+#ifndef PPPD_VERSION
|
||||
+#define PPPD_VERSION VERSION
|
||||
+#endif
|
||||
+
|
||||
+#include <pppd/fsm.h>
|
||||
+#include <pppd/ccp.h>
|
||||
+#include <pppd/eui64.h>
|
||||
+#include <pppd/ipcp.h>
|
||||
+#include <pppd/ipv6cp.h>
|
||||
+#include <pppd/eap.h>
|
||||
+#include <pppd/upap.h>
|
||||
+
|
||||
+#ifdef HAVE_PPPD_CHAP_H
|
||||
+#include <pppd/chap.h>
|
||||
+#endif
|
||||
+
|
||||
+#ifdef HAVE_PPPD_CHAP_NEW_H
|
||||
+#include <pppd/chap-new.h>
|
||||
+#endif
|
||||
+
|
||||
+#ifdef HAVE_PPPD_CHAP_MS_H
|
||||
+#include <pppd/chap_ms.h>
|
||||
+#endif
|
||||
+
|
||||
+#ifndef PPP_PROTO_CHAP
|
||||
+#define PPP_PROTO_CHAP 0xc223
|
||||
+#endif
|
||||
+
|
||||
+#ifndef PPP_PROTO_EAP
|
||||
+#define PPP_PROTO_EAP 0xc227
|
||||
+#endif
|
||||
+
|
||||
+
|
||||
+#if WITH_PPP_VERSION < PPP_VERSION(2,5,0)
|
||||
+
|
||||
+static inline bool
|
||||
+debug_on (void)
|
||||
+{
|
||||
+ return debug;
|
||||
+}
|
||||
+
|
||||
+static inline const char
|
||||
+*ppp_ipparam (void)
|
||||
+{
|
||||
+ return ipparam;
|
||||
+}
|
||||
+
|
||||
+static inline int
|
||||
+ppp_ifunit (void)
|
||||
+{
|
||||
+ return ifunit;
|
||||
+}
|
||||
+
|
||||
+static inline const char *
|
||||
+ppp_ifname (void)
|
||||
+{
|
||||
+ return ifname;
|
||||
+}
|
||||
+
|
||||
+static inline int
|
||||
+ppp_get_mtu (int idx)
|
||||
+{
|
||||
+ return netif_get_mtu(idx);
|
||||
+}
|
||||
+
|
||||
+typedef enum ppp_notify
|
||||
+{
|
||||
+ NF_PID_CHANGE,
|
||||
+ NF_PHASE_CHANGE,
|
||||
+ NF_EXIT,
|
||||
+ NF_SIGNALED,
|
||||
+ NF_IP_UP,
|
||||
+ NF_IP_DOWN,
|
||||
+ NF_IPV6_UP,
|
||||
+ NF_IPV6_DOWN,
|
||||
+ NF_AUTH_UP,
|
||||
+ NF_LINK_DOWN,
|
||||
+ NF_FORK,
|
||||
+ NF_MAX_NOTIFY
|
||||
+} ppp_notify_t;
|
||||
+
|
||||
+typedef void (ppp_notify_fn) (void *ctx, int arg);
|
||||
+
|
||||
+static inline void
|
||||
+ppp_add_notify (ppp_notify_t type, ppp_notify_fn *func, void *ctx)
|
||||
+{
|
||||
+ struct notifier **list[NF_MAX_NOTIFY] = {
|
||||
+ [NF_PID_CHANGE ] = &pidchange,
|
||||
+ [NF_PHASE_CHANGE] = &phasechange,
|
||||
+ [NF_EXIT ] = &exitnotify,
|
||||
+ [NF_SIGNALED ] = &sigreceived,
|
||||
+ [NF_IP_UP ] = &ip_up_notifier,
|
||||
+ [NF_IP_DOWN ] = &ip_down_notifier,
|
||||
+ [NF_IPV6_UP ] = &ipv6_up_notifier,
|
||||
+ [NF_IPV6_DOWN ] = &ipv6_down_notifier,
|
||||
+ [NF_AUTH_UP ] = &auth_up_notifier,
|
||||
+ [NF_LINK_DOWN ] = &link_down_notifier,
|
||||
+ [NF_FORK ] = &fork_notifier,
|
||||
+ };
|
||||
+
|
||||
+ struct notifier **notify = list[type];
|
||||
+ if (notify) {
|
||||
+ add_notifier(notify, func, ctx);
|
||||
+ }
|
||||
+}
|
||||
+
|
||||
+#endif /* #if WITH_PPP_VERSION < PPP_VERSION(2,5,0) */
|
||||
+#endif /* #if__LIBPPP_COMPAT_H__ */
|
||||
@@ -5,13 +5,11 @@ SRC_URI = "${KERNELORG_MIRROR}/linux/network/${BPN}/${BP}.tar.xz \
|
||||
file://0001-connman.service-stop-systemd-resolved-when-we-use-co.patch \
|
||||
file://connman \
|
||||
file://no-version-scripts.patch \
|
||||
file://0001-vpn-Adding-support-for-latest-pppd-2.5.0-release.patch \
|
||||
file://0001-src-log.c-Include-libgen.h-for-basename-API.patch \
|
||||
file://0002-resolve-musl-does-not-implement-res_ninit.patch \
|
||||
"
|
||||
|
||||
|
||||
SRC_URI[sha256sum] = "a3e6bae46fc081ef2e9dae3caa4f7649de892c3de622c20283ac0ca81423c2aa"
|
||||
SRC_URI[sha256sum] = "1257cebe327e7900b7e2b84c0fb330aa90815e455898cd2f941f4308ed2be3bc"
|
||||
|
||||
RRECOMMENDS:${PN} = "connman-conf"
|
||||
RCONFLICTS:${PN} = "networkmanager"
|
||||
Reference in New Issue
Block a user