[PATCH] services: Add rngd service.

[PATCH] services: Add rngd service.

[David Craven]

* gnu/services/base.scm (rngd-service): New service.
* gnu/packages/linux.scm (rng-tools): New package.
---
 gnu/packages/linux.scm | 76 +++++++++++++++++++++++++++++++-------------------
 gnu/services/base.scm  | 43 ++++++++++++++++++++++++++--
 2 files changed, 89 insertions(+), 30 deletions(-)

diff --git a/gnu/packages/linux.scm b/gnu/packages/linux.scm
index a0c21d8..f1b2172 100644
--- a/gnu/packages/linux.scm
+++ b/gnu/packages/linux.scm
@@ -30,49 +30,49 @@
 ;;; along with GNU Guix.  If not, see <http://www.gnu.org/licenses/>.
 
 (define-module (gnu packages linux)
-  #:use-module ((guix licenses) #:prefix license:)
   #:use-module (gnu packages)
+  #:use-module (gnu packages admin)
+  #:use-module (gnu packages algebra)
+  #:use-module (gnu packages attr)
+  #:use-module (gnu packages autotools)
+  #:use-module (gnu packages base)
+  #:use-module (gnu packages bison)
+  #:use-module (gnu packages calendar)
+  #:use-module (gnu packages check)
   #:use-module (gnu packages compression)
-  #:use-module (gnu packages gcc)
+  #:use-module (gnu packages databases)
+  #:use-module (gnu packages docbook)
+  #:use-module (gnu packages documentation)
+  #:use-module (gnu packages elf)
   #:use-module (gnu packages flex)
-  #:use-module (gnu packages bison)
-  #:use-module (gnu packages admin)
+  #:use-module (gnu packages freedesktop)
+  #:use-module (gnu packages gcc)
+  #:use-module (gnu packages gettext)
+  #:use-module (gnu packages glib)
   #:use-module (gnu packages gperf)
+  #:use-module (gnu packages gtk)
   #:use-module (gnu packages libusb)
+  #:use-module (gnu packages maths)
   #:use-module (gnu packages ncurses)
-  #:use-module (gnu packages pciutils)
-  #:use-module (gnu packages databases)
   #:use-module (gnu packages perl)
+  #:use-module (gnu packages pciutils)
   #:use-module (gnu packages pkg-config)
+  #:use-module (gnu packages pulseaudio)
   #:use-module (gnu packages python)
+  #:use-module (gnu packages readline)
+  #:use-module (gnu packages rrdtool)
   #:use-module (gnu packages slang)
-  #:use-module (gnu packages algebra)
-  #:use-module (gnu packages gettext)
-  #:use-module (gnu packages glib)
-  #:use-module (gnu packages pulseaudio)
-  #:use-module (gnu packages attr)
-  #:use-module (gnu packages xml)
-  #:use-module (gnu packages autotools)
   #:use-module (gnu packages texinfo)
-  #:use-module (gnu packages check)
-  #:use-module (gnu packages maths)
-  #:use-module (gnu packages base)
-  #:use-module (gnu packages rrdtool)
-  #:use-module (gnu packages elf)
-  #:use-module (gnu packages gtk)
-  #:use-module (gnu packages docbook)
-  #:use-module (gnu packages documentation)
-  #:use-module (gnu packages readline)
-  #:use-module (gnu packages calendar)
   #:use-module (gnu packages tls)
-  #:use-module (gnu packages freedesktop)
-  #:use-module (guix packages)
-  #:use-module (guix download)
-  #:use-module (guix utils)
-  #:use-module (guix build-system gnu)
+  #:use-module (gnu packages xml)
   #:use-module (guix build-system cmake)
+  #:use-module (guix build-system gnu)
   #:use-module (guix build-system python)
   #:use-module (guix build-system trivial)
+  #:use-module (guix download)
+  #:use-module ((guix licenses) #:prefix license:)
+  #:use-module (guix packages)
+  #:use-module (guix utils)
   #:use-module (srfi srfi-1)
   #:use-module (srfi srfi-2)
   #:use-module (srfi srfi-26)
@@ -2726,3 +2726,23 @@ from userspace.")
 commonly found on Microsoft Windows.  It is implemented as a FUSE file system.
 The package provides additional NTFS tools.")
     (license license:gpl2+)))
