From 908778078736bd36f7a60a2d576d415cb8e000fa Mon Sep 17 00:00:00 2001 From: V3n3RiX Date: Sat, 22 May 2021 07:31:18 +0100 Subject: gentoo resync : 22.05.2021 --- sys-apps/rng-tools/Manifest | 9 +-- 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 | 2 +- sys-apps/rng-tools/rng-tools-6.12.ebuild | 83 ++++++++++++++++++++++++++ 7 files changed, 87 insertions(+), 253 deletions(-) delete mode 100644 sys-apps/rng-tools/files/rngd-confd-6.7 delete mode 100644 sys-apps/rng-tools/files/rngd-initd-6.7-r1 delete mode 100644 sys-apps/rng-tools/files/rngd.service delete mode 100644 sys-apps/rng-tools/rng-tools-6.10-r1.ebuild create mode 100644 sys-apps/rng-tools/rng-tools-6.12.ebuild (limited to 'sys-apps/rng-tools') diff --git a/sys-apps/rng-tools/Manifest b/sys-apps/rng-tools/Manifest index 9394cc343c15..6e97aa95f485 100644 --- a/sys-apps/rng-tools/Manifest +++ b/sys-apps/rng-tools/Manifest @@ -1,10 +1,7 @@ AUX rngd-confd-6.11 2321 BLAKE2B 6cdf4cf7d61e33415df1c41933d1c38c398fd96370cb4c4e257f60479a3e69428d3735802d480e1a25714854de9bc6ed997856c1c4dbbf289b7a014026522aea SHA512 32c52316ebdffef7ec07dd97b45f124c2ecced3d0f49d75ad8d226f6eff478739dab6b008e0b1f4e55bc81bf615feee9860c45f35f0994c7c65d4d439501621f -AUX rngd-confd-6.7 2245 BLAKE2B 7643525d9a57479ba1b725ea6f976421c3df990c56d9f694b6fd2d3283c51ccf42e1be403a2208be70bc09dbd946c0cb803bfb303ae3999e97b3c3baa1162aaf SHA512 f16c5bc417e7bae86311397b3bf51927cc2cfbb0b4ee14a835fff5b62f4d12ab194329942e21cae4eec56953e4271b1fc655dcfa0be4ccbff1df1f1defdc70d8 AUX rngd-initd-6.11 1789 BLAKE2B 317c6d3d1b7ad10e137c6b5b615354ba7a6deb256da5ef9d75253a7f84c265536db1b70b290e0029cfaf40e565c8b280e3b1ec79ab93c8f659c969b5dedc7dab SHA512 60bf2c2d4984a1db8fcfaeaebd5249ed6d428c9ccb8412813ce97e146f3143efae23058475ac8baa1c2e88b00012fc119411bcfc14b04a0128696ee69641d98d -AUX rngd-initd-6.7-r1 1683 BLAKE2B 34bea128a94f2fc8479ebd8e8a398a01bb96dcbe8dd74876f8b8725f701862908448deca3768437d1cd98b138c9203106c199942910f63e7c95598d3e1b27818 SHA512 c1e3d94509d5cd3301836961598e221ef0db2e7310386f0467a4f3068eada8ad4010b063202b8a8c3d163d39799aea7d6a4dcb4d8ca569fe7b51f5c870100b6d -AUX rngd.service 133 BLAKE2B 1c3059e7ee924b42bc6567f5142973d550282248b3e49053b96782039ebd63096a0a8960d3e5a43cfac1d505c57e71015ad706099f06ac2809adf52c0b108d7c SHA512 51e9ea84b624cda8d3689d6a9a8d60da4a556aa9d2a1a04e698d9a1490717aa47172e152c93711f8d04be8a5b68b1dfd568a762bd8ee7219afb7cdfff15657d2 -DIST rng-tools-6.10.tar.gz 56806 BLAKE2B 6cce0579a47f638cd90b51ba5216712fe39bf92dd59b288691a5e9783d520212cfb62e875a7e8f85de7a932568fdf0287cbea6f4869c9616a4c9325a111b0243 SHA512 b72d8918f709989ebc70cb9ea9c8b3dabf53041b24bc3f3a6de1bea318861dfd6c1a6110bd750041dc4819406db4a2b28f5137af5f5d5f2beb666f607913b389 DIST rng-tools-6.11.tar.gz 57366 BLAKE2B d613502bcb24560638c0abc956987e57ec54b6594bed414ce2b70086716f73a9a9eec4800c86097c4a14b91401f0f28be62f5182ee01c328c9a32cd79eaec561 SHA512 0058ca5d0c1ddb554284fe8e6b9c0b85f130e0b9e0b9f0f0219f434302766e07c321d4fc0c01bdeb59053d5cd14dab67dc1c306422ef35a62a267af9fbdf7deb -EBUILD rng-tools-6.10-r1.ebuild 1801 BLAKE2B 5a4f8f9ff195d74dab6a42a00d378148b9f5054fc4e415753ad765c8d8d11305304a850541d5762ff4d4de17adb105c78eb83b0508bcd799696f50f1678708c3 SHA512 15f4b5c429b96c91249dc0350f41ae0d098110d2a999b0117ebc840147135a96ff2c7cffd65bc19e490e347e4be93e90aea683f1e3ccf90366f2c2cfa79b05f8 -EBUILD rng-tools-6.11-r1.ebuild 1799 BLAKE2B 06fa278fcf75bdab22c29ddd5c77ef20d4bc680a7df4073b95d1ab3deca1a8dcb5ae9671190140a82abc443c8a66e88be973d96d7432470691e5c7f0bf766456 SHA512 e267d1c556edb373a6c7814b1eadbbb6b64a87cda7f0c4e96a9d050e9ec6b3721eadc27004d6262615e3b8b16489135b4d9ad8a87776bc24b12b54f7e103666a +DIST rng-tools-6.12.tar.gz 57309 BLAKE2B d7a12b50889065f885cb15cda9686d63950fcc1ac9099893ed9c9236a9a930627c9541980c410318b40104637df688f5622681ce1d80eee7d4aaaf696c6bc3c5 SHA512 56dd334b65dcec1456f8dbdbee5d83590de27cb6ee1b7715828b5316a913557fd178e264139dc92a82e09635ca15b1eb5f6169bfb4412fbe1b06ea28a5064c64 +EBUILD rng-tools-6.11-r1.ebuild 1793 BLAKE2B 07215f34a520bea511c8931960af5fccdf3b92cfcb5c2ba70881ae80cac1229a5cbd40a80ccc167dc0a248ac0712d47b2a9ec03fd9c314ce528bed3cc421e196 SHA512 ea1a99eb14f59c685c2d4ea8823051b807f36fd1573ccc66a6c3fe93fb10dc278a72af901767819759832549272be5de96afbac7b7d897ea72473e45b8fc8b47 +EBUILD rng-tools-6.12.ebuild 1780 BLAKE2B d68f962d287041b3c0d3b811479743efb47e38d187dfdb731439ee2b93a234d243a5ce0aa8a825206fcfeddb8f192d360ab1e5e26ababfa184b222be0d973fa2 SHA512 aa466ceaba148c0d322b9d8dc805083ca453a2a5322a1f46c66b30924d578500e4c6f800c19f6a94562cb9b47c44d157fd279ab29d94730f3548a2a615e70d2d MISC metadata.xml 713 BLAKE2B c05a29fb9b1c47eff6e8fbdf72bcd911bff431d72e1fb432e40f5ef760d82c26ec29322ccef9d06816b5d137708922b8c44df7ed0c1c60a07eba3b319fa0e1f5 SHA512 65b2454b2161f61cf187bb14b66f8cac59de3b023ed007e7780338533b8bc5c6aa0cff00d99d958f33b566b3fd9d2a597d698275c3a7914541233a9f9336cd64 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 20aa3281d535..000000000000 --- 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 4a284b4f505f..000000000000 --- 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 04793437e2d7..000000000000 --- 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 a46c160a80f6..000000000000 --- 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 index 8392ad2b6586..8a63aedded7b 100644 --- a/sys-apps/rng-tools/rng-tools-6.11-r1.ebuild +++ b/sys-apps/rng-tools/rng-tools-6.11-r1.ebuild @@ -11,7 +11,7 @@ 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" +KEYWORDS="~alpha amd64 arm arm64 ~ia64 ~mips ppc ppc64 ~riscv x86" IUSE="jitterentropy nistbeacon pkcs11 selinux" DEPEND=" diff --git a/sys-apps/rng-tools/rng-tools-6.12.ebuild b/sys-apps/rng-tools/rng-tools-6.12.ebuild new file mode 100644 index 000000000000..b2e6591164cd --- /dev/null +++ b/sys-apps/rng-tools/rng-tools-6.12.ebuild @@ -0,0 +1,83 @@ +# 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= + 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 +} -- cgit v1.2.3