From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: Received: from mp0.migadu.com ([2001:41d0:403:58f0::]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits)) by ms8.migadu.com with LMTPS id cOCZFSaJrmVBdQAAqHPOHw:P1 (envelope-from ) for ; Mon, 22 Jan 2024 16:26:30 +0100 Received: from aspmx1.migadu.com ([2001:41d0:403:58f0::]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits)) by mp0.migadu.com with LMTPS id cOCZFSaJrmVBdQAAqHPOHw (envelope-from ) for ; Mon, 22 Jan 2024 16:26:30 +0100 X-Envelope-To: larch@yhetil.org Authentication-Results: aspmx1.migadu.com; dkim=fail ("headers rsa verify failed") header.d=jpoiret.xyz header.s=dkim header.b=iYBBpBvq; spf=pass (aspmx1.migadu.com: domain of "guix-patches-bounces+larch=yhetil.org@gnu.org" designates 209.51.188.17 as permitted sender) smtp.mailfrom="guix-patches-bounces+larch=yhetil.org@gnu.org"; dmarc=pass (policy=none) header.from=gnu.org ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=yhetil.org; s=key1; t=1705937190; h=from:from:sender:sender:reply-to: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:resent-cc: resent-from:resent-sender:resent-message-id:in-reply-to:in-reply-to: references:references:list-id:list-help:list-unsubscribe: list-subscribe:list-post:dkim-signature; bh=wTOGq5QoOooMaN/LVBuaXTP5E0xhwe5jLo8IZzKktBU=; b=nbv5RJN6Z25Kxnigc8kt5fi0JVS+B4jrYdL1DJP4xsVnI1F65YtlUs2jLijVYLnfz2c0ge CxvZec86UpF2qlQlfGnpcv5hvhy0Qg99MnoKX+QBTs+bXiH0EbGN4owAL0YfyAIaWUQoSE 5v+5aLZF4tPn9HZcsVmISdbqqv9ZVas5oJXKPYQ0RHy+UDTearfQPqjhunuiJPOv1G2lX0 2AgykfAmSS6pUKFv1Ol5TRE3mos0LK80iQlXyofOqWNGZsBE0PIU0kX8W3i9VmJJqHRqLd NYYu6AzEuIUfn+4iQqWDLqIZL9t49OwbhKlqsfu2LH7ifMtjJOrxsHJVkshseA== ARC-Authentication-Results: i=1; aspmx1.migadu.com; dkim=fail ("headers rsa verify failed") header.d=jpoiret.xyz header.s=dkim header.b=iYBBpBvq; spf=pass (aspmx1.migadu.com: domain of "guix-patches-bounces+larch=yhetil.org@gnu.org" designates 209.51.188.17 as permitted sender) smtp.mailfrom="guix-patches-bounces+larch=yhetil.org@gnu.org"; dmarc=pass (policy=none) header.from=gnu.org ARC-Seal: i=1; s=key1; d=yhetil.org; t=1705937190; a=rsa-sha256; cv=none; b=E/C6wjtOpTre6R3TcafdYSQY2E3bH2J0czNrePHaE7/fZtGOgOR2ymURH2sBQv7zf3SkIs k8zswFSypjCFWSGA+VIdgFtvi7zaV2aQuotninqYsab020fgRL/TYWvWpGX8xCm1WZGPmo XcnlDPM3dQEwahuC7R9rI4EpUi3BuaxkVtP8oMYNVOq8ByIXnbH+hEAUMfW+fXgiCY34RT Qnc/vflPJARdpiZkFytlJd4XpynAzwdoOWpII6HNSSoimoymGxsNGLShxfflg0II/Yq2Zb RpLqhHGjuXb7Tzc+9uXKi5anHYgpFdI5GI1HLbS4LhU87061SObVtST+2GWaZw== Received: from lists.gnu.org (lists.gnu.org [209.51.188.17]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by aspmx1.migadu.com (Postfix) with ESMTPS id 1F2FE6F18C for ; Mon, 22 Jan 2024 16:26:30 +0100 (CET) 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 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit X-Spamd-Bar: --- 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 From: Josselin Poiret via Guix-patches via Errors-To: guix-patches-bounces+larch=yhetil.org@gnu.org Sender: guix-patches-bounces+larch=yhetil.org@gnu.org X-Migadu-Flow: FLOW_IN X-Migadu-Country: US X-Migadu-Spam-Score: -5.66 X-Migadu-Queue-Id: 1F2FE6F18C X-Spam-Score: -5.66 X-Migadu-Scanner: mx11.migadu.com X-TUID: jvwsoBeb6ghv 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 -- 2.41.0