+
+(define-public rng-tools
+  (package
+    (name "rng-tools")
+    (version "5")
+    (source (origin
+              (method url-fetch)
+              (uri (string-append
+                "http://downloads.sourceforge.net/sourceforge/gkernel/rng-tools-" version
+                ".tar.gz"))
+              (sha256
+                (base32
+                  "13h7lc8wl9khhvkr0i3bl5j9bapf8anhqis1lcnwxg1vc2v058b0"))))
+    (build-system gnu-build-system)
+    (synopsis "Random number generator daemon")
+    (description
+     "Monitor a hardware random number generator, and supply entropy
+from that to the system kernel's /dev/random machinery.")
+    (home-page "http://sourceforge.net/projects/gkernel")
+    (license license:gpl2)))
diff --git a/gnu/services/base.scm b/gnu/services/base.scm
index 2780d12..fab287a 100644
--- a/gnu/services/base.scm
+++ b/gnu/services/base.scm
@@ -31,7 +31,7 @@
   #:use-module (gnu system mapped-devices)
   #:use-module (gnu packages admin)
   #:use-module ((gnu packages linux)
-                #:select (eudev kbd e2fsprogs lvm2 fuse alsa-utils crda gpm))
+                #:select (alsa-utils crda eudev e2fsprogs fuse gpm kbd lvm2 rng-tools))
   #:use-module ((gnu packages base)
                 #:select (canonical-package glibc))
   #:use-module (gnu packages package-management)
@@ -95,6 +95,7 @@
             gpm-service
 
             urandom-seed-service
+            rngd-service
 
             %base-services))
 
