GNU bug report logs - #62960
[PATCH] gnu: cryptsetup: Update to 2.6.1.

Previous Next

Package: guix-patches;

Reported by: Jonathan Brielmaier <jonathan.brielmaier <at> web.de>

Date: Wed, 19 Apr 2023 23:25:02 UTC

Severity: normal

Tags: patch

Done: Andreas Enge <andreas <at> enge.fr>

To reply to this bug, email your comments to 62960 AT debbugs.gnu.org.
There is no need to reopen the bug first.

Toggle the display of automated, internal messages from the tracker.

View this report as an mbox folder, status mbox, maintainer mbox


Report forwarded to guix-patches <at> gnu.org:
bug#62960; Package guix-patches. (Wed, 19 Apr 2023 23:25:02 GMT) Full text and rfc822 format available.

Acknowledgement sent to Jonathan Brielmaier <jonathan.brielmaier <at> web.de>:
New bug report received and forwarded. Copy sent to guix-patches <at> gnu.org. (Wed, 19 Apr 2023 23:25:02 GMT) Full text and rfc822 format available.

Message #5 received at submit <at> debbugs.gnu.org (full text, mbox):

From: Jonathan Brielmaier <jonathan.brielmaier <at> web.de>
To: guix-patches <at> gnu.org
Cc: Jonathan Brielmaier <jonathan.brielmaier <at> web.de>
Subject: [PATCH] gnu: cryptsetup: Update to 2.6.1.
Date: Thu, 20 Apr 2023 01:24:09 +0200
* gnu/packages/cryptsetup.scm (cryptsetup): Update to 2.6.1.
[native-inputs]: Add ruby-asciidoctor.
[inputs]: Add libssh.
(cryptsetup-static)[arguments]: Disable asciidoc and ssh token support.
---
 gnu/packages/cryptsetup.scm | 13 ++++++++++---
 1 file changed, 10 insertions(+), 3 deletions(-)

diff --git a/gnu/packages/cryptsetup.scm b/gnu/packages/cryptsetup.scm
index d8a6437259..cdeed5c26a 100644
--- a/gnu/packages/cryptsetup.scm
+++ b/gnu/packages/cryptsetup.scm
@@ -2,6 +2,7 @@
 ;;; Copyright © 2013 Andreas Enge <andreas <at> enge.fr>
 ;;; Copyright © 2016 Ludovic Courtès <ludo <at> gnu.org>
 ;;; Copyright © 2019–2021 Tobias Geerinckx-Rice <me <at> tobias.gr>
+;;; Copyright © 2023 Jonathan Brielmaier <jonathan.brielmaier <at> web.de>
 ;;;
 ;;; This file is part of GNU Guix.
 ;;;
@@ -30,12 +31,14 @@ (define-module (gnu packages cryptsetup)
   #:use-module (gnu packages pkg-config)
   #:use-module (gnu packages popt)
   #:use-module (gnu packages linux)
+  #:use-module (gnu packages ruby)
+  #:use-module (gnu packages ssh)
   #:use-module (gnu packages web))

 (define-public cryptsetup
   (package
    (name "cryptsetup")
-   (version "2.3.7")
+   (version "2.6.1")
    (source (origin
             (method url-fetch)
             (uri (string-append "mirror://kernel.org/linux/utils/cryptsetup/v"
@@ -43,7 +46,7 @@ (define-public cryptsetup
                                 "/cryptsetup-" version ".tar.xz"))
             (sha256
              (base32
-              "1a97rvi6arsj8dikh1qsvixx9rizm89k155q2ypifqlqllr530v1"))))
+              "14s6vbb9llpgnhmv0badxxzhi73jp4vyvp8swk4bjah7l5jys3a1"))))
    (build-system gnu-build-system)
    (arguments
     `(#:configure-flags
@@ -55,11 +58,13 @@ (define-public cryptsetup
        ;; GRUB 2.06 supports LUKS2, but does it reliably support all set-ups…?
        "--with-default-luks-format=LUKS1")))
    (native-inputs
-    (list pkg-config))
+    (list pkg-config
+          ruby-asciidoctor))
    (inputs
     (list argon2
           json-c
           libgcrypt
+          libssh
           lvm2 ; device-mapper
           popt
           `(,util-linux "lib"))) ;libuuid
