From d0740823a0192f6cae263721630d7844416aacd6 Mon Sep 17 00:00:00 2001
From: Lars Wendler <polynomial-c@gentoo.org>
Date: Thu, 14 Nov 2019 16:28:04 +0100
Subject: [PATCH] sys-apps/haveged: Bump to version 1.9.8c

Package-Manager: Portage-2.3.79, Repoman-2.3.18
Signed-off-by: Lars Wendler <polynomial-c@gentoo.org>
---
 sys-apps/haveged/Manifest                     |  1 +
 .../haveged-1.9.8c-threads_build_fix.patch    | 36 +++++++++++++++
 sys-apps/haveged/haveged-1.9.8c.ebuild        | 45 +++++++++++++++++++
 3 files changed, 82 insertions(+)
 create mode 100644 sys-apps/haveged/files/haveged-1.9.8c-threads_build_fix.patch
 create mode 100644 sys-apps/haveged/haveged-1.9.8c.ebuild

diff --git a/sys-apps/haveged/Manifest b/sys-apps/haveged/Manifest
index 6402a88620a1..9063a64f4d42 100644
--- a/sys-apps/haveged/Manifest
+++ b/sys-apps/haveged/Manifest
@@ -1,2 +1,3 @@
 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
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
+}
-- 
2.26.2