* [bug#34366] [PATCH] gnu: cryptsetup: Update to 2.0.6.
@ 2019-02-07 10:19 Rutger Helling
2019-02-09 9:24 ` Rutger Helling
0 siblings, 1 reply; 4+ messages in thread
From: Rutger Helling @ 2019-02-07 10:19 UTC (permalink / raw)
To: 34366
[-- Attachment #1.1: Type: text/plain, Size: 144 bytes --]
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).
[-- Warning: decoded text below may be mangled, UTF-8 assumed --]
[-- Attachment #1.2: 0001-gnu-cryptsetup-Update-to-2.0.6.patch --]
[-- Type: text/x-patch, Size: 4069 bytes --]
From 3d7e4ac45a20a93dc3e206fc4cb4049ead634d0a Mon Sep 17 00:00:00 2001
From: Rutger Helling <rhelling@mykolab.com>
Date: Thu, 7 Feb 2019 10:55:53 +0100
Subject: [PATCH] gnu: cryptsetup: Update to 2.0.6.
* gnu/packages/cryptsetup.scm (cryptsetup): Update to 2.0.6.
[inputs]: Add json-c.
[native-inputs]: Add pkg-config.
* gnu/packages/cryptsetup.scm (cryptsetup-static)[arguments]: Add
--disable-blkid configure flag. Strip new cryptsetup-reencrypt and
integritysetup binaries of references too.
[inputs]: Add json-c.
---
gnu/packages/cryptsetup.scm | 22 ++++++++++++++++------
1 file changed, 16 insertions(+), 6 deletions(-)
diff --git a/gnu/packages/cryptsetup.scm b/gnu/packages/cryptsetup.scm
index 9df26edc7..4b5498649 100644
--- a/gnu/packages/cryptsetup.scm
+++ b/gnu/packages/cryptsetup.scm
@@ -1,6 +1,7 @@
;;; GNU Guix --- Functional package management for GNU
;;; Copyright © 2013 Andreas Enge <andreas@enge.fr>
;;; Copyright © 2016 Ludovic Courtès <ludo@gnu.org>
+;;; Copyright © 2019 Rutger Helling <rhelling@mykolab.com>
;;;
;;; This file is part of GNU Guix.
;;;
@@ -25,14 +26,16 @@
#:use-module (guix utils)
#:use-module (gnu packages)
#:use-module (gnu packages gnupg)
+ #:use-module (gnu packages pkg-config)
#:use-module (gnu packages popt)
#:use-module (gnu packages python)
+ #:use-module (gnu packages web)
#:use-module (gnu packages linux))
(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,17 @@
"/" name "-" version ".tar.xz"))
(sha256
(base32
- "1gail831j826lmpdx2gsc83lp3br6wfnwh3vqwxaa1nn1lfwsc1b"))))
+ "0c1x125s7p4ps13spsqrcsd9dclz01vsrchmypq9msp7y3hgllbw"))))
(build-system gnu-build-system)
(inputs
- `(("libgcrypt" ,libgcrypt)
+ `(("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
@@ -80,6 +85,7 @@ files). This assumes LIBRARY uses Libtool."
(arguments
'(#:configure-flags '("--disable-shared"
"--enable-static-cryptsetup"
+ "--disable-blkid" ;; Enabling results in linking errors.
;; 'libdevmapper.a' pulls in libpthread, libudev and libm.
"LIBS=-ludev -pthread -lm")
@@ -109,7 +115,10 @@ files). This assumes LIBRARY uses Libtool."
".static")
file)
(remove-store-references file))
- '("sbin/cryptsetup" "sbin/veritysetup"))
+ '("sbin/cryptsetup"
+ "sbin/cryptsetup-reencrypt"
+ "sbin/integritysetup"
+ "sbin/veritysetup"))
#t))))))))
(inputs
(let ((libgcrypt-static
@@ -117,7 +126,8 @@ files). This assumes LIBRARY uses Libtool."
(inherit (static-library libgcrypt))
(propagated-inputs
`(("libgpg-error-host" ,(static-library libgpg-error)))))))
- `(("libgcrypt" ,libgcrypt-static)
+ `(("json-c" ,json-c)
+ ("libgcrypt" ,libgcrypt-static)
("lvm2" ,lvm2-static)
("util-linux" ,util-linux "static")
("util-linux" ,util-linux)
--
2.20.1
[-- Attachment #2: OpenPGP digital signature --]
[-- Type: application/pgp-signature, Size: 488 bytes --]
^ permalink raw reply related [flat|nested] 4+ messages in thread
* [bug#34366] [PATCH] gnu: cryptsetup: Update to 2.0.6.
2019-02-07 10:19 [bug#34366] [PATCH] gnu: cryptsetup: Update to 2.0.6 Rutger Helling
@ 2019-02-09 9:24 ` Rutger Helling
2019-02-12 23:08 ` Leo Famulari
0 siblings, 1 reply; 4+ messages in thread
From: Rutger Helling @ 2019-02-09 9:24 UTC (permalink / raw)
To: 34366
[-- Attachment #1: Type: text/plain, Size: 340 bytes --]
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 <rhelling@mykolab.com> 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).
[-- Attachment #2: OpenPGP digital signature --]
[-- Type: application/pgp-signature, Size: 488 bytes --]
^ permalink raw reply [flat|nested] 4+ messages in thread
* [bug#34366] [PATCH] gnu: cryptsetup: Update to 2.0.6.
2019-02-09 9:24 ` Rutger Helling
@ 2019-02-12 23:08 ` Leo Famulari
2019-02-12 23:22 ` Marius Bakke
0 siblings, 1 reply; 4+ messages in thread
From: Leo Famulari @ 2019-02-12 23:08 UTC (permalink / raw)
To: Rutger Helling; +Cc: 34366
[-- Attachment #1: Type: text/plain, Size: 567 bytes --]
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 <rhelling@mykolab.com> 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
<https://bugs.gnu.org/30974> to cryptsetup-static? Let us know either
way.
[-- Attachment #2: signature.asc --]
[-- Type: application/pgp-signature, Size: 833 bytes --]
^ permalink raw reply [flat|nested] 4+ messages in thread
* [bug#34366] [PATCH] gnu: cryptsetup: Update to 2.0.6.
2019-02-12 23:08 ` Leo Famulari
@ 2019-02-12 23:22 ` Marius Bakke
0 siblings, 0 replies; 4+ messages in thread
From: Marius Bakke @ 2019-02-12 23:22 UTC (permalink / raw)
To: Leo Famulari, Rutger Helling; +Cc: 34366
[-- Attachment #1.1: Type: text/plain, Size: 1013 bytes --]
Leo Famulari <leo@famulari.name> 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 <rhelling@mykolab.com> 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
> <https://bugs.gnu.org/30974> 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.
[-- Warning: decoded text below may be mangled, UTF-8 assumed --]
[-- Attachment #1.2: 0001-gnu-cryptsetup-Update-to-2.0.6.patch --]
[-- Type: text/x-patch, Size: 4469 bytes --]
From 49d8c2519c05403c6a4ffb992b49f64a772eeecb Mon Sep 17 00:00:00 2001
From: Marius Bakke <mbakke@fastmail.com>
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
[-- Attachment #2: signature.asc --]
[-- Type: application/pgp-signature, Size: 487 bytes --]
^ permalink raw reply related [flat|nested] 4+ messages in thread
end of thread, other threads:[~2019-02-12 23:23 UTC | newest]
Thread overview: 4+ messages (download: mbox.gz / follow: Atom feed)
-- links below jump to the message on this page --
2019-02-07 10:19 [bug#34366] [PATCH] gnu: cryptsetup: Update to 2.0.6 Rutger Helling
2019-02-09 9:24 ` Rutger Helling
2019-02-12 23:08 ` Leo Famulari
2019-02-12 23:22 ` Marius Bakke
Code repositories for project(s) associated with this external index
https://git.savannah.gnu.org/cgit/guix.git
This is an external index of several public inboxes,
see mirroring instructions on how to clone and mirror
all data and code used by this external index.