From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: Received: from lists.gentoo.org (pigeon.gentoo.org [208.92.234.80]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by finch.gentoo.org (Postfix) with ESMTPS id 92A991382C5 for ; Thu, 13 May 2021 22:11:08 +0000 (UTC) Received: from pigeon.gentoo.org (localhost [127.0.0.1]) by pigeon.gentoo.org (Postfix) with SMTP id DC938E0844; Thu, 13 May 2021 22:11:07 +0000 (UTC) Received: from smtp.gentoo.org (smtp.gentoo.org [140.211.166.183]) (using TLSv1.2 with cipher ECDHE-RSA-AES128-GCM-SHA256 (128/128 bits)) (No client certificate requested) by pigeon.gentoo.org (Postfix) with ESMTPS id AE4B8E0844 for ; Thu, 13 May 2021 22:11:07 +0000 (UTC) Received: from oystercatcher.gentoo.org (oystercatcher.gentoo.org [148.251.78.52]) (using TLSv1.2 with cipher ECDHE-RSA-AES128-GCM-SHA256 (128/128 bits)) (No client certificate requested) by smtp.gentoo.org (Postfix) with ESMTPS id 9F9F0340BF6 for ; Thu, 13 May 2021 22:11:06 +0000 (UTC) Received: from localhost.localdomain (localhost [IPv6:::1]) by oystercatcher.gentoo.org (Postfix) with ESMTP id 3A89277E for ; Thu, 13 May 2021 22:11:05 +0000 (UTC) From: "David Seifert" To: gentoo-commits@lists.gentoo.org Content-Transfer-Encoding: 8bit Content-type: text/plain; charset=UTF-8 Reply-To: gentoo-dev@lists.gentoo.org, "David Seifert" Message-ID: <1620943848.5cbef54df05545fb34254d6d02aeaf78817ef527.soap@gentoo> Subject: [gentoo-commits] repo/gentoo:master commit in: sys-apps/rng-tools/, sys-apps/rng-tools/files/ X-VCS-Repository: repo/gentoo X-VCS-Files: sys-apps/rng-tools/Manifest sys-apps/rng-tools/files/rngd-confd-6.7 sys-apps/rng-tools/files/rngd-initd-6.7-r1 sys-apps/rng-tools/files/rngd.service sys-apps/rng-tools/rng-tools-6.10-r1.ebuild sys-apps/rng-tools/rng-tools-6.11-r1.ebuild X-VCS-Directories: sys-apps/rng-tools/ sys-apps/rng-tools/files/ X-VCS-Committer: soap X-VCS-Committer-Name: David Seifert X-VCS-Revision: 5cbef54df05545fb34254d6d02aeaf78817ef527 X-VCS-Branch: master Date: Thu, 13 May 2021 22:11:05 +0000 (UTC) Precedence: bulk List-Post: List-Help: List-Unsubscribe: List-Subscribe: List-Id: Gentoo Linux mail X-BeenThere: gentoo-commits@lists.gentoo.org X-Auto-Response-Suppress: DR, RN, NRN, OOF, AutoReply X-Archives-Salt: 12591f53-3068-476f-a0a9-bf959455dd6c X-Archives-Hash: 63b1ab1bbcd8f5e036aacd9fa1d1aab8 commit: 5cbef54df05545fb34254d6d02aeaf78817ef527 Author: David Seifert gentoo org> AuthorDate: Thu May 13 22:10:48 2021 +0000 Commit: David Seifert gentoo org> CommitDate: Thu May 13 22:10:48 2021 +0000 URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=5cbef54d sys-apps/rng-tools: Remove old 6.10-r1, 6.11-r1 Package-Manager: Portage-3.0.18, Repoman-3.0.3 Signed-off-by: David Seifert gentoo.org> sys-apps/rng-tools/Manifest | 2 - sys-apps/rng-tools/files/rngd-confd-6.7 | 90 ----------------------------- sys-apps/rng-tools/files/rngd-initd-6.7-r1 | 64 -------------------- sys-apps/rng-tools/files/rngd.service | 8 --- sys-apps/rng-tools/rng-tools-6.10-r1.ebuild | 84 --------------------------- sys-apps/rng-tools/rng-tools-6.11-r1.ebuild | 84 --------------------------- 6 files changed, 332 deletions(-) diff --git a/sys-apps/rng-tools/Manifest b/sys-apps/rng-tools/Manifest index 478bde82743..9498feec57d 100644 --- a/sys-apps/rng-tools/Manifest +++ b/sys-apps/rng-tools/Manifest @@ -1,3 +1 @@ -DIST rng-tools-6.10.tar.gz 56806 BLAKE2B 6cce0579a47f638cd90b51ba5216712fe39bf92dd59b288691a5e9783d520212cfb62e875a7e8f85de7a932568fdf0287cbea6f4869c9616a4c9325a111b0243 SHA512 b72d8918f709989ebc70cb9ea9c8b3dabf53041b24bc3f3a6de1bea318861dfd6c1a6110bd750041dc4819406db4a2b28f5137af5f5d5f2beb666f607913b389 -DIST rng-tools-6.11.tar.gz 57366 BLAKE2B d613502bcb24560638c0abc956987e57ec54b6594bed414ce2b70086716f73a9a9eec4800c86097c4a14b91401f0f28be62f5182ee01c328c9a32cd79eaec561 SHA512 0058ca5d0c1ddb554284fe8e6b9c0b85f130e0b9e0b9f0f0219f434302766e07c321d4fc0c01bdeb59053d5cd14dab67dc1c306422ef35a62a267af9fbdf7deb DIST rng-tools-6.12.tar.gz 57309 BLAKE2B d7a12b50889065f885cb15cda9686d63950fcc1ac9099893ed9c9236a9a930627c9541980c410318b40104637df688f5622681ce1d80eee7d4aaaf696c6bc3c5 SHA512 56dd334b65dcec1456f8dbdbee5d83590de27cb6ee1b7715828b5316a913557fd178e264139dc92a82e09635ca15b1eb5f6169bfb4412fbe1b06ea28a5064c64 diff --git a/sys-apps/rng-tools/files/rngd-confd-6.7 b/sys-apps/rng-tools/files/rngd-confd-6.7 deleted file mode 100644 index 20aa3281d53..00000000000 --- a/sys-apps/rng-tools/files/rngd-confd-6.7 +++ /dev/null @@ -1,90 +0,0 @@ -# Copyright 1999-2019 Gentoo Authors -# Distributed under the terms of the GNU General Public License v2 - -# /etc/conf.d/rngd -# Please see "/usr/sbin/rngd --help" and "man rngd" for more information - -# Space-delimited list of entropy sources to enable -# Note that some of the entropy sources may require certain USE flags -# to be enabled or require hardware support to function properly -# Entropy sources not specified here (or in the exclude list below) -# will be enabled/disabled based on rngd default behavior -# -# Choose from the list: -# hwrng: Hardware RNG Device -# tpm: TPM RNG Device (Deprecated) -# rdrand: Intel RDRAND Instruction RNG -# darn: Power9 DARN Instruction RNG -# nist: NIST Network Entropy Beacon -# (UNSAFE for cryptographic operations) -# jitter: JITTER Entropy Generator -# pkcs11: PKCS11 Entropy Generator -# -#INCLUDE_ENTROPY_SOURCES="hwrng tpm rdrand darn nist jitter pkcs11" - - -# Space-delimited list of entropy sources to disable -# This is useful for disabling certain entropy sources even -# when they are supported on the system -# -#EXCLUDE_ENTROPY_SOURCES="nist tpm" - - -# Entropy source specific options: -# -# -# hwrng device used for random number input: -# -#HWRNG_DEVICE="/dev/hwrng" -# -# -# rdrand options: -# use_aes:(BOOLEAN) -# -#RDRAND_OPTIONS="use_aes:1" -# -# -# darn options: -# use_aes:(BOOLEAN) -# -#DARN_OPTIONS="use_aes:1" -# -# -# jitter options: -# thread_count:(INTEGER) -# buffer_size:(INTEGER) -# refill_thresh:(INTEGER) -# retry_count:(INTEGER) -# retry_delay:(INTEGER) -# use_aes:(BOOLEAN) -# -#JITTER_OPTIONS="thread_count:4 buffer_size:16535 refill_thresh:16535" -#JITTER_OPTIONS="${JITTER_OPTIONS} retry_count:1 retry_delay:-1 use_aes:1" -# -# -# pkcs11 options: -# engine_path:(STRING) -# chunk_size:(INTEGER) -# -#PKCS11_OPTIONS="engine_path:/usr/lib64/opensc-pkcs11.so chunk_size:1" - - -# Kernel device used for random number output -# -#RANDOM_DEVICE="/dev/random" - - -# Random step (Number of bytes written to random-device at a time): -# -#STEP=64 - - -# Fill watermark -# 0 <= n <= `sysctl kernel.random.poolsize` -# -#WATERMARK=2048 - - -# Any extra arguments for rngd -# -#EXTRA_ARGS="" diff --git a/sys-apps/rng-tools/files/rngd-initd-6.7-r1 b/sys-apps/rng-tools/files/rngd-initd-6.7-r1 deleted file mode 100644 index 4a284b4f505..00000000000 --- a/sys-apps/rng-tools/files/rngd-initd-6.7-r1 +++ /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="/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.service b/sys-apps/rng-tools/files/rngd.service deleted file mode 100644 index 04793437e2d..00000000000 --- a/sys-apps/rng-tools/files/rngd.service +++ /dev/null @@ -1,8 +0,0 @@ -[Unit] -Description=Hardware RNG Entropy Gatherer Daemon - -[Service] -ExecStart=/usr/sbin/rngd -f - -[Install] -WantedBy=multi-user.target diff --git a/sys-apps/rng-tools/rng-tools-6.10-r1.ebuild b/sys-apps/rng-tools/rng-tools-6.10-r1.ebuild deleted file mode 100644 index a46c160a80f..00000000000 --- a/sys-apps/rng-tools/rng-tools-6.10-r1.ebuild +++ /dev/null @@ -1,84 +0,0 @@ -# Copyright 1999-2021 Gentoo Authors -# Distributed under the terms of the GNU General Public License v2 - -EAPI=7 - -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 ~mips ppc ppc64 ~riscv x86" -IUSE="jitterentropy nistbeacon pkcs11 selinux" - -DEPEND=" - dev-libs/openssl:0= - sys-fs/sysfsutils - jitterentropy? ( - app-crypt/jitterentropy:= - ) - nistbeacon? ( - dev-libs/jansson - dev-libs/libxml2:2= - net-misc/curl[ssl] - ) - pkcs11? ( - dev-libs/libp11:= - ) - elibc_musl? ( sys-libs/argp-standalone ) -" -RDEPEND="${DEPEND} - selinux? ( sec-policy/selinux-rngd )" -BDEPEND=" - virtual/pkgconfig -" - -src_prepare() { - echo 'bin_PROGRAMS = randstat' >> contrib/Makefile.am || die - - 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) - --without-rtlsdr # no librtlsdr in the tree - ) - - 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: - '${EPREFIX}/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.11-r1.ebuild b/sys-apps/rng-tools/rng-tools-6.11-r1.ebuild deleted file mode 100644 index 8a63aedded7..00000000000 --- a/sys-apps/rng-tools/rng-tools-6.11-r1.ebuild +++ /dev/null @@ -1,84 +0,0 @@ -# Copyright 1999-2021 Gentoo Authors -# Distributed under the terms of the GNU General Public License v2 - -EAPI=7 - -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 ~mips ppc ppc64 ~riscv x86" -IUSE="jitterentropy nistbeacon pkcs11 selinux" - -DEPEND=" - dev-libs/openssl:0= - sys-fs/sysfsutils - jitterentropy? ( - app-crypt/jitterentropy:= - ) - nistbeacon? ( - dev-libs/jansson - dev-libs/libxml2:2= - net-misc/curl[ssl] - ) - pkcs11? ( - dev-libs/libp11:= - ) - elibc_musl? ( sys-libs/argp-standalone ) -" -RDEPEND="${DEPEND} - selinux? ( sec-policy/selinux-rngd )" -BDEPEND=" - virtual/pkgconfig -" - -src_prepare() { - echo 'bin_PROGRAMS = randstat' >> contrib/Makefile.am || die - - 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) - --without-rtlsdr # no librtlsdr in the tree - ) - - econf "${myeconfargs[@]}" -} - -src_install() { - default - newinitd "${FILESDIR}"/rngd-initd-6.11 rngd - newconfd "${FILESDIR}"/rngd-confd-6.11 rngd - systemd_dounit "${S}"/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: - '${EPREFIX}/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 -}