gentoo resync : 18.11.2019

3 files changed, 84 insertions, 0 deletions

diff --git a/sys-apps/haveged/Manifest b/sys-apps/haveged/Manifest
index bc37239e3357..8719ec4fd81f 100644
--- a/sys-apps/haveged/Manifest
+++ b/sys-apps/haveged/Manifest
@@ -1,9 +1,12 @@
+AUX haveged-1.9.8c-threads_build_fix.patch 1066 BLAKE2B 45013ca4709656332ad2d32b8614d0be4048878c2241240cf26bf00dbb786b1ad4192a620993e797be1938d2d2c086d44efd33542c2b061fff7788823594dd90 SHA512 945ba4a5691382010420aabb9d11ed809eebcfdff2772262da38d4809e2d7d19cbf5ee33d3b71e074dc248b33717ca66ac5433099b5829fd6b15bd35ce91e815
 AUX haveged-conf.d 207 BLAKE2B 0c6adb8c4e4f6d769e2ceb039b4a553c2e75bfdecd277c16c51df25e9dbda2baf8ac6d8ec5437794c47c56de2d4af841e3844d91660a9eec4e8b243f60c3cc3a SHA512 b7bc782765a4521d34485d44391da79a3d1ee3bfda548ffcbf662093c8c7fdeb6baf2813ed7aa741b07e7b7e8eca1a94dceaa37ef202f801686d89855ffb7c30
 AUX haveged-init.d.3 322 BLAKE2B 7484eee6c17a5c6ecf20fa656b8c3976c732ba40f370d92635517dc14dfaab1b26778f660d03389a7bb1df217d78e9ee5d8a03934bec3b53f0edc717ca8f9ef9 SHA512 057cafb7f74423759834d470664558dcf16d226fbf1f47f569bacf04a8f76334aacc7fc25348d055847f6da4c644383b0519d80a7553058bae5264508eeb4ad4
 AUX haveged.conf 147 BLAKE2B 7bdf29071f7a1a3b90266af308ab0a0a56c46f8c9ae8b6acc3b4055a89ac14c0e3cbc2e370d344debe8fb69f9ceacae6882c17d2620e0daea171d349073672d4 SHA512 052696a31ab7b9a0dda06ccb24c08524bef0cfa9c601a1ba6819bb2e42886a6b3d9b77710880d589534fae3c600d123304586f825fac554e68ce50d8b5acd563
 AUX service.gentoo 322 BLAKE2B 302a1506492e5122a03ea616de11dea493637d904cde1415abbbdeff3794251e911c6efee7d9331a4cb1e8dde1dbb579f46935cd52c58fbaeb77404b587985cb SHA512 7d7caaef45cbf268a1c1a813537a9e4ef6543addcfebe99fd178e37a8c516bbd5419fb8f47decf2370cee0562f066c72501b6c176307b1f5884b56f561386b88
 DIST haveged-1.9.2.tar.gz 494682 BLAKE2B a972d128b19fecc3d01e17bd4cf6d5ec03ae716c4b4934c73193e03f3d3f9ff3461a8280ec0a20885499fd334343deb193ddc98b0697b2b14f92fff897bbf59b SHA512 65f70950fb90ef9c24ff3bf1b26e19a9cde2bec4749e2e64d5461a51646a20cf610efa2a5014219b8605957afa0084abd2ba11c7dc15f9379afce784971627b8
 DIST haveged-1.9.4.tar.gz 493215 BLAKE2B e1a8bbda36c35523c7a0c72a1377d7006440742961f9be4527d52b7e05b176334529ee032f5bdf902e729fcfe045a7a0558dfea7c50a95019747d1158f1e4a19 SHA512 20017c7637779c0cfa414233bb67efb2976f92c08e4eb1b7ea41ccd483dad755629d8e05fb8560a2db811fc2ded7d05fa081ab10c59341cb4c206595a964641d
+DIST haveged-1.9.8c.tar.gz 494470 BLAKE2B 840aa0b985107feb38a7b5823f94de3473e79f75542565e571c4ec9b2640dddcabb09d598e101678defbdd2eb04fe2fc1fb1f8466157e53d7c41272131450dec SHA512 24167e8a9773d96b3c57cd3e57def7e291f3de86873e796cafc1a59d3f89818c6cb8d46d05e5ae4eb2683fc86b313b1acaed7f210724dadb7df3939e1b3900aa
 EBUILD haveged-1.9.2-r1.ebuild 960 BLAKE2B ca6650ea624b8ca6a372ace436bdef5c2a956fc627a16a2ccf8083a0ea3e147f5cec9571b560a5e423e1a4abd36337d632d74ac4365aa7c141a8fe81d214d79b SHA512 e18f627765762c3b64f34319bd3756bda5963cb861f6fd04a3d2e31a736bd19d99d9ab4dc3690563dbf9fbd11b750431cc808c9252c5f043c6dda4b0654c2a28
 EBUILD haveged-1.9.4.ebuild 977 BLAKE2B 9f9328f7fb42a1d625c5ca0413d11d8dd18d4ae4e9e6d3cffaab2b9969ce63359d30678cff3287f8bcbb36fca724e47af5167b6d21e5b08b8f18004b515ce299 SHA512 01517dfcaa91e879e18e9a330f4d7750e9e1a2d9fdf6f1ae6bd11cc44b4dc0a978363576fce2342feaab489ca5e335ac1fe2df31105f09388d261a7727c32930