@@ -110,7 +115,9 @@ (define-public cryptsetup-static
                            ;; The default is OpenSSL which provides better PBKDF performance.
                            "--with-crypto_backend=gcrypt"

+                           "--disable-asciidoc"
                            "--disable-blkid"
+                           "--disable-ssh-token"
                            ;; 'libdevmapper.a' pulls in libpthread, libudev and libm.
                            "LIBS=-ludev -pthread -lm")

--
2.39.2





Information forwarded to guix-patches <at> gnu.org:
bug#62960; Package guix-patches. (Wed, 19 Apr 2023 23:40:01 GMT) Full text and rfc822 format available.

Message #8 received at 62960 <at> debbugs.gnu.org (full text, mbox):

From: Jonathan Brielmaier <jonathan.brielmaier <at> web.de>
To: 62960 <at> debbugs.gnu.org
Subject: [PATCH] gnu: cryptsetup: Update to 2.6.1.
Date: Thu, 20 Apr 2023 01:38:52 +0200
Inspired by this blog post https://mjg59.dreamwidth.org/66429.html I
wanted to upgrade my LUKS partition to version 2 and argon2id on my
existing Guix System.

It seems a bit tricky. With the updated cryptsetup tool I cannot convert
the LUKS partition of the running system (cryptsetup <at> 2.3.7 still allowed
that). So I booted an Arch Livesystem and converted from there, but Guix
System refuses to boot.
It hangs in Grub console saying that cryptuuid could not be found.




Information forwarded to guix-patches <at> gnu.org:
bug#62960; Package guix-patches. (Sun, 23 Apr 2023 15:08:02 GMT) Full text and rfc822 format available.

Message #11 received at 62960 <at> debbugs.gnu.org (full text, mbox):

From: Leo Famulari <leo <at> famulari.name>
To: Jonathan Brielmaier <jonathan.brielmaier <at> web.de>
Cc: 62960 <at> debbugs.gnu.org
Subject: Re: [bug#62960] [PATCH] gnu: cryptsetup: Update to 2.6.1.
Date: Sun, 23 Apr 2023 11:07:22 -0400
On Thu, Apr 20, 2023 at 01:38:52AM +0200, Jonathan Brielmaier wrote:
> Inspired by this blog post https://mjg59.dreamwidth.org/66429.html I
> wanted to upgrade my LUKS partition to version 2 and argon2id on my
> existing Guix System.
> 
> It seems a bit tricky. With the updated cryptsetup tool I cannot convert
> the LUKS partition of the running system (cryptsetup <at> 2.3.7 still allowed
> that). So I booted an Arch Livesystem and converted from there, but Guix
> System refuses to boot.
> It hangs in Grub console saying that cryptuuid could not be found.

You might need to check on which versions of cryptsetup GRUB is
compatible with. And also which cryptsetup features are supported by
GRUB.




Reply sent to Andreas Enge <andreas <at> enge.fr>:
You have taken responsibility. (Mon, 07 Jul 2025 15:39:01 GMT) Full text and rfc822 format available.

Notification sent to Jonathan Brielmaier <jonathan.brielmaier <at> web.de>:
bug acknowledged by developer. (Mon, 07 Jul 2025 15:39:02 GMT) Full text and rfc822 format available.

Message #16 received at 62960-done <at> debbugs.gnu.org (full text, mbox):

From: Andreas Enge <andreas <at> enge.fr>
To: 62960-done <at> debbugs.gnu.org
Subject: Close
Date: Mon, 7 Jul 2025 17:38:47 +0200
Version is on master.

Andreas





This bug report was last modified 12 days ago.

Previous Next


GNU bug tracking system
Copyright (C) 1999 Darren O. Benham, 1997,2003 nCipher Corporation Ltd, 1994-97 Ian Jackson.