[PATCH 1/2] gnu: Add keyutils.

[PATCH 1/2] gnu: Add keyutils.

[Tobias Geerinckx-Rice]

* gnu/packages/crypto.scm (keyutils): New variable.
---
 gnu/packages/crypto.scm | 40 ++++++++++++++++++++++++++++++++++++++++
 1 file changed, 40 insertions(+)

diff --git a/gnu/packages/crypto.scm b/gnu/packages/crypto.scm
index 7d61164..d9dd8e2 100644
--- a/gnu/packages/crypto.scm
+++ b/gnu/packages/crypto.scm
@@ -223,3 +223,43 @@ to provide security against off-line attacks, such as a drive falling into
 the wrong hands.")
     (license (list license:lgpl3+                 ;encfs library
                    license:gpl3+))))              ;command-line tools
+
+(define-public keyutils
+  (package
+    (name "keyutils")
+    (version "1.5.9")
+    (source
+     (origin
+       (method url-fetch)
+       (uri
+        (string-append "https://people.redhat.com/dhowells/keyutils/keyutils-"
+                       version ".tar.bz2"))
+       (sha256
+        (base32
+         "1bl3w03ygxhc0hz69klfdlwqn33jvzxl1zfl2jmnb2v85iawb8jd"))
+       (modules '((guix build utils)))
+       ;; Create relative symbolic links instead of absolute ones to /lib/*
+       (snippet '(substitute* "Makefile" (("\\$\\(LNS\\) \\$\\(LIBDIR\\)/")
+                                          "$(LNS) ")))))
+    (build-system gnu-build-system)
+    (arguments
+     `(#:phases (modify-phases %standard-phases
+                  (delete 'configure))  ; no ./configure script
+       #:make-flags (list "CC=gcc"
+                          "RPATH=-Wl,-rpath,$(DESTDIR)$(LIBDIR)"
+                          (string-append "DESTDIR="
+                                         (assoc-ref %outputs "out"))
+                          "INCLUDEDIR=/include"
+                          "LIBDIR=/lib"
+                          "MANDIR=/share/man"
+                          "SHAREDIR=/share/keyutils")
+       #:test-target "test"))
+    (home-page "https://people.redhat.com/dhowells/keyutils/")
+    (synopsis "Linux key managament utilities")
+    (description
+     "Keyutils is a set of utilities for managing the key retention facility in
+the Linux kernel, which can be used by filesystems, block devices, and more to
+gain and retain the authorization and encryption keys required to perform
+secure operations. ")
+    (license (list license:lgpl2+       ; the files keyutils.*
+                   license:gpl+))))     ; the rest
-- 
2.7.4

[PATCH 2/2] gnu: Add ecryptfs-utils.

[Tobias Geerinckx-Rice]

* gnu/packages/linux.scm (ecryptfs-utils): New variable.
---
 gnu/packages/linux.scm | 37 +++++++++++++++++++++++++++++++++++++
 1 file changed, 37 insertions(+)

diff --git a/gnu/packages/linux.scm b/gnu/packages/linux.scm
index f99651a..a217220 100644
--- a/gnu/packages/linux.scm
+++ b/gnu/packages/linux.scm
@@ -40,6 +40,7 @@
   #:use-module (gnu packages bison)
   #:use-module (gnu packages calendar)
   #:use-module (gnu packages check)
+  #:use-module (gnu packages crypto)
   #:use-module (gnu packages compression)
   #:use-module (gnu packages databases)
   #:use-module (gnu packages docbook)
@@ -50,6 +51,7 @@
   #:use-module (gnu packages gcc)
   #:use-module (gnu packages gettext)
   #:use-module (gnu packages glib)
+  #:use-module (gnu packages gnuzilla)
   #:use-module (gnu packages gperf)
   #:use-module (gnu packages gtk)
   #:use-module (gnu packages libusb)
@@ -2858,3 +2860,38 @@ as used on certified hardware security devices.")
                    (license:non-copyleft "file://nist/packtest.c")
                    license:public-domain        ; nist/dfft.c
                    license:gpl3+))))            ; everything else
+
+(define-public ecryptfs-utils
+  (package
+    (name "ecryptfs-utils")
+    (version "111")
+    (source
+     (origin
+       (method url-fetch)
+       (uri (string-append "https://launchpad.net/ecryptfs/trunk/"
+                           version "/+download/ecryptfs-utils_"
+                           version ".orig.tar.gz"))
+       (sha256
+        (base32
+         "0zwq19siiwf09h7lwa7n7mgmrr8cxifp45lmwgcfr8c1gviv6b0i"))))
+    (build-system gnu-build-system)
+    (arguments
+     `(#:configure-flags (list "--disable-pywrap")))
+    (native-inputs
+     `(("intltool" ,intltool)
+       ("perl" ,perl)                   ; for pod2man
+       ("pkg-config" ,pkg-config)))
+    (inputs
+     `(("keyutils" ,keyutils)
+       ("linux-pam" ,linux-pam)
+       ("nss" ,nss)))
+    (home-page "http://ecryptfs.org/")
+    (synopsis "eCryptfs cryptographic file system utilities")
+    (description
+     "eCryptfs is a POSIX-compliant stacked cryptographic filesystem for Linux.
+Each file's cryptographic meta-data is stored inside the file itself, along
+with the encrypted contents.  This allows individual encrypted files to be
+copied between hosts and still be decrypted with the proper key.  eCryptfs is a
+native Linux filesystem, and has been part of the Linux kernel since version
+2.6.19.  This package contains the userland utilities to manage it.")
+    (license license:gpl2+)))
-- 
2.7.4

Re: [PATCH 2/2] gnu: Add ecryptfs-utils.

[Ludovic Courtès]

Tobias Geerinckx-Rice <me@tobias.gr> skribis:

> * gnu/packages/linux.scm (ecryptfs-utils): New variable.

[...]

> +    (description
> +     "eCryptfs is a POSIX-compliant stacked cryptographic filesystem for Linux.
> +Each file's cryptographic meta-data is stored inside the file itself, along
> +with the encrypted contents.  This allows individual encrypted files to be
> +copied between hosts and still be decrypted with the proper key.  eCryptfs is a
> +native Linux filesystem, and has been part of the Linux kernel since version
> +2.6.19.  This package contains the userland utilities to manage it.")
> +    (license license:gpl2+)))

“file system” as two words, but otherwise LGTM.

Thank you!

Ludo’.

Re: [PATCH 1/2] gnu: Add keyutils.

[Ludovic Courtès]

Tobias Geerinckx-Rice <me@tobias.gr> skribis:

> * gnu/packages/crypto.scm (keyutils): New variable.

[...]

> +    (description
> +     "Keyutils is a set of utilities for managing the key retention facility in
> +the Linux kernel, which can be used by filesystems, block devices, and more to

s/filesystems/file systems/  :-)

> +    (license (list license:lgpl2+       ; the files keyutils.*
> +                   license:gpl+))))     ; the rest

Did you mean ‘license:gpl2+’ for the second one?

Otherwise LGTM, thanks!

Ludo’.

Re: [PATCH 1/2] gnu: Add keyutils.

[Tobias Geerinckx-Rice]

[-- Attachment #1.1: Type: text/plain, Size: 495 bytes --]

Ludo',

On 28/08/16 18:35, Ludovic Courtès wrote:
> s/filesystems/file systems/  :-)

Thank you for making my day. I thought the correct spelling was dead.

I dread the first time I catch myself double-spacing sentences, though.

> Did you mean ‘license:gpl2+’ for the second one?

Indeed; already fixed (lgpl2.1+ & gpl2+). These were placeholders
supposed to be changed before sending — lgpl2+ doesn't exist either.

Pushed as e385e95. Thanks!

Kind regards,

T G-R


[-- Attachment #2: OpenPGP digital signature --]
[-- Type: application/pgp-signature, Size: 473 bytes --]