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