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