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"