@@ -484,7 +485,45 @@ stopped before 'kill' is called."
 (define (urandom-seed-service)
   (service urandom-seed-service-type #f))
 
-\f
+
+;;;
+;;; Add hardware random number generator to entropy pool
+;;;
+
+(define-record-type* <rngd-configuration>
+  rngd-configuration make-rngd-configuration
+  rngd-configuration?
+  (rng-tools rngd-configuration-rng-tools)
+  (rng-device rngd-configuration-rngd-device))
+
+(define rngd-service-type
+  (shepherd-service-type
+    'rngd
+    (lambda (config)
+      (define rng-tools (rngd-configuration-rng-tools config))
+      (define rng-device (rngd-configuration-rngd-device config))
+
+      (define rngd-command
+        (list #~(string-append #$rng-tools "/sbin/rngd") "-f" "-r" rng-device))
+
+      (shepherd-service
+        (documentation "Add TRNG to entropy pool.")
+        (requirement '(udev))
+        (provision '(trng))
+        (start #~(make-forkexec-constructor #$@rngd-command))
+        (stop #~(make-kill-destructor))))))
+
+(define* (rngd-service #:key
+  (rng-tools rng-tools)
+  (rng-device "/dev/hwrng"))
+  "Run the @command{rngd} program from @var{rng-tools} to add @var{rng-device}
+to the kernel's entropy pool."
+  (service rngd-service-type
+    (rngd-configuration
+      (rng-tools rng-tools)
+      (rng-device rng-device))))
+
+
 ;;;
 ;;; System-wide environment variables.
 ;;;
-- 
2.9.0

Re: [PATCH] services: Add rngd service.

[Leo Famulari]

On Sun, Jul 03, 2016 at 02:16:23AM +0200, David Craven wrote:
> * gnu/services/base.scm (rngd-service): New service.
> * gnu/packages/linux.scm (rng-tools): New package.

Thanks for taking this on!

Can you split this into 3 separate commits? One to alphabetize the
module imports in linux.scm, one to add rng-tools, and one to add
rngd-service?

Also, can you document the service in doc/guix.texi?

> +(define-public rng-tools

This package looks good to me, although I didn't try to build it yet.

> --- a/gnu/services/base.scm
> +++ b/gnu/services/base.scm
> @@ -31,7 +31,7 @@
>    #:use-module (gnu system mapped-devices)
>    #:use-module (gnu packages admin)
>    #:use-module ((gnu packages linux)
> -                #:select (eudev kbd e2fsprogs lvm2 fuse alsa-utils crda gpm))
> +                #:select (alsa-utils crda eudev e2fsprogs fuse gpm kbd lvm2 rng-tools))
>    #:use-module ((gnu packages base)
>                  #:select (canonical-package glibc))
>    #:use-module (gnu packages package-management)
> @@ -95,6 +95,7 @@
>              gpm-service
>  
>              urandom-seed-service
> +            rngd-service

I will let someone with more experience writing services review this
part.

[PATCH 1/3] gnu: Reorder imports alphabetically.

[David Craven]

* gnu/packages/linux.scm: Refactor.
---
 gnu/packages/linux.scm | 56 +++++++++++++++++++++++++-------------------------
 1 file changed, 28 insertions(+), 28 deletions(-)

diff --git a/gnu/packages/linux.scm b/gnu/packages/linux.scm
index a0c21d8..7799350 100644
--- a/gnu/packages/linux.scm
+++ b/gnu/packages/linux.scm
@@ -30,49 +30,49 @@
 ;;; along with GNU Guix.  If not, see <http://www.gnu.org/licenses/>.
 
 (define-module (gnu packages linux)
-  #:use-module ((guix licenses) #:prefix license:)
   #:use-module (gnu packages)
+  #:use-module (gnu packages admin)
+  #:use-module (gnu packages algebra)
+  #:use-module (gnu packages attr)
+  #:use-module (gnu packages autotools)
+  #:use-module (gnu packages base)
+  #:use-module (gnu packages bison)
+  #:use-module (gnu packages calendar)
+  #:use-module (gnu packages check)
   #:use-module (gnu packages compression)
-  #:use-module (gnu packages gcc)
+  #:use-module (gnu packages databases)
+  #:use-module (gnu packages docbook)
+  #:use-module (gnu packages documentation)
+  #:use-module (gnu packages elf)
   #:use-module (gnu packages flex)
-  #:use-module (gnu packages bison)
-  #:use-module (gnu packages admin)
+  #:use-module (gnu packages freedesktop)
+  #:use-module (gnu packages gcc)
+  #:use-module (gnu packages gettext)
+  #:use-module (gnu packages glib)
   #:use-module (gnu packages gperf)
+  #:use-module (gnu packages gtk)
   #:use-module (gnu packages libusb)
+  #:use-module (gnu packages maths)
   #:use-module (gnu packages ncurses)
-  #:use-module (gnu packages pciutils)
-  #:use-module (gnu packages databases)
   #:use-module (gnu packages perl)
+  #:use-module (gnu packages pciutils)
   #:use-module (gnu packages pkg-config)
+  #:use-module (gnu packages pulseaudio)
   #:use-module (gnu packages python)
+  #:use-module (gnu packages readline)
+  #:use-module (gnu packages rrdtool)
   #:use-module (gnu packages slang)
-  #:use-module (gnu packages algebra)
-  #:use-module (gnu packages gettext)
-  #:use-module (gnu packages glib)
-  #:use-module (gnu packages pulseaudio)
-  #:use-module (gnu packages attr)
-  #:use-module (gnu packages xml)
-  #:use-module (gnu packages autotools)
   #:use-module (gnu packages texinfo)
-  #:use-module (gnu packages check)
-  #:use-module (gnu packages maths)
-  #:use-module (gnu packages base)
-  #:use-module (gnu packages rrdtool)
-  #:use-module (gnu packages elf)
-  #:use-module (gnu packages gtk)
-  #:use-module (gnu packages docbook)
-  #:use-module (gnu packages documentation)
-  #:use-module (gnu packages readline)
-  #:use-module (gnu packages calendar)
   #:use-module (gnu packages tls)
-  #:use-module (gnu packages freedesktop)
-  #:use-module (guix packages)
-  #:use-module (guix download)
-  #:use-module (guix utils)
-  #:use-module (guix build-system gnu)
+  #:use-module (gnu packages xml)
   #:use-module (guix build-system cmake)
+  #:use-module (guix build-system gnu)
   #:use-module (guix build-system python)
   #:use-module (guix build-system trivial)
+  #:use-module (guix download)
+  #:use-module ((guix licenses) #:prefix license:)
+  #:use-module (guix packages)
+  #:use-module (guix utils)
   #:use-module (srfi srfi-1)
   #:use-module (srfi srfi-2)
   #:use-module (srfi srfi-26)
-- 
2.9.0

Re: [PATCH] services: Add rngd service.

[David Craven]

Thank you for reviewing my patches. I didn't get it to work with lsh
yet though :/ - need to practice my scheme skills...

On Sun, Jul 3, 2016 at 3:42 AM, Leo Famulari <leo@famulari.name> wrote:
> On Sun, Jul 03, 2016 at 02:16:23AM +0200, David Craven wrote:
>> * gnu/services/base.scm (rngd-service): New service.
>> * gnu/packages/linux.scm (rng-tools): New package.
>
> Thanks for taking this on!
>
> Can you split this into 3 separate commits? One to alphabetize the
> module imports in linux.scm, one to add rng-tools, and one to add
> rngd-service?
>
> Also, can you document the service in doc/guix.texi?
>
>> +(define-public rng-tools
>
> This package looks good to me, although I didn't try to build it yet.
>
>> --- a/gnu/services/base.scm
>> +++ b/gnu/services/base.scm
>> @@ -31,7 +31,7 @@
>>    #:use-module (gnu system mapped-devices)
>>    #:use-module (gnu packages admin)
>>    #:use-module ((gnu packages linux)
>> -                #:select (eudev kbd e2fsprogs lvm2 fuse alsa-utils crda gpm))
>> +                #:select (alsa-utils crda eudev e2fsprogs fuse gpm kbd lvm2 rng-tools))
>>    #:use-module ((gnu packages base)
>>                  #:select (canonical-package glibc))
>>    #:use-module (gnu packages package-management)
>> @@ -95,6 +95,7 @@
>>              gpm-service
>>
>>              urandom-seed-service
>> +            rngd-service
>
> I will let someone with more experience writing services review this
> part.

[PATCH 2/3] gnu: Add rng-tools 5.

[David Craven]

* gnu/packages/linux.scm: New package.
---
 gnu/packages/linux.scm | 20 ++++++++++++++++++++
 1 file changed, 20 insertions(+)

diff --git a/gnu/packages/linux.scm b/gnu/packages/linux.scm
index 7799350..f1b2172 100644
--- a/gnu/packages/linux.scm
+++ b/gnu/packages/linux.scm
@@ -2726,3 +2726,23 @@ from userspace.")
 commonly found on Microsoft Windows.  It is implemented as a FUSE file system.
 The package provides additional NTFS tools.")
     (license license:gpl2+)))
+
+(define-public rng-tools
+  (package
+    (name "rng-tools")
+    (version "5")
+    (source (origin
+              (method url-fetch)
+              (uri (string-append
+                "http://downloads.sourceforge.net/sourceforge/gkernel/rng-tools-" version
+                ".tar.gz"))
+              (sha256
+                (base32
+                  "13h7lc8wl9khhvkr0i3bl5j9bapf8anhqis1lcnwxg1vc2v058b0"))))
+    (build-system gnu-build-system)
+    (synopsis "Random number generator daemon")
+    (description
+     "Monitor a hardware random number generator, and supply entropy
+from that to the system kernel's /dev/random machinery.")
+    (home-page "http://sourceforge.net/projects/gkernel")
+    (license license:gpl2)))
-- 
2.9.0

[PATCH 3/3] services: Add rngd-service.

[David Craven]

* gnu/services/base.scm: New service.
---
 gnu/services/base.scm | 43 +++++++++++++++++++++++++++++++++++++++++--
 1 file changed, 41 insertions(+), 2 deletions(-)

diff --git a/gnu/services/base.scm b/gnu/services/base.scm
index f304bf8..67f3961 100644
--- a/gnu/services/base.scm
+++ b/gnu/services/base.scm
@@ -31,7 +31,7 @@
   #:use-module (gnu system mapped-devices)
   #:use-module (gnu packages admin)
   #:use-module ((gnu packages linux)
-                #:select (eudev kbd e2fsprogs lvm2 fuse alsa-utils crda gpm))
+                #:select (alsa-utils crda eudev e2fsprogs fuse gpm kbd lvm2 rng-tools))
   #:use-module ((gnu packages base)
                 #:select (canonical-package glibc))
   #:use-module (gnu packages package-management)
@@ -97,6 +97,7 @@
 
             urandom-seed-service-type
             urandom-seed-service
+            rngd-service
 
             %base-services))
 
@@ -486,7 +487,45 @@ stopped before 'kill' is called."
 (define (urandom-seed-service)
   (service urandom-seed-service-type #f))
 
-\f
+
+;;;
+;;; Add hardware random number generator to entropy pool
+;;;
+
+(define-record-type* <rngd-configuration>
+  rngd-configuration make-rngd-configuration
+  rngd-configuration?
+  (rng-tools rngd-configuration-rng-tools)
+  (rng-device rngd-configuration-rngd-device))
+
+(define rngd-service-type
+  (shepherd-service-type
+    'rngd
+    (lambda (config)
+      (define rng-tools (rngd-configuration-rng-tools config))
+      (define rng-device (rngd-configuration-rngd-device config))
+
+      (define rngd-command
+        (list #~(string-append #$rng-tools "/sbin/rngd") "-f" "-r" rng-device))
+
+      (shepherd-service
+        (documentation "Add TRNG to entropy pool.")
+        (requirement '(udev))
+        (provision '(trng))
+        (start #~(make-forkexec-constructor #$@rngd-command))
+        (stop #~(make-kill-destructor))))))
+
+(define* (rngd-service #:key
+  (rng-tools rng-tools)
+  (rng-device "/dev/hwrng"))
+  "Run the @command{rngd} program from @var{rng-tools} to add @var{rng-device}
+to the kernel's entropy pool."
+  (service rngd-service-type
+    (rngd-configuration
+      (rng-tools rng-tools)
+      (rng-device rng-device))))
+
+
 ;;;
 ;;; System-wide environment variables.
 ;;;
-- 
2.9.0

[PATCH 3/4] services: Add rngd-service.

[David Craven]

* gnu/services/base.scm: New service.
* doc/guix.texi: Add documentation.
---
 doc/guix.texi         |  6 ++++++
 gnu/services/base.scm | 43 +++++++++++++++++++++++++++++++++++++++++--
 2 files changed, 47 insertions(+), 2 deletions(-)

diff --git a/doc/guix.texi b/doc/guix.texi
index 62c0d34..ce28182 100644
--- a/doc/guix.texi
+++ b/doc/guix.texi
@@ -7494,6 +7494,12 @@ created by @command{guix archive --generate-key} (@pxref{Invoking guix
 archive}).  If that is not the case, the service will fail to start.
 @end deffn
 
+@anchor{rngd-service}
+@deffn {Scheme Procedure} rngd-service [#:rng-tools @var{rng-tools}] @
+          [#:rng-device "/dev/hwrng"]
+Return a service that adds @var{rng-device} to the kernel entropy pool. This
+service will fail if if the device doesn't exist.
+@end deffn
 
 @node Scheduled Job Execution
 @subsubsection Scheduled Job Execution
diff --git a/gnu/services/base.scm b/gnu/services/base.scm
index f304bf8..67f3961 100644
--- a/gnu/services/base.scm
+++ b/gnu/services/base.scm
@@ -31,7 +31,7 @@
   #:use-module (gnu system mapped-devices)
   #:use-module (gnu packages admin)
   #:use-module ((gnu packages linux)
-                #:select (eudev kbd e2fsprogs lvm2 fuse alsa-utils crda gpm))
+                #:select (alsa-utils crda eudev e2fsprogs fuse gpm kbd lvm2 rng-tools))
   #:use-module ((gnu packages base)
                 #:select (canonical-package glibc))
   #:use-module (gnu packages package-management)
@@ -97,6 +97,7 @@
 
             urandom-seed-service-type
             urandom-seed-service
+            rngd-service
 
             %base-services))
 
@@ -486,7 +487,45 @@ stopped before 'kill' is called."
 (define (urandom-seed-service)
   (service urandom-seed-service-type #f))
 
-\f
+
+;;;
+;;; Add hardware random number generator to entropy pool
+;;;
+
+(define-record-type* <rngd-configuration>
+  rngd-configuration make-rngd-configuration
+  rngd-configuration?
+  (rng-tools rngd-configuration-rng-tools)
+  (rng-device rngd-configuration-rngd-device))
+
+(define rngd-service-type
+  (shepherd-service-type
+    'rngd
+    (lambda (config)
+      (define rng-tools (rngd-configuration-rng-tools config))
+      (define rng-device (rngd-configuration-rngd-device config))
+
+      (define rngd-command
+        (list #~(string-append #$rng-tools "/sbin/rngd") "-f" "-r" rng-device))
+
+      (shepherd-service
+        (documentation "Add TRNG to entropy pool.")
+        (requirement '(udev))
+        (provision '(trng))
+        (start #~(make-forkexec-constructor #$@rngd-command))
+        (stop #~(make-kill-destructor))))))
+
+(define* (rngd-service #:key
+  (rng-tools rng-tools)
+  (rng-device "/dev/hwrng"))
+  "Run the @command{rngd} program from @var{rng-tools} to add @var{rng-device}
+to the kernel's entropy pool."
+  (service rngd-service-type
+    (rngd-configuration
+      (rng-tools rng-tools)
+      (rng-device rng-device))))
+
+
 ;;;
 ;;; System-wide environment variables.
 ;;;
-- 
2.9.0

[PATCH 4/4] build: Ignore texi2pdf temporary files.

[David Craven]

* .gitignore: Modify.
---
 .gitignore | 1 +
 1 file changed, 1 insertion(+)

diff --git a/.gitignore b/.gitignore
index 003412e..6e892ca 100644
--- a/.gitignore
+++ b/.gitignore
@@ -35,6 +35,7 @@
 /doc/guix.ky
 /doc/guix.pg
 /doc/guix.toc
+/doc/guix.t2p
 /doc/guix.tp
 /doc/guix.vr
 /doc/guix.vrs
-- 
2.9.0

Re: [PATCH 1/3] gnu: Reorder imports alphabetically.

[Leo Famulari]

On Sun, Jul 03, 2016 at 04:05:39AM +0200, David Craven wrote:
> * gnu/packages/linux.scm: Refactor.

Thanks for doing this housekeeping! Hopefully we can maintain the order
in the future :)

In the interest of consistency, I re-wrote the commit message in the
style of the only related commit I could find, f0644195. It's easier to
read the commit log when we establish conventions and stick to them.

Re: [PATCH 2/3] gnu: Add rng-tools 5.

[Leo Famulari]

On Sun, Jul 03, 2016 at 04:26:28AM +0200, David Craven wrote:
> * gnu/packages/linux.scm: New package.

Thanks for this rng-tools package!

I made some cosmetic changes, added some details about the licensing,
cleaned up the commit message, added you to the list of authors, and
pushed as 9b0942c1b0.

Re: [PATCH 1/3] gnu: Reorder imports alphabetically.

[David Craven]

Totally agree, it was my intention to follow convention.

On Sun, Jul 3, 2016 at 11:31 PM, Leo Famulari <leo@famulari.name> wrote:
> On Sun, Jul 03, 2016 at 04:05:39AM +0200, David Craven wrote:
>> * gnu/packages/linux.scm: Refactor.
>
> Thanks for doing this housekeeping! Hopefully we can maintain the order
> in the future :)
>
> In the interest of consistency, I re-wrote the commit message in the
> style of the only related commit I could find, f0644195. It's easier to
> read the commit log when we establish conventions and stick to them.

Re: [PATCH 3/4] services: Add rngd-service.

[Ludovic Courtès]

David Craven <david@craven.ch> skribis:

> * gnu/services/base.scm: New service.
> * doc/guix.texi: Add documentation.

Neat!  I adjusted the commit log and made minor changes:

> +(define-record-type* <rngd-configuration>
> +  rngd-configuration make-rngd-configuration
> +  rngd-configuration?
> +  (rng-tools rngd-configuration-rng-tools)
> +  (rng-device rngd-configuration-rngd-device))

I changed “rng-device” to “device” here and in similar places (“rng”
seemed redundant.)

> +(define* (rngd-service #:key
> +  (rng-tools rng-tools)
> +  (rng-device "/dev/hwrng"))

Reindented this.

Thanks!

Ludo’.