1 |
commit: c6a8fda5117616d36874aff862fc8093953e5e44 |
2 |
Author: Lars Wendler <polynomial-c <AT> gentoo <DOT> org> |
3 |
AuthorDate: Mon Aug 14 12:07:03 2017 +0000 |
4 |
Commit: Lars Wendler <polynomial-c <AT> gentoo <DOT> org> |
5 |
CommitDate: Mon Aug 14 13:35:42 2017 +0000 |
6 |
URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=c6a8fda5 |
7 |
|
8 |
sys-apps/rng-tools: Bump to version 6 |
9 |
|
10 |
Package-Manager: Portage-2.3.7, Repoman-2.3.3 |
11 |
|
12 |
sys-apps/rng-tools/Manifest | 1 + |
13 |
.../rng-tools/files/rng-tools-5-fix-noctty.patch | 4 +- |
14 |
.../files/rng-tools-5-man-fill-watermark.patch | 4 +- |
15 |
.../files/rng-tools-5-man-rng-device.patch | 4 +- |
16 |
...x-noctty.patch => rng-tools-6-fix-noctty.patch} | 18 ++++----- |
17 |
sys-apps/rng-tools/files/test-for-argp.patch | 4 +- |
18 |
sys-apps/rng-tools/rng-tools-6.ebuild | 46 ++++++++++++++++++++++ |
19 |
7 files changed, 64 insertions(+), 17 deletions(-) |
20 |
|
21 |
diff --git a/sys-apps/rng-tools/Manifest b/sys-apps/rng-tools/Manifest |
22 |
index e8ef399c125..108daf63caa 100644 |
23 |
--- a/sys-apps/rng-tools/Manifest |
24 |
+++ b/sys-apps/rng-tools/Manifest |
25 |
@@ -1,2 +1,3 @@ |
26 |
DIST rng-tools-4.tar.gz 110943 SHA256 b71bdfd4222c05e8316001556be90e1606f2a1bac3efde60153bd84e873cc195 SHA512 328627a9ede924026c7a7c391b04be05f098d713d35f7f38d939d52b794853b4f6db3ae125568710ab5a59640236b343f3e9fc0f735806b020cc675c02f80b08 WHIRLPOOL da58bc7d3b7d9cdf6d83d258717f22ba3552482a690311fa2c820e4ce125a5e6c6e498e0b63461ed6c9dc16dff77b2cb47377933845fb9397efa205183346e5b |
27 |
DIST rng-tools-5.tar.gz 122182 SHA256 60a102b6603bbcce2da341470cad42eeaa9564a16b4490e7867026ca11a3078e SHA512 58047c37cad4f5f1210b696e4dba122878f78e57d05d9cb822f79234240ecce31efd2d39061fea1eb5b2e81d48d8c3bf6b92d06451f1ce5d5db7117704e89c50 WHIRLPOOL 073dbeb9d27189db44658a9f25657b93a320b125fbfc8230f7ce7849b8e7c1f7802b4c3a53de3417525b02739194fab8a6e5eb03d5db317a23deb275d72fbb21 |
28 |
+DIST rng-tools-6.tar.gz 26024 SHA256 6d9c3f72824d1ea15dd2a80bfcf71f6a73c8843c6344f7f774a97a4ca7641b4c SHA512 2aea947c4dba5e8c4df33396957f7224b62200be0e3d10aac08c84155fa473a67df5f49e07a07b2cbea4dfd772d90c1b194e8fce3d8eea762463a7f4a16d6ce4 WHIRLPOOL 4e53c626288219a7cb9c94cf29d22878df5ad3298ca5ebedea46978e519d9b5b0ad94f765e217563105258f4b02b72b0033e551a7d37939ced9ca5d92f0a1048 |
29 |
|
30 |
diff --git a/sys-apps/rng-tools/files/rng-tools-5-fix-noctty.patch b/sys-apps/rng-tools/files/rng-tools-5-fix-noctty.patch |
31 |
index a48b235ac17..568ebe04589 100644 |
32 |
--- a/sys-apps/rng-tools/files/rng-tools-5-fix-noctty.patch |
33 |
+++ b/sys-apps/rng-tools/files/rng-tools-5-fix-noctty.patch |
34 |
@@ -32,8 +32,8 @@ pinpointing the issue as well as confirming the fix. |
35 |
Gentoo-Bug-URL: https://bugs.gentoo.org/556456 |
36 |
Reported-By: John Bowler <jbowler@×××.org> |
37 |
|
38 |
---- rngd_entsource.c |
39 |
-+++ rngd_entsource.c |
40 |
+--- a/rngd_entsource.c |
41 |
++++ b/rngd_entsource.c |
42 |
@@ -175,7 +175,7 @@ |
43 |
*/ |
44 |
int init_entropy_source(struct rng *ent_src) |
45 |
|
46 |
diff --git a/sys-apps/rng-tools/files/rng-tools-5-man-fill-watermark.patch b/sys-apps/rng-tools/files/rng-tools-5-man-fill-watermark.patch |
47 |
index 4cedf8fc97d..ea249a5ebdf 100644 |
48 |
--- a/sys-apps/rng-tools/files/rng-tools-5-man-fill-watermark.patch |
49 |
+++ b/sys-apps/rng-tools/files/rng-tools-5-man-fill-watermark.patch |
50 |
@@ -2,8 +2,8 @@ https://bugs.gentoo.org/555094 |
51 |
|
52 |
patch by Gokturk Yuksek <gokturk@××××××××××.edu> |
53 |
|
54 |
---- rngd.8.in |
55 |
-+++ rngd.8.in |
56 |
+--- a/rngd.8.in |
57 |
++++ b/rngd.8.in |
58 |
@@ -66,7 +66,9 @@ |
59 |
.TP |
60 |
\fB\-W\fI n\fR, \fB\-\-fill\-watermark=\fInnn\fR |
61 |
|
62 |
diff --git a/sys-apps/rng-tools/files/rng-tools-5-man-rng-device.patch b/sys-apps/rng-tools/files/rng-tools-5-man-rng-device.patch |
63 |
index fd6b97eff32..82a0cf29576 100644 |
64 |
--- a/sys-apps/rng-tools/files/rng-tools-5-man-rng-device.patch |
65 |
+++ b/sys-apps/rng-tools/files/rng-tools-5-man-rng-device.patch |
66 |
@@ -2,8 +2,8 @@ https://bugs.gentoo.org/555106 |
67 |
|
68 |
patch by Gokturk Yuksek <gokturk@××××××××××.edu> |
69 |
|
70 |
---- rngd.8.in |
71 |
-+++ rngd.8.in |
72 |
+--- a/rngd.8.in |
73 |
++++ b/rngd.8.in |
74 |
@@ -59,7 +59,7 @@ |
75 |
.TP |
76 |
\fB\-r\fI file\fR, \fB\-\-rng-device=\fIfile\fR |
77 |
|
78 |
diff --git a/sys-apps/rng-tools/files/rng-tools-5-fix-noctty.patch b/sys-apps/rng-tools/files/rng-tools-6-fix-noctty.patch |
79 |
similarity index 83% |
80 |
copy from sys-apps/rng-tools/files/rng-tools-5-fix-noctty.patch |
81 |
copy to sys-apps/rng-tools/files/rng-tools-6-fix-noctty.patch |
82 |
index a48b235ac17..e915150adb5 100644 |
83 |
--- a/sys-apps/rng-tools/files/rng-tools-5-fix-noctty.patch |
84 |
+++ b/sys-apps/rng-tools/files/rng-tools-6-fix-noctty.patch |
85 |
@@ -32,14 +32,14 @@ pinpointing the issue as well as confirming the fix. |
86 |
Gentoo-Bug-URL: https://bugs.gentoo.org/556456 |
87 |
Reported-By: John Bowler <jbowler@×××.org> |
88 |
|
89 |
---- rngd_entsource.c |
90 |
-+++ rngd_entsource.c |
91 |
-@@ -175,7 +175,7 @@ |
92 |
- */ |
93 |
- int init_entropy_source(struct rng *ent_src) |
94 |
- { |
95 |
-- ent_src->rng_fd = open(ent_src->rng_name, O_RDONLY); |
96 |
-+ ent_src->rng_fd = open(ent_src->rng_name, O_RDONLY | O_NOCTTY); |
97 |
+--- rng-tools-rng-tools-6/rngd_entsource.c |
98 |
++++ rng-tools-rng-tools-6/rngd_entsource.c |
99 |
+@@ -162,7 +162,7 @@ |
100 |
+ struct sysfs_attribute *rngavail; |
101 |
+ char buf[16]; |
102 |
+ |
103 |
+- ent_src->rng_fd = open(ent_src->rng_fname, O_RDONLY); |
104 |
++ ent_src->rng_fd = open(ent_src->rng_fname, O_RDONLY | O_NOCTTY); |
105 |
if (ent_src->rng_fd == -1) { |
106 |
+ message(LOG_DAEMON|LOG_DEBUG, "Unable to open file: %s", ent_src->rng_fname); |
107 |
return 1; |
108 |
- } |
109 |
|
110 |
diff --git a/sys-apps/rng-tools/files/test-for-argp.patch b/sys-apps/rng-tools/files/test-for-argp.patch |
111 |
index 129a522e568..4ed2aa40b6d 100644 |
112 |
--- a/sys-apps/rng-tools/files/test-for-argp.patch |
113 |
+++ b/sys-apps/rng-tools/files/test-for-argp.patch |
114 |
@@ -10,8 +10,8 @@ Reported-by: Ed Wildgoose <gentoo@××××××××××.com> |
115 |
Signed-off-by: Anthony G. Basile <blueness@g.o> |
116 |
|
117 |
|
118 |
---- configure.ac.orig 2012-05-26 22:45:42.753478198 +0000 |
119 |
-+++ configure.ac 2012-05-27 00:36:23.175844081 +0000 |
120 |
+--- a/configure.ac |
121 |
++++ b/configure.ac |
122 |
@@ -47,6 +47,28 @@ |
123 |
dnl Checks for optional library functions |
124 |
dnl ------------------------------------- |
125 |
|
126 |
diff --git a/sys-apps/rng-tools/rng-tools-6.ebuild b/sys-apps/rng-tools/rng-tools-6.ebuild |
127 |
new file mode 100644 |
128 |
index 00000000000..3a559236e0c |
129 |
--- /dev/null |
130 |
+++ b/sys-apps/rng-tools/rng-tools-6.ebuild |
131 |
@@ -0,0 +1,46 @@ |
132 |
+# Copyright 1999-2017 Gentoo Foundation |
133 |
+# Distributed under the terms of the GNU General Public License v2 |
134 |
+ |
135 |
+EAPI=6 |
136 |
+ |
137 |
+inherit eutils autotools systemd toolchain-funcs |
138 |
+ |
139 |
+DESCRIPTION="Daemon to use hardware random number generators" |
140 |
+HOMEPAGE="https://github.com/nhorman/rng-tools" |
141 |
+SRC_URI="https://github.com/nhorman/${PN}/archive/${P}.tar.gz" |
142 |
+ |
143 |
+LICENSE="GPL-2" |
144 |
+SLOT="0" |
145 |
+KEYWORDS="~alpha ~amd64 ~arm ~ia64 ~ppc ~x86" |
146 |
+IUSE="selinux" |
147 |
+ |
148 |
+DEPEND="dev-libs/libgcrypt:0 |
149 |
+ dev-libs/libgpg-error" |
150 |
+RDEPEND="${DEPEND} |
151 |
+ sys-fs/sysfsutils |
152 |
+ selinux? ( sec-policy/selinux-rngd )" |
153 |
+ |
154 |
+S="${WORKDIR}/${PN}-${P}" |
155 |
+ |
156 |
+PATCHES=( |
157 |
+ "${FILESDIR}"/test-for-argp.patch |
158 |
+ "${FILESDIR}"/${PN}-5-fix-textrels-on-PIC-x86.patch #469962 |
159 |
+ "${FILESDIR}"/${PN}-5-man-fill-watermark.patch #555094 |
160 |
+ "${FILESDIR}"/${PN}-6-fix-noctty.patch #556456 |
161 |
+) |
162 |
+ |
163 |
+src_prepare() { |
164 |
+ echo 'bin_PROGRAMS = randstat' >> contrib/Makefile.am || die |
165 |
+ default |
166 |
+ eautoreconf |
167 |
+ |
168 |
+ sed -i '/^AR /d' Makefile.in || die |
169 |
+ tc-export AR |
170 |
+} |
171 |
+ |
172 |
+src_install() { |
173 |
+ default |
174 |
+ newinitd "${FILESDIR}"/rngd-initd-r1-4.1 rngd |
175 |
+ newconfd "${FILESDIR}"/rngd-confd-4.1 rngd |
176 |
+ systemd_dounit "${FILESDIR}"/rngd.service |
177 |
+} |