[gentoo-commits] repo/gentoo:master commit in: sys-apps/rng-tools/, sys-apps/rng-tools/files/

[David Seifert]

commit:     01f3fe8d243477a650529bb734a452d8887394e3
Author:     Sam James <sam <AT> gentoo <DOT> org>
AuthorDate: Sun Jun 13 08:40:51 2021 +0000
Commit:     David Seifert <soap <AT> gentoo <DOT> org>
CommitDate: Sun Jun 13 08:40:51 2021 +0000
URL:        https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=01f3fe8d

sys-apps/rng-tools: add 6.13

Closes: https://github.com/gentoo/gentoo/pull/21210
Signed-off-by: Sam James <sam <AT> gentoo.org>
Signed-off-by: David Seifert <soap <AT> gentoo.org>

 sys-apps/rng-tools/Manifest                        |  1 +
 .../rng-tools-6.13-various-autotools-fixups.patch  | 78 ++++++++++++++++++++++
 sys-apps/rng-tools/rng-tools-6.13.ebuild           | 73 ++++++++++++++++++++
 3 files changed, 152 insertions(+)

diff --git a/sys-apps/rng-tools/Manifest b/sys-apps/rng-tools/Manifest
index 426e7b32088..684eb563631 100644
--- a/sys-apps/rng-tools/Manifest
+++ b/sys-apps/rng-tools/Manifest
@@ -1,2 +1,3 @@
 DIST rng-tools-6.11.tar.gz 57366 BLAKE2B d613502bcb24560638c0abc956987e57ec54b6594bed414ce2b70086716f73a9a9eec4800c86097c4a14b91401f0f28be62f5182ee01c328c9a32cd79eaec561 SHA512 0058ca5d0c1ddb554284fe8e6b9c0b85f130e0b9e0b9f0f0219f434302766e07c321d4fc0c01bdeb59053d5cd14dab67dc1c306422ef35a62a267af9fbdf7deb
 DIST rng-tools-6.12.tar.gz 57309 BLAKE2B d7a12b50889065f885cb15cda9686d63950fcc1ac9099893ed9c9236a9a930627c9541980c410318b40104637df688f5622681ce1d80eee7d4aaaf696c6bc3c5 SHA512 56dd334b65dcec1456f8dbdbee5d83590de27cb6ee1b7715828b5316a913557fd178e264139dc92a82e09635ca15b1eb5f6169bfb4412fbe1b06ea28a5064c64
+DIST rng-tools-6.13.tar.gz 59311 BLAKE2B e4601a2fa8158775a8ef7188edbe61a5eb1df35dccc9e1a0ab6b31b559f2f11dd67b682cf9995f0a67834690417e283d443ae6fa54e99ab6462a1185f9b9e09b SHA512 def5f2dcdd1771e8fe5af9476de866ff89a225065416672165af6019cbb166f874fae936b3705221aa47dc13ae99fa63d054d7d49b612f3151cd922a0a129490

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
new file mode 100644
index 00000000000..4ad2348dad9
--- /dev/null
+++ b/sys-apps/rng-tools/files/rng-tools-6.13-various-autotools-fixups.patch
@@ -0,0 +1,78 @@
+https://github.com/nhorman/rng-tools/pull/132
+
+From 16b728f9a5bb138386fa770de817ec244a158be5 Mon Sep 17 00:00:00 2001
+From: David Seifert <soap@g.o>
+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@g.o>
+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@g.o>
+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@×××××××××.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,

diff --git a/sys-apps/rng-tools/rng-tools-6.13.ebuild b/sys-apps/rng-tools/rng-tools-6.13.ebuild
new file mode 100644
index 00000000000..b4a1ee5c700
--- /dev/null
+++ b/sys-apps/rng-tools/rng-tools-6.13.ebuild
@@ -0,0 +1,73 @@
+# 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
+}