1 |
commit: d0740823a0192f6cae263721630d7844416aacd6 |
2 |
Author: Lars Wendler <polynomial-c <AT> gentoo <DOT> org> |
3 |
AuthorDate: Thu Nov 14 15:28:04 2019 +0000 |
4 |
Commit: Lars Wendler <polynomial-c <AT> gentoo <DOT> org> |
5 |
CommitDate: Thu Nov 14 15:28:19 2019 +0000 |
6 |
URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=d0740823 |
7 |
|
8 |
sys-apps/haveged: Bump to version 1.9.8c |
9 |
|
10 |
Package-Manager: Portage-2.3.79, Repoman-2.3.18 |
11 |
Signed-off-by: Lars Wendler <polynomial-c <AT> gentoo.org> |
12 |
|
13 |
sys-apps/haveged/Manifest | 1 + |
14 |
.../files/haveged-1.9.8c-threads_build_fix.patch | 36 +++++++++++++++++ |
15 |
sys-apps/haveged/haveged-1.9.8c.ebuild | 45 ++++++++++++++++++++++ |
16 |
3 files changed, 82 insertions(+) |
17 |
|
18 |
diff --git a/sys-apps/haveged/Manifest b/sys-apps/haveged/Manifest |
19 |
index 6402a88620a..9063a64f4d4 100644 |
20 |
--- a/sys-apps/haveged/Manifest |
21 |
+++ b/sys-apps/haveged/Manifest |
22 |
@@ -1,2 +1,3 @@ |
23 |
DIST haveged-1.9.2.tar.gz 494682 BLAKE2B a972d128b19fecc3d01e17bd4cf6d5ec03ae716c4b4934c73193e03f3d3f9ff3461a8280ec0a20885499fd334343deb193ddc98b0697b2b14f92fff897bbf59b SHA512 65f70950fb90ef9c24ff3bf1b26e19a9cde2bec4749e2e64d5461a51646a20cf610efa2a5014219b8605957afa0084abd2ba11c7dc15f9379afce784971627b8 |
24 |
DIST haveged-1.9.4.tar.gz 493215 BLAKE2B e1a8bbda36c35523c7a0c72a1377d7006440742961f9be4527d52b7e05b176334529ee032f5bdf902e729fcfe045a7a0558dfea7c50a95019747d1158f1e4a19 SHA512 20017c7637779c0cfa414233bb67efb2976f92c08e4eb1b7ea41ccd483dad755629d8e05fb8560a2db811fc2ded7d05fa081ab10c59341cb4c206595a964641d |
25 |
+DIST haveged-1.9.8c.tar.gz 494470 BLAKE2B 840aa0b985107feb38a7b5823f94de3473e79f75542565e571c4ec9b2640dddcabb09d598e101678defbdd2eb04fe2fc1fb1f8466157e53d7c41272131450dec SHA512 24167e8a9773d96b3c57cd3e57def7e291f3de86873e796cafc1a59d3f89818c6cb8d46d05e5ae4eb2683fc86b313b1acaed7f210724dadb7df3939e1b3900aa |
26 |
|
27 |
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 |
28 |
new file mode 100644 |
29 |
index 00000000000..fb88a8b5121 |
30 |
--- /dev/null |
31 |
+++ b/sys-apps/haveged/files/haveged-1.9.8c-threads_build_fix.patch |
32 |
@@ -0,0 +1,36 @@ |
33 |
+From cb1f0653c45d9c4a9a855119c85a1d4bfcc9b3b2 Mon Sep 17 00:00:00 2001 |
34 |
+From: Lars Wendler <polynomial-c@g.o> |
35 |
+Date: Thu, 14 Nov 2019 16:15:00 +0100 |
36 |
+Subject: [PATCH] build: Fix compilation with --enable-threads |
37 |
+MIME-Version: 1.0 |
38 |
+Content-Type: text/plain; charset=UTF-8 |
39 |
+Content-Transfer-Encoding: 8bit |
40 |
+ |
41 |
+Previously failed with: |
42 |
+ |
43 |
+havegetune.c:190:12: error: ‘BUILD_THREAD’ undeclared (first use in this function); did you mean ‘BUILD_THREADS’? |
44 |
+ 190 | *bp++ = BUILD_THREAD; |
45 |
+ | ^~~~~~~~~~~~ |
46 |
+ | BUILD_THREADS |
47 |
+ |
48 |
+Signed-off-by: Lars Wendler <polynomial-c@g.o> |
49 |
+--- |
50 |
+ src/havegetune.c | 2 +- |
51 |
+ 1 file changed, 1 insertion(+), 1 deletion(-) |
52 |
+ |
53 |
+diff --git a/src/havegetune.c b/src/havegetune.c |
54 |
+index de39c53..6f14476 100644 |
55 |
+--- a/src/havegetune.c |
56 |
++++ b/src/havegetune.c |
57 |
+@@ -187,7 +187,7 @@ void havege_tune( /* RETURN: none */ |
58 |
+ *bp++ = BUILD_CPUID; |
59 |
+ #endif |
60 |
+ #if NUMBER_CORES>1 |
61 |
+- *bp++ = BUILD_THREAD; |
62 |
++ *bp++ = BUILD_THREADS; |
63 |
+ #endif |
64 |
+ #ifdef ONLINE_TESTS_ENABLE |
65 |
+ *bp++ = BUILD_OLT; |
66 |
+-- |
67 |
+2.24.0 |
68 |
+ |
69 |
|
70 |
diff --git a/sys-apps/haveged/haveged-1.9.8c.ebuild b/sys-apps/haveged/haveged-1.9.8c.ebuild |
71 |
new file mode 100644 |
72 |
index 00000000000..dfe030e0569 |
73 |
--- /dev/null |
74 |
+++ b/sys-apps/haveged/haveged-1.9.8c.ebuild |
75 |
@@ -0,0 +1,45 @@ |
76 |
+# Copyright 1999-2019 Gentoo Authors |
77 |
+# Distributed under the terms of the GNU General Public License v2 |
78 |
+ |
79 |
+EAPI=7 |
80 |
+inherit systemd |
81 |
+ |
82 |
+DESCRIPTION="A simple entropy daemon using the HAVEGE algorithm" |
83 |
+HOMEPAGE="http://www.issihosts.com/haveged/" |
84 |
+SRC_URI="https://github.com/jirka-h/${PN}/archive/v${PV}.tar.gz -> ${P}.tar.gz" |
85 |
+ |
86 |
+LICENSE="GPL-3+" |
87 |
+SLOT="0" |
88 |
+KEYWORDS="~amd64 ~arm ~arm64 ~ppc ~x86" |
89 |
+IUSE="selinux static-libs threads" |
90 |
+ |
91 |
+RDEPEND=" |
92 |
+ !<sys-apps/openrc-0.11.8 |
93 |
+ selinux? ( sec-policy/selinux-entropyd ) |
94 |
+" |
95 |
+ |
96 |
+PATCHES=( |
97 |
+ "${FILESDIR}/${PN}-1.9.8c-threads_build_fix.patch" |
98 |
+) |
99 |
+ |
100 |
+src_configure() { |
101 |
+ local myeconfargs=( |
102 |
+ $(use_enable static-libs static) |
103 |
+ $(use_enable threads) |
104 |
+ --bindir=/usr/sbin |
105 |
+ --enable-nistest |
106 |
+ ) |
107 |
+ econf "${myeconfargs[@]}" |
108 |
+} |
109 |
+ |
110 |
+src_install() { |
111 |
+ default |
112 |
+ |
113 |
+ # Install gentoo ones instead |
114 |
+ newinitd "${FILESDIR}"/haveged-init.d.3 haveged |
115 |
+ newconfd "${FILESDIR}"/haveged-conf.d haveged |
116 |
+ |
117 |
+ systemd_newunit "${FILESDIR}"/service.gentoo ${PN}.service |
118 |
+ insinto /etc |
119 |
+ doins "${FILESDIR}"/haveged.conf |
120 |
+} |