From 2a5ab18f1a74b1d1e59e5d45ee425da8808eb289 Mon Sep 17 00:00:00 2001
From: =?utf8?q?G=C3=B6kt=C3=BCrk=20Y=C3=BCksek?= <gokturk@gentoo.org>
Date: Wed, 25 Oct 2017 21:05:05 -0400
Subject: [PATCH] sys-apps/rng-tools: add support for NP_TPM and NO_DRNG
 options in v6

rng-tools-6 removes the command line options '--no-tpm' and
'--no-drng'. Instead, it allows the inclusion and exclusion of a
particular entropy source using the command line options '-n' and 'x'
respectively.

Maintain backwards compatibility by translating the NP_TPM and NO_DRNG
options in the conf file to exclusion options.

Closes: https://bugs.gentoo.org/630798
Package-Manager: Portage-2.3.8, Repoman-2.3.2
---
 sys-apps/rng-tools/files/rngd-initd-6            | 16 ++++++++++++++++
 ...{rng-tools-6.ebuild => rng-tools-6-r1.ebuild} |  2 +-
 ...-tools-6.1.ebuild => rng-tools-6.1-r1.ebuild} |  2 +-
 3 files changed, 18 insertions(+), 2 deletions(-)
 create mode 100644 sys-apps/rng-tools/files/rngd-initd-6
 rename sys-apps/rng-tools/{rng-tools-6.ebuild => rng-tools-6-r1.ebuild} (95%)
 rename sys-apps/rng-tools/{rng-tools-6.1.ebuild => rng-tools-6.1-r1.ebuild} (96%)

diff --git a/sys-apps/rng-tools/files/rngd-initd-6 b/sys-apps/rng-tools/files/rngd-initd-6
new file mode 100644
index 000000000000..c3b48bf22099
--- /dev/null
+++ b/sys-apps/rng-tools/files/rngd-initd-6
@@ -0,0 +1,16 @@
+#!/sbin/openrc-run
+# Copyright 1999-2017 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+
+depend() {
+	need localmount
+	after urandom
+	provide entropy
+}
+
+command=/usr/sbin/rngd
+pidfile="/var/run/${SVCNAME}.pid"
+command_args="--pid-file ${pidfile} --background --random-step ${STEP:-64} ${NO_TPM:+-x 1} \
+	${NO_DRNG:+-x 2} --fill-watermark ${WATERMARK} ${DEVICE:+--rng-device ${DEVICE}}"
+start_stop_daemon_args="--wait 1000"
+retry="SIGKILL/5000"
diff --git a/sys-apps/rng-tools/rng-tools-6.ebuild b/sys-apps/rng-tools/rng-tools-6-r1.ebuild
similarity index 95%
rename from sys-apps/rng-tools/rng-tools-6.ebuild
rename to sys-apps/rng-tools/rng-tools-6-r1.ebuild
index 3a559236e0c7..0dcc7e1fd35b 100644
--- a/sys-apps/rng-tools/rng-tools-6.ebuild
+++ b/sys-apps/rng-tools/rng-tools-6-r1.ebuild
@@ -40,7 +40,7 @@ src_prepare() {
 
 src_install() {
 	default
-	newinitd "${FILESDIR}"/rngd-initd-r1-4.1 rngd
+	newinitd "${FILESDIR}"/rngd-initd-6 rngd
 	newconfd "${FILESDIR}"/rngd-confd-4.1 rngd
 	systemd_dounit "${FILESDIR}"/rngd.service
 }
diff --git a/sys-apps/rng-tools/rng-tools-6.1.ebuild b/sys-apps/rng-tools/rng-tools-6.1-r1.ebuild
similarity index 96%
rename from sys-apps/rng-tools/rng-tools-6.1.ebuild
rename to sys-apps/rng-tools/rng-tools-6.1-r1.ebuild
index 2b37de32bff9..2c149789b757 100644
--- a/sys-apps/rng-tools/rng-tools-6.1.ebuild
+++ b/sys-apps/rng-tools/rng-tools-6.1-r1.ebuild
@@ -54,7 +54,7 @@ src_configure() {
 
 src_install() {
 	default
-	newinitd "${FILESDIR}"/rngd-initd-r1-4.1 rngd
+	newinitd "${FILESDIR}"/rngd-initd-6 rngd
 	newconfd "${FILESDIR}"/rngd-confd-4.1 rngd
 	systemd_dounit "${FILESDIR}"/rngd.service
 }
-- 
2.26.2