commit: cddca1c62d1e8ba51f493e8082e54716ca3ee779 Author: Matt Turner <mattst88 <AT> gentoo <DOT> org> AuthorDate: Thu Dec 10 01:56:20 2020 +0000 Commit: Matt Turner <mattst88 <AT> gentoo <DOT> org> CommitDate: Thu Dec 10 02:13:02 2020 +0000 URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=cddca1c6
sys-apps/rng-tools: Drop old versions Signed-off-by: Matt Turner <mattst88 <AT> gentoo.org> sys-apps/rng-tools/Manifest | 5 -- .../rng-tools/files/rng-tools-5-fix-noctty.patch | 45 ---------- .../rng-tools-5-fix-textrels-on-PIC-x86.patch | 100 --------------------- .../files/rng-tools-5-man-fill-watermark.patch | 17 ---- .../files/rng-tools-5-man-rng-device.patch | 15 ---- sys-apps/rng-tools/files/rngd-confd-4.1 | 22 ----- sys-apps/rng-tools/files/rngd-confd-6 | 82 ----------------- sys-apps/rng-tools/files/rngd-initd-6-r1 | 60 ------------- sys-apps/rng-tools/files/rngd-initd-r1-4.1 | 16 ---- sys-apps/rng-tools/files/rngd-shutdown.patch | 37 -------- sys-apps/rng-tools/files/test-for-argp.patch | 43 --------- sys-apps/rng-tools/rng-tools-5-r2.ebuild | 41 --------- sys-apps/rng-tools/rng-tools-6.10.ebuild | 84 ----------------- sys-apps/rng-tools/rng-tools-6.6-r1.ebuild | 69 -------------- sys-apps/rng-tools/rng-tools-6.7-r1.ebuild | 97 -------------------- sys-apps/rng-tools/rng-tools-6.7-r2.ebuild | 98 -------------------- sys-apps/rng-tools/rng-tools-6.8.ebuild | 86 ------------------ sys-apps/rng-tools/rng-tools-6.9.ebuild | 86 ------------------ 18 files changed, 1003 deletions(-) diff --git a/sys-apps/rng-tools/Manifest b/sys-apps/rng-tools/Manifest index 6331901d705..643b071dd52 100644 --- a/sys-apps/rng-tools/Manifest +++ b/sys-apps/rng-tools/Manifest @@ -1,6 +1 @@ -DIST rng-tools-5.tar.gz 122182 BLAKE2B de7085d530e38de21a1c33792d67a72e0131b221082d690cdb299367b80b0a123c2976174aa3f895a4a2ab1216aacfaa8e09de485c85154dc4a5b8f960d05245 SHA512 58047c37cad4f5f1210b696e4dba122878f78e57d05d9cb822f79234240ecce31efd2d39061fea1eb5b2e81d48d8c3bf6b92d06451f1ce5d5db7117704e89c50 DIST rng-tools-6.10.tar.gz 56806 BLAKE2B 6cce0579a47f638cd90b51ba5216712fe39bf92dd59b288691a5e9783d520212cfb62e875a7e8f85de7a932568fdf0287cbea6f4869c9616a4c9325a111b0243 SHA512 b72d8918f709989ebc70cb9ea9c8b3dabf53041b24bc3f3a6de1bea318861dfd6c1a6110bd750041dc4819406db4a2b28f5137af5f5d5f2beb666f607913b389 -DIST rng-tools-6.6.tar.gz 51468 BLAKE2B 47231c60d78a48ade07855dfe8a807d6c10b8e27dc662ff7d98cf232b50e6c32f24197291a813d6ed6d15325a33fe9683d82943109a80cac1d9e348fc30cb849 SHA512 00bbe7f817d8f228f357a79ca270c27c62c0e588a99cd76917ecb7e88dfb627028c66497a59c9918205f3551aaf631963c8fd6504cb4198ddf57f714204c21c4 -DIST rng-tools-6.7.tar.gz 52792 BLAKE2B 3789aa4c6e2f024dcaef6b9b51521e206d65500a94ab456db61dc45c69ac5e4849a1e74abbe0f7640827ffb4bb20675c1f639a5be852d21d0d1a3c6b2e96bb5e SHA512 2f09edacb5448087041257326faf570c303b42f90bb695a1999b2c7543f20a28b15cdf705a2eca55cae8e9cf9fb5205c056fc26cfaf6af958bcda2cde1952b4d -DIST rng-tools-6.8.tar.gz 53769 BLAKE2B 2a10a5639c5b1f4506b2c2cfb0185d16b5b604bd8aae72ca616b121f2e7624ff1ba00eb32daa3626b00d89f106356924bde511e263ab8978ff764757b44588ea SHA512 8fa47c2f0f8ebe6ac13025fa2c74505528b503c4e126c5d02b939797d6d4a8c9fc2b345353e48e497e32c1620a0821431e70752a9eb8ecb71960f16713696b62 -DIST rng-tools-6.9.tar.gz 54426 BLAKE2B b798f8d052b5f13a2847edbe5fc4c7f189433cecac97537193afab09cd35a89d8ddde16708f45f474997ea926bf47b2c6950f03ae7d7d93e559f22ed9fbbabc3 SHA512 08d0b19c309331fd2a2cfb5523a980d5ab1a2e727d06e2b3ecc8851aa94b6fffe9021714f33b5bd1eeb8e6a1d28ab865845520d8e4c96ab3f63019718c08ae7b diff --git a/sys-apps/rng-tools/files/rng-tools-5-fix-noctty.patch b/sys-apps/rng-tools/files/rng-tools-5-fix-noctty.patch deleted file mode 100644 index 568ebe04589..00000000000 --- a/sys-apps/rng-tools/files/rng-tools-5-fix-noctty.patch +++ /dev/null @@ -1,45 +0,0 @@ -From: Gokturk Yuksek <[email protected]> -Subject: [PATCH] Fix rngd to open the entropy source with 'O_NOCTTY' flag - -When start-stop-daemon starts a rngd instance configured to use a tty -device as its entropy source, the application crashes due to not being -able to read from the entropy device. This is caused by -start-stop-daemon calling setsid() before executing rngd, which -disassociates the controlling terminal. When rngd attempts to open a -hardware entropy source that's a tty device, per POSIX rules, the -device becomes the controlling terminal for the process. Then rngd -calls daemon(), which internally calls setsid(), and consequently -disassociates the controlling terminal for the child. Meanwhile the -parent rngd process exits. This results in tty device hanging up. By -looking at the strace logs attached to the bug, it can be observed -that although the parent rngd process is able to read() from the -entropy source successfully, further attempts to read() by the child -rngd process return 0. This complies with the POSIX, which states that -read() calls on a hung up terminal shall return 0. - -Note that when rngd is started without start-stop-daemon, this problem -does not happen because at the time of opening the entropy source rngd -already has a controlling terminal. - -Prevent the entropy source from becoming the controlling terminal by -passing 'O_NOCTTY' flag to open() when opening an entropy source. This -flag prevents a tty device from becoming the controlling terminal for -a process without a controlling terminal at the time of open(). - -Thanks to John Bowler <[email protected]> for debugging the problem and -pinpointing the issue as well as confirming the fix. - -Gentoo-Bug-URL: https://bugs.gentoo.org/556456 -Reported-By: John Bowler <[email protected]> - ---- a/rngd_entsource.c -+++ b/rngd_entsource.c -@@ -175,7 +175,7 @@ - */ - int init_entropy_source(struct rng *ent_src) - { -- ent_src->rng_fd = open(ent_src->rng_name, O_RDONLY); -+ ent_src->rng_fd = open(ent_src->rng_name, O_RDONLY | O_NOCTTY); - if (ent_src->rng_fd == -1) { - return 1; - } diff --git a/sys-apps/rng-tools/files/rng-tools-5-fix-textrels-on-PIC-x86.patch b/sys-apps/rng-tools/files/rng-tools-5-fix-textrels-on-PIC-x86.patch deleted file mode 100644 index 5fa5f0b4ecf..00000000000 --- a/sys-apps/rng-tools/files/rng-tools-5-fix-textrels-on-PIC-x86.patch +++ /dev/null @@ -1,100 +0,0 @@ -From: Francisco Blas Izquierdo Riera (klondike) <[email protected]> -Subject: [PATCH] Fix assemby textrels on rdrand_asm.S on PIC x86 - -This patch updates the fixes in the assembly in rdrand_asm.S in -sys-apps/rng-tools-5 so it won't generate textrels on PIC systems. -The main fixes are in the use of leal in SETPTR for such systems, the rest is -the usual PIC support stuff. - -This should fix Gentoo bug #469962 and help fix #518210 - -This patch is released under the GPLv2 or a higher version license as is the -original file as long as the author and the tester are credited. - -Gentoo-bug-url: https://bugs.gentoo.org/show_bug.cgi?id=469962 -Gentoo-bug-url: https://bugs.gentoo.org/show_bug.cgi?id=518210 -Upstream-status: Not sent yet -Signed-off-by: Francisco Blas Izquierdo Riera (klondike) <[email protected]> -Reported-by: cilly <[email protected]> -Reported-by: Manuel Rüger <[email protected]> -Tested-by: Anthony Basile <[email protected]> - ---- rng-tools/rdrand_asm.S -+++ rng-tools/rdrand_asm.S -@@ -2,6 +2,7 @@ - * Copyright (c) 2011-2014, Intel Corporation - * Authors: Fenghua Yu <[email protected]>, - * H. Peter Anvin <[email protected]> -+ * PIC code by: Francisco Blas Izquierdo Riera (klondike) <[email protected]> - * - * This program is free software; you can redistribute it and/or modify it - * under the terms and conditions of the GNU General Public License, -@@ -174,7 +175,19 @@ - jmp 4b - ENDPROC(x86_rdseed_or_rdrand_bytes) - -+#if defined(__PIC__) -+#define INIT_PIC() \ -+ pushl %ebx ; \ -+ call __x86.get_pc_thunk.bx ; \ -+ addl $_GLOBAL_OFFSET_TABLE_, %ebx -+#define END_PIC() \ -+ popl %ebx -+#define SETPTR(var,ptr) leal (var)@GOTOFF(%ebx),ptr -+#else -+#define INIT_PIC() -+#define END_PIC() - #define SETPTR(var,ptr) movl $(var),ptr -+#endif - #define PTR0 %eax - #define PTR1 %edx - #define PTR2 %ecx -@@ -190,6 +203,7 @@ - movl 8(%ebp), %eax - movl 12(%ebp), %edx - push %esi -+ INIT_PIC() - #endif - movl $512, CTR3 /* Number of rounds */ - -@@ -280,6 +294,7 @@ - movdqa %xmm7, (7*16)(PTR1) - - #ifdef __i386__ -+ END_PIC() - pop %esi - pop %ebp - #endif -@@ -294,6 +309,7 @@ - push %ebp - mov %esp, %ebp - movl 8(%ebp), %eax -+ INIT_PIC() - #endif - - SETPTR(aes_round_keys, PTR1) -@@ -323,6 +339,7 @@ - call 1f - - #ifdef __i386__ -+ END_PIC() - pop %ebp - #endif - ret -@@ -343,6 +360,16 @@ - - ENDPROC(x86_aes_expand_key) - -+#if defined(__i386__) && defined(__PIC__) -+ .section .text.__x86.get_pc_thunk.bx,"axG",@progbits,__x86.get_pc_thunk.bx,comdat -+ .globl __x86.get_pc_thunk.bx -+ .hidden __x86.get_pc_thunk.bx -+ .type __x86.get_pc_thunk.bx, @function -+__x86.get_pc_thunk.bx: -+ movl (%esp), %ebx -+ ret -+#endif -+ - .bss - .balign 64 - aes_round_keys: diff --git a/sys-apps/rng-tools/files/rng-tools-5-man-fill-watermark.patch b/sys-apps/rng-tools/files/rng-tools-5-man-fill-watermark.patch deleted file mode 100644 index ea249a5ebdf..00000000000 --- a/sys-apps/rng-tools/files/rng-tools-5-man-fill-watermark.patch +++ /dev/null @@ -1,17 +0,0 @@ -https://bugs.gentoo.org/555094 - -patch by Gokturk Yuksek <[email protected]> - ---- a/rngd.8.in -+++ b/rngd.8.in -@@ -66,7 +66,9 @@ - .TP - \fB\-W\fI n\fR, \fB\-\-fill\-watermark=\fInnn\fR - Once we start doing it, feed entropy to \fIrandom-device\fR until at least --\fIfill-watermark\fR bits of entropy are available in its entropy pool (default: 2048). -+\fIfill-watermark\fR bits of entropy are available in its entropy pool. -+By default, this value is set to 75% of the entropy pool size or 2048 bits -+if the entropy pool size couldn't be determined. - Setting this too high will cause \fIrngd\fR to dominate the contents of the - entropy pool. Low values will hurt system performance during entropy - starves. Do not set \fIfill-watermark\fR above the size of the diff --git a/sys-apps/rng-tools/files/rng-tools-5-man-rng-device.patch b/sys-apps/rng-tools/files/rng-tools-5-man-rng-device.patch deleted file mode 100644 index 82a0cf29576..00000000000 --- a/sys-apps/rng-tools/files/rng-tools-5-man-rng-device.patch +++ /dev/null @@ -1,15 +0,0 @@ -https://bugs.gentoo.org/555106 - -patch by Gokturk Yuksek <[email protected]> - ---- a/rngd.8.in -+++ b/rngd.8.in -@@ -59,7 +59,7 @@ - .TP - \fB\-r\fI file\fR, \fB\-\-rng-device=\fIfile\fR - Kernel device used for random number input --(default: /dev/hwrandom) -+(default: /dev/hwrng) - .TP - \fB\-s\fI nnn\fR, \fB\-\-random-step=\fInnn\fR - Number of bytes written to random-device at a time (default: 64) diff --git a/sys-apps/rng-tools/files/rngd-confd-4.1 b/sys-apps/rng-tools/files/rngd-confd-4.1 deleted file mode 100644 index 77e5db58345..00000000000 --- a/sys-apps/rng-tools/files/rngd-confd-4.1 +++ /dev/null @@ -1,22 +0,0 @@ -# /etc/conf.d/rngd - -# Please see "/usr/sbin/rngd --help" and "man rngd" for more information - -# If a single device is preferred, then specify it here, otherwise we will -# search for suitable devices. -#DEVICE= - -# Random step (Number of bytes written to random-device at a time): -STEP=64 - -# Should TPM be avoided? -# NO_TPM=0 - -# Should RDRAND be avoided? Please note that unless this is commented -# out, RDRAND _will_ be disabled, as any value will cause it to be -# disabled. -# NO_DRNG=1 - -# Fill watermark -# 0 <= n <= `sysctl kernel.random.poolsize` -WATERMARK=2048 diff --git a/sys-apps/rng-tools/files/rngd-confd-6 b/sys-apps/rng-tools/files/rngd-confd-6 deleted file mode 100644 index a30e8c4fdad..00000000000 --- a/sys-apps/rng-tools/files/rngd-confd-6 +++ /dev/null @@ -1,82 +0,0 @@ -# Copyright 1999-2018 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 -# -#INCLUDE_ENTROPY_SOURCES="hwrng tpm rdrand darn nist jitter" - - -# 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" - - -# 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-r1 b/sys-apps/rng-tools/files/rngd-initd-6-r1 deleted file mode 100644 index 5d89dd7a186..00000000000 --- a/sys-apps/rng-tools/files/rngd-initd-6-r1 +++ /dev/null @@ -1,60 +0,0 @@ -#!/sbin/openrc-run -# Copyright 1999-2018 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 - - 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-r1-4.1 b/sys-apps/rng-tools/files/rngd-initd-r1-4.1 deleted file mode 100644 index b7777ebab71..00000000000 --- a/sys-apps/rng-tools/files/rngd-initd-r1-4.1 +++ /dev/null @@ -1,16 +0,0 @@ -#!/sbin/openrc-run -# Copyright 1999-2015 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:+--no-tpm=1} \ - ${NO_DRNG:+--no-drng=1} --fill-watermark ${WATERMARK} ${DEVICE:+--rng-device ${DEVICE}}" -start_stop_daemon_args="--wait 1000" -retry="SIGKILL/5000" diff --git a/sys-apps/rng-tools/files/rngd-shutdown.patch b/sys-apps/rng-tools/files/rngd-shutdown.patch deleted file mode 100644 index ba2fffdd86f..00000000000 --- a/sys-apps/rng-tools/files/rngd-shutdown.patch +++ /dev/null @@ -1,37 +0,0 @@ -https://bugzilla.redhat.com/show_bug.cgi?id=1690364 - -diff --git a/rngd_jitter.c b/rngd_jitter.c -index 23d96b3..43a13e0 100644 ---- a/rngd_jitter.c -+++ b/rngd_jitter.c -@@ -473,26 +473,22 @@ void close_jitter_entropy_source(struct rng *ent_src) - for (i=0; i < num_threads; i++) - tdata[i].active = 0; - -- flags = fcntl(pipefds[1], F_GETFL, 0); -- flags |= O_NONBLOCK; -- fcntl(pipefds[1], F_SETFL, &flags); -+ close(pipefds[1]); - - /* And wait for completion of each thread */ - for (i=0; i < num_threads; i++) { - message(LOG_DAEMON|LOG_DEBUG, "Checking on done for thread %d\n", i); - while (!tdata[i].done) -+ pthread_kill(threads[i], SIGINT); - if(tdata[i].done) { - message(LOG_DAEMON|LOG_INFO, "Closing thread %d\n", tdata[i].core_id); - pthread_join(threads[i], NULL); - jent_entropy_collector_free(tdata[i].ec); -- } else { -- read(pipefds[0], tmpbuf, 1024); -+ } else - sched_yield(); -- } - } - -- close(pipefds[2]); -- close(pipefds[1]); -+ close(pipefds[0]); - free(tdata); - free(threads); - return; diff --git a/sys-apps/rng-tools/files/test-for-argp.patch b/sys-apps/rng-tools/files/test-for-argp.patch deleted file mode 100644 index 4ed2aa40b6d..00000000000 --- a/sys-apps/rng-tools/files/test-for-argp.patch +++ /dev/null @@ -1,43 +0,0 @@ -On glibc systems, argp is provided by libc. However, on -uclibc and other systems which lack argp in their C library, -argp might be provided by a stand alone library, libargp. -This patch adds tests to the build system to find who provides -argp. - -X-Gentoo-Bug: 292191 -X-Gentoo-Bug-URL: https://bugs.gentoo.org/show_bug.cgi?id=292191 -Reported-by: Ed Wildgoose <[email protected]> -Signed-off-by: Anthony G. Basile <[email protected]> - - ---- a/configure.ac -+++ b/configure.ac -@@ -47,6 +47,28 @@ - dnl Checks for optional library functions - dnl ------------------------------------- - -+dnl First check if we have argp available from libc -+AC_LINK_IFELSE( -+ [AC_LANG_PROGRAM( -+ [#include <argp.h>], -+ [int argc=1; char *argv[]={"test"}; argp_parse(0,argc,argv,0,0,0); return 0;] -+ )], -+ [libc_has_argp="true"], -+ [libc_has_argp="false"] -+) -+ -+dnl If libc doesn't provide argp, then test for libargp -+if test "$libc_has_argp" = "false" ; then -+ AC_MSG_WARN("libc does not have argp") -+ AC_CHECK_LIB([argp], [argp_parse], [have_argp="true"], [have_argp="false"]) -+ -+ if test "$have_argp" = "false"; then -+ AC_MSG_ERROR("no libargp found") -+ else -+ LIBS+=" -largp" -+ fi -+fi -+ - dnl ----------------- - dnl Configure options - dnl ----------------- diff --git a/sys-apps/rng-tools/rng-tools-5-r2.ebuild b/sys-apps/rng-tools/rng-tools-5-r2.ebuild deleted file mode 100644 index 40645077af9..00000000000 --- a/sys-apps/rng-tools/rng-tools-5-r2.ebuild +++ /dev/null @@ -1,41 +0,0 @@ -# Copyright 1999-2020 Gentoo Authors -# Distributed under the terms of the GNU General Public License v2 - -EAPI=5 - -inherit eutils autotools systemd toolchain-funcs - -DESCRIPTION="Daemon to use hardware random number generators" -HOMEPAGE="http://gkernel.sourceforge.net/"; -SRC_URI="mirror://sourceforge/gkernel/${P}.tar.gz" - -LICENSE="GPL-2" -SLOT="0" -KEYWORDS="~alpha amd64 arm ~arm64 ~ia64 ppc x86" -IUSE="selinux" - -DEPEND="dev-libs/libgcrypt:0 - dev-libs/libgpg-error - elibc_musl? ( sys-libs/argp-standalone )" -RDEPEND="${DEPEND} - selinux? ( sec-policy/selinux-rngd )" - -src_prepare() { - echo 'bin_PROGRAMS = randstat' >> contrib/Makefile.am || die - epatch "${FILESDIR}"/test-for-argp.patch - epatch "${FILESDIR}"/${P}-fix-textrels-on-PIC-x86.patch #469962 - epatch "${FILESDIR}"/${P}-man-fill-watermark.patch #555094 - epatch "${FILESDIR}"/${P}-man-rng-device.patch #555106 - epatch "${FILESDIR}"/${P}-fix-noctty.patch #556456 - eautoreconf - - sed -i '/^AR /d' Makefile.in || die - tc-export AR -} - -src_install() { - default - newinitd "${FILESDIR}"/rngd-initd-r1-4.1 rngd - newconfd "${FILESDIR}"/rngd-confd-4.1 rngd - systemd_dounit "${FILESDIR}"/rngd.service -} diff --git a/sys-apps/rng-tools/rng-tools-6.10.ebuild b/sys-apps/rng-tools/rng-tools-6.10.ebuild deleted file mode 100644 index 52e0489c3fc..00000000000 --- a/sys-apps/rng-tools/rng-tools-6.10.ebuild +++ /dev/null @@ -1,84 +0,0 @@ -# Copyright 1999-2020 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: - '${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.6-r1.ebuild b/sys-apps/rng-tools/rng-tools-6.6-r1.ebuild deleted file mode 100644 index 7ad1a1edc80..00000000000 --- a/sys-apps/rng-tools/rng-tools-6.6-r1.ebuild +++ /dev/null @@ -1,69 +0,0 @@ -# Copyright 1999-2019 Gentoo Authors -# Distributed under the terms of the GNU General Public License v2 - -EAPI=6 - -inherit autotools systemd 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 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= - ) - 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 - default - - mv README.md README || die - - eautoreconf - - sed -i '/^AR /d' Makefile.in || die - tc-export AR -} - -src_configure() { - local myeconfargs=( - $(use_with nistbeacon) - $(use_enable jitterentropy) - ) - - econf "${myeconfargs[@]}" -} - -src_install() { - default - newinitd "${FILESDIR}"/rngd-initd-6-r1 rngd - newconfd "${FILESDIR}"/rngd-confd-6 rngd - systemd_dounit "${FILESDIR}"/rngd.service -} diff --git a/sys-apps/rng-tools/rng-tools-6.7-r1.ebuild b/sys-apps/rng-tools/rng-tools-6.7-r1.ebuild deleted file mode 100644 index 35ca738e350..00000000000 --- a/sys-apps/rng-tools/rng-tools-6.7-r1.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 ~mips ~ppc ~ppc64 ~riscv ~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-r2.ebuild b/sys-apps/rng-tools/rng-tools-6.7-r2.ebuild deleted file mode 100644 index adeb2bb4fcc..00000000000 --- a/sys-apps/rng-tools/rng-tools-6.7-r2.ebuild +++ /dev/null @@ -1,98 +0,0 @@ -# Copyright 1999-2020 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 ~mips ppc ppc64 ~riscv 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 - "${FILESDIR}"/rngd-shutdown.patch -) - -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.8.ebuild b/sys-apps/rng-tools/rng-tools-6.8.ebuild deleted file mode 100644 index 85c8eb05db8..00000000000 --- a/sys-apps/rng-tools/rng-tools-6.8.ebuild +++ /dev/null @@ -1,86 +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 ~mips ~ppc ~ppc64 ~riscv ~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:= - dev-libs/openssl:0= - ) - elibc_musl? ( sys-libs/argp-standalone ) -" -RDEPEND="${DEPEND} - selinux? ( sec-policy/selinux-rngd )" -DEPEND="${DEPEND} - nistbeacon? ( - 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) - ) - - 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.9.ebuild b/sys-apps/rng-tools/rng-tools-6.9.ebuild deleted file mode 100644 index 45d0870a2f1..00000000000 --- a/sys-apps/rng-tools/rng-tools-6.9.ebuild +++ /dev/null @@ -1,86 +0,0 @@ -# Copyright 1999-2020 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 ~mips ppc ppc64 ~riscv 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:= - dev-libs/openssl:0= - ) - elibc_musl? ( sys-libs/argp-standalone ) -" -RDEPEND="${DEPEND} - selinux? ( sec-policy/selinux-rngd )" -DEPEND="${DEPEND} - nistbeacon? ( - 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) - ) - - 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 -}
