From patchwork Fri Feb 21 23:29:56 2025 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Tomas Volf <~@wolfsden.cz> X-Patchwork-Id: 38975 Return-Path: X-Original-To: patchwork@mira.cbaines.net Delivered-To: patchwork@mira.cbaines.net Received: by mira.cbaines.net (Postfix, from userid 113) id 4BBE027BBEA; Fri, 21 Feb 2025 23:31:28 +0000 (GMT) X-Spam-Checker-Version: SpamAssassin 3.4.6 (2021-04-09) on mira.cbaines.net X-Spam-Level: X-Spam-Status: No, score=-6.8 required=5.0 tests=BAYES_00,DKIMWL_WL_HIGH, DKIM_ADSP_ALL,DKIM_SIGNED,DKIM_VALID,MAILING_LIST_MULTI, RCVD_IN_DNSWL_BLOCKED,RCVD_IN_VALIDITY_CERTIFIED,RCVD_IN_VALIDITY_RPBL, RCVD_IN_VALIDITY_SAFE,SPF_HELO_PASS,URIBL_BLOCKED autolearn=ham autolearn_force=no version=3.4.6 Received: from lists.gnu.org (lists.gnu.org [209.51.188.17]) by mira.cbaines.net (Postfix) with ESMTPS id 6215227BBE2 for ; Fri, 21 Feb 2025 23:31:27 +0000 (GMT) Received: from localhost ([::1] helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1tlcUA-0007Di-65; Fri, 21 Feb 2025 18:31:10 -0500 Received: from eggs.gnu.org ([2001:470:142:3::10]) by lists.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_GCM_SHA384:256) (Exim 4.90_1) (envelope-from ) id 1tlcU3-0007D7-0I for guix-patches@gnu.org; Fri, 21 Feb 2025 18:31:03 -0500 Received: from debbugs.gnu.org ([2001:470:142:5::43]) by eggs.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_128_GCM_SHA256:128) (Exim 4.90_1) (envelope-from ) id 1tlcU2-0005Zx-O6 for guix-patches@gnu.org; Fri, 21 Feb 2025 18:31:02 -0500 DKIM-Signature: v=1; a=rsa-sha256; q=dns/txt; c=relaxed/relaxed; d=debbugs.gnu.org; s=debbugs-gnu-org; h=MIME-Version:Date:From:To:Subject; bh=hAqSTBUn+vyS6Qr338/G4ff5z+LMeGX3QXGKcUhnDA0=; b=FOJrZ2yt6MMQlFwCitzSSfpywAG6ibjoYTRUR3GC74ZATQc5GYm7GGzbeAXxiFG3KDiEvnkjC+NofYOkLPj4RyubEKb0ywcBEUD7qA3OPr2jvZp6eMXf9ETFz0Pbuu3W+r4ANV3NUIHpb+082S2XLtKp6+UsvYl5a/mO2eQyq66BJHIrXbQdHSsDiXre72Y5SR1eDv3DWhVXxeKyR/mtELu3JqoH76bzY4d/wzlmkRlZbmszz3/5vAW4Rr1MC4+uKw9ko4a7Y/FrTSEAdUs8yBntjA0wHzqk6DQ5BuuJvchLpMwRmp4pDfzPm+UZ/ulPnfIM9rrJn16s6LP5kkF/pQ==; Received: from Debian-debbugs by debbugs.gnu.org with local (Exim 4.84_2) (envelope-from ) id 1tlcU2-00060c-5E for guix-patches@gnu.org; Fri, 21 Feb 2025 18:31:02 -0500 X-Loop: help-debbugs@gnu.org Subject: [bug#76482] [PATCH] gnu: connman: Update to 1.43. Resent-From: Tomas Volf <~@wolfsden.cz> Original-Sender: "Debbugs-submit" Resent-CC: guix-patches@gnu.org Resent-Date: Fri, 21 Feb 2025 23:31:01 +0000 Resent-Message-ID: Resent-Sender: help-debbugs@gnu.org X-GNU-PR-Message: report 76482 X-GNU-PR-Package: guix-patches X-GNU-PR-Keywords: patch To: 76482@debbugs.gnu.org Cc: Tomas Volf <~@wolfsden.cz> X-Debbugs-Original-To: guix-patches@gnu.org Received: via spool by submit@debbugs.gnu.org id=B.174018062322963 (code B ref -1); Fri, 21 Feb 2025 23:31:01 +0000 Received: (at submit) by debbugs.gnu.org; 21 Feb 2025 23:30:23 +0000 Received: from localhost ([127.0.0.1]:39728 helo=debbugs.gnu.org) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1tlcTO-0005yG-Hu for submit@debbugs.gnu.org; Fri, 21 Feb 2025 18:30:23 -0500 Received: from lists.gnu.org ([2001:470:142::17]:60576) by debbugs.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_GCM_SHA384:256) (Exim 4.84_2) (envelope-from <~@wolfsden.cz>) id 1tlcTK-0005wA-DV for submit@debbugs.gnu.org; Fri, 21 Feb 2025 18:30:20 -0500 Received: from eggs.gnu.org ([2001:470:142:3::10]) by lists.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_GCM_SHA384:256) (Exim 4.90_1) (envelope-from <~@wolfsden.cz>) id 1tlcTE-0006yX-3L for guix-patches@gnu.org; Fri, 21 Feb 2025 18:30:12 -0500 Received: from wolfsden.cz ([37.205.8.62]) by eggs.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_GCM_SHA384:256) (Exim 4.90_1) (envelope-from <~@wolfsden.cz>) id 1tlcTA-0005RH-Kw for guix-patches@gnu.org; Fri, 21 Feb 2025 18:30:11 -0500 Received: by wolfsden.cz (Postfix, from userid 104) id 0FC6E345BC7; Fri, 21 Feb 2025 23:30:04 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=wolfsden.cz; s=mail; t=1740180604; bh=fgGmtgFdjClRr77MK9TQhYU45osideAY/Nah3XPonfQ=; h=From:To:Cc:Subject:Date; b=mkBcDo5bQAhi98BxJF0x/12TLRmN/i/GR4dPLD3X6quJ+ppzEZqNkr5e13Rppg5hT HZtE7nAkd4LXAb9zqnLFNdjKCptNqkKZFquEhxknndlnjGOX9Lh8e4WgxsGmhNKVjP 4pK5EnIeIf2gFxExzszKCQ36bgV1kmgIxMXmYxRrXgziWbw9sU0a7k/vfjxx76av6O OjDyBqP58U7W3VH5pCnNzxe+yULSjCvSjqly9/WNVLvv5AT9ELaMAVv2F0UjxEVGN+ xtHxwd/TvB7AfxsTmXUXblZZdSn0D1D+oMh0Bl5lNU7e4HwTobuKw5PmzzBtTUCD1e VhtfReih6UW2lYzInjHf1+Rf0bI9NpvCJHybPBNv1gNNIVRtpyQ2b2bcbIcizYzaaY Pe3oDSujtXCBHNHRJ0dF7QZeqGVoeubPCVwgX9l0Hqh7el2CNl5KBO99/wU7O3w2MS xzwwNLiDjmYBPlvWRLBekwmckV7mNarNvjkm3ewG6GWiJxQyLcDSjcfiSH6UFOa5ho /WFd3LSKlVUl5wqd2T9bAq5NUdPjJrXqlz5B3COu9w1bOCKrqG8vNvwisGpYZD+s3H PDbe7laWYpDqxPk1NkBAiBdDrccy6KCqDGVfZyaV+k9uVvzdV++EHCckk6u4y6qejn OZ5SkkCdNWHnbicDhch7hbwI= Received: from localhost (unknown [128.0.188.242]) by wolfsden.cz (Postfix) with ESMTPSA id D11D6347327; Fri, 21 Feb 2025 23:30:01 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=wolfsden.cz; s=mail; t=1740180601; bh=fgGmtgFdjClRr77MK9TQhYU45osideAY/Nah3XPonfQ=; h=From:To:Cc:Subject:Date; b=uNES4ob3XFcDP6EVxRcwLBbSYmlocyuLhWj8oQCCZ8A/qLsn5Whrv2kTUHzE1rhus SBmVuDvpO+HR1vJ1sGguXt20AjuHgbRdxh2+SawcH8OqLlLX/mW5P1WoaosA7em7Am CfGDV/tu5nteVuAwfAei+VGAFBgHXfR6vAgXuyEjue2XeO/YMuNGEWUoDE/6yjlSRP dZYNE59Nf0VYccfnDN6u3enjG+Xc42RW8yP5P0WfWpFLxvAj8B48UO7gfrtGItvctT 6/c3z0FJYZjMiy4KBf+JI4hRAPdz+nSaQ1OrQgWKXc3J6RWXqjSOS4LsA4zLw74Y+v IDTLUcCeSPvw4z9sHyXVtXhlUFOn/mMIKZJWUaOXodeIpNVGu5fchGxBU90xrbmN5Z neHvKmfOkBwBa9F5KTyaKaP41XOgYMXgRN+0L7ka/ObUgto86EBVP65Okvf/DNA/n7 QIgat8w626TeXbxpkEWlh3g541lcsAZZ6ihKj9EpKmPKpY5JT3IxyWPihYI06lvMXr xVRy8pnofxCY1bRIxMHANwxEfP7Vsmp+Jp5AqxEfvcLpawmm6H3BMxDGyN1dtpkqoO RMwxTsigixBDc8fPNf228ZOpQL6H0xT6XBMrVy5sfTAxv0F3KoUD1a7TUTK1ggsnym C92osfslRC5TlNSFRmZYxXAM= From: Tomas Volf <~@wolfsden.cz> Date: Sat, 22 Feb 2025 00:29:56 +0100 Message-ID: <1a2e96f89d1eb20ddf3c62bdab154f5daca41722.1740180596.git.~@wolfsden.cz> X-Mailer: git-send-email 2.48.1 MIME-Version: 1.0 Received-SPF: pass client-ip=37.205.8.62; envelope-from=~@wolfsden.cz; helo=wolfsden.cz X-Spam_score_int: -20 X-Spam_score: -2.1 X-Spam_bar: -- X-Spam_report: (-2.1 / 5.0 requ) BAYES_00=-1.9, DKIM_SIGNED=0.1, DKIM_VALID=-0.1, DKIM_VALID_AU=-0.1, DKIM_VALID_EF=-0.1, RCVD_IN_VALIDITY_CERTIFIED_BLOCKED=0.001, RCVD_IN_VALIDITY_RPBL_BLOCKED=0.001, SPF_HELO_PASS=-0.001, SPF_PASS=-0.001 autolearn=ham autolearn_force=no X-Spam_action: no action X-BeenThere: debbugs-submit@debbugs.gnu.org X-Mailman-Version: 2.1.18 Precedence: list X-BeenThere: guix-patches@gnu.org List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Errors-To: guix-patches-bounces+patchwork=mira.cbaines.net@gnu.org Sender: guix-patches-bounces+patchwork=mira.cbaines.net@gnu.org X-getmail-retrieved-from-mailbox: Patches * gnu/packages/connman.scm (connman): Update to 1.43. * gnu/packages/patches/connman-add-missing-libppp-compat.h.patch: Delete obsolete patch. * gnu/local.mk (dist_patch_DATA): De-register it. Change-Id: I563f535c27b99972e95d96f291ce5dfdc83a46f1 --- gnu/local.mk | 1 - gnu/packages/connman.scm | 6 +- .../connman-add-missing-libppp-compat.h.patch | 140 ------------------ 3 files changed, 2 insertions(+), 145 deletions(-) delete mode 100644 gnu/packages/patches/connman-add-missing-libppp-compat.h.patch diff --git a/gnu/local.mk b/gnu/local.mk index c421da85cb..44e63e037b 100644 --- a/gnu/local.mk +++ b/gnu/local.mk @@ -1128,7 +1128,6 @@ dist_patch_DATA = \ %D%/packages/patches/collectd-5.11.0-noinstallvar.patch \ %D%/packages/patches/combinatorial-blas-awpm.patch \ %D%/packages/patches/combinatorial-blas-io-fix.patch \ - %D%/packages/patches/connman-add-missing-libppp-compat.h.patch \ %D%/packages/patches/containerd-create-pid-file.patch \ %D%/packages/patches/converseen-hide-updates-checks.patch \ %D%/packages/patches/converseen-hide-non-free-pointers.patch \ diff --git a/gnu/packages/connman.scm b/gnu/packages/connman.scm index bc6328926a..c5a0f8482c 100644 --- a/gnu/packages/connman.scm +++ b/gnu/packages/connman.scm @@ -47,16 +47,14 @@ (define-module (gnu packages connman) (define-public connman (package (name "connman") - (version "1.42") + (version "1.43") (source (origin (method url-fetch) (uri (string-append "mirror://kernel.org/linux/network/connman/" "connman-" version ".tar.xz")) (sha256 - (base32 "1an24caah35chc1c48p67ln8kpj9fr7slg5fklpfz0f0dzjbmrm3")) - (patches - (search-patches "connman-add-missing-libppp-compat.h.patch")))) + (base32 "1g735gnhhhqzjhpwv62q8mg8345a62rhyk5qwavh0yby6azcwmqj")))) (build-system gnu-build-system) (arguments (list #:configure-flags diff --git a/gnu/packages/patches/connman-add-missing-libppp-compat.h.patch b/gnu/packages/patches/connman-add-missing-libppp-compat.h.patch deleted file mode 100644 index 4432c161fd..0000000000 --- a/gnu/packages/patches/connman-add-missing-libppp-compat.h.patch +++ /dev/null @@ -1,140 +0,0 @@ -From: Tobias Geerinckx-Rice -Date: Sun Sep 24 02:00:00 2023 +0200 -Subject: connman: Add missing libppp-compat.h. - -This file was taken verbatim from upstream commit -a48864a2e5d2a725dfc6eef567108bc13b43857f. Its absence was since -fixed in upstream commit 09c1bbfd55647b18b5bbbb99ef2b6d902465ca16. - ---- -diff -Naur a/scripts/libppp-compat.h b/scripts/libppp-compat.h ---- a/scripts/libppp-compat.h 1970-01-01 01:00:00.000000000 +0100 -+++ b/scripts/libppp-compat.h 2023-09-29 00:45:18.726709659 +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__ */