Daniel Wagner
951aea8da7
- Update to 1.42 * Fix issue with iwd and signal strength calculation. * Fix issue with iwd and handling service removal. * Fix issue with iwd and handling new connections. * Fix issue with handling default online check URL. * Fix issue with handling nameservers refresh. * Fix issue with handling proxy from DHCP lease. (bsc#1210395 CVE-2023-28488) * Fix issue with handling multiple proxies from PAC. * Fix issue with handling manual time update changes. * Fix issue with handling invalid gateway routes. * Fix issue with handling hidden WiFi agent requests. * Fix issue with handling WiFi SAE authentication failure. * Fix issue with handling DNS Proxy and TCP server replies. * Add support for regulatory domain following timezone. * Add support for localtime configuration option. - remove patches * remove 0001-wispr-Rename-wispr_portal_list-to-wispr_portal_hash.patch * remove 0002-wispr-Ignore-NULL-proxy.patch * remove 0003-wispr-Add-reference-counter-to-portal-context.patch * remove 0004-wispr-Update-portal-context-references.patch * remove 0005-gweb-Fix-OOB-write-in-received_data.patch OBS-URL: https://build.opensuse.org/request/show/1125578 OBS-URL: https://build.opensuse.org/package/show/network:utilities/connman?expand=0&rev=42
148 lines
3.2 KiB
Diff
148 lines
3.2 KiB
Diff
From 535f1e257f6b57ee8b066fc3f111355d2a313f0e Mon Sep 17 00:00:00 2001
|
|
From: Daniel Wagner <dwagner@suse.de>
|
|
Date: Mon, 13 Nov 2023 14:07:29 +0100
|
|
Subject: [PATCH] scripts: add missing header file
|
|
|
|
Signed-off-by: Daniel Wagner <dwagner@suse.de>
|
|
---
|
|
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 000000..eee1d0
|
|
--- /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__ */
|
|
--
|
|
2.42.1
|
|
|