* [gentoo-commits] repo/gentoo:master commit in: sys-apps/rng-tools/files/, sys-apps/rng-tools/
@ 2015-08-14 6:55 Mike Frysinger
0 siblings, 0 replies; 11+ messages in thread
From: Mike Frysinger @ 2015-08-14 6:55 UTC (permalink / raw
To: gentoo-commits
commit: 3f3d293d479c67624790945244f46ab6956c05e3
Author: Mike Frysinger <vapier <AT> gentoo <DOT> org>
AuthorDate: Fri Aug 14 06:54:46 2015 +0000
Commit: Mike Frysinger <vapier <AT> gentoo <DOT> org>
CommitDate: Fri Aug 14 06:55:34 2015 +0000
URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=3f3d293d
sys-apps/rng-tools: improve the man pages #555094 #555106
.../files/rng-tools-5-man-fill-watermark.patch | 17 +++++++++
.../files/rng-tools-5-man-rng-device.patch | 15 ++++++++
sys-apps/rng-tools/rng-tools-5-r1.ebuild | 40 ++++++++++++++++++++++
3 files changed, 72 insertions(+)
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
new file mode 100644
index 0000000..4cedf8f
--- /dev/null
+++ b/sys-apps/rng-tools/files/rng-tools-5-man-fill-watermark.patch
@@ -0,0 +1,17 @@
+https://bugs.gentoo.org/555094
+
+patch by Gokturk Yuksek <gokturk@binghamton.edu>
+
+--- rngd.8.in
++++ 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
new file mode 100644
index 0000000..fd6b97e
--- /dev/null
+++ b/sys-apps/rng-tools/files/rng-tools-5-man-rng-device.patch
@@ -0,0 +1,15 @@
+https://bugs.gentoo.org/555106
+
+patch by Gokturk Yuksek <gokturk@binghamton.edu>
+
+--- rngd.8.in
++++ 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/rng-tools-5-r1.ebuild b/sys-apps/rng-tools/rng-tools-5-r1.ebuild
new file mode 100644
index 0000000..5b7caf9
--- /dev/null
+++ b/sys-apps/rng-tools/rng-tools-5-r1.ebuild
@@ -0,0 +1,40 @@
+# Copyright 1999-2015 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Id$
+
+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 ~ia64 ppc ~x86"
+IUSE="selinux"
+
+DEPEND="dev-libs/libgcrypt:0
+ dev-libs/libgpg-error"
+RDEPEND="${DEPEND}
+ selinux? ( sec-policy/selinux-rngd )"
+
+src_prepare() {
+ echo 'bin_PROGRAMS = randstat' >> contrib/Makefile.am
+ 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
+ eautoreconf
+
+ sed -i '/^AR /d' Makefile.in || die
+ tc-export AR
+}
+
+src_install() {
+ default
+ newinitd "${FILESDIR}"/rngd-initd-4.1 rngd
+ newconfd "${FILESDIR}"/rngd-confd-4.1 rngd
+ systemd_dounit "${FILESDIR}"/rngd.service
+}
^ permalink raw reply related [flat|nested] 11+ messages in thread
* [gentoo-commits] repo/gentoo:master commit in: sys-apps/rng-tools/files/, sys-apps/rng-tools/
@ 2017-08-14 13:36 Lars Wendler
0 siblings, 0 replies; 11+ messages in thread
From: Lars Wendler @ 2017-08-14 13:36 UTC (permalink / raw
To: gentoo-commits
commit: a900f982977d8baeb285abb510a080d7c035b374
Author: Lars Wendler <polynomial-c <AT> gentoo <DOT> org>
AuthorDate: Mon Aug 14 12:09:06 2017 +0000
Commit: Lars Wendler <polynomial-c <AT> gentoo <DOT> org>
CommitDate: Mon Aug 14 13:35:44 2017 +0000
URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=a900f982
sys-apps/rng-tools: Removed old.
Package-Manager: Portage-2.3.7, Repoman-2.3.3
sys-apps/rng-tools/Manifest | 1 -
.../rng-tools/files/fix-textrels-on-PIC-x86.patch | 71 ----------------------
sys-apps/rng-tools/files/rngd-initd-4.1 | 28 ---------
sys-apps/rng-tools/rng-tools-4-r7.ebuild | 35 -----------
sys-apps/rng-tools/rng-tools-5-r1.ebuild | 39 ------------
sys-apps/rng-tools/rng-tools-5.ebuild | 37 -----------
6 files changed, 211 deletions(-)
diff --git a/sys-apps/rng-tools/Manifest b/sys-apps/rng-tools/Manifest
index 108daf63caa..cb68eb34d0c 100644
--- a/sys-apps/rng-tools/Manifest
+++ b/sys-apps/rng-tools/Manifest
@@ -1,3 +1,2 @@
-DIST rng-tools-4.tar.gz 110943 SHA256 b71bdfd4222c05e8316001556be90e1606f2a1bac3efde60153bd84e873cc195 SHA512 328627a9ede924026c7a7c391b04be05f098d713d35f7f38d939d52b794853b4f6db3ae125568710ab5a59640236b343f3e9fc0f735806b020cc675c02f80b08 WHIRLPOOL da58bc7d3b7d9cdf6d83d258717f22ba3552482a690311fa2c820e4ce125a5e6c6e498e0b63461ed6c9dc16dff77b2cb47377933845fb9397efa205183346e5b
DIST rng-tools-5.tar.gz 122182 SHA256 60a102b6603bbcce2da341470cad42eeaa9564a16b4490e7867026ca11a3078e SHA512 58047c37cad4f5f1210b696e4dba122878f78e57d05d9cb822f79234240ecce31efd2d39061fea1eb5b2e81d48d8c3bf6b92d06451f1ce5d5db7117704e89c50 WHIRLPOOL 073dbeb9d27189db44658a9f25657b93a320b125fbfc8230f7ce7849b8e7c1f7802b4c3a53de3417525b02739194fab8a6e5eb03d5db317a23deb275d72fbb21
DIST rng-tools-6.tar.gz 26024 SHA256 6d9c3f72824d1ea15dd2a80bfcf71f6a73c8843c6344f7f774a97a4ca7641b4c SHA512 2aea947c4dba5e8c4df33396957f7224b62200be0e3d10aac08c84155fa473a67df5f49e07a07b2cbea4dfd772d90c1b194e8fce3d8eea762463a7f4a16d6ce4 WHIRLPOOL 4e53c626288219a7cb9c94cf29d22878df5ad3298ca5ebedea46978e519d9b5b0ad94f765e217563105258f4b02b72b0033e551a7d37939ced9ca5d92f0a1048
diff --git a/sys-apps/rng-tools/files/fix-textrels-on-PIC-x86.patch b/sys-apps/rng-tools/files/fix-textrels-on-PIC-x86.patch
deleted file mode 100644
index 5ff34da861b..00000000000
--- a/sys-apps/rng-tools/files/fix-textrels-on-PIC-x86.patch
+++ /dev/null
@@ -1,71 +0,0 @@
-From: Francisco Blas Izquierdo Riera (klondike) <klondike@gentoo.org>
-Subject: [PATCH] Fix assemby textrels on rdrand_asm.S on PIC x86
-
-This patch fixes the assembly in rdrand_asm.S 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
-
-This patch is released under the GPLv2 or a higher version license as is the original file
-as long as reference to the author and the tester are included in the final code.
-
-Gentoo-bug-url: https://bugs.gentoo.org/show_bug.cgi?id=469962
-Upstream-status: Not sent yet
-Signed-off-by: Francisco Blas Izquierdo Riera (klondike) <klondike@gentoo.org>
-Reported-by: cilly <cilly@cilly.mine.nu>
-Tested-by: Anthony Basile <blueness@gentoo.org>
-
---- rng-tools/rdrand_asm.S
-+++ rng-tools/rdrand_asm.S
-@@ -49,6 +49,7 @@
- ret
- ENDPROC(x86_rdrand_nlong)
-
-+#define INIT_PIC()
- #define SETPTR(var,ptr) leaq var(%rip),ptr
- #define PTR0 %rdi
- #define PTR1 %rsi
-@@ -84,7 +85,16 @@
- ret
- ENDPROC(x86_rdrand_nlong)
-
-+#if defined(__PIC__)
-+#undef __i686 /* gcc builtin define gets in our way */
-+#define INIT_PIC() \
-+ call __i686.get_pc_thunk.bx ; \
-+ addl $_GLOBAL_OFFSET_TABLE_, %ebx
-+#define SETPTR(var,ptr) leal (var)@GOTOFF(%ebx),ptr
-+#else
-+#define INIT_PIC()
- #define SETPTR(var,ptr) movl $(var),ptr
-+#endif
- #define PTR0 %eax
- #define PTR1 %edx
- #define PTR2 %ecx
-@@ -101,6 +111,7 @@
- movl 8(%ebp), %eax
- movl 12(%ebp), %edx
- #endif
-+ INIT_PIC()
-
- SETPTR(aes_round_keys, PTR2)
-
-@@ -166,6 +177,17 @@
- #endif
- ret
- ENDPROC(x86_aes_mangle)
-+
-+#if defined(__i386__) && defined(__PIC__)
-+ .section .gnu.linkonce.t.__i686.get_pc_thunk.bx,"ax",@progbits
-+.globl __i686.get_pc_thunk.bx
-+ .hidden __i686.get_pc_thunk.bx
-+ .type __i686.get_pc_thunk.bx,@function
-+__i686.get_pc_thunk.bx:
-+ movl (%esp), %ebx
-+ ret
-+#endif
-+
- /*
- * AES round keys for an arbitrary key:
- * 00102030405060708090A0B0C0D0E0F0
diff --git a/sys-apps/rng-tools/files/rngd-initd-4.1 b/sys-apps/rng-tools/files/rngd-initd-4.1
deleted file mode 100644
index 20f581b50b4..00000000000
--- a/sys-apps/rng-tools/files/rngd-initd-4.1
+++ /dev/null
@@ -1,28 +0,0 @@
-#!/sbin/openrc-run
-# Copyright 1999-2013 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-depend() {
- need localmount
- after urandom
- provide entropy
-}
-
-# Do NOT add /dev/tpm to this.
-DEFAULT_DEVICE="/dev/hw_random* /dev/hwrandom* /dev/i810_rng /dev/hwrng*"
-
-find_device() {
- local d
- # The echo is to cause globbing
- for d in $(echo ${DEFAULT_DEVICE}) ; do
- [ -e "${d}" ] && echo "${d}"
- done
-}
-
-RNG_DEVICE="${DEVICE:-$(find_device)}"
-
-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} ${RNG_DEVICE:+--rng-device ${RNG_DEVICE}}"
-start_stop_daemon_args="--wait 1000"
-retry="SIGKILL/5000"
diff --git a/sys-apps/rng-tools/rng-tools-4-r7.ebuild b/sys-apps/rng-tools/rng-tools-4-r7.ebuild
deleted file mode 100644
index 5c0f35ceac0..00000000000
--- a/sys-apps/rng-tools/rng-tools-4-r7.ebuild
+++ /dev/null
@@ -1,35 +0,0 @@
-# Copyright 1999-2014 Gentoo Foundation
-# 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 ia64 ppc x86"
-IUSE="selinux"
-
-RDEPEND="selinux? ( sec-policy/selinux-rngd )"
-DEPEND=""
-
-src_prepare() {
- echo 'bin_PROGRAMS = randstat' >> contrib/Makefile.am
- epatch "${FILESDIR}"/test-for-argp.patch
- epatch "${FILESDIR}"/fix-textrels-on-PIC-x86.patch
- eautoreconf
-
- sed -i '/^AR /d' Makefile.in
- tc-export AR
-}
-
-src_install() {
- default
- newinitd "${FILESDIR}"/rngd-initd-4.1 rngd
- newconfd "${FILESDIR}"/rngd-confd-4.1 rngd
- systemd_dounit "${FILESDIR}"/rngd.service
-}
diff --git a/sys-apps/rng-tools/rng-tools-5-r1.ebuild b/sys-apps/rng-tools/rng-tools-5-r1.ebuild
deleted file mode 100644
index ba4a8314451..00000000000
--- a/sys-apps/rng-tools/rng-tools-5-r1.ebuild
+++ /dev/null
@@ -1,39 +0,0 @@
-# Copyright 1999-2015 Gentoo Foundation
-# 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 ~ia64 ppc ~x86"
-IUSE="selinux"
-
-DEPEND="dev-libs/libgcrypt:0
- dev-libs/libgpg-error"
-RDEPEND="${DEPEND}
- selinux? ( sec-policy/selinux-rngd )"
-
-src_prepare() {
- echo 'bin_PROGRAMS = randstat' >> contrib/Makefile.am
- 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
- eautoreconf
-
- sed -i '/^AR /d' Makefile.in || die
- tc-export AR
-}
-
-src_install() {
- default
- newinitd "${FILESDIR}"/rngd-initd-4.1 rngd
- newconfd "${FILESDIR}"/rngd-confd-4.1 rngd
- systemd_dounit "${FILESDIR}"/rngd.service
-}
diff --git a/sys-apps/rng-tools/rng-tools-5.ebuild b/sys-apps/rng-tools/rng-tools-5.ebuild
deleted file mode 100644
index 0bda55df9f7..00000000000
--- a/sys-apps/rng-tools/rng-tools-5.ebuild
+++ /dev/null
@@ -1,37 +0,0 @@
-# Copyright 1999-2015 Gentoo Foundation
-# 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 ~ia64 ppc x86"
-IUSE="selinux"
-
-DEPEND="dev-libs/libgcrypt:0
- dev-libs/libgpg-error"
-RDEPEND="${DEPEND}
- selinux? ( sec-policy/selinux-rngd )"
-
-src_prepare() {
- echo 'bin_PROGRAMS = randstat' >> contrib/Makefile.am
- epatch "${FILESDIR}"/test-for-argp.patch\
- "${FILESDIR}"/${P}-fix-textrels-on-PIC-x86.patch
- eautoreconf
-
- sed -i '/^AR /d' Makefile.in || die
- tc-export AR
-}
-
-src_install() {
- default
- newinitd "${FILESDIR}"/rngd-initd-4.1 rngd
- newconfd "${FILESDIR}"/rngd-confd-4.1 rngd
- systemd_dounit "${FILESDIR}"/rngd.service
-}
^ permalink raw reply related [flat|nested] 11+ messages in thread
* [gentoo-commits] repo/gentoo:master commit in: sys-apps/rng-tools/files/, sys-apps/rng-tools/
@ 2017-08-14 13:36 Lars Wendler
0 siblings, 0 replies; 11+ messages in thread
From: Lars Wendler @ 2017-08-14 13:36 UTC (permalink / raw
To: gentoo-commits
commit: c6a8fda5117616d36874aff862fc8093953e5e44
Author: Lars Wendler <polynomial-c <AT> gentoo <DOT> org>
AuthorDate: Mon Aug 14 12:07:03 2017 +0000
Commit: Lars Wendler <polynomial-c <AT> gentoo <DOT> org>
CommitDate: Mon Aug 14 13:35:42 2017 +0000
URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=c6a8fda5
sys-apps/rng-tools: Bump to version 6
Package-Manager: Portage-2.3.7, Repoman-2.3.3
sys-apps/rng-tools/Manifest | 1 +
.../rng-tools/files/rng-tools-5-fix-noctty.patch | 4 +-
.../files/rng-tools-5-man-fill-watermark.patch | 4 +-
.../files/rng-tools-5-man-rng-device.patch | 4 +-
...x-noctty.patch => rng-tools-6-fix-noctty.patch} | 18 ++++-----
sys-apps/rng-tools/files/test-for-argp.patch | 4 +-
sys-apps/rng-tools/rng-tools-6.ebuild | 46 ++++++++++++++++++++++
7 files changed, 64 insertions(+), 17 deletions(-)
diff --git a/sys-apps/rng-tools/Manifest b/sys-apps/rng-tools/Manifest
index e8ef399c125..108daf63caa 100644
--- a/sys-apps/rng-tools/Manifest
+++ b/sys-apps/rng-tools/Manifest
@@ -1,2 +1,3 @@
DIST rng-tools-4.tar.gz 110943 SHA256 b71bdfd4222c05e8316001556be90e1606f2a1bac3efde60153bd84e873cc195 SHA512 328627a9ede924026c7a7c391b04be05f098d713d35f7f38d939d52b794853b4f6db3ae125568710ab5a59640236b343f3e9fc0f735806b020cc675c02f80b08 WHIRLPOOL da58bc7d3b7d9cdf6d83d258717f22ba3552482a690311fa2c820e4ce125a5e6c6e498e0b63461ed6c9dc16dff77b2cb47377933845fb9397efa205183346e5b
DIST rng-tools-5.tar.gz 122182 SHA256 60a102b6603bbcce2da341470cad42eeaa9564a16b4490e7867026ca11a3078e SHA512 58047c37cad4f5f1210b696e4dba122878f78e57d05d9cb822f79234240ecce31efd2d39061fea1eb5b2e81d48d8c3bf6b92d06451f1ce5d5db7117704e89c50 WHIRLPOOL 073dbeb9d27189db44658a9f25657b93a320b125fbfc8230f7ce7849b8e7c1f7802b4c3a53de3417525b02739194fab8a6e5eb03d5db317a23deb275d72fbb21
+DIST rng-tools-6.tar.gz 26024 SHA256 6d9c3f72824d1ea15dd2a80bfcf71f6a73c8843c6344f7f774a97a4ca7641b4c SHA512 2aea947c4dba5e8c4df33396957f7224b62200be0e3d10aac08c84155fa473a67df5f49e07a07b2cbea4dfd772d90c1b194e8fce3d8eea762463a7f4a16d6ce4 WHIRLPOOL 4e53c626288219a7cb9c94cf29d22878df5ad3298ca5ebedea46978e519d9b5b0ad94f765e217563105258f4b02b72b0033e551a7d37939ced9ca5d92f0a1048
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
index a48b235ac17..568ebe04589 100644
--- a/sys-apps/rng-tools/files/rng-tools-5-fix-noctty.patch
+++ b/sys-apps/rng-tools/files/rng-tools-5-fix-noctty.patch
@@ -32,8 +32,8 @@ pinpointing the issue as well as confirming the fix.
Gentoo-Bug-URL: https://bugs.gentoo.org/556456
Reported-By: John Bowler <jbowler@acm.org>
---- rngd_entsource.c
-+++ rngd_entsource.c
+--- a/rngd_entsource.c
++++ b/rngd_entsource.c
@@ -175,7 +175,7 @@
*/
int init_entropy_source(struct rng *ent_src)
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
index 4cedf8fc97d..ea249a5ebdf 100644
--- 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
@@ -2,8 +2,8 @@ https://bugs.gentoo.org/555094
patch by Gokturk Yuksek <gokturk@binghamton.edu>
---- rngd.8.in
-+++ rngd.8.in
+--- a/rngd.8.in
++++ b/rngd.8.in
@@ -66,7 +66,9 @@
.TP
\fB\-W\fI n\fR, \fB\-\-fill\-watermark=\fInnn\fR
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
index fd6b97eff32..82a0cf29576 100644
--- 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
@@ -2,8 +2,8 @@ https://bugs.gentoo.org/555106
patch by Gokturk Yuksek <gokturk@binghamton.edu>
---- rngd.8.in
-+++ rngd.8.in
+--- a/rngd.8.in
++++ b/rngd.8.in
@@ -59,7 +59,7 @@
.TP
\fB\-r\fI file\fR, \fB\-\-rng-device=\fIfile\fR
diff --git a/sys-apps/rng-tools/files/rng-tools-5-fix-noctty.patch b/sys-apps/rng-tools/files/rng-tools-6-fix-noctty.patch
similarity index 83%
copy from sys-apps/rng-tools/files/rng-tools-5-fix-noctty.patch
copy to sys-apps/rng-tools/files/rng-tools-6-fix-noctty.patch
index a48b235ac17..e915150adb5 100644
--- a/sys-apps/rng-tools/files/rng-tools-5-fix-noctty.patch
+++ b/sys-apps/rng-tools/files/rng-tools-6-fix-noctty.patch
@@ -32,14 +32,14 @@ pinpointing the issue as well as confirming the fix.
Gentoo-Bug-URL: https://bugs.gentoo.org/556456
Reported-By: John Bowler <jbowler@acm.org>
---- rngd_entsource.c
-+++ 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);
+--- rng-tools-rng-tools-6/rngd_entsource.c
++++ rng-tools-rng-tools-6/rngd_entsource.c
+@@ -162,7 +162,7 @@
+ struct sysfs_attribute *rngavail;
+ char buf[16];
+
+- ent_src->rng_fd = open(ent_src->rng_fname, O_RDONLY);
++ ent_src->rng_fd = open(ent_src->rng_fname, O_RDONLY | O_NOCTTY);
if (ent_src->rng_fd == -1) {
+ message(LOG_DAEMON|LOG_DEBUG, "Unable to open file: %s", ent_src->rng_fname);
return 1;
- }
diff --git a/sys-apps/rng-tools/files/test-for-argp.patch b/sys-apps/rng-tools/files/test-for-argp.patch
index 129a522e568..4ed2aa40b6d 100644
--- a/sys-apps/rng-tools/files/test-for-argp.patch
+++ b/sys-apps/rng-tools/files/test-for-argp.patch
@@ -10,8 +10,8 @@ Reported-by: Ed Wildgoose <gentoo@wildgooses.com>
Signed-off-by: Anthony G. Basile <blueness@gentoo.org>
---- configure.ac.orig 2012-05-26 22:45:42.753478198 +0000
-+++ configure.ac 2012-05-27 00:36:23.175844081 +0000
+--- a/configure.ac
++++ b/configure.ac
@@ -47,6 +47,28 @@
dnl Checks for optional library functions
dnl -------------------------------------
diff --git a/sys-apps/rng-tools/rng-tools-6.ebuild b/sys-apps/rng-tools/rng-tools-6.ebuild
new file mode 100644
index 00000000000..3a559236e0c
--- /dev/null
+++ b/sys-apps/rng-tools/rng-tools-6.ebuild
@@ -0,0 +1,46 @@
+# Copyright 1999-2017 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=6
+
+inherit eutils 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/${P}.tar.gz"
+
+LICENSE="GPL-2"
+SLOT="0"
+KEYWORDS="~alpha ~amd64 ~arm ~ia64 ~ppc ~x86"
+IUSE="selinux"
+
+DEPEND="dev-libs/libgcrypt:0
+ dev-libs/libgpg-error"
+RDEPEND="${DEPEND}
+ sys-fs/sysfsutils
+ selinux? ( sec-policy/selinux-rngd )"
+
+S="${WORKDIR}/${PN}-${P}"
+
+PATCHES=(
+ "${FILESDIR}"/test-for-argp.patch
+ "${FILESDIR}"/${PN}-5-fix-textrels-on-PIC-x86.patch #469962
+ "${FILESDIR}"/${PN}-5-man-fill-watermark.patch #555094
+ "${FILESDIR}"/${PN}-6-fix-noctty.patch #556456
+)
+
+src_prepare() {
+ echo 'bin_PROGRAMS = randstat' >> contrib/Makefile.am || die
+ default
+ 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
+}
^ permalink raw reply related [flat|nested] 11+ messages in thread
* [gentoo-commits] repo/gentoo:master commit in: sys-apps/rng-tools/files/, sys-apps/rng-tools/
@ 2017-10-26 1:05 Göktürk Yüksek
0 siblings, 0 replies; 11+ messages in thread
From: Göktürk Yüksek @ 2017-10-26 1:05 UTC (permalink / raw
To: gentoo-commits
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
}
^ permalink raw reply related [flat|nested] 11+ messages in thread
* [gentoo-commits] repo/gentoo:master commit in: sys-apps/rng-tools/files/, sys-apps/rng-tools/
@ 2018-04-19 9:40 Göktürk Yüksek
0 siblings, 0 replies; 11+ messages in thread
From: Göktürk Yüksek @ 2018-04-19 9:40 UTC (permalink / raw
To: gentoo-commits
commit: 9bbc0187db3923e17e93801acd2879ef59965548
Author: Göktürk Yüksek <gokturk <AT> gentoo <DOT> org>
AuthorDate: Thu Apr 19 09:40:12 2018 +0000
Commit: Göktürk Yüksek <gokturk <AT> gentoo <DOT> org>
CommitDate: Thu Apr 19 09:40:12 2018 +0000
URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=9bbc0187
sys-apps/rng-tools: fix nistbeacon block validation on 32-bit x86
Package-Manager: Portage-2.3.19, Repoman-2.3.6
...ools-6.1-fix-nistbeacon-validation-on-x86.patch | 45 ++++++++++++++++++++++
...tools-6.1-r1.ebuild => rng-tools-6.1-r2.ebuild} | 3 +-
2 files changed, 47 insertions(+), 1 deletion(-)
diff --git a/sys-apps/rng-tools/files/rng-tools-6.1-fix-nistbeacon-validation-on-x86.patch b/sys-apps/rng-tools/files/rng-tools-6.1-fix-nistbeacon-validation-on-x86.patch
new file mode 100644
index 00000000000..1872444bc4a
--- /dev/null
+++ b/sys-apps/rng-tools/files/rng-tools-6.1-fix-nistbeacon-validation-on-x86.patch
@@ -0,0 +1,45 @@
+From e8d7ea04e39f1209a79c003f3b62c9f1761dec0e Mon Sep 17 00:00:00 2001
+From: =?UTF-8?q?G=C3=B6kt=C3=BCrk=20Y=C3=BCksek?= <gokturk@gentoo.org>
+Date: Thu, 19 Apr 2018 05:29:01 -0400
+Subject: [PATCH] rngd_nistbeacon: fix the size of frequency and timestamp on
+ x86_32
+
+The members "frequency" and "timestamp" of struct nist_data_block are
+defined as int and long, respectively. On x86_64, their sizes
+correctly correspond to 4 and 8 bytes. However, on 32-bit x86
+architectures, both int and long are defined as 4 bytes, causing the
+digest verification to fail. Fix it by using uint32_t and uint64_t
+explicitly.
+---
+ rngd_nistbeacon.c | 8 ++++----
+ 1 file changed, 4 insertions(+), 4 deletions(-)
+
+diff --git a/rngd_nistbeacon.c b/rngd_nistbeacon.c
+index fbebc53..eadde39 100644
+--- a/rngd_nistbeacon.c
++++ b/rngd_nistbeacon.c
+@@ -97,8 +97,8 @@ BIO *bfp;
+
+ struct nist_data_block {
+ char *version;
+- int frequency;
+- long timestamp;
++ uint32_t frequency;
++ uint64_t timestamp;
+ char *seedvalue;
+ size_t seedvaluelen;
+ char *previoushash;
+@@ -355,8 +355,8 @@ static int validate_nist_block()
+
+
+ EVP_VerifyUpdate(mdctx, block.version, strlen(block.version));
+- EVP_VerifyUpdate(mdctx, &block.frequency, sizeof(int));
+- EVP_VerifyUpdate(mdctx, &block.timestamp, sizeof(long));
++ EVP_VerifyUpdate(mdctx, &block.frequency, sizeof(uint32_t));
++ EVP_VerifyUpdate(mdctx, &block.timestamp, sizeof(uint64_t));
+ EVP_VerifyUpdate(mdctx, block.seedvalue, block.seedvaluelen);
+ EVP_VerifyUpdate(mdctx, block.previoushash, block.previoushashlen);
+ EVP_VerifyUpdate(mdctx, &block.errorcode, block.errorcodelen);
+--
+2.13.6
+
diff --git a/sys-apps/rng-tools/rng-tools-6.1-r1.ebuild b/sys-apps/rng-tools/rng-tools-6.1-r2.ebuild
similarity index 91%
rename from sys-apps/rng-tools/rng-tools-6.1-r1.ebuild
rename to sys-apps/rng-tools/rng-tools-6.1-r2.ebuild
index 2c149789b75..607a19b11e2 100644
--- a/sys-apps/rng-tools/rng-tools-6.1-r1.ebuild
+++ b/sys-apps/rng-tools/rng-tools-6.1-r2.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2017 Gentoo Foundation
+# Copyright 1999-2018 Gentoo Foundation
# Distributed under the terms of the GNU General Public License v2
EAPI=6
@@ -34,6 +34,7 @@ DEPEND="${DEPEND}
PATCHES=(
"${FILESDIR}"/test-for-argp.patch
"${FILESDIR}"/${PN}-5-fix-textrels-on-PIC-x86.patch #469962
+ "${FILESDIR}"/${PN}-6.1-fix-nistbeacon-validation-on-x86.patch
)
src_prepare() {
^ permalink raw reply related [flat|nested] 11+ messages in thread
* [gentoo-commits] repo/gentoo:master commit in: sys-apps/rng-tools/files/, sys-apps/rng-tools/
@ 2018-09-19 20:50 Göktürk Yüksek
0 siblings, 0 replies; 11+ messages in thread
From: Göktürk Yüksek @ 2018-09-19 20:50 UTC (permalink / raw
To: gentoo-commits
commit: 76e53b38578266e4a8f657c2db67c13c6ae72150
Author: Göktürk Yüksek <gokturk <AT> gentoo <DOT> org>
AuthorDate: Wed Sep 19 20:48:33 2018 +0000
Commit: Göktürk Yüksek <gokturk <AT> gentoo <DOT> org>
CommitDate: Wed Sep 19 20:49:54 2018 +0000
URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=76e53b38
sys-apps/rng-tools: bump to 6.4
Package-Manager: Portage-2.3.49, Repoman-2.3.10
sys-apps/rng-tools/Manifest | 1 +
.../rng-tools-6.4-jitterentropy-linking-fix.patch | 36 +++++++++++
sys-apps/rng-tools/rng-tools-6.4.ebuild | 69 ++++++++++++++++++++++
3 files changed, 106 insertions(+)
diff --git a/sys-apps/rng-tools/Manifest b/sys-apps/rng-tools/Manifest
index 6e3960c5627..8146fd915f2 100644
--- a/sys-apps/rng-tools/Manifest
+++ b/sys-apps/rng-tools/Manifest
@@ -3,4 +3,5 @@ DIST rng-tools-6.1.tar.gz 29814 BLAKE2B 4102c03ced36b33f9db6f7e5f77e8f918c4b9286
DIST rng-tools-6.2.tar.gz 30421 BLAKE2B 646628095cbc611aee4113198e0874b5f0672cd787f04f1649ff350883edebe6b31753aef3ac2bca1f05eedcf3c1400435c084382bde9f97fe6dcdd71adf18c2 SHA512 ffd8be5b232f092f8bcfdb6281580ce9053ec8bb87ff6bcae76585c38e3e91b9e464a9544a33ecd9814a9f244a89bac973d15c9bd3560d1164559685c720d174
DIST rng-tools-6.3.1.tar.gz 31797 BLAKE2B 00d75d8436b4b49798bca8fb76e43a98feac8805b47a57d2315c22e72ed3dff30c6305b206168531c85c0576dc1d9864585eb3d4c2af833e9bec8dc5a478e19b SHA512 cb85674e6448e8152f92b4a82e944a9258dcc9ce68349404c0000c09378ac5f6fb298c50ed2d9a1b18d76c5f35b0a4884d5efd0f4dd434ec0952107e0738b937
DIST rng-tools-6.3.tar.gz 31474 BLAKE2B 4d3924b3ca85d31d1999ceb45908cf64e8d2978d2e0aa638d9bbd3054a11a41251f9db54db35583c8fc080fd0667387cd63792c15486048d1f52300217e02fa9 SHA512 c00ac28c059ba689f114480958fe993e2199a1428137b151779a0331b9cc5a667f08770aa7b28d98c801166a509e8bd40d6b92f5c29b6ff73eb50a1cb0f2dd13
+DIST rng-tools-6.4.tar.gz 41248 BLAKE2B 16000e0779cf7aa25936a95661a0c40d4f0f12ed91fa36160924782d22a1057838bfb466f60614f91ef6c5576e0a29b6c1028bb72d5f5403c9a61d8f5ec16edd SHA512 12da9819b6e9a9ea688e82d1689642a690f6c9d78ad5fcf159a71b37a49f79120c8f62d4e1b8e81a496eac46a28137c5c87973499b31e1881a7866de99a168f0
DIST rng-tools-6.tar.gz 26024 BLAKE2B a523328fcce56997e2847940cdc096abd5a539135f857f0a4cd3d782a1659f4d2978870149caac47b839c80788df6a3d891adcd39371d5968149dd29bc46bc62 SHA512 2aea947c4dba5e8c4df33396957f7224b62200be0e3d10aac08c84155fa473a67df5f49e07a07b2cbea4dfd772d90c1b194e8fce3d8eea762463a7f4a16d6ce4
diff --git a/sys-apps/rng-tools/files/rng-tools-6.4-jitterentropy-linking-fix.patch b/sys-apps/rng-tools/files/rng-tools-6.4-jitterentropy-linking-fix.patch
new file mode 100644
index 00000000000..e6cf95d13f3
--- /dev/null
+++ b/sys-apps/rng-tools/files/rng-tools-6.4-jitterentropy-linking-fix.patch
@@ -0,0 +1,36 @@
+From ac00de69665a14bc1884be90ec83f8e8bc4d69f0 Mon Sep 17 00:00:00 2001
+From: =?UTF-8?q?G=C3=B6kt=C3=BCrk=20Y=C3=BCksek?= <gokturk@gentoo.org>
+Date: Wed, 19 Sep 2018 16:45:37 -0400
+Subject: [PATCH] Makefile.am: use the libjitterentropy available on the system
+
+---
+ Makefile.am | 6 ++----
+ 1 file changed, 2 insertions(+), 4 deletions(-)
+
+diff --git a/Makefile.am b/Makefile.am
+index fa8ecca..abc759a 100644
+--- a/Makefile.am
++++ b/Makefile.am
+@@ -2,9 +2,7 @@
+ ## Toplevel Makefile.am for rng-tools
+ ##
+ if JITTER
+- JSUBDIR = jitterentropy-library
+- JSUBLIB = ./jitterentropy-library/libjitterentropy.a
+- AM_CPPFLAGS = -I./jitterentropy-library
++ jitterentropy_LIBS = -ljitterentropy
+ endif
+
+ SUBDIRS = contrib tests $(JSUBDIR)
+@@ -33,7 +31,7 @@ if JITTER
+ rngd_SOURCES += rngd_jitter.c
+ endif
+
+-rngd_LDADD = librngd.a -lsysfs $(JSUBLIB) ${libcurl_LIBS} ${libxml2_LIBS} ${openssl_LIBS} $(PTHREAD_LIBS)
++rngd_LDADD = librngd.a -lsysfs $(jitterentropy_LIBS) ${libcurl_LIBS} ${libxml2_LIBS} ${openssl_LIBS} $(PTHREAD_LIBS)
+
+ rngd_CFLAGS = ${libxml2_CFLAGS} ${openssl_CFLAGS} $(PTHREAD_CFLAGS)
+ rngd_LDFLAGS = $(PTHREAD_CFLAGS)
+--
+2.19.0
+
diff --git a/sys-apps/rng-tools/rng-tools-6.4.ebuild b/sys-apps/rng-tools/rng-tools-6.4.ebuild
new file mode 100644
index 00000000000..6c2cc7c69ab
--- /dev/null
+++ b/sys-apps/rng-tools/rng-tools-6.4.ebuild
@@ -0,0 +1,69 @@
+# Copyright 1999-2018 Gentoo Foundation
+# 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 ~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=
+ )
+"
+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}"/${PN}-6.4-jitterentropy-linking-fix.patch
+)
+
+src_prepare() {
+ echo 'bin_PROGRAMS = randstat' >> contrib/Makefile.am || die
+ default
+
+ mv README.md README || die
+
+ if use jitterentropy; then
+ # Fool the build system into thinking that
+ # jitterentropy source code exists
+ touch "${S}"/jitterentropy-library/Makefile || die
+ fi
+ eautoreconf
+
+ sed -i '/^AR /d' Makefile.in || die
+ tc-export AR
+}
+
+src_configure() {
+ econf $(use_with nistbeacon)
+}
+
+src_install() {
+ default
+ newinitd "${FILESDIR}"/rngd-initd-6 rngd
+ newconfd "${FILESDIR}"/rngd-confd-4.1 rngd
+ systemd_dounit "${FILESDIR}"/rngd.service
+}
^ permalink raw reply related [flat|nested] 11+ messages in thread
* [gentoo-commits] repo/gentoo:master commit in: sys-apps/rng-tools/files/, sys-apps/rng-tools/
@ 2019-03-13 0:42 Göktürk Yüksek
0 siblings, 0 replies; 11+ messages in thread
From: Göktürk Yüksek @ 2019-03-13 0:42 UTC (permalink / raw
To: gentoo-commits
commit: 5d19cee5dc3501f2d5d58c96e4b2506f38abe85e
Author: Göktürk Yüksek <gokturk <AT> gentoo <DOT> org>
AuthorDate: Wed Mar 13 00:33:58 2019 +0000
Commit: Göktürk Yüksek <gokturk <AT> gentoo <DOT> org>
CommitDate: Wed Mar 13 00:41:43 2019 +0000
URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=5d19cee5
sys-apps/rng-tools: remove old
Bug: https://bugs.gentoo.org/679122
Package-Manager: Portage-2.3.52, Repoman-2.3.12
Signed-off-by: Göktürk Yüksek <gokturk <AT> gentoo.org>
sys-apps/rng-tools/Manifest | 7 ---
...ools-6.1-fix-nistbeacon-validation-on-x86.patch | 45 --------------
.../rng-tools-6.3-jitterentropy-linking-fix.patch | 36 -----------
.../rng-tools-6.4-jitterentropy-linking-fix.patch | 36 -----------
...6.5-jitterentropy-automagic-detection-fix.patch | 60 -------------------
sys-apps/rng-tools/files/rngd-initd-6 | 16 -----
sys-apps/rng-tools/rng-tools-6-r1.ebuild | 47 ---------------
sys-apps/rng-tools/rng-tools-6.1-r2.ebuild | 62 -------------------
sys-apps/rng-tools/rng-tools-6.2.ebuild | 61 -------------------
sys-apps/rng-tools/rng-tools-6.3.1.ebuild | 70 ----------------------
sys-apps/rng-tools/rng-tools-6.3.ebuild | 70 ----------------------
sys-apps/rng-tools/rng-tools-6.4.ebuild | 70 ----------------------
sys-apps/rng-tools/rng-tools-6.5.ebuild | 70 ----------------------
sys-apps/rng-tools/rng-tools-6.6.ebuild | 69 ---------------------
14 files changed, 719 deletions(-)
diff --git a/sys-apps/rng-tools/Manifest b/sys-apps/rng-tools/Manifest
index d17b7055c3c..3152e7a0de1 100644
--- a/sys-apps/rng-tools/Manifest
+++ b/sys-apps/rng-tools/Manifest
@@ -1,10 +1,3 @@
DIST rng-tools-5.tar.gz 122182 BLAKE2B de7085d530e38de21a1c33792d67a72e0131b221082d690cdb299367b80b0a123c2976174aa3f895a4a2ab1216aacfaa8e09de485c85154dc4a5b8f960d05245 SHA512 58047c37cad4f5f1210b696e4dba122878f78e57d05d9cb822f79234240ecce31efd2d39061fea1eb5b2e81d48d8c3bf6b92d06451f1ce5d5db7117704e89c50
-DIST rng-tools-6.1.tar.gz 29814 BLAKE2B 4102c03ced36b33f9db6f7e5f77e8f918c4b9286a4c94cfd9ea9645c394f054fb3165255c3beb0f73d897d066831301f69a64e2758296b4418808343c97f3269 SHA512 388593ffeef0b5f2770532629418cdf1b6421092ae9c5fe0a68d198a5cbd4ff733fbca8091d497e09620c61a9e8b982298fb064edfd05a0fc36fa49c22eef5c9
-DIST rng-tools-6.2.tar.gz 30421 BLAKE2B 646628095cbc611aee4113198e0874b5f0672cd787f04f1649ff350883edebe6b31753aef3ac2bca1f05eedcf3c1400435c084382bde9f97fe6dcdd71adf18c2 SHA512 ffd8be5b232f092f8bcfdb6281580ce9053ec8bb87ff6bcae76585c38e3e91b9e464a9544a33ecd9814a9f244a89bac973d15c9bd3560d1164559685c720d174
-DIST rng-tools-6.3.1.tar.gz 31797 BLAKE2B 00d75d8436b4b49798bca8fb76e43a98feac8805b47a57d2315c22e72ed3dff30c6305b206168531c85c0576dc1d9864585eb3d4c2af833e9bec8dc5a478e19b SHA512 cb85674e6448e8152f92b4a82e944a9258dcc9ce68349404c0000c09378ac5f6fb298c50ed2d9a1b18d76c5f35b0a4884d5efd0f4dd434ec0952107e0738b937
-DIST rng-tools-6.3.tar.gz 31474 BLAKE2B 4d3924b3ca85d31d1999ceb45908cf64e8d2978d2e0aa638d9bbd3054a11a41251f9db54db35583c8fc080fd0667387cd63792c15486048d1f52300217e02fa9 SHA512 c00ac28c059ba689f114480958fe993e2199a1428137b151779a0331b9cc5a667f08770aa7b28d98c801166a509e8bd40d6b92f5c29b6ff73eb50a1cb0f2dd13
-DIST rng-tools-6.4.tar.gz 41248 BLAKE2B 16000e0779cf7aa25936a95661a0c40d4f0f12ed91fa36160924782d22a1057838bfb466f60614f91ef6c5576e0a29b6c1028bb72d5f5403c9a61d8f5ec16edd SHA512 12da9819b6e9a9ea688e82d1689642a690f6c9d78ad5fcf159a71b37a49f79120c8f62d4e1b8e81a496eac46a28137c5c87973499b31e1881a7866de99a168f0
-DIST rng-tools-6.5.tar.gz 51484 BLAKE2B 92700cbe1b48244effeae4f058507c27f8c9714f9bb5435ee7c6c08e260ce57891084208ea62391ab68b6551a3d95997c91d88020e9541564488abcf2041e479 SHA512 ae356ae18cb8584a594519038789d17e0f1b3d30122c058f86f3919a9c5ebfe0c48f8d7bfa6154b37d4f92d89c8b8a4a91007de0d1262ce5b86af19248c57bd0
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.tar.gz 26024 BLAKE2B a523328fcce56997e2847940cdc096abd5a539135f857f0a4cd3d782a1659f4d2978870149caac47b839c80788df6a3d891adcd39371d5968149dd29bc46bc62 SHA512 2aea947c4dba5e8c4df33396957f7224b62200be0e3d10aac08c84155fa473a67df5f49e07a07b2cbea4dfd772d90c1b194e8fce3d8eea762463a7f4a16d6ce4
diff --git a/sys-apps/rng-tools/files/rng-tools-6.1-fix-nistbeacon-validation-on-x86.patch b/sys-apps/rng-tools/files/rng-tools-6.1-fix-nistbeacon-validation-on-x86.patch
deleted file mode 100644
index 1872444bc4a..00000000000
--- a/sys-apps/rng-tools/files/rng-tools-6.1-fix-nistbeacon-validation-on-x86.patch
+++ /dev/null
@@ -1,45 +0,0 @@
-From e8d7ea04e39f1209a79c003f3b62c9f1761dec0e Mon Sep 17 00:00:00 2001
-From: =?UTF-8?q?G=C3=B6kt=C3=BCrk=20Y=C3=BCksek?= <gokturk@gentoo.org>
-Date: Thu, 19 Apr 2018 05:29:01 -0400
-Subject: [PATCH] rngd_nistbeacon: fix the size of frequency and timestamp on
- x86_32
-
-The members "frequency" and "timestamp" of struct nist_data_block are
-defined as int and long, respectively. On x86_64, their sizes
-correctly correspond to 4 and 8 bytes. However, on 32-bit x86
-architectures, both int and long are defined as 4 bytes, causing the
-digest verification to fail. Fix it by using uint32_t and uint64_t
-explicitly.
----
- rngd_nistbeacon.c | 8 ++++----
- 1 file changed, 4 insertions(+), 4 deletions(-)
-
-diff --git a/rngd_nistbeacon.c b/rngd_nistbeacon.c
-index fbebc53..eadde39 100644
---- a/rngd_nistbeacon.c
-+++ b/rngd_nistbeacon.c
-@@ -97,8 +97,8 @@ BIO *bfp;
-
- struct nist_data_block {
- char *version;
-- int frequency;
-- long timestamp;
-+ uint32_t frequency;
-+ uint64_t timestamp;
- char *seedvalue;
- size_t seedvaluelen;
- char *previoushash;
-@@ -355,8 +355,8 @@ static int validate_nist_block()
-
-
- EVP_VerifyUpdate(mdctx, block.version, strlen(block.version));
-- EVP_VerifyUpdate(mdctx, &block.frequency, sizeof(int));
-- EVP_VerifyUpdate(mdctx, &block.timestamp, sizeof(long));
-+ EVP_VerifyUpdate(mdctx, &block.frequency, sizeof(uint32_t));
-+ EVP_VerifyUpdate(mdctx, &block.timestamp, sizeof(uint64_t));
- EVP_VerifyUpdate(mdctx, block.seedvalue, block.seedvaluelen);
- EVP_VerifyUpdate(mdctx, block.previoushash, block.previoushashlen);
- EVP_VerifyUpdate(mdctx, &block.errorcode, block.errorcodelen);
---
-2.13.6
-
diff --git a/sys-apps/rng-tools/files/rng-tools-6.3-jitterentropy-linking-fix.patch b/sys-apps/rng-tools/files/rng-tools-6.3-jitterentropy-linking-fix.patch
deleted file mode 100644
index f7b87c88715..00000000000
--- a/sys-apps/rng-tools/files/rng-tools-6.3-jitterentropy-linking-fix.patch
+++ /dev/null
@@ -1,36 +0,0 @@
-From c9f795da2dbeb0e85025f6264321aef1ba12059e Mon Sep 17 00:00:00 2001
-From: =?UTF-8?q?G=C3=B6kt=C3=BCrk=20Y=C3=BCksek?= <gokturk@gentoo.org>
-Date: Fri, 6 Jul 2018 17:20:28 -0400
-Subject: [PATCH] Makefile.am: use the libjitterentropy available on the system
-
----
- Makefile.am | 6 ++----
- 1 file changed, 2 insertions(+), 4 deletions(-)
-
-diff --git a/Makefile.am b/Makefile.am
-index b80e9a0..5d33aaf 100644
---- a/Makefile.am
-+++ b/Makefile.am
-@@ -2,9 +2,7 @@
- ## Toplevel Makefile.am for rng-tools
- ##
- if JITTER
-- JSUBDIR = jitterentropy-library
-- JSUBLIB = ./jitterentropy-library/libjitterentropy.a
-- AM_CPPFLAGS = -I./jitterentropy-library
-+ jitterentropy_LIBS = -ljitterentropy
- endif
-
- SUBDIRS = contrib tests $(JSUBDIR)
-@@ -33,7 +31,7 @@ if JITTER
- rngd_SOURCES += rngd_jitter.c
- endif
-
--rngd_LDADD = librngd.a -lsysfs $(JSUBLIB) ${libcurl_LIBS} ${libxml2_LIBS} ${openssl_LIBS}
-+rngd_LDADD = librngd.a -lsysfs $(jitterentropy_LIBS) ${libcurl_LIBS} ${libxml2_LIBS} ${openssl_LIBS}
-
- rngd_CFLAGS = ${libxml2_CFLAGS} ${openssl_CFLAGS}
-
---
-2.17.0
-
diff --git a/sys-apps/rng-tools/files/rng-tools-6.4-jitterentropy-linking-fix.patch b/sys-apps/rng-tools/files/rng-tools-6.4-jitterentropy-linking-fix.patch
deleted file mode 100644
index e6cf95d13f3..00000000000
--- a/sys-apps/rng-tools/files/rng-tools-6.4-jitterentropy-linking-fix.patch
+++ /dev/null
@@ -1,36 +0,0 @@
-From ac00de69665a14bc1884be90ec83f8e8bc4d69f0 Mon Sep 17 00:00:00 2001
-From: =?UTF-8?q?G=C3=B6kt=C3=BCrk=20Y=C3=BCksek?= <gokturk@gentoo.org>
-Date: Wed, 19 Sep 2018 16:45:37 -0400
-Subject: [PATCH] Makefile.am: use the libjitterentropy available on the system
-
----
- Makefile.am | 6 ++----
- 1 file changed, 2 insertions(+), 4 deletions(-)
-
-diff --git a/Makefile.am b/Makefile.am
-index fa8ecca..abc759a 100644
---- a/Makefile.am
-+++ b/Makefile.am
-@@ -2,9 +2,7 @@
- ## Toplevel Makefile.am for rng-tools
- ##
- if JITTER
-- JSUBDIR = jitterentropy-library
-- JSUBLIB = ./jitterentropy-library/libjitterentropy.a
-- AM_CPPFLAGS = -I./jitterentropy-library
-+ jitterentropy_LIBS = -ljitterentropy
- endif
-
- SUBDIRS = contrib tests $(JSUBDIR)
-@@ -33,7 +31,7 @@ if JITTER
- rngd_SOURCES += rngd_jitter.c
- endif
-
--rngd_LDADD = librngd.a -lsysfs $(JSUBLIB) ${libcurl_LIBS} ${libxml2_LIBS} ${openssl_LIBS} $(PTHREAD_LIBS)
-+rngd_LDADD = librngd.a -lsysfs $(jitterentropy_LIBS) ${libcurl_LIBS} ${libxml2_LIBS} ${openssl_LIBS} $(PTHREAD_LIBS)
-
- rngd_CFLAGS = ${libxml2_CFLAGS} ${openssl_CFLAGS} $(PTHREAD_CFLAGS)
- rngd_LDFLAGS = $(PTHREAD_CFLAGS)
---
-2.19.0
-
diff --git a/sys-apps/rng-tools/files/rng-tools-6.5-jitterentropy-automagic-detection-fix.patch b/sys-apps/rng-tools/files/rng-tools-6.5-jitterentropy-automagic-detection-fix.patch
deleted file mode 100644
index b03960180ed..00000000000
--- a/sys-apps/rng-tools/files/rng-tools-6.5-jitterentropy-automagic-detection-fix.patch
+++ /dev/null
@@ -1,60 +0,0 @@
-From 76cfc06afb69019dcf0bbd9938f6378168e37411 Mon Sep 17 00:00:00 2001
-From: =?UTF-8?q?G=C3=B6kt=C3=BCrk=20Y=C3=BCksek?= <gokturk@gentoo.org>
-Date: Wed, 26 Sep 2018 13:32:39 -0400
-Subject: [PATCH] configure.ac: control jitterentropy support using
- --with-jitter
-
-Replace automagic detection of jitterentropy DSO with an AC_ARG_WITH
-macro so that rngd can be compiled without jitter support even when
-the jitterentropy library is available on the system.
----
- configure.ac | 26 +++++++++++++++++++-------
- 1 file changed, 19 insertions(+), 7 deletions(-)
-
-diff --git a/configure.ac b/configure.ac
-index b1544d9..1e58184 100644
---- a/configure.ac
-+++ b/configure.ac
-@@ -40,6 +40,13 @@ AC_ARG_WITH([nistbeacon],
- [with_nistbeacon=check]
- )
-
-+AC_ARG_WITH([jitter],
-+ AS_HELP_STRING([--without-jitter],
-+ [Disable jitter entropy library support. ]),
-+ [],
-+ [with_jitter=check]
-+)
-+
- dnl Make sure anyone changing configure.ac/Makefile.am has a clue
- AM_MAINTAINER_MODE
- AM_PROG_AS
-@@ -61,13 +68,18 @@ AS_IF([test $target_cpu = powerpc64le], [AC_DEFINE([HAVE_DARN],1,[Enable DARN])]
-
- AM_CONDITIONAL([JITTER], [false])
- AM_CONDITIONAL([JITTER_DSO], [false])
--AS_IF([test -f jitterentropy-library/Makefile],
-- [AM_CONDITIONAL([JITTER], [true])
-- AC_DEFINE([HAVE_JITTER],1,[Enable JITTER])],
-- [AC_SEARCH_LIBS(jent_version,jitterentropy,
-- [AM_CONDITIONAL([JITTER_DSO], [true])
-- AC_DEFINE([HAVE_JITTER],1,[Enable JITTER])],
-- [AC_MSG_NOTICE([Disabling JITTER entropy source])])])
-+AS_IF(
-+ [ test "x$with_jitter" != "xno" ],
-+ [
-+ AS_IF([test -f jitterentropy-library/Makefile],
-+ [AM_CONDITIONAL([JITTER], [true])
-+ AC_DEFINE([HAVE_JITTER],1,[Enable JITTER])],
-+ [AC_SEARCH_LIBS(jent_version,jitterentropy,
-+ [AM_CONDITIONAL([JITTER_DSO], [true])
-+ AC_DEFINE([HAVE_JITTER],1,[Enable JITTER])],
-+ [AC_MSG_NOTICE([Disabling JITTER entropy source])])])
-+ ]
-+)
-
- #AM_CONDITIONAL([JITTER], [test -f jitterentropy-library/Makefile])
- #AS_IF([test -f jitterentropy-library/Makefile], [AC_DEFINE([HAVE_JITTER],1,[Enable JITTER])],[AC_MSG_NOTICE([Disabling JITTER entropy source])])
---
-2.19.0
-
diff --git a/sys-apps/rng-tools/files/rngd-initd-6 b/sys-apps/rng-tools/files/rngd-initd-6
deleted file mode 100644
index c3b48bf2209..00000000000
--- a/sys-apps/rng-tools/files/rngd-initd-6
+++ /dev/null
@@ -1,16 +0,0 @@
-#!/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-r1.ebuild b/sys-apps/rng-tools/rng-tools-6-r1.ebuild
deleted file mode 100644
index 1cee6b6717b..00000000000
--- a/sys-apps/rng-tools/rng-tools-6-r1.ebuild
+++ /dev/null
@@ -1,47 +0,0 @@
-# Copyright 1999-2019 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=6
-
-inherit eutils 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/${P}.tar.gz"
-
-LICENSE="GPL-2"
-SLOT="0"
-KEYWORDS="~alpha ~amd64 ~arm ~ia64 ~ppc ~x86"
-IUSE="selinux"
-
-DEPEND="dev-libs/libgcrypt:0
- dev-libs/libgpg-error
- elibc_musl? ( sys-libs/argp-standalone )"
-RDEPEND="${DEPEND}
- sys-fs/sysfsutils
- selinux? ( sec-policy/selinux-rngd )"
-
-S="${WORKDIR}/${PN}-${P}"
-
-PATCHES=(
- "${FILESDIR}"/test-for-argp.patch
- "${FILESDIR}"/${PN}-5-fix-textrels-on-PIC-x86.patch #469962
- "${FILESDIR}"/${PN}-5-man-fill-watermark.patch #555094
- "${FILESDIR}"/${PN}-6-fix-noctty.patch #556456
-)
-
-src_prepare() {
- echo 'bin_PROGRAMS = randstat' >> contrib/Makefile.am || die
- default
- eautoreconf
-
- sed -i '/^AR /d' Makefile.in || die
- tc-export AR
-}
-
-src_install() {
- default
- 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-r2.ebuild b/sys-apps/rng-tools/rng-tools-6.1-r2.ebuild
deleted file mode 100644
index c51a2821f9d..00000000000
--- a/sys-apps/rng-tools/rng-tools-6.1-r2.ebuild
+++ /dev/null
@@ -1,62 +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 ~ia64 ~ppc ~x86"
-IUSE="nistbeacon selinux"
-
-DEPEND="dev-libs/libgcrypt:0
- dev-libs/libgpg-error
- nistbeacon? (
- net-misc/curl[ssl]
- dev-libs/libxml2:2=
- dev-libs/openssl:0=
- )
- elibc_musl? ( sys-libs/argp-standalone )
-"
-RDEPEND="${DEPEND}
- sys-fs/sysfsutils
- 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}"/${PN}-6.1-fix-nistbeacon-validation-on-x86.patch
-)
-
-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() {
- econf $(use_with nistbeacon)
-}
-
-src_install() {
- default
- 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.2.ebuild b/sys-apps/rng-tools/rng-tools-6.2.ebuild
deleted file mode 100644
index 45197defe8b..00000000000
--- a/sys-apps/rng-tools/rng-tools-6.2.ebuild
+++ /dev/null
@@ -1,61 +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 ~ia64 ~ppc ~x86"
-IUSE="nistbeacon selinux"
-
-DEPEND="dev-libs/libgcrypt:0
- dev-libs/libgpg-error
- sys-fs/sysfsutils
- 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() {
- econf $(use_with nistbeacon)
-}
-
-src_install() {
- default
- 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.3.1.ebuild b/sys-apps/rng-tools/rng-tools-6.3.1.ebuild
deleted file mode 100644
index a8887e279b0..00000000000
--- a/sys-apps/rng-tools/rng-tools-6.3.1.ebuild
+++ /dev/null
@@ -1,70 +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 ~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
- "${FILESDIR}"/${PN}-6.3-jitterentropy-linking-fix.patch
-)
-
-src_prepare() {
- echo 'bin_PROGRAMS = randstat' >> contrib/Makefile.am || die
- default
-
- mv README.md README || die
-
- if use jitterentropy; then
- # Fool the build system into thinking that
- # jitterentropy source code exists
- touch "${S}"/jitterentropy-library/Makefile || die
- fi
- eautoreconf
-
- sed -i '/^AR /d' Makefile.in || die
- tc-export AR
-}
-
-src_configure() {
- econf $(use_with nistbeacon)
-}
-
-src_install() {
- default
- 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.3.ebuild b/sys-apps/rng-tools/rng-tools-6.3.ebuild
deleted file mode 100644
index a8887e279b0..00000000000
--- a/sys-apps/rng-tools/rng-tools-6.3.ebuild
+++ /dev/null
@@ -1,70 +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 ~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
- "${FILESDIR}"/${PN}-6.3-jitterentropy-linking-fix.patch
-)
-
-src_prepare() {
- echo 'bin_PROGRAMS = randstat' >> contrib/Makefile.am || die
- default
-
- mv README.md README || die
-
- if use jitterentropy; then
- # Fool the build system into thinking that
- # jitterentropy source code exists
- touch "${S}"/jitterentropy-library/Makefile || die
- fi
- eautoreconf
-
- sed -i '/^AR /d' Makefile.in || die
- tc-export AR
-}
-
-src_configure() {
- econf $(use_with nistbeacon)
-}
-
-src_install() {
- default
- 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.4.ebuild b/sys-apps/rng-tools/rng-tools-6.4.ebuild
deleted file mode 100644
index 3ee017a12dc..00000000000
--- a/sys-apps/rng-tools/rng-tools-6.4.ebuild
+++ /dev/null
@@ -1,70 +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 ~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
- "${FILESDIR}"/${PN}-6.4-jitterentropy-linking-fix.patch
-)
-
-src_prepare() {
- echo 'bin_PROGRAMS = randstat' >> contrib/Makefile.am || die
- default
-
- mv README.md README || die
-
- if use jitterentropy; then
- # Fool the build system into thinking that
- # jitterentropy source code exists
- touch "${S}"/jitterentropy-library/Makefile || die
- fi
- eautoreconf
-
- sed -i '/^AR /d' Makefile.in || die
- tc-export AR
-}
-
-src_configure() {
- econf $(use_with nistbeacon)
-}
-
-src_install() {
- default
- 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.5.ebuild b/sys-apps/rng-tools/rng-tools-6.5.ebuild
deleted file mode 100644
index b7c7cd5116b..00000000000
--- a/sys-apps/rng-tools/rng-tools-6.5.ebuild
+++ /dev/null
@@ -1,70 +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 ~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
- "${FILESDIR}"/${PN}-6.5-jitterentropy-automagic-detection-fix.patch
-)
-
-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_with jitterentropy jitter)
- )
-
- econf "${myeconfargs[@]}"
-}
-
-src_install() {
- default
- 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.6.ebuild b/sys-apps/rng-tools/rng-tools-6.6.ebuild
deleted file mode 100644
index d32e279caa0..00000000000
--- a/sys-apps/rng-tools/rng-tools-6.6.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 ~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 rngd
- newconfd "${FILESDIR}"/rngd-confd-4.1 rngd
- systemd_dounit "${FILESDIR}"/rngd.service
-}
^ permalink raw reply related [flat|nested] 11+ messages in thread
* [gentoo-commits] repo/gentoo:master commit in: sys-apps/rng-tools/files/, sys-apps/rng-tools/
@ 2020-12-10 2:13 Matt Turner
0 siblings, 0 replies; 11+ messages in thread
From: Matt Turner @ 2020-12-10 2:13 UTC (permalink / raw
To: gentoo-commits
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 <gokturk@binghamton.edu>
-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 <jbowler@acm.org> 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 <jbowler@acm.org>
-
---- 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) <klondike@gentoo.org>
-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) <klondike@gentoo.org>
-Reported-by: cilly <cilly@cilly.mine.nu>
-Reported-by: Manuel Rüger <mrueg@gentoo.org>
-Tested-by: Anthony Basile <blueness@gentoo.org>
-
---- rng-tools/rdrand_asm.S
-+++ rng-tools/rdrand_asm.S
-@@ -2,6 +2,7 @@
- * Copyright (c) 2011-2014, Intel Corporation
- * Authors: Fenghua Yu <fenghua.yu@intel.com>,
- * H. Peter Anvin <hpa@linux.intel.com>
-+ * PIC code by: Francisco Blas Izquierdo Riera (klondike) <klondike@gentoo.org>
- *
- * 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 <gokturk@binghamton.edu>
-
---- 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 <gokturk@binghamton.edu>
-
---- 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 <gentoo@wildgooses.com>
-Signed-off-by: Anthony G. Basile <blueness@gentoo.org>
-
-
---- 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
-}
^ permalink raw reply related [flat|nested] 11+ messages in thread
* [gentoo-commits] repo/gentoo:master commit in: sys-apps/rng-tools/files/, sys-apps/rng-tools/
@ 2021-08-03 22:34 Sam James
0 siblings, 0 replies; 11+ messages in thread
From: Sam James @ 2021-08-03 22:34 UTC (permalink / raw
To: gentoo-commits
commit: b3c0d813a60847423f5a683af1cc9f40cedbf4a9
Author: Sam James <sam <AT> gentoo <DOT> org>
AuthorDate: Tue Aug 3 22:33:51 2021 +0000
Commit: Sam James <sam <AT> gentoo <DOT> org>
CommitDate: Tue Aug 3 22:33:51 2021 +0000
URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=b3c0d813
sys-apps/rng-tools: backport configure.ac fix
Let's revbump to ensure that nobody had a misdetected
feature, just in case.
Signed-off-by: Sam James <sam <AT> gentoo.org>
.../rng-tools-6.13-various-autotools-fixups.patch | 25 ++++++++++++++++++++++
...-tools-6.13.ebuild => rng-tools-6.13-r1.ebuild} | 0
2 files changed, 25 insertions(+)
diff --git a/sys-apps/rng-tools/files/rng-tools-6.13-various-autotools-fixups.patch b/sys-apps/rng-tools/files/rng-tools-6.13-various-autotools-fixups.patch
index 4ad2348dad9..8cb68ae9b02 100644
--- a/sys-apps/rng-tools/files/rng-tools-6.13-various-autotools-fixups.patch
+++ b/sys-apps/rng-tools/files/rng-tools-6.13-various-autotools-fixups.patch
@@ -1,4 +1,5 @@
https://github.com/nhorman/rng-tools/pull/132
+https://github.com/nhorman/rng-tools/pull/143
From 16b728f9a5bb138386fa770de817ec244a158be5 Mon Sep 17 00:00:00 2001
From: David Seifert <soap@gentoo.org>
@@ -76,3 +77,27 @@ Subject: [PATCH 3/3] `AC_CANONICAL_TARGET` -> `AC_CANONICAL_HOST`
AM_CONDITIONAL([JITTER], [false])
AC_ARG_ENABLE(jitterentropy,
+From 800d7c6e23f0a04bd893ee748a74b622657017a9 Mon Sep 17 00:00:00 2001
+From: David Seifert <soap@gentoo.org>
+Date: Sun, 1 Aug 2021 13:16:16 +0200
+Subject: [PATCH] configure.ac: Add missing `test`
+
+---
+ configure.ac | 4 ++--
+ 1 file changed, 2 insertions(+), 2 deletions(-)
+
+diff --git a/configure.ac b/configure.ac
+index 0fe06fc..7c8e327 100644
+--- a/configure.ac
++++ b/configure.ac
+@@ -68,8 +68,8 @@ AC_PROG_GCC_TRADITIONAL
+
+ AX_PTHREAD
+
+-AM_CONDITIONAL([RDRAND], [test $host_cpu = x86_64 || $host_cpu = i686])
+-AS_IF([test $host_cpu = x86_64 || $host_cpu = i686], [AC_DEFINE([HAVE_RDRAND],1,[Enable RDRAND])],[])
++AM_CONDITIONAL([RDRAND], [test $host_cpu = x86_64 || test $host_cpu = i686])
++AS_IF([test $host_cpu = x86_64 || test $host_cpu = i686], [AC_DEFINE([HAVE_RDRAND],1,[Enable RDRAND])],[])
+
+ AM_CONDITIONAL([DARN], [test $host_cpu = powerpc64le])
+ AS_IF([test $host_cpu = powerpc64le], [AC_DEFINE([HAVE_DARN],1,[Enable DARN])],[])
diff --git a/sys-apps/rng-tools/rng-tools-6.13.ebuild b/sys-apps/rng-tools/rng-tools-6.13-r1.ebuild
similarity index 100%
rename from sys-apps/rng-tools/rng-tools-6.13.ebuild
rename to sys-apps/rng-tools/rng-tools-6.13-r1.ebuild
^ permalink raw reply related [flat|nested] 11+ messages in thread
* [gentoo-commits] repo/gentoo:master commit in: sys-apps/rng-tools/files/, sys-apps/rng-tools/
@ 2021-10-03 11:28 David Seifert
0 siblings, 0 replies; 11+ messages in thread
From: David Seifert @ 2021-10-03 11:28 UTC (permalink / raw
To: gentoo-commits
commit: 9bef75f8b67dad193e3da2aacf4ae6019c9c179e
Author: David Seifert <soap <AT> gentoo <DOT> org>
AuthorDate: Sun Oct 3 11:27:55 2021 +0000
Commit: David Seifert <soap <AT> gentoo <DOT> org>
CommitDate: Sun Oct 3 11:27:55 2021 +0000
URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=9bef75f8
sys-apps/rng-tools: drop 6.13-r2
Signed-off-by: David Seifert <soap <AT> gentoo.org>
sys-apps/rng-tools/Manifest | 1 -
.../rng-tools-6.13-various-autotools-fixups.patch | 103 ---------------------
sys-apps/rng-tools/rng-tools-6.13-r2.ebuild | 73 ---------------
3 files changed, 177 deletions(-)
diff --git a/sys-apps/rng-tools/Manifest b/sys-apps/rng-tools/Manifest
index 0fbe4f3074f..8d1413398ee 100644
--- a/sys-apps/rng-tools/Manifest
+++ b/sys-apps/rng-tools/Manifest
@@ -1,2 +1 @@
-DIST rng-tools-6.13.tar.gz 59311 BLAKE2B e4601a2fa8158775a8ef7188edbe61a5eb1df35dccc9e1a0ab6b31b559f2f11dd67b682cf9995f0a67834690417e283d443ae6fa54e99ab6462a1185f9b9e09b SHA512 def5f2dcdd1771e8fe5af9476de866ff89a225065416672165af6019cbb166f874fae936b3705221aa47dc13ae99fa63d054d7d49b612f3151cd922a0a129490
DIST rng-tools-6.14.tar.gz 60277 BLAKE2B 177065f9ea68b68459d034d38278f866a0c9d5c499578fabcc29ceb387b49667393f23dcae9f13ff401599846e872dbada73f5e319a99dfa4605cdb77ee3e896 SHA512 6a267257292697023cd349a5bda4998e39e874969f2b437eb2498f2d7d70a7ed293ca76b4c83aebf80955e33f6c8f8bbb65c6636cc0979e0e0d80d148380b8c7
diff --git a/sys-apps/rng-tools/files/rng-tools-6.13-various-autotools-fixups.patch b/sys-apps/rng-tools/files/rng-tools-6.13-various-autotools-fixups.patch
deleted file mode 100644
index 8cb68ae9b02..00000000000
--- a/sys-apps/rng-tools/files/rng-tools-6.13-various-autotools-fixups.patch
+++ /dev/null
@@ -1,103 +0,0 @@
-https://github.com/nhorman/rng-tools/pull/132
-https://github.com/nhorman/rng-tools/pull/143
-
-From 16b728f9a5bb138386fa770de817ec244a158be5 Mon Sep 17 00:00:00 2001
-From: David Seifert <soap@gentoo.org>
-Date: Sat, 12 Jun 2021 22:15:06 +0200
-Subject: [PATCH 1/3] Use `AM_PROG_AR` over `AC_CHECK_TOOLS`
-
-* `AM_PROG_AR` is the canonical way to detect the archiver
- and includes workarounds for Cygwin.
---- a/configure.ac
-+++ b/configure.ac
-@@ -62,10 +62,9 @@ AM_PROG_AS
- dnl Checks for programs
- AC_PROG_CC
- AC_PROG_RANLIB
-+AM_PROG_AR
- AC_PROG_GCC_TRADITIONAL
-
--AC_CHECK_TOOLS([AR], [ar gar], :)
--
- AX_PTHREAD
-
- AM_CONDITIONAL([RDRAND], [test $target_cpu = x86_64 -o $target_cpu = i686])
-
-From 2ce93190cb0111fcab2f622a539689d70960643a Mon Sep 17 00:00:00 2001
-From: David Seifert <soap@gentoo.org>
-Date: Sat, 12 Jun 2021 22:15:09 +0200
-Subject: [PATCH 2/3] Build `randstat` binary
---- a/contrib/Makefile.am
-+++ b/contrib/Makefile.am
-@@ -1,3 +1,2 @@
--
--EXTRA_DIST = randstat.c
--
-+bin_PROGRAMS = randstat
-+randstat_SOURCES = randstat.c
-
-From 3adf2613e262efbda0a3455e59c8cb3390271563 Mon Sep 17 00:00:00 2001
-From: David Seifert <soap@gentoo.org>
-Date: Sat, 12 Jun 2021 22:15:12 +0200
-Subject: [PATCH 3/3] `AC_CANONICAL_TARGET` -> `AC_CANONICAL_HOST`
-
-* `AC_CANONICAL_TARGET` is the type of system for which code
- will be produced, not on which it will run. This is a common
- confusion with Autoconf's target triplet.
---- a/configure.ac
-+++ b/configure.ac
-@@ -20,7 +20,8 @@ dnl Foundation, Inc., 51 Franklin Street, Suite 500, Boston, MA 02110-1335 USA
- AC_INIT(rng-tools, 6.13, [Neil Horman <nhorman@tuxdriver.com>])
- AC_PREREQ(2.52)
- AC_CONFIG_SRCDIR([rngd.c])
--AC_CANONICAL_TARGET
-+AC_CANONICAL_HOST
-+AC_CANONICAL_TARGET dnl required for broken AX_PTHREAD
- AM_INIT_AUTOMAKE([foreign])
- AC_CONFIG_HEADERS([rng-tools-config.h])
- AC_CONFIG_MACRO_DIRS([m4])
-@@ -67,14 +68,14 @@ AC_PROG_GCC_TRADITIONAL
-
- AX_PTHREAD
-
--AM_CONDITIONAL([RDRAND], [test $target_cpu = x86_64 -o $target_cpu = i686])
--AS_IF([test $target_cpu = x86_64 -o $target_cpu = i686], [AC_DEFINE([HAVE_RDRAND],1,[Enable RDRAND])],[])
-+AM_CONDITIONAL([RDRAND], [test $host_cpu = x86_64 || $host_cpu = i686])
-+AS_IF([test $host_cpu = x86_64 || $host_cpu = i686], [AC_DEFINE([HAVE_RDRAND],1,[Enable RDRAND])],[])
-
--AM_CONDITIONAL([DARN], [test $target_cpu = powerpc64le])
--AS_IF([test $target_cpu = powerpc64le], [AC_DEFINE([HAVE_DARN],1,[Enable DARN])],[])
-+AM_CONDITIONAL([DARN], [test $host_cpu = powerpc64le])
-+AS_IF([test $host_cpu = powerpc64le], [AC_DEFINE([HAVE_DARN],1,[Enable DARN])],[])
-
--AM_CONDITIONAL([RNDR], [test $target_cpu = aarch64])
--AS_IF([test $target_cpu = aarch64], [AC_DEFINE([HAVE_RNDR],1,[Enable RNDR])],[])
-+AM_CONDITIONAL([RNDR], [test $host_cpu = aarch64])
-+AS_IF([test $host_cpu = aarch64], [AC_DEFINE([HAVE_RNDR],1,[Enable RNDR])],[])
- AM_CONDITIONAL([JITTER], [false])
-
- AC_ARG_ENABLE(jitterentropy,
-From 800d7c6e23f0a04bd893ee748a74b622657017a9 Mon Sep 17 00:00:00 2001
-From: David Seifert <soap@gentoo.org>
-Date: Sun, 1 Aug 2021 13:16:16 +0200
-Subject: [PATCH] configure.ac: Add missing `test`
-
----
- configure.ac | 4 ++--
- 1 file changed, 2 insertions(+), 2 deletions(-)
-
-diff --git a/configure.ac b/configure.ac
-index 0fe06fc..7c8e327 100644
---- a/configure.ac
-+++ b/configure.ac
-@@ -68,8 +68,8 @@ AC_PROG_GCC_TRADITIONAL
-
- AX_PTHREAD
-
--AM_CONDITIONAL([RDRAND], [test $host_cpu = x86_64 || $host_cpu = i686])
--AS_IF([test $host_cpu = x86_64 || $host_cpu = i686], [AC_DEFINE([HAVE_RDRAND],1,[Enable RDRAND])],[])
-+AM_CONDITIONAL([RDRAND], [test $host_cpu = x86_64 || test $host_cpu = i686])
-+AS_IF([test $host_cpu = x86_64 || test $host_cpu = i686], [AC_DEFINE([HAVE_RDRAND],1,[Enable RDRAND])],[])
-
- AM_CONDITIONAL([DARN], [test $host_cpu = powerpc64le])
- AS_IF([test $host_cpu = powerpc64le], [AC_DEFINE([HAVE_DARN],1,[Enable DARN])],[])
diff --git a/sys-apps/rng-tools/rng-tools-6.13-r2.ebuild b/sys-apps/rng-tools/rng-tools-6.13-r2.ebuild
deleted file mode 100644
index f70781ca79d..00000000000
--- a/sys-apps/rng-tools/rng-tools-6.13-r2.ebuild
+++ /dev/null
@@ -1,73 +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=
- 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"
-
-PATCHES=(
- # backport, remove on bump
- "${FILESDIR}"/${P}-various-autotools-fixups.patch
-)
-
-src_prepare() {
- default
- eautoreconf
-}
-
-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 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
-}
^ permalink raw reply related [flat|nested] 11+ messages in thread
* [gentoo-commits] repo/gentoo:master commit in: sys-apps/rng-tools/files/, sys-apps/rng-tools/
@ 2023-12-19 11:27 Sam James
0 siblings, 0 replies; 11+ messages in thread
From: Sam James @ 2023-12-19 11:27 UTC (permalink / raw
To: gentoo-commits
commit: ac62c5917a3a871982b477ebcfe1e7bac07b9e7e
Author: Sam James <sam <AT> gentoo <DOT> org>
AuthorDate: Tue Dec 19 11:27:22 2023 +0000
Commit: Sam James <sam <AT> gentoo <DOT> org>
CommitDate: Tue Dec 19 11:27:22 2023 +0000
URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=ac62c591
sys-apps/rng-tools: fix modern C issue in configure
Closes: https://bugs.gentoo.org/919399
Signed-off-by: Sam James <sam <AT> gentoo.org>
sys-apps/rng-tools/files/rng-tools-6.16-c99.patch | 22 ++++++
sys-apps/rng-tools/rng-tools-6.16-r1.ebuild | 90 +++++++++++++++++++++++
2 files changed, 112 insertions(+)
diff --git a/sys-apps/rng-tools/files/rng-tools-6.16-c99.patch b/sys-apps/rng-tools/files/rng-tools-6.16-c99.patch
new file mode 100644
index 000000000000..dad35eeed1ff
--- /dev/null
+++ b/sys-apps/rng-tools/files/rng-tools-6.16-c99.patch
@@ -0,0 +1,22 @@
+https://bugs.gentoo.org/919399
+https://github.com/nhorman/rng-tools/pull/205
+
+From 593e326815ba7ee820ee2f0a3c45279282f07c34 Mon Sep 17 00:00:00 2001
+From: Florian Weimer <fweimer@redhat.com>
+Date: Tue, 19 Dec 2023 10:32:11 +0100
+Subject: [PATCH] configure: Fix m4 quoting issue in libargp probe
+
+Without the surrounding [], m4 drops the inner [], treating, argv[] as
+argv. This results in an incorrect argument type for argp_parse,
+causing the probe to fail with future compilers due to type error.
+--- a/configure.ac
++++ b/configure.ac
+@@ -196,7 +196,7 @@ AS_IF(
+ 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;]
++ [[int argc=1; char *argv[]={"test"}; argp_parse(0,argc,argv,0,0,0); return 0;]]
+ )],
+ [need_libargp=no],
+ [need_libargp=yes
diff --git a/sys-apps/rng-tools/rng-tools-6.16-r1.ebuild b/sys-apps/rng-tools/rng-tools-6.16-r1.ebuild
new file mode 100644
index 000000000000..3dd714dfc810
--- /dev/null
+++ b/sys-apps/rng-tools/rng-tools-6.16-r1.ebuild
@@ -0,0 +1,90 @@
+# Copyright 1999-2023 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=8
+
+inherit autotools readme.gentoo-r1 systemd
+
+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 ~sparc ~x86"
+IUSE="jitterentropy nistbeacon pkcs11 qrypt rtlsdr selinux test"
+REQUIRED_USE="test? ( jitterentropy )"
+RESTRICT="!test? ( test )"
+
+DEPEND="
+ dev-libs/openssl:=
+ sys-libs/libcap
+ jitterentropy? ( app-crypt/jitterentropy:= )
+ nistbeacon? (
+ dev-libs/jansson:=
+ dev-libs/libxml2:2=
+ net-misc/curl[ssl]
+ )
+ pkcs11? ( dev-libs/libp11:= )
+ qrypt? (
+ dev-libs/jansson:=
+ net-misc/curl[ssl]
+ )
+ rtlsdr? ( net-wireless/rtl-sdr )
+ elibc_musl? ( sys-libs/argp-standalone )
+"
+RDEPEND="
+ ${DEPEND}
+ selinux? ( sec-policy/selinux-rngd )
+"
+BDEPEND="virtual/pkgconfig"
+
+PATCHES=(
+ "${FILESDIR}"/${PN}-6.16-c99.patch
+)
+
+src_prepare() {
+ sed -i "s/sleep 30/sleep 120/g" tests/rngtestjitter.sh || die
+ default
+
+ eautoreconf
+}
+
+src_configure() {
+ local myeconfargs=(
+ $(use_enable jitterentropy)
+ $(use_with nistbeacon)
+ $(use_with pkcs11)
+ $(use_with rtlsdr)
+ $(use_with qrypt)
+ )
+
+ econf "${myeconfargs[@]}"
+}
+
+src_test() {
+ RNGD_JITTER_TIMEOUT=90 default
+}
+
+src_install() {
+ default
+
+ newinitd "${FILESDIR}"/rngd-initd-6.11 rngd
+ newconfd "${FILESDIR}"/rngd-confd-6.11 rngd
+ systemd_dounit 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
+}
^ permalink raw reply related [flat|nested] 11+ messages in thread
end of thread, other threads:[~2023-12-19 11:28 UTC | newest]
Thread overview: 11+ messages (download: mbox.gz follow: Atom feed
-- links below jump to the message on this page --
2021-08-03 22:34 [gentoo-commits] repo/gentoo:master commit in: sys-apps/rng-tools/files/, sys-apps/rng-tools/ Sam James
-- strict thread matches above, loose matches on Subject: below --
2023-12-19 11:27 Sam James
2021-10-03 11:28 David Seifert
2020-12-10 2:13 Matt Turner
2019-03-13 0:42 Göktürk Yüksek
2018-09-19 20:50 Göktürk Yüksek
2018-04-19 9:40 Göktürk Yüksek
2017-10-26 1:05 Göktürk Yüksek
2017-08-14 13:36 Lars Wendler
2017-08-14 13:36 Lars Wendler
2015-08-14 6:55 Mike Frysinger
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox