From unknown Tue Jun 17 22:29:09 2025 X-Loop: help-debbugs@gnu.org Subject: [bug#63793] [PATCH] gnu: sbsigntools: Update to 0.9.5. Resent-From: kiasoc5 Original-Sender: "Debbugs-submit" Resent-CC: guix-patches@gnu.org Resent-Date: Mon, 29 May 2023 21:55:02 +0000 Resent-Message-ID: Resent-Sender: help-debbugs@gnu.org X-GNU-PR-Message: report 63793 X-GNU-PR-Package: guix-patches X-GNU-PR-Keywords: patch To: 63793@debbugs.gnu.org Cc: kiasoc5 X-Debbugs-Original-To: guix-patches@gnu.org Received: via spool by submit@debbugs.gnu.org id=B.16853972706122 (code B ref -1); Mon, 29 May 2023 21:55:02 +0000 Received: (at submit) by debbugs.gnu.org; 29 May 2023 21:54:30 +0000 Received: from localhost ([127.0.0.1]:59368 helo=debbugs.gnu.org) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1q3kow-0001ae-Cs for submit@debbugs.gnu.org; Mon, 29 May 2023 17:54:30 -0400 Received: from lists.gnu.org ([209.51.188.17]:42106) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1q3kov-0001aX-5G for submit@debbugs.gnu.org; Mon, 29 May 2023 17:54:29 -0400 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 1q3kou-00040r-MY for guix-patches@gnu.org; Mon, 29 May 2023 17:54:28 -0400 Received: from knopi.disroot.org ([178.21.23.139]) by eggs.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_GCM_SHA384:256) (Exim 4.90_1) (envelope-from ) id 1q3kos-0003Da-8P for guix-patches@gnu.org; Mon, 29 May 2023 17:54:28 -0400 Received: from localhost (localhost [127.0.0.1]) by disroot.org (Postfix) with ESMTP id 0CE08451AD; Mon, 29 May 2023 23:54:23 +0200 (CEST) X-Virus-Scanned: SPAM Filter at disroot.org Received: from knopi.disroot.org ([127.0.0.1]) by localhost (disroot.org [127.0.0.1]) (amavisd-new, port 10024) with ESMTP id HyCodBfeQZ6M; Mon, 29 May 2023 23:54:21 +0200 (CEST) From: kiasoc5 DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=disroot.org; s=mail; t=1685397261; bh=x5FvA7A362uB9flOAR87V38AMWkGepniOIkOYCRTqZ0=; h=From:To:Cc:Subject:Date; b=jXgJj/dNZ2DPQI9KBpwFivmImMOMAnc8Ib8tTIlytA0wr3EpuYTaZTzvOYcx2wpLe KzodrN8H+k02d1r1zACU0aamqefWCpH19PDBiXEFTPVSr0Hq9bxnmbR3PLo5+G3nBp 019ig39x1v3ShVTW44V3hUqny5irZTQA21ZTtM2O4dtRdKstzPRFSbwApW5VCM8Hzh s3Hd5ROGu1+iLLb1e0uWgm9usfjZbtTq47abFNHR6EVvg0kMX2A+Dkd0ydKjyLNCWP +fmfucRiw3xzEWrgnilOpFB9k0mcTyDUiTBE7o3f/e3XU5WdSORNSgB6VSgMCzRnXh H56XdX02SBkAw== Date: Mon, 29 May 2023 17:53:41 -0400 Message-Id: <782d12b0f1d53565166394065415862fba56bff1.1685397220.git.kiasoc5@disroot.org> MIME-Version: 1.0 Content-Transfer-Encoding: 8bit Received-SPF: pass client-ip=178.21.23.139; envelope-from=kiasoc5@disroot.org; helo=knopi.disroot.org 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, SPF_HELO_NONE=0.001, SPF_PASS=-0.001, T_SCC_BODY_TEXT_LINE=-0.01 autolearn=ham autolearn_force=no X-Spam_action: no action X-Spam-Score: -1.4 (-) X-BeenThere: debbugs-submit@debbugs.gnu.org X-Mailman-Version: 2.1.18 Precedence: list List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Errors-To: debbugs-submit-bounces@debbugs.gnu.org Sender: "Debbugs-submit" X-Spam-Score: -2.4 (--) This fixes a build failure with openssl-3. * gnu/packages/efi.scm (sbsigntools): Update to 0.9.5. [arguments]: Remove trailing #t's. Use Gexps. Use "this-package-input". Simplify lambdas. [inputs]: Remove labels. --- gnu/packages/efi.scm | 58 +++++++++++++++++++++----------------------- 1 file changed, 28 insertions(+), 30 deletions(-) diff --git a/gnu/packages/efi.scm b/gnu/packages/efi.scm index 75eb24bf86..50d52c4d65 100644 --- a/gnu/packages/efi.scm +++ b/gnu/packages/efi.scm @@ -30,6 +30,7 @@ (define-module (gnu packages efi) #:use-module ((guix licenses) #:prefix license:) #:use-module (guix build-system gnu) #:use-module (guix download) + #:use-module (guix gexp) #:use-module (guix git-download) #:use-module (guix packages) #:use-module (guix utils) @@ -99,7 +100,7 @@ (define-public efi-analyzer (define-public sbsigntools (package (name "sbsigntools") - (version "0.9.4") + (version "0.9.5") (source (origin (method git-fetch) @@ -110,34 +111,31 @@ (define-public sbsigntools (recursive? #t))) (file-name (git-file-name name version)) (sha256 - (base32 "1y76wy65y6k10mjl2dm5hb5ms475alr4s080xzj8y833x01xvf3m")))) + (base32 "060n6w0dx1mrilhdv482ncckanqz6pdv53piimiki0bm15d2fcp4")))) (build-system gnu-build-system) (arguments - `(#:phases - (modify-phases %standard-phases - (add-after 'unpack 'patch-more-shebangs - (lambda* (#:key inputs #:allow-other-keys) - (substitute* "lib/ccan.git/tools/create-ccan-tree" - (("#!/bin/bash") - (string-append "#!" - (assoc-ref inputs "bash") - "/bin/bash"))) - #t)) - (add-after 'unpack 'patch - (lambda* (#:key inputs outputs #:allow-other-keys) - (substitute* '("configure.ac" - "tests/Makefile.am") - (("/usr/include/efi") - (string-append (assoc-ref inputs "gnu-efi") - "/include/efi")) - (("/usr/lib/gnuefi") - (string-append (assoc-ref inputs "gnu-efi") - "/lib"))) - #t)) - (add-after 'unpack 'setenv - (lambda _ - (setenv "CC" "gcc") - #t))))) + (list #:phases + #~(modify-phases %standard-phases + (add-after 'unpack 'patch-more-shebangs + (lambda _ + (substitute* "lib/ccan.git/tools/create-ccan-tree" + (("#!/bin/bash") + (string-append "#!" + #$(this-package-native-input "bash") + "/bin/bash"))))) + (add-after 'unpack 'patch + (lambda _ + (substitute* '("configure.ac" + "tests/Makefile.am") + (("/usr/include/efi") + (string-append #$(this-package-input "gnu-efi") + "/include/efi")) + (("/usr/lib/gnuefi") + (string-append #$(this-package-input "gnu-efi") + "/lib"))))) + (add-after 'unpack 'setenv + (lambda _ + (setenv "CC" "gcc")))))) (native-inputs (list autoconf automake @@ -146,9 +144,9 @@ (define-public sbsigntools pkg-config util-linux)) ; getopt (inputs - `(("gnu-efi" ,gnu-efi) - ("libuuid" ,util-linux "lib") - ("openssl" ,openssl))) + (list gnu-efi + `(,util-linux "lib") ; libuuid + openssl)) (synopsis "EFI signing tools") (description "This package provides tools for signing EFI binaries.") (home-page "https://git.kernel.org/pub/scm/linux/kernel/git/jejb/sbsigntools.git/") base-commit: b96b82bcd4bc24529941ff74a91432481f1a71b5 -- 2.40.1 From debbugs-submit-bounces@debbugs.gnu.org Tue May 30 00:06:34 2023 Received: (at control) by debbugs.gnu.org; 30 May 2023 04:06:34 +0000 Received: from localhost ([127.0.0.1]:59659 helo=debbugs.gnu.org) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1q3qd0-0003Nx-Jf for submit@debbugs.gnu.org; Tue, 30 May 2023 00:06:34 -0400 Received: from sail-ipv4.us-core.com ([208.82.101.137]:50374) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1q3qcx-0003Nj-Kn for control@debbugs.gnu.org; Tue, 30 May 2023 00:06:33 -0400 DKIM-Signature: v=1; a=rsa-sha256; c=simple/simple; s=2017; bh=bMlYv7TKg6rgr2K D6yiSaN1jPxdYfWH/OGdGpHPDjfw=; h=to:subject:date:from; d=lease-up.com; b=UMEsoqT1igR7/Pcx2GB40pmCIPgHZlOETboys1k7BZuU84WzKPZV2X03hgblQRbspIdM WiDs6+yFv5aIkO7KJbZCII9SdA3exCwEXy4EJOck+eyqiQ7ck+/Eb5EpRMQZfL2hnfSouv d9bkRg8mizQC76k4k8RhhSvs78bslDf6U= Received: by sail-ipv4.us-core.com (OpenSMTPD) with ESMTPSA id 991733d3 (TLSv1.3:TLS_CHACHA20_POLY1305_SHA256:256:NO) for ; Tue, 30 May 2023 04:06:29 +0000 (UTC) Received: by mail-lj1-f176.google.com with SMTP id 38308e7fff4ca-2af278ca45eso40520341fa.1 for ; Mon, 29 May 2023 21:06:29 -0700 (PDT) X-Gm-Message-State: AC+VfDy/UVEmtS4ZzHywHaiPVIsr58H9g2cqCWalqvfvXJBe6gkxLQ8O MSN36BZSfEd95wd/MG4nBKtkyUyOq+ekl9UkUMw= X-Google-Smtp-Source: ACHHUZ6PsfzupeZk7f/wuTOX5H9EBNJPi16QGYC1j3tlt0hPqx9k9ThKq9hnTqlf0UL1a3ykQzj353otB4H9QDErvbY= X-Received: by 2002:a05:651c:10b:b0:2af:d2ef:49d4 with SMTP id a11-20020a05651c010b00b002afd2ef49d4mr189813ljb.1.1685419587463; Mon, 29 May 2023 21:06:27 -0700 (PDT) MIME-Version: 1.0 From: Felix Lechner Date: Mon, 29 May 2023 21:05:51 -0700 X-Gmail-Original-Message-ID: Message-ID: Subject: Merging duplicates for / gnu: sbsigntools: Update to 0.9.5. To: control@debbugs.gnu.org Content-Type: text/plain; charset="UTF-8" X-Spam-Score: 0.0 (/) X-Debbugs-Envelope-To: control X-BeenThere: debbugs-submit@debbugs.gnu.org X-Mailman-Version: 2.1.18 Precedence: list List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Errors-To: debbugs-submit-bounces@debbugs.gnu.org Sender: "Debbugs-submit" X-Spam-Score: -1.0 (-) forcemerge 63793 63635 thanks From unknown Tue Jun 17 22:29:09 2025 X-Loop: help-debbugs@gnu.org Subject: [bug#63793] Merged duplicate References: <782d12b0f1d53565166394065415862fba56bff1.1685397220.git.kiasoc5@disroot.org> In-Reply-To: <782d12b0f1d53565166394065415862fba56bff1.1685397220.git.kiasoc5@disroot.org> Resent-From: Felix Lechner Original-Sender: "Debbugs-submit" Resent-CC: guix-patches@gnu.org Resent-Date: Wed, 31 May 2023 14:51:02 +0000 Resent-Message-ID: Resent-Sender: help-debbugs@gnu.org X-GNU-PR-Message: followup 63793 X-GNU-PR-Package: guix-patches X-GNU-PR-Keywords: patch To: 63635@debbugs.gnu.org, 63793@debbugs.gnu.org Cc: kiasoc5@disroot.org Received: via spool by 63793-submit@debbugs.gnu.org id=B63793.168554463710860 (code B ref 63793); Wed, 31 May 2023 14:51:02 +0000 Received: (at 63793) by debbugs.gnu.org; 31 May 2023 14:50:37 +0000 Received: from localhost ([127.0.0.1]:36165 helo=debbugs.gnu.org) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1q4N9o-0002p3-QB for submit@debbugs.gnu.org; Wed, 31 May 2023 10:50:36 -0400 Received: from sail-ipv4.us-core.com ([208.82.101.137]:36936) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1q4N9l-0002op-Ua; Wed, 31 May 2023 10:50:35 -0400 DKIM-Signature: v=1; a=rsa-sha256; c=simple/simple; s=2017; bh=UYbBEh+Ukuw5zUl gJ1kz3nS5pATwxiXaqepu3uuk+lE=; h=cc:to:subject:date:from; d=lease-up.com; b=OeZlazgk0OvS/bO0Fzwk15N/fpfJOhhUlY9ee8ui6cEtEBMU1nav QtXhPeBx5ViyJAz7FwRol6ddlqn4AFIQrWaKQrimeUBKIiScCx7sfiCdoghm+EKjr/Upf8 etN3OI92/pzmfFsHqs5nCRtw6jiB+V5+PdNG2i6ZUyMHH2VHQ= Received: by sail-ipv4.us-core.com (OpenSMTPD) with ESMTPSA id 408c5ad7 (TLSv1.3:TLS_CHACHA20_POLY1305_SHA256:256:NO); Wed, 31 May 2023 14:50:31 +0000 (UTC) Received: by mail-lj1-f177.google.com with SMTP id 38308e7fff4ca-2af30d10d8fso62621911fa.0; Wed, 31 May 2023 07:50:31 -0700 (PDT) X-Gm-Message-State: AC+VfDwVFJXDiHNbdpoc8KWoYSPQXFnooodrVAmV3AviRgl0tMjhIpzi BvHyMfk2yCl3pMEiz0x9xPwJiKbSMl3Ry32ySa0= X-Google-Smtp-Source: ACHHUZ4cMO/CN5eAuGxatDaCMXQXZ3ZK5eAQcQE9xtLZYlpn4an54TMblxvex+4Mc2ChyZOruap9f3KZsFEjwLbievA= X-Received: by 2002:a2e:9c51:0:b0:2a8:b7e9:82ee with SMTP id t17-20020a2e9c51000000b002a8b7e982eemr2765670ljj.1.1685544629468; Wed, 31 May 2023 07:50:29 -0700 (PDT) MIME-Version: 1.0 From: Felix Lechner Date: Wed, 31 May 2023 07:49:53 -0700 X-Gmail-Original-Message-ID: Message-ID: Content-Type: text/plain; charset="UTF-8" X-Spam-Score: 0.0 (/) X-BeenThere: debbugs-submit@debbugs.gnu.org X-Mailman-Version: 2.1.18 Precedence: list List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Errors-To: debbugs-submit-bounces@debbugs.gnu.org Sender: "Debbugs-submit" X-Spam-Score: -1.0 (-) Hi, There is a merged duplicate to this bug that may be hidden in Mumi. The two bugs are Bug#63793 and Bug#63635. The linkage may be easier to see in Debbugs. Kind regards Felix From unknown Tue Jun 17 22:29:09 2025 MIME-Version: 1.0 X-Mailer: MIME-tools 5.505 (Entity 5.505) X-Loop: help-debbugs@gnu.org From: help-debbugs@gnu.org (GNU bug Tracking System) To: kiasoc5 Subject: bug#63793: closed (Re: [bug#63793] [PATCH] gnu: sbsigntools: Update to 0.9.5.) Message-ID: References: <87bkhvef98.fsf@jpoiret.xyz> <782d12b0f1d53565166394065415862fba56bff1.1685397220.git.kiasoc5@disroot.org> X-Gnu-PR-Message: they-closed 63793 X-Gnu-PR-Package: guix-patches X-Gnu-PR-Keywords: patch Reply-To: 63793@debbugs.gnu.org Date: Sun, 04 Jun 2023 09:42:02 +0000 Content-Type: multipart/mixed; boundary="----------=_1685871722-16047-1" This is a multi-part message in MIME format... ------------=_1685871722-16047-1 Content-Disposition: inline Content-Transfer-Encoding: quoted-printable Content-Type: text/plain; charset="utf-8" Your bug report #63793: [PATCH] gnu: sbsigntools: Update to 0.9.5. which was filed against the guix-patches package, has been closed. The explanation is attached below, along with your original report. If you require more details, please reply to 63793@debbugs.gnu.org. --=20 63793: https://debbugs.gnu.org/cgi/bugreport.cgi?bug=3D63793 GNU Bug Tracking System Contact help-debbugs@gnu.org with problems ------------=_1685871722-16047-1 Content-Type: message/rfc822 Content-Disposition: inline Content-Transfer-Encoding: 7bit Received: (at 63793-done) by debbugs.gnu.org; 4 Jun 2023 09:41:29 +0000 Received: from localhost ([127.0.0.1]:45051 helo=debbugs.gnu.org) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1q5kEq-0004A1-LK for submit@debbugs.gnu.org; Sun, 04 Jun 2023 05:41:29 -0400 Received: from jpoiret.xyz ([206.189.101.64]:55400) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1q5kEo-00049t-Jj for 63793-done@debbugs.gnu.org; Sun, 04 Jun 2023 05:41:27 -0400 Received: from authenticated-user (jpoiret.xyz [206.189.101.64]) by jpoiret.xyz (Postfix) with ESMTPA id 60067185309; Sun, 4 Jun 2023 09:41:25 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=jpoiret.xyz; s=dkim; t=1685871685; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:cc:mime-version:mime-version:content-type:content-type: in-reply-to:in-reply-to:references:references; bh=9nSQWyyp/epbR0xD8kakXa6/TV2UiqgIxs0UEI5iww4=; b=XdidKYPwOWE98GueDszldtLxomBpc1FN4Ks4jWe7n7N0lhVG3glSz4RmJ8p6PGC2P9/xHy 6Nohyogj6c/sfnzIwScjyA/KGXR7OLrwsvtQRp72JMBXUGnfUzrydczNdGeLPBbxZvf251 AH1zekgGk3sm+fnCxCzLmbLlq7nv9BaZlekGWFfD2A86chZBJFZOfql5N8UiISGzwS9hqM weNFkeAMjjbuYT3kdIA8X9QaylbiKqMjrjC19XzdPaJLqI6F/13sE/NJHeum6pIaGJCFmf AFJrkOKAknPuWmrN4HLGBwCm7+IK8IqzPUzYmamOtcJKP28VY1jqJ7Qp70KaVA== From: Josselin Poiret To: kiasoc5 , 63793-done@debbugs.gnu.org Subject: Re: [bug#63793] [PATCH] gnu: sbsigntools: Update to 0.9.5. In-Reply-To: <782d12b0f1d53565166394065415862fba56bff1.1685397220.git.kiasoc5@disroot.org> References: <782d12b0f1d53565166394065415862fba56bff1.1685397220.git.kiasoc5@disroot.org> Date: Sun, 04 Jun 2023 11:41:23 +0200 Message-ID: <87bkhvef98.fsf@jpoiret.xyz> MIME-Version: 1.0 Content-Type: multipart/signed; boundary="=-=-="; micalg=pgp-sha512; protocol="application/pgp-signature" X-Spamd-Bar: / Authentication-Results: jpoiret.xyz; auth=pass smtp.auth=jpoiret@jpoiret.xyz smtp.mailfrom=dev@jpoiret.xyz X-Spam-Score: 0.0 (/) X-Debbugs-Envelope-To: 63793-done Cc: Felix Lechner X-BeenThere: debbugs-submit@debbugs.gnu.org X-Mailman-Version: 2.1.18 Precedence: list List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Errors-To: debbugs-submit-bounces@debbugs.gnu.org Sender: "Debbugs-submit" X-Spam-Score: 0.0 (/) --=-=-= Content-Type: text/plain Content-Transfer-Encoding: quoted-printable Hi, kiasoc5 via Guix-patches via writes: > This fixes a build failure with openssl-3. > > * gnu/packages/efi.scm (sbsigntools): Update to 0.9.5. > [arguments]: Remove trailing #t's. Use Gexps. Use "this-package-input". S= implify lambdas. > [inputs]: Remove labels. Thanks for your patch! Pushed as f72f3a909a41dce5dc4512c30d4cd0673bc6560f with the following best practices modifications (importantly, note cc-for-target and search-input-file for bash). By the way, please enable forceinbodyfrom in git so that a pristine From field is inserted into your patches, as your mail From list is being rewritten to comply with your domain's DKIM. diff --git a/gnu/packages/efi.scm b/gnu/packages/efi.scm index 50d52c4d65..499745eba1 100644 =2D-- a/gnu/packages/efi.scm +++ b/gnu/packages/efi.scm @@ -114,28 +114,29 @@ (define-public sbsigntools (base32 "060n6w0dx1mrilhdv482ncckanqz6pdv53piimiki0bm15d2fcp4")))) (build-system gnu-build-system) (arguments =2D (list #:phases =2D #~(modify-phases %standard-phases =2D (add-after 'unpack 'patch-more-shebangs =2D (lambda _ =2D (substitute* "lib/ccan.git/tools/create-ccan-tree" =2D (("#!/bin/bash") =2D (string-append "#!" =2D #$(this-package-native-input "bash") =2D "/bin/bash"))))) =2D (add-after 'unpack 'patch =2D (lambda _ =2D (substitute* '("configure.ac" =2D "tests/Makefile.am") =2D (("/usr/include/efi") =2D (string-append #$(this-package-input "gnu-efi") =2D "/include/efi")) =2D (("/usr/lib/gnuefi") =2D (string-append #$(this-package-input "gnu-efi") =2D "/lib"))))) =2D (add-after 'unpack 'setenv =2D (lambda _ =2D (setenv "CC" "gcc")))))) + (list + #:phases + #~(modify-phases %standard-phases + (add-after 'unpack 'patch-more-shebangs + (lambda* (#:key inputs native-inputs #:allow-other-keys) + (substitute* "lib/ccan.git/tools/create-ccan-tree" + (("#!/bin/bash") + (string-append "#!" + (search-input-file (or native-inputs input= s) + "/bin/bash")))))) + (add-after 'unpack 'patch + (lambda _ + (substitute* '("configure.ac" + "tests/Makefile.am") + (("/usr/include/efi") + (string-append #$(this-package-input "gnu-efi") + "/include/efi")) + (("/usr/lib/gnuefi") + (string-append #$(this-package-input "gnu-efi") + "/lib"))))) + (add-after 'unpack 'setenv + (lambda _ + (setenv "CC" #$(cc-for-target))))))) (native-inputs (list autoconf automake =2D-=20 Josselin Poiret --=-=-= Content-Type: application/pgp-signature; name="signature.asc" -----BEGIN PGP SIGNATURE----- iQHEBAEBCgAuFiEEOSSM2EHGPMM23K8vUF5AuRYXGooFAmR8XEMQHGRldkBqcG9p cmV0Lnh5egAKCRBQXkC5FhcairsBC/9TAKHkYADXuymzDyIZYJV4q3beSYubkAio rVqG+az5cT1zMLh4mpIlU8fDwinnGvPdjepxlfikkO/9SDsuGkPFhORZ7sl0gX4F 4uA43g7R4YorR3z7WwrFEcd7PQUF1pIjt47HZ6tTLiQt2dC9hoWTWPlm8ga2zojk NCGL28gxrHIiMlWHoKcwNTMPfwBbCDt5F54LpQlbUTYMFASWJ5l2JIZ2jIYxxT0N RHm69xLgABvpio+0muqb245yl236bnfzqj246mefGlWGCmMtgfCuYNp2xQk+RZxG zM/Yr9gEEAlMc6h+1WsJSv5vFs/xr5OK6W42uC6nG2GNMMgwg1EuRkLb3QCn9+tL M9TlhXWiT6dRAfh88/7HytjV23va6zfBAR2ZueBSltN4gdTNsSUs+SwFPfD0WG1h NzuqdCf6wlYWZFF9uevoVM4sPob2Xtu5wqjsY55PNiVXw0XJDNo9oh4IaSC6v7Yf TghRMSeQplTMVOIMTdhMCKAkXalC4tc= =cVIV -----END PGP SIGNATURE----- --=-=-=-- ------------=_1685871722-16047-1 Content-Type: message/rfc822 Content-Disposition: inline Content-Transfer-Encoding: 7bit Received: (at submit) by debbugs.gnu.org; 29 May 2023 21:54:30 +0000 Received: from localhost ([127.0.0.1]:59368 helo=debbugs.gnu.org) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1q3kow-0001ae-Cs for submit@debbugs.gnu.org; Mon, 29 May 2023 17:54:30 -0400 Received: from lists.gnu.org ([209.51.188.17]:42106) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1q3kov-0001aX-5G for submit@debbugs.gnu.org; Mon, 29 May 2023 17:54:29 -0400 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 1q3kou-00040r-MY for guix-patches@gnu.org; Mon, 29 May 2023 17:54:28 -0400 Received: from knopi.disroot.org ([178.21.23.139]) by eggs.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_GCM_SHA384:256) (Exim 4.90_1) (envelope-from ) id 1q3kos-0003Da-8P for guix-patches@gnu.org; Mon, 29 May 2023 17:54:28 -0400 Received: from localhost (localhost [127.0.0.1]) by disroot.org (Postfix) with ESMTP id 0CE08451AD; Mon, 29 May 2023 23:54:23 +0200 (CEST) X-Virus-Scanned: SPAM Filter at disroot.org Received: from knopi.disroot.org ([127.0.0.1]) by localhost (disroot.org [127.0.0.1]) (amavisd-new, port 10024) with ESMTP id HyCodBfeQZ6M; Mon, 29 May 2023 23:54:21 +0200 (CEST) From: kiasoc5 DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=disroot.org; s=mail; t=1685397261; bh=x5FvA7A362uB9flOAR87V38AMWkGepniOIkOYCRTqZ0=; h=From:To:Cc:Subject:Date; b=jXgJj/dNZ2DPQI9KBpwFivmImMOMAnc8Ib8tTIlytA0wr3EpuYTaZTzvOYcx2wpLe KzodrN8H+k02d1r1zACU0aamqefWCpH19PDBiXEFTPVSr0Hq9bxnmbR3PLo5+G3nBp 019ig39x1v3ShVTW44V3hUqny5irZTQA21ZTtM2O4dtRdKstzPRFSbwApW5VCM8Hzh s3Hd5ROGu1+iLLb1e0uWgm9usfjZbtTq47abFNHR6EVvg0kMX2A+Dkd0ydKjyLNCWP +fmfucRiw3xzEWrgnilOpFB9k0mcTyDUiTBE7o3f/e3XU5WdSORNSgB6VSgMCzRnXh H56XdX02SBkAw== To: guix-patches@gnu.org Subject: [PATCH] gnu: sbsigntools: Update to 0.9.5. Date: Mon, 29 May 2023 17:53:41 -0400 Message-Id: <782d12b0f1d53565166394065415862fba56bff1.1685397220.git.kiasoc5@disroot.org> MIME-Version: 1.0 Content-Transfer-Encoding: 8bit Received-SPF: pass client-ip=178.21.23.139; envelope-from=kiasoc5@disroot.org; helo=knopi.disroot.org 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, SPF_HELO_NONE=0.001, SPF_PASS=-0.001, T_SCC_BODY_TEXT_LINE=-0.01 autolearn=ham autolearn_force=no X-Spam_action: no action X-Spam-Score: -1.4 (-) X-Debbugs-Envelope-To: submit Cc: kiasoc5 X-BeenThere: debbugs-submit@debbugs.gnu.org X-Mailman-Version: 2.1.18 Precedence: list List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Errors-To: debbugs-submit-bounces@debbugs.gnu.org Sender: "Debbugs-submit" X-Spam-Score: -2.4 (--) This fixes a build failure with openssl-3. * gnu/packages/efi.scm (sbsigntools): Update to 0.9.5. [arguments]: Remove trailing #t's. Use Gexps. Use "this-package-input". Simplify lambdas. [inputs]: Remove labels. --- gnu/packages/efi.scm | 58 +++++++++++++++++++++----------------------- 1 file changed, 28 insertions(+), 30 deletions(-) diff --git a/gnu/packages/efi.scm b/gnu/packages/efi.scm index 75eb24bf86..50d52c4d65 100644 --- a/gnu/packages/efi.scm +++ b/gnu/packages/efi.scm @@ -30,6 +30,7 @@ (define-module (gnu packages efi) #:use-module ((guix licenses) #:prefix license:) #:use-module (guix build-system gnu) #:use-module (guix download) + #:use-module (guix gexp) #:use-module (guix git-download) #:use-module (guix packages) #:use-module (guix utils) @@ -99,7 +100,7 @@ (define-public efi-analyzer (define-public sbsigntools (package (name "sbsigntools") - (version "0.9.4") + (version "0.9.5") (source (origin (method git-fetch) @@ -110,34 +111,31 @@ (define-public sbsigntools (recursive? #t))) (file-name (git-file-name name version)) (sha256 - (base32 "1y76wy65y6k10mjl2dm5hb5ms475alr4s080xzj8y833x01xvf3m")))) + (base32 "060n6w0dx1mrilhdv482ncckanqz6pdv53piimiki0bm15d2fcp4")))) (build-system gnu-build-system) (arguments - `(#:phases - (modify-phases %standard-phases - (add-after 'unpack 'patch-more-shebangs - (lambda* (#:key inputs #:allow-other-keys) - (substitute* "lib/ccan.git/tools/create-ccan-tree" - (("#!/bin/bash") - (string-append "#!" - (assoc-ref inputs "bash") - "/bin/bash"))) - #t)) - (add-after 'unpack 'patch - (lambda* (#:key inputs outputs #:allow-other-keys) - (substitute* '("configure.ac" - "tests/Makefile.am") - (("/usr/include/efi") - (string-append (assoc-ref inputs "gnu-efi") - "/include/efi")) - (("/usr/lib/gnuefi") - (string-append (assoc-ref inputs "gnu-efi") - "/lib"))) - #t)) - (add-after 'unpack 'setenv - (lambda _ - (setenv "CC" "gcc") - #t))))) + (list #:phases + #~(modify-phases %standard-phases + (add-after 'unpack 'patch-more-shebangs + (lambda _ + (substitute* "lib/ccan.git/tools/create-ccan-tree" + (("#!/bin/bash") + (string-append "#!" + #$(this-package-native-input "bash") + "/bin/bash"))))) + (add-after 'unpack 'patch + (lambda _ + (substitute* '("configure.ac" + "tests/Makefile.am") + (("/usr/include/efi") + (string-append #$(this-package-input "gnu-efi") + "/include/efi")) + (("/usr/lib/gnuefi") + (string-append #$(this-package-input "gnu-efi") + "/lib"))))) + (add-after 'unpack 'setenv + (lambda _ + (setenv "CC" "gcc")))))) (native-inputs (list autoconf automake @@ -146,9 +144,9 @@ (define-public sbsigntools pkg-config util-linux)) ; getopt (inputs - `(("gnu-efi" ,gnu-efi) - ("libuuid" ,util-linux "lib") - ("openssl" ,openssl))) + (list gnu-efi + `(,util-linux "lib") ; libuuid + openssl)) (synopsis "EFI signing tools") (description "This package provides tools for signing EFI binaries.") (home-page "https://git.kernel.org/pub/scm/linux/kernel/git/jejb/sbsigntools.git/") base-commit: b96b82bcd4bc24529941ff74a91432481f1a71b5 -- 2.40.1 ------------=_1685871722-16047-1-- From unknown Tue Jun 17 22:29:09 2025 MIME-Version: 1.0 X-Mailer: MIME-tools 5.505 (Entity 5.505) X-Loop: help-debbugs@gnu.org From: help-debbugs@gnu.org (GNU bug Tracking System) To: Felix Lechner Subject: bug#63635: closed (Re: [bug#63793] [PATCH] gnu: sbsigntools: Update to 0.9.5.) Message-ID: References: <87bkhvef98.fsf@jpoiret.xyz> X-Gnu-PR-Message: they-closed 63635 X-Gnu-PR-Package: guix-patches X-Gnu-PR-Keywords: patch Reply-To: 63635@debbugs.gnu.org Date: Sun, 04 Jun 2023 09:42:02 +0000 Content-Type: multipart/mixed; boundary="----------=_1685871722-16047-3" This is a multi-part message in MIME format... ------------=_1685871722-16047-3 Content-Disposition: inline Content-Transfer-Encoding: quoted-printable Content-Type: text/plain; charset="utf-8" Your bug report #63793: [PATCH 0/2] gnu: sbsigntools: Update to 0.9.5. which was filed against the guix-patches package, has been closed. The explanation is attached below, along with your original report. If you require more details, please reply to 63635@debbugs.gnu.org. --=20 63793: https://debbugs.gnu.org/cgi/bugreport.cgi?bug=3D63793 GNU Bug Tracking System Contact help-debbugs@gnu.org with problems ------------=_1685871722-16047-3 Content-Type: message/rfc822 Content-Disposition: inline Content-Transfer-Encoding: 7bit Received: (at 63793-done) by debbugs.gnu.org; 4 Jun 2023 09:41:29 +0000 Received: from localhost ([127.0.0.1]:45051 helo=debbugs.gnu.org) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1q5kEq-0004A1-LK for submit@debbugs.gnu.org; Sun, 04 Jun 2023 05:41:29 -0400 Received: from jpoiret.xyz ([206.189.101.64]:55400) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1q5kEo-00049t-Jj for 63793-done@debbugs.gnu.org; Sun, 04 Jun 2023 05:41:27 -0400 Received: from authenticated-user (jpoiret.xyz [206.189.101.64]) by jpoiret.xyz (Postfix) with ESMTPA id 60067185309; Sun, 4 Jun 2023 09:41:25 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=jpoiret.xyz; s=dkim; t=1685871685; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:cc:mime-version:mime-version:content-type:content-type: in-reply-to:in-reply-to:references:references; bh=9nSQWyyp/epbR0xD8kakXa6/TV2UiqgIxs0UEI5iww4=; b=XdidKYPwOWE98GueDszldtLxomBpc1FN4Ks4jWe7n7N0lhVG3glSz4RmJ8p6PGC2P9/xHy 6Nohyogj6c/sfnzIwScjyA/KGXR7OLrwsvtQRp72JMBXUGnfUzrydczNdGeLPBbxZvf251 AH1zekgGk3sm+fnCxCzLmbLlq7nv9BaZlekGWFfD2A86chZBJFZOfql5N8UiISGzwS9hqM weNFkeAMjjbuYT3kdIA8X9QaylbiKqMjrjC19XzdPaJLqI6F/13sE/NJHeum6pIaGJCFmf AFJrkOKAknPuWmrN4HLGBwCm7+IK8IqzPUzYmamOtcJKP28VY1jqJ7Qp70KaVA== From: Josselin Poiret To: kiasoc5 , 63793-done@debbugs.gnu.org Subject: Re: [bug#63793] [PATCH] gnu: sbsigntools: Update to 0.9.5. In-Reply-To: <782d12b0f1d53565166394065415862fba56bff1.1685397220.git.kiasoc5@disroot.org> References: <782d12b0f1d53565166394065415862fba56bff1.1685397220.git.kiasoc5@disroot.org> Date: Sun, 04 Jun 2023 11:41:23 +0200 Message-ID: <87bkhvef98.fsf@jpoiret.xyz> MIME-Version: 1.0 Content-Type: multipart/signed; boundary="=-=-="; micalg=pgp-sha512; protocol="application/pgp-signature" X-Spamd-Bar: / Authentication-Results: jpoiret.xyz; auth=pass smtp.auth=jpoiret@jpoiret.xyz smtp.mailfrom=dev@jpoiret.xyz X-Spam-Score: 0.0 (/) X-Debbugs-Envelope-To: 63793-done Cc: Felix Lechner X-BeenThere: debbugs-submit@debbugs.gnu.org X-Mailman-Version: 2.1.18 Precedence: list List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Errors-To: debbugs-submit-bounces@debbugs.gnu.org Sender: "Debbugs-submit" X-Spam-Score: 0.0 (/) --=-=-= Content-Type: text/plain Content-Transfer-Encoding: quoted-printable Hi, kiasoc5 via Guix-patches via writes: > This fixes a build failure with openssl-3. > > * gnu/packages/efi.scm (sbsigntools): Update to 0.9.5. > [arguments]: Remove trailing #t's. Use Gexps. Use "this-package-input". S= implify lambdas. > [inputs]: Remove labels. Thanks for your patch! Pushed as f72f3a909a41dce5dc4512c30d4cd0673bc6560f with the following best practices modifications (importantly, note cc-for-target and search-input-file for bash). By the way, please enable forceinbodyfrom in git so that a pristine From field is inserted into your patches, as your mail From list is being rewritten to comply with your domain's DKIM. diff --git a/gnu/packages/efi.scm b/gnu/packages/efi.scm index 50d52c4d65..499745eba1 100644 =2D-- a/gnu/packages/efi.scm +++ b/gnu/packages/efi.scm @@ -114,28 +114,29 @@ (define-public sbsigntools (base32 "060n6w0dx1mrilhdv482ncckanqz6pdv53piimiki0bm15d2fcp4")))) (build-system gnu-build-system) (arguments =2D (list #:phases =2D #~(modify-phases %standard-phases =2D (add-after 'unpack 'patch-more-shebangs =2D (lambda _ =2D (substitute* "lib/ccan.git/tools/create-ccan-tree" =2D (("#!/bin/bash") =2D (string-append "#!" =2D #$(this-package-native-input "bash") =2D "/bin/bash"))))) =2D (add-after 'unpack 'patch =2D (lambda _ =2D (substitute* '("configure.ac" =2D "tests/Makefile.am") =2D (("/usr/include/efi") =2D (string-append #$(this-package-input "gnu-efi") =2D "/include/efi")) =2D (("/usr/lib/gnuefi") =2D (string-append #$(this-package-input "gnu-efi") =2D "/lib"))))) =2D (add-after 'unpack 'setenv =2D (lambda _ =2D (setenv "CC" "gcc")))))) + (list + #:phases + #~(modify-phases %standard-phases + (add-after 'unpack 'patch-more-shebangs + (lambda* (#:key inputs native-inputs #:allow-other-keys) + (substitute* "lib/ccan.git/tools/create-ccan-tree" + (("#!/bin/bash") + (string-append "#!" + (search-input-file (or native-inputs input= s) + "/bin/bash")))))) + (add-after 'unpack 'patch + (lambda _ + (substitute* '("configure.ac" + "tests/Makefile.am") + (("/usr/include/efi") + (string-append #$(this-package-input "gnu-efi") + "/include/efi")) + (("/usr/lib/gnuefi") + (string-append #$(this-package-input "gnu-efi") + "/lib"))))) + (add-after 'unpack 'setenv + (lambda _ + (setenv "CC" #$(cc-for-target))))))) (native-inputs (list autoconf automake =2D-=20 Josselin Poiret --=-=-= Content-Type: application/pgp-signature; name="signature.asc" -----BEGIN PGP SIGNATURE----- iQHEBAEBCgAuFiEEOSSM2EHGPMM23K8vUF5AuRYXGooFAmR8XEMQHGRldkBqcG9p cmV0Lnh5egAKCRBQXkC5FhcairsBC/9TAKHkYADXuymzDyIZYJV4q3beSYubkAio rVqG+az5cT1zMLh4mpIlU8fDwinnGvPdjepxlfikkO/9SDsuGkPFhORZ7sl0gX4F 4uA43g7R4YorR3z7WwrFEcd7PQUF1pIjt47HZ6tTLiQt2dC9hoWTWPlm8ga2zojk NCGL28gxrHIiMlWHoKcwNTMPfwBbCDt5F54LpQlbUTYMFASWJ5l2JIZ2jIYxxT0N RHm69xLgABvpio+0muqb245yl236bnfzqj246mefGlWGCmMtgfCuYNp2xQk+RZxG zM/Yr9gEEAlMc6h+1WsJSv5vFs/xr5OK6W42uC6nG2GNMMgwg1EuRkLb3QCn9+tL M9TlhXWiT6dRAfh88/7HytjV23va6zfBAR2ZueBSltN4gdTNsSUs+SwFPfD0WG1h NzuqdCf6wlYWZFF9uevoVM4sPob2Xtu5wqjsY55PNiVXw0XJDNo9oh4IaSC6v7Yf TghRMSeQplTMVOIMTdhMCKAkXalC4tc= =cVIV -----END PGP SIGNATURE----- --=-=-=-- ------------=_1685871722-16047-3 Content-Type: message/rfc822 Content-Disposition: inline Content-Transfer-Encoding: 7bit Received: (at submit) by debbugs.gnu.org; 21 May 2023 23:13:14 +0000 Received: from localhost ([127.0.0.1]:32995 helo=debbugs.gnu.org) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1q0sEj-0004bd-SI for submit@debbugs.gnu.org; Sun, 21 May 2023 19:13:14 -0400 Received: from lists.gnu.org ([209.51.188.17]:50670) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1q0sEh-0004bV-LK for submit@debbugs.gnu.org; Sun, 21 May 2023 19:13:12 -0400 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 1q0sEh-0003mV-F3 for guix-patches@gnu.org; Sun, 21 May 2023 19:13:11 -0400 Received: from sail-ipv4.us-core.com ([208.82.101.137]) by eggs.gnu.org with esmtps (TLS1.2:ECDHE_RSA_CHACHA20_POLY1305:256) (Exim 4.90_1) (envelope-from ) id 1q0sEf-0006PF-6p for guix-patches@gnu.org; Sun, 21 May 2023 19:13:11 -0400 DKIM-Signature: v=1; a=rsa-sha256; c=simple/simple; s=2017; bh=xuPij49bjN+QED0 ZJTSW9f+oZOqI7CLdVJYUDS9MVdw=; h=date:subject:cc:to:from; d=lease-up.com; b=OV+OJIwAAMo0gBbkP78ElHmEeVoJbip3PD41ZuWWWpkYGsJUHdEX fBwsEOb2IcNLb1rOJB2GxmOhj/s4I5TGxpqCmWue8dZYS7NGb+m2A+Y9t8opjO2ze5C4+R osjNO4lVbDhYM07dw7B4A4VGMxF1MHERttyyVF2Q2VehZoc2c= Received: by sail-ipv4.us-core.com (OpenSMTPD) with ESMTPSA id 93c10a3a (TLSv1.3:TLS_CHACHA20_POLY1305_SHA256:256:NO); Sun, 21 May 2023 23:13:03 +0000 (UTC) Received: from localhost (localhost [local]) by localhost (OpenSMTPD) with ESMTPA id 818d1549; Sun, 21 May 2023 23:13:02 +0000 (UTC) From: Felix Lechner To: guix-patches@gnu.org Subject: [PATCH 0/2] gnu: sbsigntools: Update to 0.9.5, Date: Sun, 21 May 2023 16:13:00 -0700 Message-Id: X-Mailer: git-send-email 2.40.1 MIME-Version: 1.0 Content-Transfer-Encoding: 8bit Received-SPF: pass client-ip=208.82.101.137; envelope-from=felix.lechner@us-core.com; helo=sail-ipv4.us-core.com X-Spam_score_int: -17 X-Spam_score: -1.8 X-Spam_bar: - X-Spam_report: (-1.8 / 5.0 requ) BAYES_00=-1.9, DKIM_SIGNED=0.1, DKIM_VALID=-0.1, DKIM_VALID_AU=-0.1, HEADER_FROM_DIFFERENT_DOMAINS=0.25, SPF_HELO_NONE=0.001, SPF_PASS=-0.001, T_SCC_BODY_TEXT_LINE=-0.01, UNPARSEABLE_RELAY=0.001 autolearn=no autolearn_force=no X-Spam_action: no action X-Spam-Score: -1.1 (-) X-Debbugs-Envelope-To: submit Cc: Felix Lechner X-BeenThere: debbugs-submit@debbugs.gnu.org X-Mailman-Version: 2.1.18 Precedence: list List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Errors-To: debbugs-submit-bounces@debbugs.gnu.org Sender: "Debbugs-submit" X-Spam-Score: -2.1 (--) This patch series brings sbsigntools up the the latest coding standards. Felix Lechner (2): gnu: sbsigntools: Convert to gexp, new-style inputs. gnu: sbsigntools: Update to 0.9.5. gnu/packages/efi.scm | 58 +++++++++++++++++++++----------------------- 1 file changed, 28 insertions(+), 30 deletions(-) base-commit: c5bc698e8922d78ed85989985cc2ceb034de2f23 -- 2.40.1 ------------=_1685871722-16047-3-- From unknown Tue Jun 17 22:29:09 2025 X-Loop: help-debbugs@gnu.org Subject: [bug#63793] [PATCH] gnu: sbsigntools: Update to 0.9.5. Resent-From: kiasoc5 Original-Sender: "Debbugs-submit" Resent-CC: guix-patches@gnu.org Resent-Date: Sun, 04 Jun 2023 13:56:01 +0000 Resent-Message-ID: Resent-Sender: help-debbugs@gnu.org X-GNU-PR-Message: followup 63793 X-GNU-PR-Package: guix-patches X-GNU-PR-Keywords: patch To: Josselin Poiret , 63793-done@debbugs.gnu.org Cc: Felix Lechner Received: via spool by 63793-done@debbugs.gnu.org id=D63793.16858869058282 (code D ref 63793); Sun, 04 Jun 2023 13:56:01 +0000 Received: (at 63793-done) by debbugs.gnu.org; 4 Jun 2023 13:55:05 +0000 Received: from localhost ([127.0.0.1]:45360 helo=debbugs.gnu.org) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1q5oCG-00029V-RT for submit@debbugs.gnu.org; Sun, 04 Jun 2023 09:55:05 -0400 Received: from knopi.disroot.org ([178.21.23.139]:49546) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1q5oCD-00028m-DL for 63793-done@debbugs.gnu.org; Sun, 04 Jun 2023 09:55:02 -0400 Received: from localhost (localhost [127.0.0.1]) by disroot.org (Postfix) with ESMTP id AB6B3405FE; Sun, 4 Jun 2023 15:54:56 +0200 (CEST) X-Virus-Scanned: SPAM Filter at disroot.org Received: from knopi.disroot.org ([127.0.0.1]) by localhost (disroot.org [127.0.0.1]) (amavisd-new, port 10024) with ESMTP id 2txjepmAJ4Hn; Sun, 4 Jun 2023 15:54:55 +0200 (CEST) Message-ID: <15c235c9-6454-bdc2-5e1e-a69dc6bcb6d3@disroot.org> DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=disroot.org; s=mail; t=1685886895; bh=tPVXPAVK6+xz4c1/5axG+T0FK97T7XF4sn0+yGjptKg=; h=Date:Subject:To:Cc:References:From:In-Reply-To; b=Fp7cRA0AmFpf/SrnmcarSFmuqj758GMx8KXGJtyD4D55qIAswg9c1BPK33Fz0yS67 Y6ngnLcATs9Tv0W9HiO2GwdP9txplLQitzbsDQMB3UKfzn6q2dsrsSWhwSxxkU0eDs uy563s8j7Zel0BOHwzWfvRFm9I1WdW/1y+SC4a+DRrr0rpS//269RmUjY06y0KZvnq tOj2vk9Gvc3wWjH0uRYJDq6pPpAhJAcv2Nbq0Vgh06nJ4zvz7s2qlAkanNhNnhHTRP lQuHa06JqgT1nZ5gqlrP+F4rM4rMp7eG2ID8+4/C03vwfLlS9ofL4mTINjdyqW+cKV YGwpRApGkrVFQ== Date: Sun, 4 Jun 2023 09:54:52 -0400 MIME-Version: 1.0 Content-Language: en-US References: <782d12b0f1d53565166394065415862fba56bff1.1685397220.git.kiasoc5@disroot.org> <87bkhvef98.fsf@jpoiret.xyz> From: kiasoc5 In-Reply-To: <87bkhvef98.fsf@jpoiret.xyz> Content-Type: text/plain; charset=UTF-8; format=flowed Content-Transfer-Encoding: 7bit X-Spam-Score: 0.0 (/) X-BeenThere: debbugs-submit@debbugs.gnu.org X-Mailman-Version: 2.1.18 Precedence: list List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Errors-To: debbugs-submit-bounces@debbugs.gnu.org Sender: "Debbugs-submit" X-Spam-Score: -1.0 (-) Hi Josselin, On 6/4/23 05:41, Josselin Poiret wrote: > Thanks for your patch! Pushed as > f72f3a909a41dce5dc4512c30d4cd0673bc6560f with the following best > practices modifications (importantly, note cc-for-target and > search-input-file for bash). Thanks for merging! What is the difference between this > - (lambda _ > - (substitute* "lib/ccan.git/tools/create-ccan-tree" > - (("#!/bin/bash") > - (string-append "#!" > - #$(this-package-native-input "bash") > - "/bin/bash"))))) and this? > + (lambda* (#:key inputs native-inputs #:allow-other-keys) > + (substitute* "lib/ccan.git/tools/create-ccan-tree" > + (("#!/bin/bash") > + (string-append "#!" > + (search-input-file (or native-inputs inputs) > + "/bin/bash")))))) I meant to search for bash as a native input but I guess they are different. From unknown Tue Jun 17 22:29:09 2025 X-Loop: help-debbugs@gnu.org Subject: [bug#63793] [PATCH] gnu: sbsigntools: Update to 0.9.5. Resent-From: Josselin Poiret Original-Sender: "Debbugs-submit" Resent-CC: guix-patches@gnu.org Resent-Date: Sun, 04 Jun 2023 15:07:02 +0000 Resent-Message-ID: Resent-Sender: help-debbugs@gnu.org X-GNU-PR-Message: followup 63793 X-GNU-PR-Package: guix-patches X-GNU-PR-Keywords: patch To: kiasoc5 , 63793-done@debbugs.gnu.org Cc: Felix Lechner Received: via spool by 63793-done@debbugs.gnu.org id=D63793.168589121117125 (code D ref 63793); Sun, 04 Jun 2023 15:07:02 +0000 Received: (at 63793-done) by debbugs.gnu.org; 4 Jun 2023 15:06:51 +0000 Received: from localhost ([127.0.0.1]:46906 helo=debbugs.gnu.org) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1q5pJj-0004S9-DY for submit@debbugs.gnu.org; Sun, 04 Jun 2023 11:06:51 -0400 Received: from jpoiret.xyz ([206.189.101.64]:50314) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1q5pJh-0004S1-WA for 63793-done@debbugs.gnu.org; Sun, 04 Jun 2023 11:06:50 -0400 Received: from authenticated-user (jpoiret.xyz [206.189.101.64]) by jpoiret.xyz (Postfix) with ESMTPA id 6248818540C; Sun, 4 Jun 2023 15:06:47 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=jpoiret.xyz; s=dkim; t=1685891208; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:cc:mime-version:mime-version:content-type:content-type: in-reply-to:in-reply-to:references:references; bh=aqWcRDPvG8xMnFbjk0mPliv2bPTt3oegZZvbEhjVZV4=; b=kbnIyqqxGnJ8/F8EmufJtrx4Uipun5Y5Vrx/iV54zpKj3yXl36hiUuWR6Xs7NnPNlmx2RM TXh6EWBsd25g82bDDeY99qoKGjuxcW/SXgTkNfmGHcuRYoDnRxmdEMHnVMuU/ckudi3kod nYQQRpp6EMjGZXmb4LPHoxQagj82u4kQmefweZaxibD6Z5PYW7MUvJerTuqAyI236NaCM1 nKOEjfjtRL+81vLkarhw/H/fUpU0BKNZH+aaarEehsiIYa/ARZsZ4hMPvInR/jTs21qraF qETCFzLX91gzrKi4ZulB5x+6FsMI93hVu/FDBw/g3mNHR0DvQ8WZV8e17FbdYg== From: Josselin Poiret In-Reply-To: <15c235c9-6454-bdc2-5e1e-a69dc6bcb6d3@disroot.org> References: <782d12b0f1d53565166394065415862fba56bff1.1685397220.git.kiasoc5@disroot.org> <87bkhvef98.fsf@jpoiret.xyz> <15c235c9-6454-bdc2-5e1e-a69dc6bcb6d3@disroot.org> Date: Sun, 04 Jun 2023 17:06:45 +0200 Message-ID: <87fs77xo56.fsf@jpoiret.xyz> MIME-Version: 1.0 Content-Type: multipart/signed; boundary="=-=-="; micalg=pgp-sha512; protocol="application/pgp-signature" X-Spamd-Bar: / Authentication-Results: jpoiret.xyz; auth=pass smtp.auth=jpoiret@jpoiret.xyz smtp.mailfrom=dev@jpoiret.xyz X-Spam-Score: 0.0 (/) X-BeenThere: debbugs-submit@debbugs.gnu.org X-Mailman-Version: 2.1.18 Precedence: list List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Errors-To: debbugs-submit-bounces@debbugs.gnu.org Sender: "Debbugs-submit" X-Spam-Score: 0.0 (/) --=-=-= Content-Type: text/plain Content-Transfer-Encoding: quoted-printable Hi kiasoc5, kiasoc5 writes: > What is the difference between this > >> - (lambda _ >> - (substitute* "lib/ccan.git/tools/create-ccan-tree" >> - (("#!/bin/bash") >> - (string-append "#!" >> - #$(this-package-native-input "bash= ") >> - "/bin/bash"))))) > > and this? > >> + (lambda* (#:key inputs native-inputs #:allow-other-keys) >> + (substitute* "lib/ccan.git/tools/create-ccan-tree" >> + (("#!/bin/bash") >> + (string-append "#!" >> + (search-input-file (or native-inputs in= puts) >> + "/bin/bash")))))) > > I meant to search for bash as a native input but I guess they are differe= nt. In general, the first method doesn't compose well with package transformations that replace inputs, since it will still refer to the original bash input. The bottom one will always search for a /bin/bash binary among all the inputs, so will pick up a new one if the input is replaced. Also, in general, inside phases, if you're building natively, native-inputs is always #f and inputs also contains the native inputs, hence the need for that (or ...) form. HTH, =2D-=20 Josselin Poiret --=-=-= Content-Type: application/pgp-signature; name="signature.asc" -----BEGIN PGP SIGNATURE----- iQHEBAEBCgAuFiEEOSSM2EHGPMM23K8vUF5AuRYXGooFAmR8qIUQHGRldkBqcG9p cmV0Lnh5egAKCRBQXkC5FhcaihC5C/wPOgI/Vkp+61KZdok7GlsdyyFDMETVceMQ Qs9p8A3tFutz8opJj2lQnDX219jDe1039UkEBkQmy449CELcxTs9vEKCs5sXJiwc hmIJWjLo/7VUNG+KcoaybQPzuyxgBFhN3Gzr/+Bdp8LaCMZ5HoiIEkVpcepPu7DV odjceU+24yysWnB8JOQ8mldMDA7G0Ntn0w6JhZegFxksh26kc5ibo4ZKSPf/fUvy GGkXWdB6RCOiGhfYFn7ua6WmfhjW73DmPCDIMxQK5s78uLBMS1c1eT422W/092/E UEwLMODbzSJfpQUypJYFAw46lz8RPNagRN5t0YxEmtMbK47Gxz5kEMaME+YuCD/K 5RrylO/6qU6PjaVQkscYPUwh5kfgNZTQXJcWQIi5YZlz5Nn+lro7Sas7Zhhn3tAX DMpxxzWGz4Sx0gcA4CZolBgHSCRpA9dQ4fRyK4pZ+yq7ebLt+XzdN8fZ4RLKqjB+ 32qe9oYkGestM3siouDRCecuiDuX3I4= =u3M8 -----END PGP SIGNATURE----- --=-=-=--