+EBUILD haveged-1.9.8c.ebuild 1003 BLAKE2B 610931f67cb089bfdb9b8fad276f98278f33506465177e699e8e29c306d265e89519c3ea4719068ead744047da5ab3164abb5552f99390d24102ead9cff6038d SHA512 c0da839f56f2ac86cc919233960be6afab5a4bf09dc270596376a3fffafd53c7e9af718fe7c0e4e7ee6be156bc97c9c28d76ec23ecc827c986caf6ce889526a6
 MISC metadata.xml 371 BLAKE2B d44d1873136cfff8c9c1ae42ee0ded780af875987caecc98494afba60017c3da105423642f10f2475d344636d54c71885607649ceb4f285a477698b40449d2ef SHA512 640e188a0829d4408d9bc7ca0c7558222ed8148afef25a88a136c0ae5bb44531bc8352c9c1da1c13e395cb54d67c62a485fa4f6329ad7b76255def9d979b70d0
diff --git a/sys-apps/haveged/files/haveged-1.9.8c-threads_build_fix.patch b/sys-apps/haveged/files/haveged-1.9.8c-threads_build_fix.patch
new file mode 100644
index 000000000000..fb88a8b51212
--- /dev/null
+++ b/sys-apps/haveged/files/haveged-1.9.8c-threads_build_fix.patch
@@ -0,0 +1,36 @@
+From cb1f0653c45d9c4a9a855119c85a1d4bfcc9b3b2 Mon Sep 17 00:00:00 2001
+From: Lars Wendler <polynomial-c@gentoo.org>
+Date: Thu, 14 Nov 2019 16:15:00 +0100
+Subject: [PATCH] build: Fix compilation with --enable-threads
+MIME-Version: 1.0
+Content-Type: text/plain; charset=UTF-8
+Content-Transfer-Encoding: 8bit
+
+Previously failed with:
+
+havegetune.c:190:12: error: ‘BUILD_THREAD’ undeclared (first use in this function); did you mean ‘BUILD_THREADS’?
+  190 |    *bp++ = BUILD_THREAD;
+      |            ^~~~~~~~~~~~
+      |            BUILD_THREADS
+
+Signed-off-by: Lars Wendler <polynomial-c@gentoo.org>
+---
+ src/havegetune.c | 2 +-
+ 1 file changed, 1 insertion(+), 1 deletion(-)
+
+diff --git a/src/havegetune.c b/src/havegetune.c
+index de39c53..6f14476 100644
+--- a/src/havegetune.c
++++ b/src/havegetune.c
+@@ -187,7 +187,7 @@ void havege_tune(          /* RETURN: none               */
+    *bp++ = BUILD_CPUID;
+ #endif
+ #if NUMBER_CORES>1
+-   *bp++ = BUILD_THREAD;
++   *bp++ = BUILD_THREADS;
+ #endif
+ #ifdef ONLINE_TESTS_ENABLE
+    *bp++ = BUILD_OLT;
+-- 
+2.24.0
+
diff --git a/sys-apps/haveged/haveged-1.9.8c.ebuild b/sys-apps/haveged/haveged-1.9.8c.ebuild
new file mode 100644
index 000000000000..dfe030e05698
--- /dev/null
+++ b/sys-apps/haveged/haveged-1.9.8c.ebuild
@@ -0,0 +1,45 @@
+# Copyright 1999-2019 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+inherit systemd
+
+DESCRIPTION="A simple entropy daemon using the HAVEGE algorithm"
+HOMEPAGE="http://www.issihosts.com/haveged/"
+SRC_URI="https://github.com/jirka-h/${PN}/archive/v${PV}.tar.gz -> ${P}.tar.gz"
+
+LICENSE="GPL-3+"
+SLOT="0"
+KEYWORDS="~amd64 ~arm ~arm64 ~ppc ~x86"
+IUSE="selinux static-libs threads"
+
+RDEPEND="
+	!<sys-apps/openrc-0.11.8
+	selinux? ( sec-policy/selinux-entropyd )
+"
+
+PATCHES=(
+	"${FILESDIR}/${PN}-1.9.8c-threads_build_fix.patch"
+)
+
+src_configure() {
+	local myeconfargs=(
+		$(use_enable static-libs static)
+		$(use_enable threads)
+		--bindir=/usr/sbin
+		--enable-nistest
+	)
+	econf "${myeconfargs[@]}"
+}
+
+src_install() {
+	default
+
+	# Install gentoo ones instead
+	newinitd "${FILESDIR}"/haveged-init.d.3 haveged
+	newconfd "${FILESDIR}"/haveged-conf.d haveged
+
+	systemd_newunit "${FILESDIR}"/service.gentoo ${PN}.service
+	insinto /etc
+	doins "${FILESDIR}"/haveged.conf
+}