From patchwork Sun Jun 4 09:41:23 2023 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Josselin Poiret X-Patchwork-Id: 50591 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 3075527BBEA; Sun, 4 Jun 2023 10:42:21 +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=-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 5FADA27BBE2 for ; Sun, 4 Jun 2023 10:42:20 +0100 (BST) Received: from localhost ([::1] helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1q5kFQ-0004HZ-Km; Sun, 04 Jun 2023 05:42: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 1q5kFP-0004Gf-0f for guix-patches@gnu.org; Sun, 04 Jun 2023 05:42:03 -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 1q5kFO-00043e-DV for guix-patches@gnu.org; Sun, 04 Jun 2023 05:42:02 -0400 Received: from Debian-debbugs by debbugs.gnu.org with local (Exim 4.84_2) (envelope-from ) id 1q5kFO-0004Au-AD for guix-patches@gnu.org; Sun, 04 Jun 2023 05:42:02 -0400 Subject: bug#63793: [PATCH] gnu: sbsigntools: Update to 0.9.5. Resent-From: Josselin Poiret Original-Sender: "Debbugs-submit" Resent-To: guix-patches@gnu.org Resent-Date: Sun, 04 Jun 2023 09:42:02 +0000 Resent-Message-ID: Resent-Sender: help-debbugs@gnu.org X-GNU-PR-Message: cc-closed 63793 X-GNU-PR-Package: guix-patches X-GNU-PR-Keywords: patch To: kiasoc5 , 63793-done@debbugs.gnu.org Cc: Felix Lechner Mail-Followup-To: 63793@debbugs.gnu.org, dev@jpoiret.xyz, kiasoc5@disroot.org Received: via spool by 63793-done@debbugs.gnu.org id=D63793.168587168916002 (code D ref 63793); Sun, 04 Jun 2023 09:42:02 +0000 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== 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 X-Spamd-Bar: / Authentication-Results: jpoiret.xyz; auth=pass smtp.auth=jpoiret@jpoiret.xyz smtp.mailfrom=dev@jpoiret.xyz 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: Josselin Poiret X-ACL-Warn: , Josselin Poiret via Guix-patches X-Patchwork-Original-From: Josselin Poiret via Guix-patches via From: Josselin Poiret 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 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". Simplify 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 --- 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 - (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")))))) + (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 inputs) + "/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