From e23a08d0c97a0cc415aaa165da840b056f93c997 Mon Sep 17 00:00:00 2001 From: V3n3RiX Date: Fri, 8 Oct 2021 23:06:07 +0100 Subject: gentoo resync : 08.10.2021 --- sys-apps/rng-tools/Manifest | 5 +- .../rng-tools-6.13-various-autotools-fixups.patch | 103 --------------------- sys-apps/rng-tools/rng-tools-6.13-r2.ebuild | 73 --------------- sys-apps/rng-tools/rng-tools-6.14-r2.ebuild | 4 +- 4 files changed, 3 insertions(+), 182 deletions(-) delete mode 100644 sys-apps/rng-tools/files/rng-tools-6.13-various-autotools-fixups.patch delete mode 100644 sys-apps/rng-tools/rng-tools-6.13-r2.ebuild (limited to 'sys-apps/rng-tools') diff --git a/sys-apps/rng-tools/Manifest b/sys-apps/rng-tools/Manifest index d4d2296590d5..af00dd6a4c4f 100644 --- a/sys-apps/rng-tools/Manifest +++ b/sys-apps/rng-tools/Manifest @@ -1,8 +1,5 @@ -AUX rng-tools-6.13-various-autotools-fixups.patch 3845 BLAKE2B 83087f451411a57c1426d5510241a9cc3fe887d9b38b341e60b9e9c00cc063f9bc96ffc18c48ebf067a8428464c7e7503adcbc54d98bb01ebcbdfdb338a4b908 SHA512 c7f43976f64955bf15922389201ba3c2c10c1eabb63b6eb613d3ac49f2910f0ed6c3996ba0001126255728be6d792c3515bc9578109979d62d166f0fb575b67c AUX rngd-confd-6.11 2321 BLAKE2B 6cdf4cf7d61e33415df1c41933d1c38c398fd96370cb4c4e257f60479a3e69428d3735802d480e1a25714854de9bc6ed997856c1c4dbbf289b7a014026522aea SHA512 32c52316ebdffef7ec07dd97b45f124c2ecced3d0f49d75ad8d226f6eff478739dab6b008e0b1f4e55bc81bf615feee9860c45f35f0994c7c65d4d439501621f AUX rngd-initd-6.11 1789 BLAKE2B 317c6d3d1b7ad10e137c6b5b615354ba7a6deb256da5ef9d75253a7f84c265536db1b70b290e0029cfaf40e565c8b280e3b1ec79ab93c8f659c969b5dedc7dab SHA512 60bf2c2d4984a1db8fcfaeaebd5249ed6d428c9ccb8412813ce97e146f3143efae23058475ac8baa1c2e88b00012fc119411bcfc14b04a0128696ee69641d98d -DIST rng-tools-6.13.tar.gz 59311 BLAKE2B e4601a2fa8158775a8ef7188edbe61a5eb1df35dccc9e1a0ab6b31b559f2f11dd67b682cf9995f0a67834690417e283d443ae6fa54e99ab6462a1185f9b9e09b SHA512 def5f2dcdd1771e8fe5af9476de866ff89a225065416672165af6019cbb166f874fae936b3705221aa47dc13ae99fa63d054d7d49b612f3151cd922a0a129490 DIST rng-tools-6.14.tar.gz 60277 BLAKE2B 177065f9ea68b68459d034d38278f866a0c9d5c499578fabcc29ceb387b49667393f23dcae9f13ff401599846e872dbada73f5e319a99dfa4605cdb77ee3e896 SHA512 6a267257292697023cd349a5bda4998e39e874969f2b437eb2498f2d7d70a7ed293ca76b4c83aebf80955e33f6c8f8bbb65c6636cc0979e0e0d80d148380b8c7 -EBUILD rng-tools-6.13-r2.ebuild 1706 BLAKE2B 3bf72b094d00456cc61acb2d98ce19a5db21b1f0eb822e722139f696eb81a56e87f0d97ad149b92997827b60c6af10e36ce6594438b68b418586cca58d713c20 SHA512 416a3b5bd41180eda085714ce9e34bb0eac7a925428207aef6f444193a6bb8b6232b00a85e27513bad2921fa318bffe87403fd9fddcf37ce936def6c53685af2 -EBUILD rng-tools-6.14-r2.ebuild 1631 BLAKE2B 7b4b35c429759350d2a5b516ebf2922aef43cde36f5d6a45ae88fac9a027a043f865c96e93f7ce36e62b005ccedc74d74d9e51ae59b3e908614c18b9fb71ba9e SHA512 e4c212ee04442ba3eadb12fac8f7fc77a60ac870281036de185f7b56e1ace223c2b9d560e7bb47450082f9a422a0e2902af2225ad0684c661ae97d632c6564f4 +EBUILD rng-tools-6.14-r2.ebuild 1614 BLAKE2B 71d653d03e6efdd46783d53dbe0306b417dfb56d06f3a658ff1e158d761bd5234d7b6d00f7318374e299e678b9b8ee368263c498702a91c2c5df7e98e69e6f15 SHA512 5d0c3bda93eae06d80c87dadafbcc00604bc962590d8ddc6b2c4d3fa8ebee757f081890b41345a60307dd144259526679a7cec655d4928293b863eeecfd37c76 MISC metadata.xml 826 BLAKE2B 6a0fb04e17c209dcbf342357d8b044258533e877bc191d3afea272d379f02e75af2fbf912a840db32313e2fbf418c25556d423aec7793a0fca0fbaca5a4feb18 SHA512 24e9616ab14295a4cc0101752734332e98bb0299c42e831a0db9262527f83433174b704d3b1114841c4a00c82adfbe07b7473b2d57ec85d9358f41bff3797f3c 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 8cb68ae9b02a..000000000000 --- 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 -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 -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 -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 ]) - 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 -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 f70781ca79d6..000000000000 --- 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 -} diff --git a/sys-apps/rng-tools/rng-tools-6.14-r2.ebuild b/sys-apps/rng-tools/rng-tools-6.14-r2.ebuild index 6d708a77d27f..92fd4222d6c1 100644 --- a/sys-apps/rng-tools/rng-tools-6.14-r2.ebuild +++ b/sys-apps/rng-tools/rng-tools-6.14-r2.ebuild @@ -3,7 +3,7 @@ EAPI=7 -inherit autotools systemd readme.gentoo-r1 toolchain-funcs +inherit autotools systemd readme.gentoo-r1 DESCRIPTION="Daemon to use hardware random number generators" HOMEPAGE="https://github.com/nhorman/rng-tools" @@ -11,7 +11,7 @@ SRC_URI="https://github.com/nhorman/${PN}/archive/v${PV}.tar.gz -> ${P}.tar.gz" LICENSE="GPL-2" SLOT="0" -KEYWORDS="~alpha amd64 arm ~arm64 ~ia64 ~mips ppc ppc64 ~riscv x86" +KEYWORDS="~alpha amd64 arm arm64 ~ia64 ~mips ppc ppc64 ~riscv x86" IUSE="jitterentropy nistbeacon pkcs11 rtlsdr selinux" DEPEND=" -- cgit v1.2.3