From: Josselin Poiret via Guix-patches via <guix-patches@gnu.org>
To: 68656@debbugs.gnu.org
Cc: Josselin Poiret <dev@jpoiret.xyz>
Subject: [bug#68656] [PATCH core-updates 1/7] gnu: cryptsetup: Update to 2.6.1.
Date: Mon, 22 Jan 2024 14:36:17 +0100 [thread overview]
Message-ID: <9939efb9bb6e769d0a0298183128e4b6c34771d2.1705762361.git.dev@jpoiret.xyz> (raw)
In-Reply-To: <cover.1705762361.git.dev@jpoiret.xyz>
From: Josselin Poiret <dev@jpoiret.xyz>
* gnu/packages/cryptsetup.scm (cryptsetup): Update to 2.6.1. Disable external
tokens for now.
Change-Id: I5610cabfbd46d010a8241430d8d90f5920847c04
---
gnu/packages/cryptsetup.scm | 11 ++++++++---
1 file changed, 8 insertions(+), 3 deletions(-)
diff --git a/gnu/packages/cryptsetup.scm b/gnu/packages/cryptsetup.scm
index 3bdc68ae5a..3cb669206a 100644
--- a/gnu/packages/cryptsetup.scm
+++ b/gnu/packages/cryptsetup.scm
@@ -30,12 +30,13 @@ (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 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 +44,7 @@ (define-public cryptsetup
"/cryptsetup-" version ".tar.xz"))
(sha256
(base32
- "1a97rvi6arsj8dikh1qsvixx9rizm89k155q2ypifqlqllr530v1"))))
+ "14s6vbb9llpgnhmv0badxxzhi73jp4vyvp8swk4bjah7l5jys3a1"))))
(build-system gnu-build-system)
(arguments
`(#:configure-flags
@@ -54,12 +55,16 @@ (define-public cryptsetup
"--with-crypto_backend=gcrypt"
;; GRUB 2.06 supports LUKS2, but does it reliably support all set-ups…?
"--with-default-luks-format=LUKS1"
+ ;; External tokens would need an env variable to work on Guix, and we
+ ;; don't have users for it yet.
+ "--disable-external-tokens"
+ "--disable-ssh-token"
;; libgcrypt is not found otherwise when cross-compiling.
;; <https://issues.guix.gnu.org/63864>
(string-append "--with-libgcrypt-prefix="
(assoc-ref %build-inputs "libgcrypt")))))
(native-inputs
- (list pkg-config))
+ (list pkg-config ruby-asciidoctor))
(inputs
(list argon2
json-c
--
2.41.0
next prev parent reply other threads:[~2024-01-22 15:26 UTC|newest]
Thread overview: 9+ messages / expand[flat|nested] mbox.gz Atom feed top
2024-01-22 13:33 [bug#68656] [PATCH core-updates 0/7] Cryptsetup woes Josselin Poiret via Guix-patches via
2024-01-22 13:36 ` Josselin Poiret via Guix-patches via [this message]
2024-01-22 13:36 ` [bug#68656] [PATCH core-updates 2/7] gnu: Add libdevmapper-propagated-inputs Josselin Poiret via Guix-patches via
2024-01-22 13:36 ` [bug#68656] [PATCH core-updates 3/7] gnu: Add libcryptsetup-propagated-inputs Josselin Poiret via Guix-patches via
2024-01-22 13:36 ` [bug#68656] [PATCH core-updates 4/7] gnu: volume-key: Add required transitive dependencies Josselin Poiret via Guix-patches via
2024-01-22 13:36 ` [bug#68656] [PATCH core-updates 5/7] gnu: libblockdev: Add libcryptsetup propagated inputs Josselin Poiret via Guix-patches via
2024-01-22 13:36 ` [bug#68656] [PATCH core-updates 6/7] gnu: lvm2-static: Properly handle eudev dependency in pkg-config Josselin Poiret via Guix-patches via
2024-01-22 13:36 ` [bug#68656] [PATCH core-updates 7/7] gnu: cryptsetup-static: Fix static build Josselin Poiret via Guix-patches via
2024-01-24 16:42 ` [bug#68656] [PATCH core-updates 0/7] Cryptsetup woes Maxim Cournoyer
Reply instructions:
You may reply publicly to this message via plain-text email
using any one of the following methods:
* Save the following mbox file, import it into your mail client,
and reply-to-all from there: mbox
Avoid top-posting and favor interleaved quoting:
https://en.wikipedia.org/wiki/Posting_style#Interleaved_style
List information: https://guix.gnu.org/
* Reply using the --to, --cc, and --in-reply-to
switches of git-send-email(1):
git send-email \
--in-reply-to=9939efb9bb6e769d0a0298183128e4b6c34771d2.1705762361.git.dev@jpoiret.xyz \
--to=guix-patches@gnu.org \
--cc=68656@debbugs.gnu.org \
--cc=dev@jpoiret.xyz \
/path/to/YOUR_REPLY
https://kernel.org/pub/software/scm/git/docs/git-send-email.html
* If your mail client supports setting the In-Reply-To header
via mailto: links, try the mailto: link
Be sure your reply has a Subject: header at the top and a blank line
before the message body.
Code repositories for project(s) associated with this public inbox
https://git.savannah.gnu.org/cgit/guix.git
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox;
as well as URLs for read-only IMAP folder(s) and NNTP newsgroup(s).