Gentoo Archives: gentoo-commits

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