1 |
flameeyes 11/11/01 09:55:12 |
2 |
|
3 |
Modified: ChangeLog |
4 |
Added: ekeyd-1.1.4-r2.ebuild |
5 |
Removed: ekeyd-1.1.4-r1.ebuild |
6 |
Log: |
7 |
Patch the udev rules to not use the deprecated BUS match (bug #388821). |
8 |
|
9 |
(Portage version: 2.2.0_alpha72/cvs/Linux x86_64) |
10 |
|
11 |
Revision Changes Path |
12 |
1.26 app-crypt/ekeyd/ChangeLog |
13 |
|
14 |
file : http://sources.gentoo.org/viewvc.cgi/gentoo-x86/app-crypt/ekeyd/ChangeLog?rev=1.26&view=markup |
15 |
plain: http://sources.gentoo.org/viewvc.cgi/gentoo-x86/app-crypt/ekeyd/ChangeLog?rev=1.26&content-type=text/plain |
16 |
diff : http://sources.gentoo.org/viewvc.cgi/gentoo-x86/app-crypt/ekeyd/ChangeLog?r1=1.25&r2=1.26 |
17 |
|
18 |
Index: ChangeLog |
19 |
=================================================================== |
20 |
RCS file: /var/cvsroot/gentoo-x86/app-crypt/ekeyd/ChangeLog,v |
21 |
retrieving revision 1.25 |
22 |
retrieving revision 1.26 |
23 |
diff -u -r1.25 -r1.26 |
24 |
--- ChangeLog 20 Oct 2011 11:40:28 -0000 1.25 |
25 |
+++ ChangeLog 1 Nov 2011 09:55:11 -0000 1.26 |
26 |
@@ -1,6 +1,12 @@ |
27 |
# ChangeLog for app-crypt/ekeyd |
28 |
# Copyright 1999-2011 Gentoo Foundation; Distributed under the GPL v2 |
29 |
-# $Header: /var/cvsroot/gentoo-x86/app-crypt/ekeyd/ChangeLog,v 1.25 2011/10/20 11:40:28 flameeyes Exp $ |
30 |
+# $Header: /var/cvsroot/gentoo-x86/app-crypt/ekeyd/ChangeLog,v 1.26 2011/11/01 09:55:11 flameeyes Exp $ |
31 |
+ |
32 |
+*ekeyd-1.1.4-r2 (01 Nov 2011) |
33 |
+ |
34 |
+ 01 Nov 2011; Diego E. Pettenò <flameeyes@g.o> +ekeyd-1.1.4-r2.ebuild, |
35 |
+ -ekeyd-1.1.4-r1.ebuild, files/ekeyd-1.1.4-gentoo.patch: |
36 |
+ Patch the udev rules to not use the deprecated BUS match (bug #388821). |
37 |
|
38 |
*ekeyd-1.1.4-r1 (20 Oct 2011) |
39 |
|
40 |
|
41 |
|
42 |
|
43 |
1.1 app-crypt/ekeyd/ekeyd-1.1.4-r2.ebuild |
44 |
|
45 |
file : http://sources.gentoo.org/viewvc.cgi/gentoo-x86/app-crypt/ekeyd/ekeyd-1.1.4-r2.ebuild?rev=1.1&view=markup |
46 |
plain: http://sources.gentoo.org/viewvc.cgi/gentoo-x86/app-crypt/ekeyd/ekeyd-1.1.4-r2.ebuild?rev=1.1&content-type=text/plain |
47 |
|
48 |
Index: ekeyd-1.1.4-r2.ebuild |
49 |
=================================================================== |
50 |
# Copyright 1999-2011 Gentoo Foundation |
51 |
# Distributed under the terms of the GNU General Public License v2 |
52 |
# $Header: /var/cvsroot/gentoo-x86/app-crypt/ekeyd/ekeyd-1.1.4-r2.ebuild,v 1.1 2011/11/01 09:55:11 flameeyes Exp $ |
53 |
|
54 |
EAPI=4 |
55 |
|
56 |
inherit multilib linux-info toolchain-funcs |
57 |
|
58 |
DESCRIPTION="Entropy Key userspace daemon" |
59 |
HOMEPAGE="http://www.entropykey.co.uk/" |
60 |
SRC_URI="http://www.entropykey.co.uk/res/download/${P}.tar.gz" |
61 |
|
62 |
LICENSE="as-is" # yes, truly |
63 |
|
64 |
SLOT="0" |
65 |
|
66 |
KEYWORDS="~amd64 ~x86" |
67 |
|
68 |
IUSE="usb kernel_linux munin minimal" |
69 |
|
70 |
EKEYD_RDEPEND="dev-lang/lua |
71 |
usb? ( virtual/libusb:0 )" |
72 |
EKEYD_DEPEND="${EKEYD_RDEPEND}" |
73 |
EKEYD_RDEPEND="${EKEYD_RDEPEND} |
74 |
dev-lua/luasocket |
75 |
kernel_linux? ( >=sys-fs/udev-147 ) |
76 |
usb? ( !kernel_linux? ( sys-apps/usbutils ) ) |
77 |
munin? ( net-analyzer/munin )" |
78 |
|
79 |
RDEPEND="!minimal? ( ${EKEYD_RDEPEND} ) |
80 |
!app-crypt/ekey-egd-linux |
81 |
sys-apps/openrc" |
82 |
DEPEND="!minimal? ( ${EKEYD_DEPEND} )" |
83 |
|
84 |
CONFIG_CHECK="~USB_ACM" |
85 |
|
86 |
REQUIRED_USE="minimal? ( !munin !usb )" |
87 |
|
88 |
pkg_setup() { |
89 |
if ! use minimal && use kernel_linux && ! use usb && linux_config_exists; then |
90 |
check_extra_config |
91 |
fi |
92 |
} |
93 |
|
94 |
src_prepare() { |
95 |
epatch "${FILESDIR}"/${P}-gentoo.patch |
96 |
} |
97 |
|
98 |
src_compile() { |
99 |
local osname |
100 |
|
101 |
# Override automatic detection: upstream provides this with uname, |
102 |
# we don't like using uname. |
103 |
case ${CHOST} in |
104 |
*-linux-*) |
105 |
osname=linux;; |
106 |
*-freebsd*) |
107 |
osname=freebsd;; |
108 |
*-kfrebsd-gnu) |
109 |
osname=gnukfreebsd;; |
110 |
*-openbsd*) |
111 |
osname=openbsd;; |
112 |
*) |
113 |
die "Unsupported operating system!" |
114 |
;; |
115 |
esac |
116 |
|
117 |
# We don't slot LUA so we don't really need to have the variables |
118 |
# set at all. |
119 |
emake -C host \ |
120 |
CC="$(tc-getCC)" \ |
121 |
LUA_V= LUA_INC= \ |
122 |
OSNAME=${osname} \ |
123 |
OPT="${CFLAGS}" \ |
124 |
BUILD_ULUSBD=$(use usb && echo yes || echo no) \ |
125 |
$(use minimal && echo egd-linux) |
126 |
} |
127 |
|
128 |
src_install() { |
129 |
exeinto /usr/libexec |
130 |
newexe host/egd-linux ekey-egd-linux |
131 |
newman host/egd-linux.8 ekey-egd-linux.8 |
132 |
|
133 |
newconfd "${FILESDIR}"/ekey-egd-linux.conf.2 ekey-egd-linux |
134 |
newinitd "${FILESDIR}"/ekey-egd-linux.init.2 ekey-egd-linux |
135 |
|
136 |
dodoc doc/* AUTHORS ChangeLog THANKS |
137 |
|
138 |
use minimal && return |
139 |
# from here on, install everything that is not part of the minimal |
140 |
# support. |
141 |
|
142 |
emake -C host \ |
143 |
DESTDIR="${D}" \ |
144 |
MANZCMD=cat MANZEXT= \ |
145 |
install-ekeyd $(use usb && echo install-ekey-ulusbd) |
146 |
|
147 |
# We move the daemons around to avoid polluting the available |
148 |
# commands. |
149 |
dodir /usr/libexec |
150 |
mv "${D}"/usr/sbin/ekey*d "${D}"/usr/libexec |
151 |
|
152 |
newinitd "${FILESDIR}"/${PN}.init.2 ${PN} |
153 |
|
154 |
if use usb && ! use kernel_linux; then |
155 |
newinitd "${FILESDIR}"/ekey-ulusbd.init.2 ekey-ulusbd |
156 |
newconfd "${FILESDIR}"/ekey-ulusbd.conf.2 ekey-ulusbd |
157 |
fi |
158 |
|
159 |
if use kernel_linux; then |
160 |
local rules=udev/fedora15/60-entropykey.rules |
161 |
use usb && rules=udev/fedora15/60-entropykey-uds.rules |
162 |
|
163 |
insinto /lib/udev/rules.d |
164 |
newins ${rules} 70-${PN}.rules |
165 |
|
166 |
exeinto /lib/udev |
167 |
doexe udev/entropykey.sh |
168 |
fi |
169 |
|
170 |
if use munin; then |
171 |
exeinto /usr/libexec/munin/plugins |
172 |
doexe munin/ekeyd_stat_ |
173 |
|
174 |
insinto /etc/munin/plugin-conf.d |
175 |
newins munin/plugin-conf.d_ekeyd ekeyd |
176 |
fi |
177 |
} |
178 |
|
179 |
pkg_postinst() { |
180 |
elog "${CATEGORY}/${PN} now install also the EGD client service ekey-egd-linux." |
181 |
elog "To use this service, you need enable EGDTCPSocket for the ekeyd service" |
182 |
elog "managing the key(s)." |
183 |
elog "" |
184 |
elog "The daemon will send more entropy to the kernel once the available pool" |
185 |
elog "falls below the value set in the kernel.random.write_wakeup_threshold" |
186 |
elog "sysctl entry." |
187 |
elog "" |
188 |
ewarn "Since version 1.1.4-r1, ekey-egd-linux will *not* set the watermark for" |
189 |
ewarn "you, instead you'll have to configure the sysctl in /etc/sysctl.conf" |
190 |
|
191 |
use minimal && return |
192 |
# from here on, document everything that is not part of the minimal |
193 |
# support. |
194 |
|
195 |
elog "" |
196 |
elog "To make use of your EntropyKey, make sure to execute ekey-rekey" |
197 |
elog "the first time, and then start the ekeyd service." |
198 |
elog "" |
199 |
elog "By default ekeyd will feed the entropy directly to the kernel's pool;" |
200 |
elog "if your system has jumps in load average, you might prefer using the" |
201 |
elog "EGD compatibility mode, by enabling EGDTCPSocket for ekeyd and then" |
202 |
elog "starting the ekey-egd-linux service." |
203 |
elog "" |
204 |
elog "The same applies if you intend to provide entropy for multiple hosts" |
205 |
elog "over the network. If you want to have the ekey-egd-linux service on" |
206 |
elog "other hosts, you can enable the 'minimal' USE flag." |
207 |
elog "" |
208 |
elog "The service supports multiplexing if you wish to use multiple" |
209 |
elog "keys, just symlink /etc/init.d/ekeyd → /etc/init.d/ekeyd.identifier" |
210 |
elog "and it'll be looking for /etc/entropykey/identifier.conf" |
211 |
elog "" |
212 |
|
213 |
if use usb; then |
214 |
if use kernel_linux; then |
215 |
elog "You're going to use the userland USB daemon, the udev rules" |
216 |
elog "will be used accordingly. If you want to use the CDC driver" |
217 |
elog "please disable the usb USE flag." |
218 |
else |
219 |
elog "You're going to use the userland USB daemon, since your OS" |
220 |
elog "does not support udev, you should start the ekey-ulusbd" |
221 |
elog "service before ekeyd." |
222 |
fi |
223 |
|
224 |
ewarn "The userland USB daemon has multiple known issues. If you can," |
225 |
ewarn "please consider disabling the 'usb' USE flag and instead use the" |
226 |
ewarn "CDC-ACM access method." |
227 |
else |
228 |
if use kernel_linux; then |
229 |
elog "Some versions of Linux have a faulty CDC ACM driver that stops" |
230 |
elog "EntropyKey from working properly; please check the compatibility" |
231 |
elog "table at http://www.entropykey.co.uk/download/" |
232 |
else |
233 |
elog "Make sure your operating system supports the CDC ACM driver" |
234 |
elog "or otherwise you won't be able to use the EntropyKey." |
235 |
fi |
236 |
elog "" |
237 |
elog "If you're unsure about the working state of the CDC ACM driver" |
238 |
elog "enable the usb USE flag and use the userland USB daemon" |
239 |
fi |
240 |
} |