1 |
flameeyes 09/09/29 12:03:21 |
2 |
|
3 |
Modified: ChangeLog |
4 |
Added: ekeyd-1.0.5-r2.ebuild |
5 |
Removed: ekeyd-1.0.5-r1.ebuild |
6 |
Log: |
7 |
New revision, thanks to the comments from Rob Kendrick (upstream); the init script now uses lsusb, and is only installed for non-Linux systems, while the correct udev rules are installed on Linux. Add a check for the CDC driver, and also add warnings about both the userland USB and CDC options. |
8 |
(Portage version: 2.2_rc42/cvs/Linux x86_64) |
9 |
|
10 |
Revision Changes Path |
11 |
1.3 app-crypt/ekeyd/ChangeLog |
12 |
|
13 |
file : http://sources.gentoo.org/viewcvs.py/gentoo-x86/app-crypt/ekeyd/ChangeLog?rev=1.3&view=markup |
14 |
plain: http://sources.gentoo.org/viewcvs.py/gentoo-x86/app-crypt/ekeyd/ChangeLog?rev=1.3&content-type=text/plain |
15 |
diff : http://sources.gentoo.org/viewcvs.py/gentoo-x86/app-crypt/ekeyd/ChangeLog?r1=1.2&r2=1.3 |
16 |
|
17 |
Index: ChangeLog |
18 |
=================================================================== |
19 |
RCS file: /var/cvsroot/gentoo-x86/app-crypt/ekeyd/ChangeLog,v |
20 |
retrieving revision 1.2 |
21 |
retrieving revision 1.3 |
22 |
diff -u -r1.2 -r1.3 |
23 |
--- ChangeLog 28 Sep 2009 18:29:35 -0000 1.2 |
24 |
+++ ChangeLog 29 Sep 2009 12:03:20 -0000 1.3 |
25 |
@@ -1,6 +1,17 @@ |
26 |
# ChangeLog for app-crypt/ekeyd |
27 |
# Copyright 1999-2009 Gentoo Foundation; Distributed under the GPL v2 |
28 |
-# $Header: /var/cvsroot/gentoo-x86/app-crypt/ekeyd/ChangeLog,v 1.2 2009/09/28 18:29:35 flameeyes Exp $ |
29 |
+# $Header: /var/cvsroot/gentoo-x86/app-crypt/ekeyd/ChangeLog,v 1.3 2009/09/29 12:03:20 flameeyes Exp $ |
30 |
+ |
31 |
+*ekeyd-1.0.5-r2 (29 Sep 2009) |
32 |
+ |
33 |
+ 29 Sep 2009; Diego E. Pettenò <flameeyes@g.o> |
34 |
+ -ekeyd-1.0.5-r1.ebuild, +ekeyd-1.0.5-r2.ebuild, files/ekey-ulusbd.conf, |
35 |
+ files/ekey-ulusbd.init: |
36 |
+ New revision, thanks to the comments from Rob Kendrick (upstream); the |
37 |
+ init script now uses lsusb, and is only installed for non-Linux systems, |
38 |
+ while the correct udev rules are installed on Linux. Add a check for the |
39 |
+ CDC driver, and also add warnings about both the userland USB and CDC |
40 |
+ options. |
41 |
|
42 |
*ekeyd-1.0.5-r1 (28 Sep 2009) |
43 |
|
44 |
|
45 |
|
46 |
|
47 |
1.1 app-crypt/ekeyd/ekeyd-1.0.5-r2.ebuild |
48 |
|
49 |
file : http://sources.gentoo.org/viewcvs.py/gentoo-x86/app-crypt/ekeyd/ekeyd-1.0.5-r2.ebuild?rev=1.1&view=markup |
50 |
plain: http://sources.gentoo.org/viewcvs.py/gentoo-x86/app-crypt/ekeyd/ekeyd-1.0.5-r2.ebuild?rev=1.1&content-type=text/plain |
51 |
|
52 |
Index: ekeyd-1.0.5-r2.ebuild |
53 |
=================================================================== |
54 |
# Copyright 1999-2009 Gentoo Foundation |
55 |
# Distributed under the terms of the GNU General Public License v2 |
56 |
# $Header: /var/cvsroot/gentoo-x86/app-crypt/ekeyd/ekeyd-1.0.5-r2.ebuild,v 1.1 2009/09/29 12:03:20 flameeyes Exp $ |
57 |
|
58 |
EAPI=2 |
59 |
|
60 |
inherit multilib linux-info |
61 |
|
62 |
DESCRIPTION="Entropy Key userspace daemon" |
63 |
HOMEPAGE="http://www.entropykey.co.uk/" |
64 |
SRC_URI="http://www.entropykey.co.uk/res/download/${P}.tar.gz" |
65 |
|
66 |
LICENSE="as-is" # yes, truly |
67 |
|
68 |
SLOT="0" |
69 |
|
70 |
KEYWORDS="~amd64 ~x86" |
71 |
|
72 |
IUSE="usb kernel_linux" |
73 |
|
74 |
RDEPEND="dev-lang/lua |
75 |
usb? ( dev-libs/libusb:0 )" |
76 |
DEPEND="${RDEPEND}" |
77 |
RDEPEND="${RDEPEND} |
78 |
dev-libs/luasocket |
79 |
kernel_linux? ( sys-fs/udev ) |
80 |
usb? ( !kernel_linux? ( sys-apps/usbutils ) )" |
81 |
|
82 |
CONFIG_CHECK="USB_ACM" |
83 |
|
84 |
pkg_setup() { |
85 |
if use kernel_linux && ! use usb && linux_config_exists; then |
86 |
check_extra_config |
87 |
fi |
88 |
} |
89 |
|
90 |
src_prepare() { |
91 |
# - avoid using -Werror; |
92 |
# - don't gzip the man pages, this will also stop it from |
93 |
# installing them, so we'll do it by hand. |
94 |
sed -i \ |
95 |
-e 's:-Werror::' \ |
96 |
-e '/gzip/d' \ |
97 |
daemon/Makefile || die |
98 |
|
99 |
# We moved the binaries around |
100 |
sed -i -e 's:$BINPATH/ekey-ulusbd:/usr/libexec/ekey-ulusbd:' \ |
101 |
doc/ekeyd-udev || die |
102 |
} |
103 |
|
104 |
src_compile() { |
105 |
local osname |
106 |
|
107 |
# Override automatic detection: upstream provides this with uname, |
108 |
# we don't like using uname. |
109 |
case ${CHOST} in |
110 |
*-linux-*) |
111 |
osname=linux;; |
112 |
*-freebsd*) |
113 |
osname=freebsd;; |
114 |
*-kfrebsd-gnu) |
115 |
osname=gnukfreebsd;; |
116 |
*-openbsd*) |
117 |
osname=openbsd;; |
118 |
*) |
119 |
die "Unsupported operating system!" |
120 |
;; |
121 |
esac |
122 |
|
123 |
# We don't slot LUA so we don't really need to have the variables |
124 |
# set at all. |
125 |
emake -C daemon \ |
126 |
LUA_V= LUA_INC= \ |
127 |
OSNAME=${osname} \ |
128 |
OPT="${CFLAGS}" \ |
129 |
BUILD_ULUSBD=$(use usb && echo yes || echo no) \ |
130 |
|| die "emake failed" |
131 |
} |
132 |
|
133 |
src_install() { |
134 |
emake -C daemon \ |
135 |
DESTDIR="${D}" \ |
136 |
BUILD_ULUSBD=$(use usb && echo yes || echo no) \ |
137 |
install || die "emake install failed" |
138 |
|
139 |
# We move the daemons around to avoid polluting the available |
140 |
# commands. |
141 |
dodir /usr/libexec |
142 |
mv "${D}"/usr/sbin/ekey*d "${D}"/usr/libexec |
143 |
|
144 |
keepdir /etc/ekeyd |
145 |
|
146 |
# Install them manually because we don't want them gzipped |
147 |
doman daemon/{ekeyd,ekey-setkey,ekey-rekey,ekeydctl}.8 \ |
148 |
daemon/ekeyd.conf.5 || die |
149 |
|
150 |
newinitd "${FILESDIR}"/${PN}.init ${PN} || die |
151 |
|
152 |
if use usb; then |
153 |
if ! use kernel_linux; then |
154 |
newinitd "${FILESDIR}"/ekey-ulusbd.init ekey-ulusbd || die |
155 |
newconfd "${FILESDIR}"/ekey-ulusbd.conf ekey-ulusbd || die |
156 |
fi |
157 |
doman daemon/ekey-ulusbd.8 || die |
158 |
fi |
159 |
|
160 |
dodoc daemon/README* AUTHORS WARNING || die |
161 |
|
162 |
if use kernel_linux; then |
163 |
insinto /etc/udev/rules.d |
164 |
if use usb; then |
165 |
newins doc/60-UDEKEY01-UDS.rules 70-ekey-ulusbd.rules || die |
166 |
else |
167 |
newins doc/60-UDEKEY01.rules 70-${PN}.rules || die |
168 |
fi |
169 |
|
170 |
exeinto /$(get_libdir)/udev |
171 |
doexe doc/ekeyd-udev || die |
172 |
fi |
173 |
} |
174 |
|
175 |
pkg_postinst() { |
176 |
elog "To make use of your entropykey, make sure to execute ekey-rekey" |
177 |
elog "the first time, and then start the ekeyd service." |
178 |
elog "" |
179 |
elog "The service supports multiplexing if you wish to use multiple" |
180 |
elog "keys, just symlink /etc/init.d/ekeyd → /etc/init.d/ekeyd.identifier" |
181 |
elog "and it'll be looking for /etc/init.d/identifier.conf" |
182 |
elog "" |
183 |
|
184 |
if use usb; then |
185 |
if use kernel_linux; then |
186 |
elog "You're going to use the userland USB daemon, the udev rules" |
187 |
elog "will be used accordingly. If you want to use the CDC driver" |
188 |
elog "please disable the usb USE flag." |
189 |
else |
190 |
elog "You're going to use the userland USB daemon, since your OS" |
191 |
elog "does not support udev, you should start the ekey-ulusbd" |
192 |
elog "service before ekeyd." |
193 |
fi |
194 |
else |
195 |
if use kernel_linux; then |
196 |
elog "Some versions of Linux have a faulty CDC ACM driver that stops" |
197 |
elog "EntropyKey from working properly; please check the compatibility" |
198 |
elog "table at http://www.entropykey.co.uk/download/" |
199 |
else |
200 |
elog "Make sure your operating system supports the CDC ACM driver" |
201 |
elog "or otherwise you won't be able to use the EntropyKey." |
202 |
fi |
203 |
elog "" |
204 |
elog "If you're unsure about the working state of the CDC ACM driver" |
205 |
elog "enable the usb USE flag and use the userland USB daemon" |
206 |
fi |
207 |
} |