From 8c6132ee689913fa10285b0caa9a8e86bec524ba Mon Sep 17 00:00:00 2001 From: Göktürk Yüksek Date: Wed, 5 Jun 2019 14:09:16 -0400 Subject: sys-apps/rng-tools: use '/run' instead of '/var/run' #685326 MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit Closes: https://bugs.gentoo.org/685326 Package-Manager: Portage-2.3.67, Repoman-2.3.12 Signed-off-by: Göktürk Yüksek --- sys-apps/rng-tools/files/rngd-initd-6.7 | 64 -------------------- sys-apps/rng-tools/files/rngd-initd-6.7-r1 | 64 ++++++++++++++++++++ sys-apps/rng-tools/rng-tools-6.7-r1.ebuild | 97 ++++++++++++++++++++++++++++++ sys-apps/rng-tools/rng-tools-6.7.ebuild | 97 ------------------------------ 4 files changed, 161 insertions(+), 161 deletions(-) delete mode 100644 sys-apps/rng-tools/files/rngd-initd-6.7 create mode 100644 sys-apps/rng-tools/files/rngd-initd-6.7-r1 create mode 100644 sys-apps/rng-tools/rng-tools-6.7-r1.ebuild delete mode 100644 sys-apps/rng-tools/rng-tools-6.7.ebuild diff --git a/sys-apps/rng-tools/files/rngd-initd-6.7 b/sys-apps/rng-tools/files/rngd-initd-6.7 deleted file mode 100644 index e85581ba6cb4..000000000000 --- a/sys-apps/rng-tools/files/rngd-initd-6.7 +++ /dev/null @@ -1,64 +0,0 @@ -#!/sbin/openrc-run -# Copyright 1999-2019 Gentoo Authors -# Distributed under the terms of the GNU General Public License v2 - -depend() { - need localmount - after urandom - provide entropy -} - -command="/usr/sbin/rngd" -description="Check and feed random data from hardware device to kernel entropy pool." -pidfile="/var/run/${RC_SVCNAME}.pid" -command_args="" -command_args_background="--pid-file ${pidfile} --background" -start_stop_daemon_args="--wait 1000" -retry="SIGKILL/5000" - - -# Parse rngd confd file for extra command line arguments -start_pre() { - for entsrc in ${INCLUDE_ENTROPY_SOURCES}; do - command_args="${command_args} -n ${entsrc}" - done - - for entsrc in ${EXCLUDE_ENTROPY_SOURCES}; do - command_args="${command_args} -x ${entsrc}" - done - - if [ "x${HWRNG_DEVICE}" != "x" ]; then - command_args="${command_args} --rng-device=${HWRNG_DEVICE}" - fi - - for entsrc_opt in ${RDRAND_OPTIONS}; do - command_args="${command_args} -O rdrand:${entsrc_opt}" - done - - for entsrc_opt in ${DARN_OPTIONS}; do - command_args="${command_args} -O darn:${entsrc_opt}" - done - - for entsrc_opt in ${JITTER_OPTIONS}; do - command_args="${command_args} -O jitter:${entsrc_opt}" - done - - for entsrc_opt in ${PKCS11_OPTIONS}; do - command_args="${command_args} -O pkcs11:${entsrc_opt}" - done - - if [ "x${RANDOM_DEVICE}" != "x" ]; then - command_args="${command_args} --random-device=${RANDOM_DEVICE}" - fi - - if [ "x${STEP}" != "x" ]; then - command_args="${command_args} --random-step=${STEP}" - fi - - if [ "x${WATERMARK}" != "x" ]; then - command_args="${command_args} --fill-watermark=${WATERMARK}" - fi - - command_args="${command_args} ${EXTRA_ARGS}" - return 0 -} diff --git a/sys-apps/rng-tools/files/rngd-initd-6.7-r1 b/sys-apps/rng-tools/files/rngd-initd-6.7-r1 new file mode 100644 index 000000000000..4a284b4f505f --- /dev/null +++ b/sys-apps/rng-tools/files/rngd-initd-6.7-r1 @@ -0,0 +1,64 @@ +#!/sbin/openrc-run +# Copyright 1999-2019 Gentoo Authors +# Distributed under the terms of the GNU General Public License v2 + +depend() { + need localmount + after urandom + provide entropy +} + +command="/usr/sbin/rngd" +description="Check and feed random data from hardware device to kernel entropy pool." +pidfile="/run/${RC_SVCNAME}.pid" +command_args="" +command_args_background="--pid-file ${pidfile} --background" +start_stop_daemon_args="--wait 1000" +retry="SIGKILL/5000" + + +# Parse rngd confd file for extra command line arguments +start_pre() { + for entsrc in ${INCLUDE_ENTROPY_SOURCES}; do + command_args="${command_args} -n ${entsrc}" + done + + for entsrc in ${EXCLUDE_ENTROPY_SOURCES}; do + command_args="${command_args} -x ${entsrc}" + done + + if [ "x${HWRNG_DEVICE}" != "x" ]; then + command_args="${command_args} --rng-device=${HWRNG_DEVICE}" + fi + + for entsrc_opt in ${RDRAND_OPTIONS}; do + command_args="${command_args} -O rdrand:${entsrc_opt}" + done + + for entsrc_opt in ${DARN_OPTIONS}; do + command_args="${command_args} -O darn:${entsrc_opt}" + done + + for entsrc_opt in ${JITTER_OPTIONS}; do + command_args="${command_args} -O jitter:${entsrc_opt}" + done + + for entsrc_opt in ${PKCS11_OPTIONS}; do + command_args="${command_args} -O pkcs11:${entsrc_opt}" + done + + if [ "x${RANDOM_DEVICE}" != "x" ]; then + command_args="${command_args} --random-device=${RANDOM_DEVICE}" + fi + + if [ "x${STEP}" != "x" ]; then + command_args="${command_args} --random-step=${STEP}" + fi + + if [ "x${WATERMARK}" != "x" ]; then + command_args="${command_args} --fill-watermark=${WATERMARK}" + fi + + command_args="${command_args} ${EXTRA_ARGS}" + return 0 +} diff --git a/sys-apps/rng-tools/rng-tools-6.7-r1.ebuild b/sys-apps/rng-tools/rng-tools-6.7-r1.ebuild new file mode 100644 index 000000000000..c112d9e0d3f6 --- /dev/null +++ b/sys-apps/rng-tools/rng-tools-6.7-r1.ebuild @@ -0,0 +1,97 @@ +# Copyright 1999-2019 Gentoo Authors +# Distributed under the terms of the GNU General Public License v2 + +EAPI=6 + +inherit autotools systemd readme.gentoo-r1 toolchain-funcs + +DESCRIPTION="Daemon to use hardware random number generators" +HOMEPAGE="https://github.com/nhorman/rng-tools" +SRC_URI="https://github.com/nhorman/${PN}/archive/v${PV}.tar.gz -> ${P}.tar.gz" + +LICENSE="GPL-2" +SLOT="0" +KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~ia64 ~ppc ~x86" +IUSE="jitterentropy nistbeacon pkcs11 selinux" + +DEPEND="dev-libs/libgcrypt:0 + dev-libs/libgpg-error + sys-fs/sysfsutils + jitterentropy? ( + app-crypt/jitterentropy:= + ) + nistbeacon? ( + net-misc/curl[ssl] + dev-libs/libxml2:2= + dev-libs/openssl:0= + ) + pkcs11? ( + dev-libs/libp11:= + ) + elibc_musl? ( sys-libs/argp-standalone ) +" +RDEPEND="${DEPEND} + selinux? ( sec-policy/selinux-rngd )" +DEPEND="${DEPEND} + nistbeacon? ( + virtual/pkgconfig + ) +" + +PATCHES=( + "${FILESDIR}"/test-for-argp.patch + "${FILESDIR}"/${PN}-5-fix-textrels-on-PIC-x86.patch #469962 +) + +src_prepare() { + echo 'bin_PROGRAMS = randstat' >> contrib/Makefile.am || die + + # rngd_pkcs11.c needs to be linked against -lcrypto #684228 + # See: https://github.com/nhorman/rng-tools/pull/61 + if use pkcs11; then + sed -e '/rngd_pkcs11.c$/ a rngd_LDADD\t+= -lcrypto' \ + -i Makefile.am || die + fi + + default + + mv README.md README || die + + eautoreconf + + sed -i '/^AR /d' Makefile.in || die + tc-export AR +} + +src_configure() { + local myeconfargs=( + $(use_enable jitterentropy) + $(use_with nistbeacon) + $(use_with pkcs11) + ) + + econf "${myeconfargs[@]}" +} + +src_install() { + default + newinitd "${FILESDIR}"/rngd-initd-6.7-r1 rngd + newconfd "${FILESDIR}"/rngd-confd-6.7 rngd + systemd_dounit "${FILESDIR}"/rngd.service + + if use pkcs11; then + local DISABLE_AUTOFORMATTING=1 + local DOC_CONTENTS=" +The PKCS11 entropy source may require extra packages (e.g. 'dev-libs/opensc') +to support various smartcard readers. Make sure 'PKCS11_OPTIONS' in: + '${EROOT%/}/etc/conf.d/rngd' +reflects the correct PKCS11 engine path to be used by rngd. +" + readme.gentoo_create_doc + fi + +} + +pkg_postinst() { + use pkcs11 && readme.gentoo_print_elog +} diff --git a/sys-apps/rng-tools/rng-tools-6.7.ebuild b/sys-apps/rng-tools/rng-tools-6.7.ebuild deleted file mode 100644 index ca5962d6923d..000000000000 --- a/sys-apps/rng-tools/rng-tools-6.7.ebuild +++ /dev/null @@ -1,97 +0,0 @@ -# Copyright 1999-2019 Gentoo Authors -# Distributed under the terms of the GNU General Public License v2 - -EAPI=6 - -inherit autotools systemd readme.gentoo-r1 toolchain-funcs - -DESCRIPTION="Daemon to use hardware random number generators" -HOMEPAGE="https://github.com/nhorman/rng-tools" -SRC_URI="https://github.com/nhorman/${PN}/archive/v${PV}.tar.gz -> ${P}.tar.gz" - -LICENSE="GPL-2" -SLOT="0" -KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~ia64 ~ppc ~x86" -IUSE="jitterentropy nistbeacon pkcs11 selinux" - -DEPEND="dev-libs/libgcrypt:0 - dev-libs/libgpg-error - sys-fs/sysfsutils - jitterentropy? ( - app-crypt/jitterentropy:= - ) - nistbeacon? ( - net-misc/curl[ssl] - dev-libs/libxml2:2= - dev-libs/openssl:0= - ) - pkcs11? ( - dev-libs/libp11:= - ) - elibc_musl? ( sys-libs/argp-standalone ) -" -RDEPEND="${DEPEND} - selinux? ( sec-policy/selinux-rngd )" -DEPEND="${DEPEND} - nistbeacon? ( - virtual/pkgconfig - ) -" - -PATCHES=( - "${FILESDIR}"/test-for-argp.patch - "${FILESDIR}"/${PN}-5-fix-textrels-on-PIC-x86.patch #469962 -) - -src_prepare() { - echo 'bin_PROGRAMS = randstat' >> contrib/Makefile.am || die - - # rngd_pkcs11.c needs to be linked against -lcrypto #684228 - # See: https://github.com/nhorman/rng-tools/pull/61 - if use pkcs11; then - sed -e '/rngd_pkcs11.c$/ a rngd_LDADD\t+= -lcrypto' \ - -i Makefile.am || die - fi - - default - - mv README.md README || die - - eautoreconf - - sed -i '/^AR /d' Makefile.in || die - tc-export AR -} - -src_configure() { - local myeconfargs=( - $(use_enable jitterentropy) - $(use_with nistbeacon) - $(use_with pkcs11) - ) - - econf "${myeconfargs[@]}" -} - -src_install() { - default - newinitd "${FILESDIR}"/rngd-initd-6.7 rngd - newconfd "${FILESDIR}"/rngd-confd-6.7 rngd - systemd_dounit "${FILESDIR}"/rngd.service - - if use pkcs11; then - local DISABLE_AUTOFORMATTING=1 - local DOC_CONTENTS=" -The PKCS11 entropy source may require extra packages (e.g. 'dev-libs/opensc') -to support various smartcard readers. Make sure 'PKCS11_OPTIONS' in: - '${EROOT%/}/etc/conf.d/rngd' -reflects the correct PKCS11 engine path to be used by rngd. -" - readme.gentoo_create_doc - fi - -} - -pkg_postinst() { - use pkcs11 && readme.gentoo_print_elog -} -- cgit v1.2.3-65-gdbad