From patchwork Tue Feb 12 23:22:23 2019 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Marius Bakke X-Patchwork-Id: 1071 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 D5A8616C0E; Tue, 12 Feb 2019 23:23:12 +0000 (GMT) X-Spam-Checker-Version: SpamAssassin 3.4.0 (2014-02-07) on mira.cbaines.net X-Spam-Level: X-Spam-Status: No, score=-1.9 required=5.0 tests=BAYES_00,FREEMAIL_FROM, T_DKIM_INVALID,URIBL_BLOCKED autolearn=unavailable autolearn_force=no version=3.4.0 Received: from lists.gnu.org (lists.gnu.org [209.51.188.17]) by mira.cbaines.net (Postfix) with ESMTP id 6036F16C0B for ; Tue, 12 Feb 2019 23:23:12 +0000 (GMT) Received: from localhost ([127.0.0.1]:47736 helo=lists.gnu.org) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1gthOR-0001eV-U2 for patchwork@mira.cbaines.net; Tue, 12 Feb 2019 18:23:11 -0500 Received: from eggs.gnu.org ([209.51.188.92]:36326) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1gthOK-0001cw-7N for guix-patches@gnu.org; Tue, 12 Feb 2019 18:23:05 -0500 Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71) (envelope-from ) id 1gthOI-00064U-RG for guix-patches@gnu.org; Tue, 12 Feb 2019 18:23:04 -0500 Received: from debbugs.gnu.org ([209.51.188.43]:46161) by eggs.gnu.org with esmtps (TLS1.0:RSA_AES_128_CBC_SHA1:16) (Exim 4.71) (envelope-from ) id 1gthOI-00063m-GO for guix-patches@gnu.org; Tue, 12 Feb 2019 18:23:02 -0500 Received: from Debian-debbugs by debbugs.gnu.org with local (Exim 4.84_2) (envelope-from ) id 1gthOI-0001W6-7h for guix-patches@gnu.org; Tue, 12 Feb 2019 18:23:02 -0500 X-Loop: help-debbugs@gnu.org Subject: [bug#34366] [PATCH] gnu: cryptsetup: Update to 2.0.6. Resent-From: Marius Bakke Original-Sender: "Debbugs-submit" Resent-CC: guix-patches@gnu.org Resent-Date: Tue, 12 Feb 2019 23:23:02 +0000 Resent-Message-ID: Resent-Sender: help-debbugs@gnu.org X-GNU-PR-Message: followup 34366 X-GNU-PR-Package: guix-patches X-GNU-PR-Keywords: patch To: Leo Famulari , Rutger Helling Received: via spool by 34366-submit@debbugs.gnu.org id=B34366.15500137535778 (code B ref 34366); Tue, 12 Feb 2019 23:23:02 +0000 Received: (at 34366) by debbugs.gnu.org; 12 Feb 2019 23:22:33 +0000 Received: from localhost ([127.0.0.1]:45442 helo=debbugs.gnu.org) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1gthNp-0001V7-5k for submit@debbugs.gnu.org; Tue, 12 Feb 2019 18:22:33 -0500 Received: from out2-smtp.messagingengine.com ([66.111.4.26]:45771) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1gthNm-0001Uq-Ff for 34366@debbugs.gnu.org; Tue, 12 Feb 2019 18:22:31 -0500 Received: from compute5.internal (compute5.nyi.internal [10.202.2.45]) by mailout.nyi.internal (Postfix) with ESMTP id 443BA22071; Tue, 12 Feb 2019 18:22:25 -0500 (EST) Received: from mailfrontend2 ([10.202.2.163]) by compute5.internal (MEProxy); Tue, 12 Feb 2019 18:22:25 -0500 DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=fastmail.com; h= from:to:cc:subject:in-reply-to:references:date:message-id :mime-version:content-type; s=fm2; bh=K4y/ekxoj+48rnrPQwVP28lp3C ULIrbiaFFKf4edsNY=; b=uWuyTc/ZfXttDGuONcVROQAEO8UqTs0cKlHovuN/eJ 3JZxf0HokRNEEWHqYLiptg6/4/Os61CA911bYFauByWuvVLcvp1KFOelZWF4p4D5 XFY+OMLr3Q1jXJJngi9wFgf4N/N4i601K3CjqWTA3O/laPA8eOMVqihziltI5nbO mo8LUabIPTRW73lh2nTSzp/ZbgrQ9cJgM6cKg6ngbbHtZ0uXCJGmm2WPLi7GmBU7 DG4et/3KMErRz6GkK4EtNQBJ3R1fzy3S4iqH9TPnNZSeCla/OADXbxzW83cdwWAW 9xrN/sGypjFQr7gACWLNXvX1cK1KLYW5DWpj5DVW9A1Q== DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d= messagingengine.com; h=cc:content-type:date:from:in-reply-to :message-id:mime-version:references:subject:to:x-me-proxy :x-me-proxy:x-me-sender:x-me-sender:x-sasl-enc; s=fm2; bh=K4y/ek xoj+48rnrPQwVP28lp3CULIrbiaFFKf4edsNY=; b=bEZrTj5JoMlna6Js1RP6RK Ba7A8e20SP2Trj9Go2xwCeV8cx96MBBa6xVgz4jMVfGHTsFUG05fyeO353JBYimQ FqlJhZrT4WDPebsShUPwhEKE6bQZ3ZVvtq9L6Bui37c08K15pPDZAVaws6bAsyHo ma3aMpi8G+7GdWNrw9cVRNXhX0S4LMFZRbunF7umShmQ5PwUcEY8bJa0XHQxVKvV VXN1uLolgtqw67Lid0I2F6+ns9BwYyhGKeQM6kLXF2QpCED+qmNutSYX1wdOT3qI 1qWKQsqBP54GcnbbLunxzpGkcFb7QRHnk7aFZofuB4kFXM3K1yKRCaeNjsC9CVGA == X-ME-Sender: X-ME-Proxy-Cause: gggruggvucftvghtrhhoucdtuddrgedtledruddtvddgtdelucetufdoteggodetrfdotf fvucfrrhhofhhilhgvmecuhfgrshhtofgrihhlpdfquhhtnecuuegrihhlohhuthemucef tddtnecusecvtfgvtghiphhivghnthhsucdlqddutddtmdenucfjughrpefhvffujghffg ffkfggtgesghdtreertdertdenucfhrhhomhepofgrrhhiuhhsuceurghkkhgvuceomhgs rghkkhgvsehfrghsthhmrghilhdrtghomheqnecuffhomhgrihhnpehgnhhurdhorhhgne cukfhppeeivddrudeirddvvdeirddugedtnecurfgrrhgrmhepmhgrihhlfhhrohhmpehm sggrkhhkvgesfhgrshhtmhgrihhlrdgtohhmnecuvehluhhsthgvrhfuihiivgeptd X-ME-Proxy: Received: from localhost (140.226.16.62.customer.cdi.no [62.16.226.140]) by mail.messagingengine.com (Postfix) with ESMTPA id 81CA610312; Tue, 12 Feb 2019 18:22:24 -0500 (EST) From: Marius Bakke In-Reply-To: <20190212230843.GB31074@jasmine.lan> References: <20190207111902.36bd0753@mykolab.com> <20190209102400.19d8fa94@mykolab.com> <20190212230843.GB31074@jasmine.lan> User-Agent: Notmuch/0.28.1 (https://notmuchmail.org) Emacs/26.1 (x86_64-pc-linux-gnu) Date: Wed, 13 Feb 2019 00:22:23 +0100 Message-ID: <87k1i4wq1c.fsf@fastmail.com> MIME-Version: 1.0 X-BeenThere: debbugs-submit@debbugs.gnu.org X-Mailman-Version: 2.1.18 Precedence: list X-detected-operating-system: by eggs.gnu.org: GNU/Linux 2.2.x-3.x [generic] X-Received-From: 209.51.188.43 X-BeenThere: guix-patches@gnu.org List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Cc: 34366@debbugs.gnu.org Errors-To: guix-patches-bounces+patchwork=mira.cbaines.net@gnu.org Sender: "Guix-patches" X-getmail-retrieved-from-mailbox: Patches Leo Famulari writes: > On Sat, Feb 09, 2019 at 10:24:00AM +0100, Rutger Helling wrote: >> I just tested reconfiguring and rebooting. Everything still works for >> me, including the initramfs. >> >> On Thu, 7 Feb 2019 11:19:02 +0100 >> Rutger Helling wrote: >> >> > Hey Guix, >> > >> > here's an update for cryptsetup. Note that although it seems to run >> > fine I haven't been able to test it with an initramfs (yet). > > Thanks! > > Are you able to incorporate the changes suggested in > to cryptsetup-static? Let us know either > way. Note that, when testing #30974 on my machine, it caused severe file system corruption and I had to reinstall. So I recommend taking a full backup before trying this on real hardware! That said, I have tested a more recent version of that patch (attached) in a VM and it appears to works fine. Did not get around to trying it on an already encrypted disk yet though. From 49d8c2519c05403c6a4ffb992b49f64a772eeecb Mon Sep 17 00:00:00 2001 From: Marius Bakke Date: Fri, 1 Feb 2019 00:27:45 +0100 Subject: [PATCH] gnu: cryptsetup: Update to 2.0.6. * gnu/packages/cryptsetup.scm (cryptsetup): Update to 2.0.6. [source](snippet): Delete bundled argon2. [arguments]: Add #:configure-flags to use system argon2. [inputs]: Add ARGON2 and JSON-C. [native-inputs]: Add PKG-CONFIG. (cryptsetup-static)[inputs]: Add ARGON2 and JSON-C. [arguments]: Add "--enable-libargon2" and "BLKID_LIBS" to #:configure-flags. [inputs]: Distinguish the static output of UTIL-LINUX. --- gnu/packages/cryptsetup.scm | 43 ++++++++++++++++++++++++++++++------- 1 file changed, 35 insertions(+), 8 deletions(-) diff --git a/gnu/packages/cryptsetup.scm b/gnu/packages/cryptsetup.scm index be60ef072d..c1aafc3bbc 100644 --- a/gnu/packages/cryptsetup.scm +++ b/gnu/packages/cryptsetup.scm @@ -25,14 +25,17 @@ #:use-module (guix utils) #:use-module (gnu packages) #:use-module (gnu packages gnupg) + #:use-module (gnu packages linux) + #:use-module (gnu packages password-utils) + #:use-module (gnu packages pkg-config) #:use-module (gnu packages popt) #:use-module (gnu packages python) - #:use-module (gnu packages linux)) + #:use-module (gnu packages web)) (define-public cryptsetup (package (name "cryptsetup") - (version "1.7.5") + (version "2.0.6") (source (origin (method url-fetch) (uri (string-append "mirror://kernel.org/linux/utils/cryptsetup/v" @@ -40,15 +43,30 @@ "/" name "-" version ".tar.xz")) (sha256 (base32 - "1gail831j826lmpdx2gsc83lp3br6wfnwh3vqwxaa1nn1lfwsc1b")))) + "0c1x125s7p4ps13spsqrcsd9dclz01vsrchmypq9msp7y3hgllbw")) + (modules '((guix build utils))) + (snippet + '(begin + ;; Delete bundled argon2 library. Preserve the build files + ;; so that we don't trigger 'autoreconf'. + (for-each (lambda (file) + (delete-file file)) + (find-files "lib/crypto_backend/argon2" + "(README|LICENSE|\\.[ch])$")) + #t)))) (build-system gnu-build-system) + (arguments + `(#:configure-flags '("--enable-libargon2"))) (inputs - `(("libgcrypt" ,libgcrypt) + `(("argon2" ,argon2) + ("json-c" ,json-c) + ("libgcrypt" ,libgcrypt) ("lvm2" ,lvm2) ("util-linux" ,util-linux) ("popt" ,popt))) (native-inputs - `(("python" ,python-wrapper))) + `(("pkg-config" ,pkg-config) + ("python" ,python-wrapper))) (synopsis "Hard disk encryption tool") (description "LUKS (Linux Unified Key Setup)/Cryptsetup provides a standard on-disk @@ -78,8 +96,15 @@ files). This assumes LIBRARY uses Libtool." (inherit cryptsetup) (name "cryptsetup-static") (arguments - '(#:configure-flags '("--disable-shared" + '(#:configure-flags `("--disable-shared" "--enable-static-cryptsetup" + "--enable-libargon2" + + ;; Link against the statically built blkid library instead + ;; of the shared one guessed by pkg-config. + ,(string-append "BLKID_LIBS=-L" + (assoc-ref %build-inputs "util-linux:static") + " -lblkid") ;; 'libdevmapper.a' pulls in libpthread, libudev and libm. "LIBS=-ludev -pthread -lm") @@ -117,9 +142,11 @@ files). This assumes LIBRARY uses Libtool." (inherit (static-library libgcrypt)) (propagated-inputs `(("libgpg-error-host" ,(static-library libgpg-error))))))) - `(("libgcrypt" ,libgcrypt-static) + `(("argon2" ,argon2) + ("json-c" ,json-c) + ("libgcrypt" ,libgcrypt-static) ("lvm2" ,lvm2-static) - ("util-linux" ,util-linux "static") + ("util-linux:static" ,util-linux "static") ("util-linux" ,util-linux) ("popt" ,popt)))) (synopsis "Hard disk encryption tool (statically linked)"))) -- 2.20.1