gentoo resync : 30.09.2018

3 files changed, 132 insertions, 0 deletions

diff --git a/sys-apps/rng-tools/Manifest b/sys-apps/rng-tools/Manifest
index 6ce2fa328f12..04fe8076a706 100644
--- a/sys-apps/rng-tools/Manifest
+++ b/sys-apps/rng-tools/Manifest
@@ -6,6 +6,7 @@ AUX rng-tools-6-fix-noctty.patch 2188 BLAKE2B 73eebe43b950e0ef261208c073f5b6c0fe
 AUX rng-tools-6.1-fix-nistbeacon-validation-on-x86.patch 1615 BLAKE2B 63b8e975bcff85d0990d8ffe172b394167083fb95c0a9425425dd0b9aeb84a5c7265cc3181451b299cbbc7b965b957f472e18d7f1c109c38a564819581d863da SHA512 44a23471ba5dec1da76d4ff9ff77caa83a26fdebabcfbf561bc87ab838885a55a6fac7e31b64798e5ed0f67c4a47da03961a150efa7bb5ec4eebfc4889a21784
 AUX rng-tools-6.3-jitterentropy-linking-fix.patch 1057 BLAKE2B f07a9f6621c814237a71956f18b267c009181677fb47b3e0f1ed3b6417e3b33afd620cdb9bd1d5e9746ba195b1d861d86d03c16f7f2839931677c400cfe6281c SHA512 e64f4cf670143d91b4ac0dd4844d120308badfbccbe8764f9c5ed6badee90e9c5b58cc8cce3a3d6e53ac0c8fe906f155c629acc42ae3b414ff2559713844863a
 AUX rng-tools-6.4-jitterentropy-linking-fix.patch 1140 BLAKE2B 8233f70b487f5992d646d3894d908e29a708660513380e3d12a48e359fcaaafab9cab18d5a14dcc2c90c6bacc3a4aa4e1aa2ef38f084e57efb3006e06de23c3b SHA512 46036a9856b115974d92284f586b0f8874095e2e4c120e24b94828dee55aaea4bd5af7b27da690dcf0e82a2e0f6d299d1e57ba225bacf5d4a32fd04236fc953f
+AUX rng-tools-6.5-jitterentropy-automagic-detection-fix.patch 2121 BLAKE2B 33fe402d23759e4a50545e0f89a670ebe724719babeb62654b80470db2b52bf3761bb1a23c98c10a5408400c36e863695a7422afb72abfa43d9c44f90ab32ee0 SHA512 559f0e3ac4d5873c90d629d85a795192f555f6d3fd1b5c9b2bd85712c409493cceec01da0d19d2369f0673b6776b886a0a7ae92621ae47b7b003a86cb8b7a2ab
 AUX rngd-confd-4.1 562 BLAKE2B 8fe0147a1f9e67541c709f793ed1f34ed173204739973abbb1df629fb79ebf47d78c7d2e0f1aa9a867aff1f77133271325e2dbb2bfe5440921f5c16c2f0e8e5b SHA512 45e0e9cbe0180162f659bf05c15ee99fb8c1b80274cd8744384ba7f791b1c9a46a63e81eea665b4f492c13b7d5cc1fdb6e524a49a25af77f3791f527b31f688b
 AUX rngd-initd-6 481 BLAKE2B 0642727e7dfb7cafcca269ce2b559880743f85402c5df26f28dd144766c8f5c0661d5a4d563d121550bec31c1ae103a4b6169ec5143ab895a7e1b7cf5bc77f0d SHA512 d15b462aa333bd0d64fa827626fa953d30cadce861dfc070598218104f072ffad26d88531d48bd22b5d627dc4fe8560a2808cc9e2e27310dcd74a6efad8a9baf
 AUX rngd-initd-r1-4.1 494 BLAKE2B 1f11526717fcc9b88125e89474e1f06fc11621435811f4997e9e6197f634794df681ef698ab08d3f7c610dfb47c156231a157cfda05c804a6293a27dc276322f SHA512 8bf9a0bd25bcc9c1cc4eacdf875077208ba0899c626a55e57f055cc93b62e23a427e0622859c5b4a31c3aebe550b180777528b43942a3efb2e2c0b4243c3c9c6
