1 |
commit: 76e53b38578266e4a8f657c2db67c13c6ae72150 |
2 |
Author: Göktürk Yüksek <gokturk <AT> gentoo <DOT> org> |
3 |
AuthorDate: Wed Sep 19 20:48:33 2018 +0000 |
4 |
Commit: Göktürk Yüksek <gokturk <AT> gentoo <DOT> org> |
5 |
CommitDate: Wed Sep 19 20:49:54 2018 +0000 |
6 |
URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=76e53b38 |
7 |
|
8 |
sys-apps/rng-tools: bump to 6.4 |
9 |
|
10 |
Package-Manager: Portage-2.3.49, Repoman-2.3.10 |
11 |
|
12 |
sys-apps/rng-tools/Manifest | 1 + |
13 |
.../rng-tools-6.4-jitterentropy-linking-fix.patch | 36 +++++++++++ |
14 |
sys-apps/rng-tools/rng-tools-6.4.ebuild | 69 ++++++++++++++++++++++ |
15 |
3 files changed, 106 insertions(+) |
16 |
|
17 |
diff --git a/sys-apps/rng-tools/Manifest b/sys-apps/rng-tools/Manifest |
18 |
index 6e3960c5627..8146fd915f2 100644 |
19 |
--- a/sys-apps/rng-tools/Manifest |
20 |
+++ b/sys-apps/rng-tools/Manifest |
21 |
@@ -3,4 +3,5 @@ DIST rng-tools-6.1.tar.gz 29814 BLAKE2B 4102c03ced36b33f9db6f7e5f77e8f918c4b9286 |
22 |
DIST rng-tools-6.2.tar.gz 30421 BLAKE2B 646628095cbc611aee4113198e0874b5f0672cd787f04f1649ff350883edebe6b31753aef3ac2bca1f05eedcf3c1400435c084382bde9f97fe6dcdd71adf18c2 SHA512 ffd8be5b232f092f8bcfdb6281580ce9053ec8bb87ff6bcae76585c38e3e91b9e464a9544a33ecd9814a9f244a89bac973d15c9bd3560d1164559685c720d174 |
23 |
DIST rng-tools-6.3.1.tar.gz 31797 BLAKE2B 00d75d8436b4b49798bca8fb76e43a98feac8805b47a57d2315c22e72ed3dff30c6305b206168531c85c0576dc1d9864585eb3d4c2af833e9bec8dc5a478e19b SHA512 cb85674e6448e8152f92b4a82e944a9258dcc9ce68349404c0000c09378ac5f6fb298c50ed2d9a1b18d76c5f35b0a4884d5efd0f4dd434ec0952107e0738b937 |
24 |
DIST rng-tools-6.3.tar.gz 31474 BLAKE2B 4d3924b3ca85d31d1999ceb45908cf64e8d2978d2e0aa638d9bbd3054a11a41251f9db54db35583c8fc080fd0667387cd63792c15486048d1f52300217e02fa9 SHA512 c00ac28c059ba689f114480958fe993e2199a1428137b151779a0331b9cc5a667f08770aa7b28d98c801166a509e8bd40d6b92f5c29b6ff73eb50a1cb0f2dd13 |
25 |
+DIST rng-tools-6.4.tar.gz 41248 BLAKE2B 16000e0779cf7aa25936a95661a0c40d4f0f12ed91fa36160924782d22a1057838bfb466f60614f91ef6c5576e0a29b6c1028bb72d5f5403c9a61d8f5ec16edd SHA512 12da9819b6e9a9ea688e82d1689642a690f6c9d78ad5fcf159a71b37a49f79120c8f62d4e1b8e81a496eac46a28137c5c87973499b31e1881a7866de99a168f0 |
26 |
DIST rng-tools-6.tar.gz 26024 BLAKE2B a523328fcce56997e2847940cdc096abd5a539135f857f0a4cd3d782a1659f4d2978870149caac47b839c80788df6a3d891adcd39371d5968149dd29bc46bc62 SHA512 2aea947c4dba5e8c4df33396957f7224b62200be0e3d10aac08c84155fa473a67df5f49e07a07b2cbea4dfd772d90c1b194e8fce3d8eea762463a7f4a16d6ce4 |
27 |
|
28 |
diff --git a/sys-apps/rng-tools/files/rng-tools-6.4-jitterentropy-linking-fix.patch b/sys-apps/rng-tools/files/rng-tools-6.4-jitterentropy-linking-fix.patch |
29 |
new file mode 100644 |
30 |
index 00000000000..e6cf95d13f3 |
31 |
--- /dev/null |
32 |
+++ b/sys-apps/rng-tools/files/rng-tools-6.4-jitterentropy-linking-fix.patch |
33 |
@@ -0,0 +1,36 @@ |
34 |
+From ac00de69665a14bc1884be90ec83f8e8bc4d69f0 Mon Sep 17 00:00:00 2001 |
35 |
+From: =?UTF-8?q?G=C3=B6kt=C3=BCrk=20Y=C3=BCksek?= <gokturk@g.o> |
36 |
+Date: Wed, 19 Sep 2018 16:45:37 -0400 |
37 |
+Subject: [PATCH] Makefile.am: use the libjitterentropy available on the system |
38 |
+ |
39 |
+--- |
40 |
+ Makefile.am | 6 ++---- |
41 |
+ 1 file changed, 2 insertions(+), 4 deletions(-) |
42 |
+ |
43 |
+diff --git a/Makefile.am b/Makefile.am |
44 |
+index fa8ecca..abc759a 100644 |
45 |
+--- a/Makefile.am |
46 |
++++ b/Makefile.am |
47 |
+@@ -2,9 +2,7 @@ |
48 |
+ ## Toplevel Makefile.am for rng-tools |
49 |
+ ## |
50 |
+ if JITTER |
51 |
+- JSUBDIR = jitterentropy-library |
52 |
+- JSUBLIB = ./jitterentropy-library/libjitterentropy.a |
53 |
+- AM_CPPFLAGS = -I./jitterentropy-library |
54 |
++ jitterentropy_LIBS = -ljitterentropy |
55 |
+ endif |
56 |
+ |
57 |
+ SUBDIRS = contrib tests $(JSUBDIR) |
58 |
+@@ -33,7 +31,7 @@ if JITTER |
59 |
+ rngd_SOURCES += rngd_jitter.c |
60 |
+ endif |
61 |
+ |
62 |
+-rngd_LDADD = librngd.a -lsysfs $(JSUBLIB) ${libcurl_LIBS} ${libxml2_LIBS} ${openssl_LIBS} $(PTHREAD_LIBS) |
63 |
++rngd_LDADD = librngd.a -lsysfs $(jitterentropy_LIBS) ${libcurl_LIBS} ${libxml2_LIBS} ${openssl_LIBS} $(PTHREAD_LIBS) |
64 |
+ |
65 |
+ rngd_CFLAGS = ${libxml2_CFLAGS} ${openssl_CFLAGS} $(PTHREAD_CFLAGS) |
66 |
+ rngd_LDFLAGS = $(PTHREAD_CFLAGS) |
67 |
+-- |
68 |
+2.19.0 |
69 |
+ |
70 |
|
71 |
diff --git a/sys-apps/rng-tools/rng-tools-6.4.ebuild b/sys-apps/rng-tools/rng-tools-6.4.ebuild |
72 |
new file mode 100644 |
73 |
index 00000000000..6c2cc7c69ab |
74 |
--- /dev/null |
75 |
+++ b/sys-apps/rng-tools/rng-tools-6.4.ebuild |
76 |
@@ -0,0 +1,69 @@ |
77 |
+# Copyright 1999-2018 Gentoo Foundation |
78 |
+# Distributed under the terms of the GNU General Public License v2 |
79 |
+ |
80 |
+EAPI=6 |
81 |
+ |
82 |
+inherit autotools systemd toolchain-funcs |
83 |
+ |
84 |
+DESCRIPTION="Daemon to use hardware random number generators" |
85 |
+HOMEPAGE="https://github.com/nhorman/rng-tools" |
86 |
+SRC_URI="https://github.com/nhorman/${PN}/archive/v${PV}.tar.gz -> ${P}.tar.gz" |
87 |
+ |
88 |
+LICENSE="GPL-2" |
89 |
+SLOT="0" |
90 |
+KEYWORDS="~alpha ~amd64 ~arm ~ia64 ~ppc ~x86" |
91 |
+IUSE="jitterentropy nistbeacon selinux" |
92 |
+ |
93 |
+DEPEND="dev-libs/libgcrypt:0 |
94 |
+ dev-libs/libgpg-error |
95 |
+ sys-fs/sysfsutils |
96 |
+ jitterentropy? ( |
97 |
+ app-crypt/jitterentropy:= |
98 |
+ ) |
99 |
+ nistbeacon? ( |
100 |
+ net-misc/curl[ssl] |
101 |
+ dev-libs/libxml2:2= |
102 |
+ dev-libs/openssl:0= |
103 |
+ ) |
104 |
+" |
105 |
+RDEPEND="${DEPEND} |
106 |
+ selinux? ( sec-policy/selinux-rngd )" |
107 |
+DEPEND="${DEPEND} |
108 |
+ nistbeacon? ( |
109 |
+ virtual/pkgconfig |
110 |
+ ) |
111 |
+" |
112 |
+ |
113 |
+PATCHES=( |
114 |
+ "${FILESDIR}"/test-for-argp.patch |
115 |
+ "${FILESDIR}"/${PN}-5-fix-textrels-on-PIC-x86.patch #469962 |
116 |
+ "${FILESDIR}"/${PN}-6.4-jitterentropy-linking-fix.patch |
117 |
+) |
118 |
+ |
119 |
+src_prepare() { |
120 |
+ echo 'bin_PROGRAMS = randstat' >> contrib/Makefile.am || die |
121 |
+ default |
122 |
+ |
123 |
+ mv README.md README || die |
124 |
+ |
125 |
+ if use jitterentropy; then |
126 |
+ # Fool the build system into thinking that |
127 |
+ # jitterentropy source code exists |
128 |
+ touch "${S}"/jitterentropy-library/Makefile || die |
129 |
+ fi |
130 |
+ eautoreconf |
131 |
+ |
132 |
+ sed -i '/^AR /d' Makefile.in || die |
133 |
+ tc-export AR |
134 |
+} |
135 |
+ |
136 |
+src_configure() { |
137 |
+ econf $(use_with nistbeacon) |
138 |
+} |
139 |
+ |
140 |
+src_install() { |
141 |
+ default |
142 |
+ newinitd "${FILESDIR}"/rngd-initd-6 rngd |
143 |
+ newconfd "${FILESDIR}"/rngd-confd-4.1 rngd |
144 |
+ systemd_dounit "${FILESDIR}"/rngd.service |
145 |
+} |