commit: 2a5ab18f1a74b1d1e59e5d45ee425da8808eb289 Author: Göktürk Yüksek <gokturk <AT> gentoo <DOT> org> AuthorDate: Thu Oct 26 01:05:05 2017 +0000 Commit: Göktürk Yüksek <gokturk <AT> gentoo <DOT> org> CommitDate: Thu Oct 26 01:05:37 2017 +0000 URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=2a5ab18f
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 +- .../{rng-tools-6.1.ebuild => rng-tools-6.1-r1.ebuild} | 2 +- 3 files changed, 18 insertions(+), 2 deletions(-) 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 00000000000..c3b48bf2209 --- /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 3a559236e0c..0dcc7e1fd35 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 2b37de32bff..2c149789b75 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 }
