From unknown Fri Jun 13 10:00:51 2025 Content-Disposition: inline Content-Transfer-Encoding: quoted-printable MIME-Version: 1.0 X-Mailer: MIME-tools 5.509 (Entity 5.509) Content-Type: text/plain; charset=utf-8 From: bug#62960 <62960@debbugs.gnu.org> To: bug#62960 <62960@debbugs.gnu.org> Subject: Status: [PATCH] gnu: cryptsetup: Update to 2.6.1. Reply-To: bug#62960 <62960@debbugs.gnu.org> Date: Fri, 13 Jun 2025 17:00:51 +0000 retitle 62960 [PATCH] gnu: cryptsetup: Update to 2.6.1. reassign 62960 guix-patches submitter 62960 Jonathan Brielmaier severity 62960 normal tag 62960 patch thanks From debbugs-submit-bounces@debbugs.gnu.org Wed Apr 19 19:24:28 2023 Received: (at submit) by debbugs.gnu.org; 19 Apr 2023 23:24:28 +0000 Received: from localhost ([127.0.0.1]:36072 helo=debbugs.gnu.org) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1ppHA3-0000q0-SX for submit@debbugs.gnu.org; Wed, 19 Apr 2023 19:24:28 -0400 Received: from lists.gnu.org ([209.51.188.17]:39806) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1ppH9z-0000pr-Vq for submit@debbugs.gnu.org; Wed, 19 Apr 2023 19:24:26 -0400 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 1ppH9z-0001t5-Pn for guix-patches@gnu.org; Wed, 19 Apr 2023 19:24:23 -0400 Received: from mout.web.de ([212.227.15.3]) by eggs.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_GCM_SHA384:256) (Exim 4.90_1) (envelope-from ) id 1ppH9x-0004ja-14 for guix-patches@gnu.org; Wed, 19 Apr 2023 19:24:23 -0400 DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=web.de; s=s29768273; t=1681946658; i=jonathan.brielmaier@web.de; bh=BHE7/Kb8RiVoZXfATjyk5Y2vDr7uUtIX59fWfGcbwdg=; h=X-UI-Sender-Class:From:To:Cc:Subject:Date; b=m0Fm8VSEJv46fu955b8pgRmlMMvFRFF4k+qG7xybc+2rxkLmWzc/7Fpgh8evqc6AJ Nx+tpriZ/dr4UlG3EUZG8o6D31F8lTK1fOaENHBvy3C3LZjqh0tom9tWV669ADoraD TdiaozlqdtriBJhCr8jeV/KOEpO/gSRAYa7+8otHYseh1RPvwoJ1wcjUFSZ5kUzYOF W0lGdqorOxz/0jWxrN6eQ1YZ9j3qMpQLHtw20LsrfLAcqs/4hsLiOjxznMsGHrxHo7 /UFi1O9o6SMEkeXF17n9+SwV+O1d1cYRJ7+4U/KRIqdea5M9zmAJE672QftBCj4eLN Cs/qEa1V7LrPA== X-UI-Sender-Class: 814a7b36-bfc1-4dae-8640-3722d8ec6cd6 Received: from 3700X.fritz.box ([77.12.77.39]) by smtp.web.de (mrweb005 [213.165.67.108]) with ESMTPSA (Nemesis) id 1MlsON-1qYCkT0S4x-00j5PW; Thu, 20 Apr 2023 01:24:18 +0200 From: Jonathan Brielmaier To: guix-patches@gnu.org Subject: [PATCH] gnu: cryptsetup: Update to 2.6.1. Date: Thu, 20 Apr 2023 01:24:09 +0200 Message-Id: <20230419232409.24020-1-jonathan.brielmaier@web.de> X-Mailer: git-send-email 2.39.2 MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: quoted-printable X-Provags-ID: V03:K1:nj4TwqHkcCbYU2XU7E2whkRoNrRN2wkqR5M4bSA+cFuDn+b8IeV GIIMLPeOZjjJ4hcVr6+wK46IzeNONTEdGWf+VN0K29IE/+7D1u4a0FhZ6GoTUj11KIG7gmZ bk87/PAdbbR7GE8bn12DjuHOEKu+DZJVob4joUFWZhvdNnSNWMRR+tmixABuyzsSqE+uM0I hC8nJjEJezsTgo0XCNi6g== X-Spam-Flag: NO UI-OutboundReport: notjunk:1;M01:P0:b2MD2CZrfDM=;AAg9wYKcFkhzBfe8Q3dZexgmwJk DLWMwH00Zg6nOlnIjERSzsqsyjAHRLBfVHYEJbXWpKlUbGd0KqjUS6cHms77mPKIyzpA6bebU Tfa4wXF9DralGrRTbDIEI3TcTrFgfwQdy01UuusXPWemBgTIqKg7ikCv9JFWNauZSMLe0UmJn 5KupWk8q197P3LpGtFUqzsyFYK6Gt0SZnKpHYUb73r7YvP2+o16Qv3mxFSq9CVAP2sdQh4abe DxcpMYTYBHBKH+HlLdTy7QODuA6KcIx4M1FYCDw93mPFnXUeWfenakamr4rdVUwanhjLgBmjI soDfBdobajcxp1vRNy8QjhdkTzoqMs0cJds1EYLeU5R8AsRTPTPkPoMnJqL/oMN+7Ptd/25VH H8G9OH79b8IbnX7n99gsJsdHsH3KhZUCLGlWh9XpxvqaWWvY4lxNWDIVyETHvapECMiH+Sdmx 5nSAtW3W0EWY2CsbuhsNcz7vktrQcM1eoQ8u0EW9LNeMpavziEiH8rbJPq7gCmlj8ebgU8K2b vEhZNxdZmTaM13Mtv/a7ooPamlmh37ygKvCX9r3psR7iWHK5AB/YL1/rdFDauU2HypRxsNZ2l OvTUcDM854Jtblk3YnlT0KgxGCdXunNlZI6wmLE5tsn2OoBD1RaJXTvmGl2vZ5F04qO5qupzi rvkwe/K4N7Uzs5JmKiDTbJ4Om7NGg52KkJTZIxmmQrMtDQzn6jhx7uhRR/iPQp99RtJ8P9nA4 YxNbdp3eKzNIoOzKwBHWBGP1951f+VAWe/yIwwejQkvXeOtVWg7szhrqm9qf5XWYwYgMbjXji /ySpDSYvCGduOnlGLByNHvu4euMBPZ8guWElXUfN/ar5f+BOu70gEl/VHlI2BI3KV/dH93l5J wCJdQ52M0+9RjLANAwHxlUrqsjktZqgfBT9adMSUysdicogxpa+YVMgVcUhbeLpYB0oWoi639 0+Wxyoq8VUdVQcHXdM/+/nVajhg= Received-SPF: pass client-ip=212.227.15.3; envelope-from=jonathan.brielmaier@web.de; helo=mout.web.de X-Spam_score_int: -27 X-Spam_score: -2.8 X-Spam_bar: -- X-Spam_report: (-2.8 / 5.0 requ) BAYES_00=-1.9, DKIM_SIGNED=0.1, DKIM_VALID=-0.1, DKIM_VALID_AU=-0.1, DKIM_VALID_EF=-0.1, FREEMAIL_FROM=0.001, RCVD_IN_DNSWL_LOW=-0.7, RCVD_IN_MSPIKE_H3=0.001, RCVD_IN_MSPIKE_WL=0.001, SPF_HELO_NONE=0.001, SPF_PASS=-0.001, T_SCC_BODY_TEXT_LINE=-0.01 autolearn=ham autolearn_force=no X-Spam_action: no action X-Spam-Score: -1.4 (-) X-Debbugs-Envelope-To: submit Cc: Jonathan Brielmaier X-BeenThere: debbugs-submit@debbugs.gnu.org X-Mailman-Version: 2.1.18 Precedence: list List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Errors-To: debbugs-submit-bounces@debbugs.gnu.org Sender: "Debbugs-submit" X-Spam-Score: -2.4 (--) * 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. =2D-- 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 =2D-- a/gnu/packages/cryptsetup.scm +++ b/gnu/packages/cryptsetup.scm @@ -2,6 +2,7 @@ ;;; Copyright =C2=A9 2013 Andreas Enge ;;; Copyright =C2=A9 2016 Ludovic Court=C3=A8s ;;; Copyright =C2=A9 2019=E2=80=932021 Tobias Geerinckx-Rice +;;; Copyright =C2=A9 2023 Jonathan Brielmaier ;;; ;;; 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/cryptset= up/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=E2=80=A6? "--with-default-luks-format=3DLUKS1"))) (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 bette= r PBKDF performance. "--with-crypto_backend=3Dgcrypt" + "--disable-asciidoc" "--disable-blkid" + "--disable-ssh-token" ;; 'libdevmapper.a' pulls in libpthread, libud= ev and libm. "LIBS=3D-ludev -pthread -lm") =2D- 2.39.2 From debbugs-submit-bounces@debbugs.gnu.org Wed Apr 19 19:39:02 2023 Received: (at 62960) by debbugs.gnu.org; 19 Apr 2023 23:39:02 +0000 Received: from localhost ([127.0.0.1]:36092 helo=debbugs.gnu.org) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1ppHOA-0001Cl-Hx for submit@debbugs.gnu.org; Wed, 19 Apr 2023 19:39:02 -0400 Received: from mout.web.de ([212.227.15.3]:52227) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1ppHO6-0001CC-Qb for 62960@debbugs.gnu.org; Wed, 19 Apr 2023 19:39:01 -0400 DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=web.de; s=s29768273; t=1681947532; i=jonathan.brielmaier@web.de; bh=ZIBapKZdk84pmCSYakdXsCPF4kW3syfqheru83ddoqI=; h=X-UI-Sender-Class:Date:To:From:Subject; b=g/HbYN7C+n6ns7TZx4UANTyPOEvwauXfQ1Z1F1OvaNA8Xzv36Q+8jg9GMHdUxgjmn 2llqrrYfAUny9JrRRnFFCjuEzloA4TMzUcW1xK+5zsGKJa7wbXFR0ZQZJi26KWBArm bPFwCVN0UiLCYMlEDrVSz05BnlLU68yM1CduOdXOVV8N7tojb4Li7DeWHuZgw6kHLv 0eLBl867faMheTB5q0HeeCfpqa6mgtyf45F92lHcmbZRFeTNrJfrcuePktteWnxZGr x5aM+BY9KN38JgOhjgy/oX4EBWddJOmm+pV95GSQShqv/dUOd9fQbEEh/WPugQVagM H9KMA8Ld4fXkg== X-UI-Sender-Class: 814a7b36-bfc1-4dae-8640-3722d8ec6cd6 Received: from [192.168.178.23] ([77.12.77.39]) by smtp.web.de (mrweb005 [213.165.67.108]) with ESMTPSA (Nemesis) id 1MW9ra-1pnUzm2afC-00Xauh for <62960@debbugs.gnu.org>; Thu, 20 Apr 2023 01:38:52 +0200 Message-ID: <74028111-23c6-f018-1274-879ab2031043@web.de> Date: Thu, 20 Apr 2023 01:38:52 +0200 MIME-Version: 1.0 User-Agent: Mozilla/5.0 (X11; Linux x86_64; rv:102.0) Gecko/20100101 Thunderbird/102.10.0 To: 62960@debbugs.gnu.org Content-Language: de-DE, en-US From: Jonathan Brielmaier Subject: [PATCH] gnu: cryptsetup: Update to 2.6.1. Content-Type: text/plain; charset=UTF-8; format=flowed Content-Transfer-Encoding: quoted-printable X-Provags-ID: V03:K1:zGxXcq03vcCNsVzV5E7FtcFsXrymyomCaSWd+RL1ON0iQU8QaPI lM3jNcBnzF1aR9ZF9UOd5dyuj+ldTN165iPLyXkAEuUtSx8uw/ANdYIYpVAhIT8MJZQEnsv TE0L3p+Mg4olbfj92LVc5bTpsPJeHfacgqZ8tSSvKCdGHuEfd79LXTEAOw30/O2KBdkwMmy dA7su7epp+cK3SQZ56Thw== X-Spam-Flag: NO UI-OutboundReport: notjunk:1;M01:P0:FuJi/fh0H4w=;Xz8NbqrbCzMENSv+w0w2YfZ/80+ 13WHmLmN5ovdRN4/2Er7nxHrWLPm/UL6qyfIDGlbovp8UcS4VkbMs+Qwh0LFq4aneIgZmi+u7 YXueqLPg9EGParmoaA6mD87Qocn1Bo4La+zW5632ZBh72OZGr+/i1YZPLXCF6tJqQNGrMismj WEZxtInFuDWYofAWXQklmQGK6qrGkqP+oDrYalJ30YLU5+zrFY1O4HFFRCeSgFm5VEWQrKM8G HVtncGGdDXKPYH6egp4f26g2Wux5KJQnjfoSi9XXJc8GeSw6+VjagVJs+mz7EWorNwuqyuDzm G+PIA24l/pu2gGzsfTi+9wxF0Y5HVF4mOCfZVzkFcSOgp0XYHp+WcOVerXrFJcqeg6ZXBc7qu JQnARYeNxrdUFmGFgX4BW6EP90Fb3QNSaplS/5SgKtOvoVTHl8/s1nyoXcAHXTMA/sEDjT34j UVwx3QXSG/yotxJX+13E72XAzZWchdSIWIzrg7dFpS2JEl+J2tMI5PWZ+oJ/Sw3UEawfAuycs ug/60Ff7UVwZkttOdywJPlS5gcpD/bDV1fpkgfgerF1RDiNCjsKk57nv1VTdLZTiaM5P899Sq 8eOMnfKmwIRnJA0HR2oVHghOOz9B8+aBE/aQdaE6I9gR/ON54xTsvHIpIrmjh2WVr7oE/nGn+ /PQ7FoDg0mdudVrXAb/FnJdRXMBugDT20XPDD46s7lSGLYmyK1cBYSEEa8IGg1zZJDr5Qclvl gx+Rk/mlQqxyklHaL7xIhDHVc6S/ZYpCTvzmMy5w4ZJEEG5qWPSjUXfhWTISxxQqkL29wd9qb BeVC4rvizU2Srqkpts6RHKb7AUcYF71Swa0kY69cb3uHk4v4SmYrAio3ZXGN4YEbxF74SRW98 1h1ntL5jbXiwyP5GesGWJHHbi46F2JXzXPNAFNBhTF+4gCV4vXakHopuedT95BC1m/V+Wbpwx u8z3/Q== X-Spam-Score: -0.7 (/) X-Debbugs-Envelope-To: 62960 X-BeenThere: debbugs-submit@debbugs.gnu.org X-Mailman-Version: 2.1.18 Precedence: list List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Errors-To: debbugs-submit-bounces@debbugs.gnu.org Sender: "Debbugs-submit" X-Spam-Score: -1.7 (-) 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@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. From debbugs-submit-bounces@debbugs.gnu.org Sun Apr 23 11:07:31 2023 Received: (at 62960) by debbugs.gnu.org; 23 Apr 2023 15:07:31 +0000 Received: from localhost ([127.0.0.1]:46665 helo=debbugs.gnu.org) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1pqbJK-0002u6-MF for submit@debbugs.gnu.org; Sun, 23 Apr 2023 11:07:30 -0400 Received: from out5-smtp.messagingengine.com ([66.111.4.29]:33265) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1pqbJJ-0002ts-AM for 62960@debbugs.gnu.org; Sun, 23 Apr 2023 11:07:29 -0400 Received: from compute4.internal (compute4.nyi.internal [10.202.2.44]) by mailout.nyi.internal (Postfix) with ESMTP id 3A1CD5C009C; Sun, 23 Apr 2023 11:07:24 -0400 (EDT) Received: from mailfrontend1 ([10.202.2.162]) by compute4.internal (MEProxy); Sun, 23 Apr 2023 11:07:24 -0400 DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=famulari.name; h=cc:cc:content-type:content-type:date:date:from:from :in-reply-to:in-reply-to:message-id:mime-version:references :reply-to:sender:subject:subject:to:to; s=mesmtp; t=1682262444; x=1682348844; bh=dTLvLuS9paByu/R+WOYOUW0SzvyAXN1grAdHT5YW1Is=; b= djXVV2dS3/CgDdaLAM27w4E7kirqYCKo97akUPsPZ8u+tdRb9rvKBKTf4gMeQ3rM MVvw01k1bCPH4g35e/Xw0asm+Q7I1twEF3jqQGCasVPZ+03OQZ2S1PN7+ZrSe5Ha TX0pt7Hbp9JJqAag7AqQJgFgklB2NU/nGAf47H9xMBo= DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d= messagingengine.com; h=cc:cc:content-type:content-type:date:date :feedback-id:feedback-id:from:from:in-reply-to:in-reply-to :message-id:mime-version:references:reply-to:sender:subject :subject:to:to:x-me-proxy:x-me-proxy:x-me-sender:x-me-sender :x-sasl-enc; s=fm3; t=1682262444; x=1682348844; bh=dTLvLuS9paByu /R+WOYOUW0SzvyAXN1grAdHT5YW1Is=; b=AKsakfH4aRVMnk/7HJTMw8Ku6wTB+ CpdMuI8LGeps1xoGOnDbmB8Gl4XF/rPMQCUSWRXloyEKnXRMG0ptAEY9kvEtcxoX I9oF/l6fz/ZJkzb1SI5zTYs1VizZ5G0E0ARVojdkA6gz3j5a0OVzUZHadPjaw3rf DI4IcPMpjN5XhGyrBFAW9XVU+wNZryNTLfoJuBkW1zk0AVsP2YWIfgSuan5Ua5rb EFvhkbQWkBuCn3GwDHP/BCvhy3I0DmfMvYPt94dR1ef3FsQxnStir+QkU1riPGGQ W2k4rDRpyfChadkWFl85u++0vGzClF90M9Strh97AI+Qq1e3UiKHASdsQ== X-ME-Sender: X-ME-Received: X-ME-Proxy-Cause: gggruggvucftvghtrhhoucdtuddrgedvhedrfedtkedgkeehucetufdoteggodetrfdotf fvucfrrhhofhhilhgvmecuhfgrshhtofgrihhlpdfqfgfvpdfurfetoffkrfgpnffqhgen uceurghilhhouhhtmecufedttdenucesvcftvggtihhpihgvnhhtshculddquddttddmne cujfgurhepfffhvfevuffkfhggtggujgesthdtredttddtvdenucfhrhhomhepnfgvohcu hfgrmhhulhgrrhhiuceolhgvohesfhgrmhhulhgrrhhirdhnrghmvgeqnecuggftrfgrth htvghrnhepffejvdevhedutdeklefgteevjeduudejkeekffffhfegvefhhefgvdffkedu teejnecuffhomhgrihhnpegurhgvrghmfihiughthhdrohhrghenucevlhhushhtvghruf hiiigvpedtnecurfgrrhgrmhepmhgrihhlfhhrohhmpehlvghosehfrghmuhhlrghrihdr nhgrmhgv X-ME-Proxy: Feedback-ID: i819c4023:Fastmail Received: by mail.messagingengine.com (Postfix) with ESMTPA; Sun, 23 Apr 2023 11:07:23 -0400 (EDT) Date: Sun, 23 Apr 2023 11:07:22 -0400 From: Leo Famulari To: Jonathan Brielmaier Subject: Re: [bug#62960] [PATCH] gnu: cryptsetup: Update to 2.6.1. Message-ID: References: <20230419232409.24020-1-jonathan.brielmaier@web.de> <74028111-23c6-f018-1274-879ab2031043@web.de> MIME-Version: 1.0 Content-Type: text/plain; charset=us-ascii Content-Disposition: inline In-Reply-To: <74028111-23c6-f018-1274-879ab2031043@web.de> X-Spam-Score: -0.7 (/) X-Debbugs-Envelope-To: 62960 Cc: 62960@debbugs.gnu.org X-BeenThere: debbugs-submit@debbugs.gnu.org X-Mailman-Version: 2.1.18 Precedence: list List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Errors-To: debbugs-submit-bounces@debbugs.gnu.org Sender: "Debbugs-submit" X-Spam-Score: -1.7 (-) 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@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.