From patchwork Mon Jan 22 13:36:17 2024 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 8bit X-Patchwork-Submitter: Josselin Poiret X-Patchwork-Id: 59313 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 BC7C127BBE9; Mon, 22 Jan 2024 15:26:30 +0000 (GMT) X-Spam-Checker-Version: SpamAssassin 3.4.6 (2021-04-09) on mira.cbaines.net X-Spam-Level: X-Spam-Status: No, score=-1.7 required=5.0 tests=BAYES_00,DKIM_INVALID, DKIM_SIGNED,FROM_SUSPICIOUS_NTLD,MAILING_LIST_MULTI,PDS_OTHER_BAD_TLD, RCVD_IN_MSPIKE_H5,RCVD_IN_MSPIKE_WL,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 1654827BBE2 for ; Mon, 22 Jan 2024 15:26:30 +0000 (GMT) Received: from localhost ([::1] helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1rRwBT-0007MQ-Vj; Mon, 22 Jan 2024 10:26:00 -0500 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 1rRwBS-0007Lf-4t for guix-patches@gnu.org; Mon, 22 Jan 2024 10:25:58 -0500 Received: from debbugs.gnu.org ([2001:470:142:5::43]) by eggs.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_128_GCM_SHA256:128) (Exim 4.90_1) (envelope-from ) id 1rRwBR-0005gG-Ib for guix-patches@gnu.org; Mon, 22 Jan 2024 10:25:57 -0500 Received: from Debian-debbugs by debbugs.gnu.org with local (Exim 4.84_2) (envelope-from ) id 1rRwBV-00071o-Ju for guix-patches@gnu.org; Mon, 22 Jan 2024 10:26:01 -0500 X-Loop: help-debbugs@gnu.org Subject: [bug#68656] [PATCH core-updates 1/7] gnu: cryptsetup: Update to 2.6.1. Resent-From: Josselin Poiret Original-Sender: "Debbugs-submit" Resent-CC: guix-patches@gnu.org Resent-Date: Mon, 22 Jan 2024 15:26:01 +0000 Resent-Message-ID: Resent-Sender: help-debbugs@gnu.org X-GNU-PR-Message: followup 68656 X-GNU-PR-Package: guix-patches X-GNU-PR-Keywords: patch To: 68656@debbugs.gnu.org Cc: Josselin Poiret Received: via spool by 68656-submit@debbugs.gnu.org id=B68656.170593713726905 (code B ref 68656); Mon, 22 Jan 2024 15:26:01 +0000 Received: (at 68656) by debbugs.gnu.org; 22 Jan 2024 15:25:37 +0000 Received: from localhost ([127.0.0.1]:41536 helo=debbugs.gnu.org) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1rRwB7-0006zr-6r for submit@debbugs.gnu.org; Mon, 22 Jan 2024 10:25:37 -0500 Received: from jpoiret.xyz ([206.189.101.64]:44504) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1rRwB4-0006za-5u for 68656@debbugs.gnu.org; Mon, 22 Jan 2024 10:25:35 -0500 Received: from authenticated-user (jpoiret.xyz [206.189.101.64]) by jpoiret.xyz (Postfix) with ESMTPA id 7EB0118530C; Mon, 22 Jan 2024 15:25:28 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=jpoiret.xyz; s=dkim; t=1705937128; 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: content-transfer-encoding:content-transfer-encoding: in-reply-to:in-reply-to:references:references; bh=wTOGq5QoOooMaN/LVBuaXTP5E0xhwe5jLo8IZzKktBU=; b=iYBBpBvqTSLl1KUnSUOGQqjUqcKlbeffaGkHhz7zkImgREw+7fsV5SVwP5JXH6EyiLc8R/ i5rVn9TL9NMdi9Tu2OowiRuOWTv2BZ7ALbjP+DRn/4Kcg/MOudP9vUvTkN1O/jfvpHWnxs coLAMw3jnOv75AvjggEJW7+Ar+5kOcl9rKYd2TtfLZNi58exCnF0pzW1oatc5W8t5WEHT7 o3VDuFf4RK/YvIjjBikZWp/D+IYg5NZ0uXx9CpC3bflu7+N1WfSRSNEltuDJVH1+TfZAzo ErF5hGDTQNZZGEp0iJEOQrpsXnUp9mqL5dN37SPChfmel+nM94hSd+J+d9+HiQ== Date: Mon, 22 Jan 2024 14:36:17 +0100 Message-ID: <9939efb9bb6e769d0a0298183128e4b6c34771d2.1705762361.git.dev@jpoiret.xyz> In-Reply-To: References: 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 From: Josselin Poiret * 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. ;; (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