From cb9029dd160ea89cc926c8a4b738051aa686400f Mon Sep 17 00:00:00 2001 From: Jakub Bogusz Date: Fri, 1 Sep 2023 18:32:30 +0200 Subject: [PATCH] - updated to 1.42 (+missing file from git) --- connman-missing.patch | 130 ++++++++++++++++++++++++++++++++++++++++++ connman.spec | 6 +- 2 files changed, 134 insertions(+), 2 deletions(-) create mode 100644 connman-missing.patch diff --git a/connman-missing.patch b/connman-missing.patch new file mode 100644 index 0000000..0f3af0f --- /dev/null +++ b/connman-missing.patch @@ -0,0 +1,130 @@ +--- connman-1.42/scripts/libppp-compat.h.orig 1970-01-01 01:00:00.000000000 +0100 ++++ connman-1.42/scripts/libppp-compat.h 2023-09-01 18:28:08.210878898 +0200 +@@ -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 ++ ++#ifndef PPPD_VERSION ++#define PPPD_VERSION VERSION ++#endif ++ ++#include ++#include ++#include ++#include ++#include ++#include ++#include ++ ++#ifdef HAVE_PPPD_CHAP_H ++#include ++#endif ++ ++#ifdef HAVE_PPPD_CHAP_NEW_H ++#include ++#endif ++ ++#ifdef HAVE_PPPD_CHAP_MS_H ++#include ++#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__ */ diff --git a/connman.spec b/connman.spec index 7b5285b..3211f3a 100644 --- a/connman.spec +++ b/connman.spec @@ -5,12 +5,13 @@ Summary: Connection Manager Summary(pl.UTF-8): Zarządca połączeń Name: connman -Version: 1.41 +Version: 1.42 Release: 1 License: GPL v2 Group: Networking/Daemons Source0: https://www.kernel.org/pub/linux/network/connman/%{name}-%{version}.tar.xz -# Source0-md5: 7f0a05fef485d3679cd73c8808f763f9 +# Source0-md5: 09856b27a39a8ff8b739fe41894cc231 +Patch0: %{name}-missing.patch URL: https://connman.net/ BuildRequires: dbus-devel >= 1.4 BuildRequires: glib2-devel >= 1:2.40 @@ -80,6 +81,7 @@ Pliki nagłówkowe dla wtyczek ConnMana. %prep %setup -q +%patch0 -p1 %build %configure \ -- 2.43.0