From patchwork Wed Apr 19 23:24:09 2023 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 8bit X-Patchwork-Submitter: Jonathan Brielmaier X-Patchwork-Id: 49308 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 42F1617AB6; Thu, 20 Apr 2023 00:25:48 +0100 (BST) X-Spam-Checker-Version: SpamAssassin 3.4.6 (2021-04-09) on mira.cbaines.net X-Spam-Level: X-Spam-Status: No, score=-3.7 required=5.0 tests=BAYES_00,DKIM_INVALID, DKIM_SIGNED,FREEMAIL_FROM,MAILING_LIST_MULTI,RCVD_IN_MSPIKE_H2, SPF_HELO_PASS autolearn=ham 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 4E799174AF for ; Thu, 20 Apr 2023 00:25:47 +0100 (BST) Received: from localhost ([::1] helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1ppHAh-0001ua-GV; Wed, 19 Apr 2023 19:25:07 -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 1ppHAe-0001uN-72 for guix-patches@gnu.org; Wed, 19 Apr 2023 19:25:04 -0400 Received: from debbugs.gnu.org ([209.51.188.43]) by eggs.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_128_GCM_SHA256:128) (Exim 4.90_1) (envelope-from ) id 1ppHAd-0004ro-7l for guix-patches@gnu.org; Wed, 19 Apr 2023 19:25:03 -0400 Received: from Debian-debbugs by debbugs.gnu.org with local (Exim 4.84_2) (envelope-from ) id 1ppHAc-0000qu-Lj for guix-patches@gnu.org; Wed, 19 Apr 2023 19:25:02 -0400 X-Loop: help-debbugs@gnu.org Subject: [bug#62960] [PATCH] gnu: cryptsetup: Update to 2.6.1. Resent-From: Jonathan Brielmaier Original-Sender: "Debbugs-submit" Resent-CC: guix-patches@gnu.org Resent-Date: Wed, 19 Apr 2023 23:25:02 +0000 Resent-Message-ID: Resent-Sender: help-debbugs@gnu.org X-GNU-PR-Message: report 62960 X-GNU-PR-Package: guix-patches X-GNU-PR-Keywords: patch To: 62960@debbugs.gnu.org Cc: Jonathan Brielmaier X-Debbugs-Original-To: guix-patches@gnu.org Received: via spool by submit@debbugs.gnu.org id=B.16819466683228 (code B ref -1); Wed, 19 Apr 2023 23:25:02 +0000 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 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 X-Provags-ID: V03:K1:nj4TwqHkcCbYU2XU7E2whkRoNrRN2wkqR5M4bSA+cFuDn+b8IeV GIIMLPeOZjjJ4hcVr6+wK46IzeNONTEdGWf+VN0K29IE/+7D1u4a0FhZ6GoTUj11KIG7gmZ bk87/PAdbbR7GE8bn12DjuHOEKu+DZJVob4joUFWZhvdNnSNWMRR+tmixABuyzsSqE+uM0I hC8nJjEJezsTgo0XCNi6g== 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-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: , 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 * 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(-) -- 2.39.2 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 ;;; Copyright © 2016 Ludovic Courtès ;;; Copyright © 2019–2021 Tobias Geerinckx-Rice +;;; Copyright © 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/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")