@@ -17,6 +18,7 @@ DIST rng-tools-6.2.tar.gz 30421 BLAKE2B 646628095cbc611aee4113198e0874b5f0672cd7
 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.tar.gz 26024 BLAKE2B a523328fcce56997e2847940cdc096abd5a539135f857f0a4cd3d782a1659f4d2978870149caac47b839c80788df6a3d891adcd39371d5968149dd29bc46bc62 SHA512 2aea947c4dba5e8c4df33396957f7224b62200be0e3d10aac08c84155fa473a67df5f49e07a07b2cbea4dfd772d90c1b194e8fce3d8eea762463a7f4a16d6ce4
 EBUILD rng-tools-5-r2.ebuild 1098 BLAKE2B b9cd42d86a00f766dcf81fb4e3e5f1346c2ffcc3722a97d4508b89a3ee60be4fe6112ef0b624b270c9be12af50fd0b9c838725740f1c89cff9513d2c476797f3 SHA512 b4a612e14a4e556c57c182a5e709bf497eb11c2b9ca850ca1dd32f94c313157d3273b02715eef907b570d5aaaa06e9786ce33f9085f83423d61fb5af4bbe1b52
 EBUILD rng-tools-6-r1.ebuild 1109 BLAKE2B f3411983c54dd734685ed56d41cfc2b36b1cd1ca00716b3e8b0de30227cabc59e18d3cf7cfcf8cb18bf3f8398b18a5907d0bf7669828ae7666f0b20f7c191eaf SHA512 dd9cecec2238e7fd8d1ea332e11f10dcd0fc8e4aa545fda6a4f3eae0807b273529ef40b5ebc76426b1feb5d9253ef37f2626d93a8a7e5380290d9944b0143e20
@@ -25,4 +27,5 @@ EBUILD rng-tools-6.2.ebuild 1222 BLAKE2B c411ec68551e0a6ee9bc6138d1f34486db0a3df
 EBUILD rng-tools-6.3.1.ebuild 1509 BLAKE2B 097d8bea4ea6d217e2a4489756545a6e8f768075fe26062062dd7c94f8c354be96d791ff6e9951e97f6c1b34f177368067663819a0f6606e3c56a749354f486e SHA512 e9d9e1cdea25334ac66d4cc8fcd3229694125209c310daa65cc9161f1cddc45e555838462b67e01793958a05b466870a97b62a6611cdf708e0f48a8850b0b353
 EBUILD rng-tools-6.3.ebuild 1509 BLAKE2B 097d8bea4ea6d217e2a4489756545a6e8f768075fe26062062dd7c94f8c354be96d791ff6e9951e97f6c1b34f177368067663819a0f6606e3c56a749354f486e SHA512 e9d9e1cdea25334ac66d4cc8fcd3229694125209c310daa65cc9161f1cddc45e555838462b67e01793958a05b466870a97b62a6611cdf708e0f48a8850b0b353
 EBUILD rng-tools-6.4.ebuild 1509 BLAKE2B 3e1afa8eb3de21a527175e1317086e9f2be4c29b4fb34b3b5ec108e46ce30fae2fb83604362d2c3ec81966c5180a070994c918a68d010a98f96906cdee37fab3 SHA512 2e05998a3bffefe7ffb67e575eeff832b38cd5a920ccc49ee0a7e01a8b356fb905b6d459e1293ff4adc0860e82f47e983da6ef6b8e544f57ad7ad578512a75f1
+EBUILD rng-tools-6.5.ebuild 1433 BLAKE2B 1ac28e203a827d529ba6d5208137616a06b560c0b5758d81b7006e8dc6a0f1731a7bb7574e25e76bbf76c00432dcb330bcfa3f1cdfc70833484f397a7139d348 SHA512 d6c32f311e02f86b9b8d7e76f129c0d4a7afcab6c60c5f1a7c611bd2f0c161fa5ae7073edf7f12b95c6498d4adbbc75a1198067e6a27f2da87cd42915a25d60a
 MISC metadata.xml 650 BLAKE2B d34f1f678d081e26075a4defa96ae293e2c8d06a6ff7a1091ddfe4c324b4e2c98db4f763664455008fba84d656b75220e5e16be9183fe8a5ddbe5aa250aadb8c SHA512 afe5c54ac87af8f1802160cc0e67198b1b0c8ddcf86dbc70571d5b879d128ddb4343a69da16a9fda789520a3e092735a5ea906d321b12bb329009c49e9813d41
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
new file mode 100644
index 000000000000..b03960180ed9
--- /dev/null
+++ b/sys-apps/rng-tools/files/rng-tools-6.5-jitterentropy-automagic-detection-fix.patch
@@ -0,0 +1,60 @@
+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/rng-tools-6.5.ebuild b/sys-apps/rng-tools/rng-tools-6.5.ebuild
new file mode 100644
index 000000000000..23bb96b42152
--- /dev/null
+++ b/sys-apps/rng-tools/rng-tools-6.5.ebuild
@@ -0,0 +1,69 @@
+# Copyright 1999-2018 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=
+	)
+"
+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
+}