Subject: bug#63635: closed (Re: [bug#63793] [PATCH] gnu: sbsigntools: Update to 0.9.5.)

From: [email-masked] (GNU bug Tracking System)
Date: Sun, 04 Jun 2023 09:42:02 +0000

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 [email-masked].

-- 
63793: https://debbugs.gnu.org/cgi/bugreport.cgi?bug=63793
GNU Bug Tracking System
Contact [email-masked] with problems

Subject: Re: [bug#63793] [PATCH] gnu: sbsigntools: Update to 0.9.5.
From: Josselin Poiret <[email-masked]>
To: kiasoc5 <[email-masked]>, [email-masked]
Cc: Felix Lechner <[email-masked]>
Date: Sun, 04 Jun 2023 11:41:23 +0200
List-Id: <debbugs-submit.debbugs.gnu.org>

Hi,

kiasoc5 via Guix-patches via <[email-masked]> 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

-- 
Josselin Poiret

Subject: [PATCH 0/2] gnu: sbsigntools: Update to 0.9.5,
From: Felix Lechner <[email-masked]>
To: [email-masked]
Cc: Felix Lechner <[email-masked]>
Date: Sun, 21 May 2023 16:13:00 -0700
List-Id: <debbugs-submit.debbugs.gnu.org>

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