From patchwork Sat Jan 6 06:04:46 2024 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Hilton Chain X-Patchwork-Id: 58420 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 0CC8D27BBE2; Sat, 6 Jan 2024 06:06:13 +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=-0.7 required=5.0 tests=BAYES_00,DKIM_INVALID, DKIM_SIGNED,FROM_SUSPICIOUS_NTLD,MAILING_LIST_MULTI,PDS_OTHER_BAD_TLD, SPF_HELO_PASS,URIBL_BLOCKED autolearn=no 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 15CBA27BBEA for ; Sat, 6 Jan 2024 06:06:12 +0000 (GMT) Received: from localhost ([::1] helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1rLzol-0004Jr-HD; Sat, 06 Jan 2024 01:05:59 -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 1rLzok-0004J8-BX for guix-patches@gnu.org; Sat, 06 Jan 2024 01:05:58 -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 1rLzok-0002YM-39 for guix-patches@gnu.org; Sat, 06 Jan 2024 01:05:58 -0500 Received: from Debian-debbugs by debbugs.gnu.org with local (Exim 4.84_2) (envelope-from ) id 1rLzoo-00057I-7n; Sat, 06 Jan 2024 01:06:02 -0500 X-Loop: help-debbugs@gnu.org Subject: [bug#68276] [PATCH 1/4] gnu: ell: Update to 0.61. Resent-From: Hilton Chain Original-Sender: "Debbugs-submit" Resent-CC: hako@ultrarare.space, leo@famulari.name, me@tobias.gr, guix-patches@gnu.org Resent-Date: Sat, 06 Jan 2024 06:06:02 +0000 Resent-Message-ID: Resent-Sender: help-debbugs@gnu.org X-GNU-PR-Message: followup 68276 X-GNU-PR-Package: guix-patches X-GNU-PR-Keywords: patch To: 68276@debbugs.gnu.org Cc: Hilton Chain , Hilton Chain , Leo Famulari , Tobias Geerinckx-Rice X-Debbugs-Original-Xcc: Hilton Chain , Leo Famulari , Tobias Geerinckx-Rice Received: via spool by 68276-submit@debbugs.gnu.org id=B68276.170452112919584 (code B ref 68276); Sat, 06 Jan 2024 06:06:02 +0000 Received: (at 68276) by debbugs.gnu.org; 6 Jan 2024 06:05:29 +0000 Received: from localhost ([127.0.0.1]:58408 helo=debbugs.gnu.org) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1rLzoH-00055n-4q for submit@debbugs.gnu.org; Sat, 06 Jan 2024 01:05:29 -0500 Received: from mail.boiledscript.com ([144.168.59.46]:46462) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1rLzoF-00055e-6p for 68276@debbugs.gnu.org; Sat, 06 Jan 2024 01:05:28 -0500 DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=ultrarare.space; s=dkim; t=1704521089; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:cc:mime-version:mime-version: content-transfer-encoding:content-transfer-encoding: in-reply-to:in-reply-to:references:references; bh=PF7f+tUypBa+5mpl0D3WX6r5LNc3Dr4JDQFYb7L7XMY=; b=vNt8sLzO7C73hR840oPAo2dGgHwg7GHRqz3mwm9XbZDqVbsxKEUx0+tW10SdPWEns2fsre jb/+KAlkpE8gygLUDP50eByna/KPjLDUPlOJFHkWjk8hQGv3gCbYtVl2z4G9hLkpCg4akq wd/rQoPofAavwdwc1g7YjfbohHbsjG1zQm34FhrycsgBnG7NHUJG5nIWNwy3cNx/Gg2Ibu mg7wfkbNMgTvBY514dvfJSHo/QWYEw6XXLi+wK17a+7/dZX2KwBi6YzdHszBs1cEtefj7m pczruUjmemteAwopzkahbZI5lZkTFs+od/3fRZd46NdbpugU6Btz3Dd17o1CkQ== Authentication-Results: mail.boiledscript.com; auth=pass smtp.mailfrom=hako@ultrarare.space Date: Sat, 6 Jan 2024 14:04:46 +0800 Message-ID: <3d937b99bf274fa9337f6cf096f1010bed94af19.1704519990.git.hako@ultrarare.space> In-Reply-To: References: MIME-Version: 1.0 X-Spamd-Bar: -- 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: , Reply-to: Hilton Chain X-ACL-Warn: , Hilton Chain via Guix-patches X-Patchwork-Original-From: Hilton Chain via Guix-patches via From: Hilton Chain 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/linux.scm (ell): Update to 0.61. Change-Id: I221dc36bacfd9ebb1f4a6cafa30fdc8bb53ec7d6 --- gnu/packages/linux.scm | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/gnu/packages/linux.scm b/gnu/packages/linux.scm index 0fe64bacf3..e686626a01 100644 --- a/gnu/packages/linux.scm +++ b/gnu/packages/linux.scm @@ -9467,7 +9467,7 @@ (define-public wireplumber-minimal (define-public ell (package (name "ell") - (version "0.59") + (version "0.61") (source (origin (method git-fetch) (uri (git-reference @@ -9476,7 +9476,7 @@ (define-public ell (file-name (git-file-name name version)) (sha256 (base32 - "11xlkdvw7pyd9idq1zsnl946dry9aksnz29wbpzxqjc97xhhd5xq")))) + "1lkjf24ap40wk747z1iv8ds8z40alc5x8rzsgczjj1707x2ik6mj")))) (build-system gnu-build-system) (arguments ;; Tests launch dbus-daemon instances that all try to bind to From patchwork Sat Jan 6 06:04:47 2024 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Hilton Chain X-Patchwork-Id: 58419 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 24AB827BBE9; Sat, 6 Jan 2024 06:06:12 +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=-0.7 required=5.0 tests=BAYES_00,DKIM_INVALID, DKIM_SIGNED,FROM_SUSPICIOUS_NTLD,MAILING_LIST_MULTI,PDS_OTHER_BAD_TLD, SPF_HELO_PASS,URIBL_BLOCKED autolearn=no 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 5CB3127BBE2 for ; Sat, 6 Jan 2024 06:06:11 +0000 (GMT) Received: from localhost ([::1] helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1rLzom-0004Li-Os; Sat, 06 Jan 2024 01:06:00 -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 1rLzok-0004J9-Bb for guix-patches@gnu.org; Sat, 06 Jan 2024 01:05:58 -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 1rLzok-0002YN-39 for guix-patches@gnu.org; Sat, 06 Jan 2024 01:05:58 -0500 Received: from Debian-debbugs by debbugs.gnu.org with local (Exim 4.84_2) (envelope-from ) id 1rLzoo-00057Q-MK; Sat, 06 Jan 2024 01:06:02 -0500 X-Loop: help-debbugs@gnu.org Subject: [bug#68276] [PATCH 2/4] gnu: iwd: Update to 2.12. Resent-From: Hilton Chain Original-Sender: "Debbugs-submit" Resent-CC: hako@ultrarare.space, guix-patches@gnu.org Resent-Date: Sat, 06 Jan 2024 06:06:02 +0000 Resent-Message-ID: Resent-Sender: help-debbugs@gnu.org X-GNU-PR-Message: followup 68276 X-GNU-PR-Package: guix-patches X-GNU-PR-Keywords: patch To: 68276@debbugs.gnu.org Cc: Hilton Chain , Hilton Chain X-Debbugs-Original-Xcc: Hilton Chain Received: via spool by 68276-submit@debbugs.gnu.org id=B68276.170452113319601 (code B ref 68276); Sat, 06 Jan 2024 06:06:02 +0000 Received: (at 68276) by debbugs.gnu.org; 6 Jan 2024 06:05:33 +0000 Received: from localhost ([127.0.0.1]:58411 helo=debbugs.gnu.org) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1rLzoL-000564-DL for submit@debbugs.gnu.org; Sat, 06 Jan 2024 01:05:33 -0500 Received: from mail.boiledscript.com ([144.168.59.46]:46470) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1rLzoJ-00055w-Av for 68276@debbugs.gnu.org; Sat, 06 Jan 2024 01:05:31 -0500 DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=ultrarare.space; s=dkim; t=1704521094; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:cc:mime-version:mime-version: content-transfer-encoding:content-transfer-encoding: in-reply-to:in-reply-to:references:references; bh=vV1ERrrhbQY6nDIf4aZVWVzbh2BfQWO2GgkswM+bMW0=; b=AQ31LuxQty0jpsty3m+iIReIoiXsEOAeOpj0wdn4G9zL/bP5gb3eI9zY22QbXxFpHbhpLt 1J3we2Dq4Tc1ZDnt5b160riElfsDzJjwvNuBfZSeolsiyKaCZLZdqH1K+dSU7b8ePdrT/b h9c8OcVMhVskpXTaPNSPh4Bc8yF5bvQx7/QHXTBpTPparqKkruXd90EEbCVWFpf02zZOJ9 ulM5I82+aQTAHIEEWgqpVgGN1ftW/DgoBearaMmt5jONXmyi3uXP8pdfare1q/WhvLd48i 1JkpxCEfdVH62KQ1LZ6p7OdwS2rFyOZLtVTqjbmJrcQgCb0OA2TfaqVkxjka1w== Authentication-Results: mail.boiledscript.com; auth=pass smtp.mailfrom=hako@ultrarare.space Date: Sat, 6 Jan 2024 14:04:47 +0800 Message-ID: <604a3abb982ef30c2ce4587c045864dfadd598ad.1704519990.git.hako@ultrarare.space> In-Reply-To: References: MIME-Version: 1.0 X-Spamd-Bar: -- 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: , Reply-to: Hilton Chain X-ACL-Warn: , Hilton Chain via Guix-patches X-Patchwork-Original-From: Hilton Chain via Guix-patches via From: Hilton Chain 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/networking.scm (iwd): Update to 2.12. [home-page]: Update homepage. Change-Id: Icfaee7fdbe7ce9bb4648d8ad841d74caaea84b4f --- gnu/packages/networking.scm | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/gnu/packages/networking.scm b/gnu/packages/networking.scm index c3796f7328..fda6775d71 100644 --- a/gnu/packages/networking.scm +++ b/gnu/packages/networking.scm @@ -3937,7 +3937,7 @@ (define-public bird (define-public iwd (package (name "iwd") - (version "2.8") + (version "2.12") (source (origin (method git-fetch) (uri (git-reference @@ -3946,7 +3946,7 @@ (define-public iwd (file-name (git-file-name name version)) (sha256 (base32 - "0bpksqyaqr624bj7zm9hi22rnp6wnjbngx4q08l7lbd0r7r93vcb")))) + "199pcs20054xhp5c0dnxf9ny5cf5cynkqpx68dpn46nq8ly76n2y")))) (build-system gnu-build-system) (inputs (list dbus ell (package-source ell) readline)) @@ -3990,7 +3990,7 @@ (define-public iwd (substitute* "Makefile" ;; Don't try to 'mkdir /var'. (("\\$\\(MKDIR_P\\) -m 700") "true"))))))) - (home-page "https://git.kernel.org/pub/scm/network/wireless/iwd.git/") + (home-page "https://iwd.wiki.kernel.org/") (synopsis "iNet Wireless Daemon") (description "iwd is a wireless daemon for Linux that aims to replace WPA Supplicant. It optimizes resource utilization by not depending on any external From patchwork Sat Jan 6 06:04:48 2024 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Hilton Chain X-Patchwork-Id: 58421 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 299B727BBEC; Sat, 6 Jan 2024 06:06:30 +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=-0.7 required=5.0 tests=BAYES_00,DKIM_INVALID, DKIM_SIGNED,FROM_SUSPICIOUS_NTLD,MAILING_LIST_MULTI,PDS_OTHER_BAD_TLD, SPF_HELO_PASS,URIBL_BLOCKED autolearn=no 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 565AD27BBE2 for ; Sat, 6 Jan 2024 06:06:29 +0000 (GMT) Received: from localhost ([::1] helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1rLzoo-0004Lr-Go; Sat, 06 Jan 2024 01:06:02 -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 1rLzok-0004JM-PT for guix-patches@gnu.org; Sat, 06 Jan 2024 01:05:58 -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 1rLzok-0002YW-H4 for guix-patches@gnu.org; Sat, 06 Jan 2024 01:05:58 -0500 Received: from Debian-debbugs by debbugs.gnu.org with local (Exim 4.84_2) (envelope-from ) id 1rLzop-00057a-6Z; Sat, 06 Jan 2024 01:06:03 -0500 X-Loop: help-debbugs@gnu.org Subject: [bug#68276] [PATCH 3/4] gnu: iwd: Use gexps. Resent-From: Hilton Chain Original-Sender: "Debbugs-submit" Resent-CC: hako@ultrarare.space, guix-patches@gnu.org Resent-Date: Sat, 06 Jan 2024 06:06:03 +0000 Resent-Message-ID: Resent-Sender: help-debbugs@gnu.org X-GNU-PR-Message: followup 68276 X-GNU-PR-Package: guix-patches X-GNU-PR-Keywords: patch To: 68276@debbugs.gnu.org Cc: Hilton Chain , Hilton Chain X-Debbugs-Original-Xcc: Hilton Chain Received: via spool by 68276-submit@debbugs.gnu.org id=B68276.170452113919622 (code B ref 68276); Sat, 06 Jan 2024 06:06:03 +0000 Received: (at 68276) by debbugs.gnu.org; 6 Jan 2024 06:05:39 +0000 Received: from localhost ([127.0.0.1]:58414 helo=debbugs.gnu.org) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1rLzoQ-00056P-S4 for submit@debbugs.gnu.org; Sat, 06 Jan 2024 01:05:39 -0500 Received: from mail.boiledscript.com ([144.168.59.46]:41586) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1rLzoO-00056F-1R for 68276@debbugs.gnu.org; Sat, 06 Jan 2024 01:05:36 -0500 DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=ultrarare.space; s=dkim; t=1704521099; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:cc:mime-version:mime-version: content-transfer-encoding:content-transfer-encoding: in-reply-to:in-reply-to:references:references; bh=H5YUwkMm/5Kg+brx9QLh8r7WB3GJMzyb0fnHtE7PtZ4=; b=wjqvEZZzU9OHqtuji2Ayw6RNgrLiUK9jmST7+JKwG4zARmTAPbUiuRfe8qpfOsQAuD5hOq zjd4xkO4iyysPEggyZPLqU+O+N66ZAGLl4UOLd/4ETsiyN1Acg4tJZ8U/JXk17VWoscu/5 Hzy2mJZ9VHa6PVD0t9XYZi/1Wcj5952DoTt1HVwcNb/U6TM54g1SHfsfAWSzfsfWlz017r rbhyMG6jZqwnu6YwK+co+1ixDWGKmGicX8LaVqxnXDcRVf9VgJCkONr0V5SlxeU4Afgb48 FKTqd/DQsN2ajBa7Uf2aizQswsj778jHQ4nXhnQi6Y1cp8dbYbOIRgb3Axb1iQ== Authentication-Results: mail.boiledscript.com; auth=pass smtp.mailfrom=hako@ultrarare.space Date: Sat, 6 Jan 2024 14:04:48 +0800 Message-ID: In-Reply-To: References: MIME-Version: 1.0 X-Spamd-Bar: -- 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: , Reply-to: Hilton Chain X-ACL-Warn: , Hilton Chain via Guix-patches X-Patchwork-Original-From: Hilton Chain via Guix-patches via From: Hilton Chain 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/networking.scm (iwd): Use gexps. Change-Id: Ie4a6394c9c7977291f56990eb1a535ba673d04ee --- gnu/packages/networking.scm | 62 ++++++++++++++++++------------------- 1 file changed, 31 insertions(+), 31 deletions(-) diff --git a/gnu/packages/networking.scm b/gnu/packages/networking.scm index fda6775d71..20674de76d 100644 --- a/gnu/packages/networking.scm +++ b/gnu/packages/networking.scm @@ -3959,37 +3959,37 @@ (define-public iwd python-docutils openssl)) (arguments - `(#:configure-flags - ,#~(list "--disable-systemd-service" - "--enable-external-ell" - "--enable-hwsim" - "--enable-tools" - "--enable-wired" - "--localstatedir=/var" - (string-append "--with-dbus-datadir=" #$output "/share/") - (string-append "--with-dbus-busdir=" - #$output "/share/dbus-1/system-services")) - #:phases - (modify-phases %standard-phases - (add-after 'unpack 'copy-ell-header-files - ;; Copy into the source tree two of ell's private header files that - ;; it shares with iwd, as is required to build with the - ;; "--enable-external-ell" configure option. - ;; See the definition of "ell_shared" in iwd's Makefile.am. - (lambda* (#:key inputs #:allow-other-keys) - (let ((ell-header-dir (search-input-directory inputs "/ell")) - (target-dir "ell")) - (mkdir target-dir) - (for-each - (lambda (file-name) - (copy-file (string-append ell-header-dir "/" file-name) - (string-append target-dir "/" file-name))) - '("asn1-private.h" "useful.h"))))) - (add-after 'configure 'patch-Makefile - (lambda _ - (substitute* "Makefile" - ;; Don't try to 'mkdir /var'. - (("\\$\\(MKDIR_P\\) -m 700") "true"))))))) + (list #:configure-flags + #~(list "--disable-systemd-service" + "--enable-external-ell" + "--enable-hwsim" + "--enable-tools" + "--enable-wired" + "--localstatedir=/var" + (string-append "--with-dbus-datadir=" #$output "/share/") + (string-append "--with-dbus-busdir=" + #$output "/share/dbus-1/system-services")) + #:phases + #~(modify-phases %standard-phases + (add-after 'unpack 'copy-ell-header-files + ;; Copy into the source tree two of ell's private header files + ;; that it shares with iwd, as is required to build with the + ;; "--enable-external-ell" configure option. See the + ;; definition of "ell_shared" in iwd's Makefile.am. + (lambda* (#:key inputs #:allow-other-keys) + (let ((ell-header-dir (search-input-directory inputs "/ell")) + (target-dir "ell")) + (mkdir target-dir) + (for-each + (lambda (file-name) + (copy-file (string-append ell-header-dir "/" file-name) + (string-append target-dir "/" file-name))) + '("asn1-private.h" "useful.h"))))) + (add-after 'configure 'patch-Makefile + (lambda _ + (substitute* "Makefile" + ;; Don't try to 'mkdir /var'. + (("\\$\\(MKDIR_P\\) -m 700") "true"))))))) (home-page "https://iwd.wiki.kernel.org/") (synopsis "iNet Wireless Daemon") (description "iwd is a wireless daemon for Linux that aims to replace WPA From patchwork Sat Jan 6 06:04:49 2024 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Hilton Chain X-Patchwork-Id: 58422 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 2FBA227BBE2; Sat, 6 Jan 2024 06:06:31 +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=-0.7 required=5.0 tests=BAYES_00,DKIM_INVALID, DKIM_SIGNED,FROM_SUSPICIOUS_NTLD,MAILING_LIST_MULTI,PDS_OTHER_BAD_TLD, SPF_HELO_PASS,URIBL_BLOCKED autolearn=no 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 07F6827BBEA for ; Sat, 6 Jan 2024 06:06:30 +0000 (GMT) Received: from localhost ([::1] helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1rLzon-0004Lq-WF; Sat, 06 Jan 2024 01:06:02 -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 1rLzol-0004Jc-8d for guix-patches@gnu.org; Sat, 06 Jan 2024 01:05:59 -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 1rLzol-0002Yg-0b for guix-patches@gnu.org; Sat, 06 Jan 2024 01:05:59 -0500 Received: from Debian-debbugs by debbugs.gnu.org with local (Exim 4.84_2) (envelope-from ) id 1rLzop-00057i-Mc; Sat, 06 Jan 2024 01:06:03 -0500 X-Loop: help-debbugs@gnu.org Subject: [bug#68276] [PATCH 4/4] gnu: iwd: Patch resolvconf path. Resent-From: Hilton Chain Original-Sender: "Debbugs-submit" Resent-CC: hako@ultrarare.space, guix-patches@gnu.org Resent-Date: Sat, 06 Jan 2024 06:06:03 +0000 Resent-Message-ID: Resent-Sender: help-debbugs@gnu.org X-GNU-PR-Message: followup 68276 X-GNU-PR-Package: guix-patches X-GNU-PR-Keywords: patch To: 68276@debbugs.gnu.org Cc: Hilton Chain , Hilton Chain X-Debbugs-Original-Xcc: Hilton Chain Received: via spool by 68276-submit@debbugs.gnu.org id=B68276.170452114219638 (code B ref 68276); Sat, 06 Jan 2024 06:06:03 +0000 Received: (at 68276) by debbugs.gnu.org; 6 Jan 2024 06:05:42 +0000 Received: from localhost ([127.0.0.1]:58417 helo=debbugs.gnu.org) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1rLzoU-00056f-Aw for submit@debbugs.gnu.org; Sat, 06 Jan 2024 01:05:42 -0500 Received: from mail.boiledscript.com ([144.168.59.46]:41600) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1rLzoS-00056Y-W2 for 68276@debbugs.gnu.org; Sat, 06 Jan 2024 01:05:41 -0500 DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=ultrarare.space; s=dkim; t=1704521104; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:cc:mime-version:mime-version: content-transfer-encoding:content-transfer-encoding: in-reply-to:in-reply-to:references:references; bh=WNDblQmMORRw+KxBa7ZxoFd33v4NwlDmT0aAqoQ40jE=; b=eqKYbv/KhKRk+nj1qnUOvmtvrQSy71oLMQG/i3dkxy6iMyLCiDss9J6ubB49b35EG6pQ5a BmT3Yy7n8OBIVpa9D1mCLF3PyNPwWWgjldyDQZGKa1c4QkdZ+Iq6yzsLO054C7ZPbVcnlF 5Q+8lf//34uzTqvqmBNyBAmG711jPH8tVLYj6eP/9tPUJmDaOrYknUQbdS06nd9pFP8hoW 9aRY1+rclLLBG5vvKqdUI1W71dBxBKh5Wo3I8H4VVJzERCPaVGjUdWwShperBKKmc06RZF t4W5yFbSwOfPN1uwnQv9Z207K7TkByzaOWZZuG5wKYv1qh3eN9gLrCqmqyC7QA== Authentication-Results: mail.boiledscript.com; auth=pass smtp.mailfrom=hako@ultrarare.space Date: Sat, 6 Jan 2024 14:04:49 +0800 Message-ID: <5f077d8952d96050ec3ae8dbbb52786766bbfa90.1704519990.git.hako@ultrarare.space> In-Reply-To: References: MIME-Version: 1.0 X-Spamd-Bar: -- 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: , Reply-to: Hilton Chain X-ACL-Warn: , Hilton Chain via Guix-patches X-Patchwork-Original-From: Hilton Chain via Guix-patches via From: Hilton Chain 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/networking.scm (iwd)[inputs]: Add openresolv. [arguments]<#:phases>: Add 'patch-resolvconf-path. Change-Id: Ica59a76dd6318e06979314e4b49c5371f4c98e4d --- gnu/packages/networking.scm | 10 +++++++++- 1 file changed, 9 insertions(+), 1 deletion(-) diff --git a/gnu/packages/networking.scm b/gnu/packages/networking.scm index 20674de76d..a6798bb166 100644 --- a/gnu/packages/networking.scm +++ b/gnu/packages/networking.scm @@ -113,6 +113,7 @@ (define-module (gnu packages networking) #:use-module (gnu packages curl) #:use-module (gnu packages cyrus-sasl) #:use-module (gnu packages dejagnu) + #:use-module (gnu packages dns) #:use-module (gnu packages docbook) #:use-module (gnu packages documentation) #:use-module (gnu packages flex) @@ -3949,7 +3950,7 @@ (define-public iwd "199pcs20054xhp5c0dnxf9ny5cf5cynkqpx68dpn46nq8ly76n2y")))) (build-system gnu-build-system) (inputs - (list dbus ell (package-source ell) readline)) + (list dbus ell (package-source ell) openresolv readline)) (native-inputs (list autoconf automake @@ -3985,6 +3986,13 @@ (define-public iwd (copy-file (string-append ell-header-dir "/" file-name) (string-append target-dir "/" file-name))) '("asn1-private.h" "useful.h"))))) + (add-after 'unpack 'patch-resolvconf-path + (lambda* (#:key inputs #:allow-other-keys) + (substitute* "src/resolve.c" + (("getenv\\(\"PATH\"\\)") + (format #f "\"~a\"" + (dirname (search-input-file + inputs "sbin/resolvconf"))))))) (add-after 'configure 'patch-Makefile (lambda _ (substitute* "Makefile"