From patchwork Mon May 29 21:53:41 2023 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: kiasoc5 X-Patchwork-Id: 50474 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 3943427BBE2; Mon, 29 May 2023 22:58:11 +0100 (BST) X-Spam-Checker-Version: SpamAssassin 3.4.6 (2021-04-09) on mira.cbaines.net X-Spam-Level: X-Spam-Status: No, score=-2.7 required=5.0 tests=BAYES_00,DKIM_INVALID, DKIM_SIGNED,MAILING_LIST_MULTI,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 B53EF27BBE9 for ; Mon, 29 May 2023 22:55:13 +0100 (BST) Received: from localhost ([::1] helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1q3kpU-00042f-9N; Mon, 29 May 2023 17:55:04 -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 1q3kpS-00042X-If for guix-patches@gnu.org; Mon, 29 May 2023 17:55:02 -0400 Received: from debbugs.gnu.org ([209.51.188.43]) by eggs.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_128_GCM_SHA256:128) (Exim 4.90_1) (envelope-from ) id 1q3kpS-0003Fb-Au for guix-patches@gnu.org; Mon, 29 May 2023 17:55:02 -0400 Received: from Debian-debbugs by debbugs.gnu.org with local (Exim 4.84_2) (envelope-from ) id 1q3kpS-0001bV-60 for guix-patches@gnu.org; Mon, 29 May 2023 17:55:02 -0400 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) 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 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-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: kiasoc5 X-ACL-Warn: , kiasoc5 via Guix-patches X-Patchwork-Original-From: kiasoc5 via Guix-patches via From: kiasoc5 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 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(-) base-commit: b96b82bcd4bc24529941ff74a91432481f1a71b5 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/")