From mboxrd@z Thu Jan 1 00:00:00 1970 Received: from pigeon.gentoo.org ([208.92.234.80] helo=lists.gentoo.org) by finch.gentoo.org with esmtp (Exim 4.60) (envelope-from ) id 1MsbQR-0006y7-Cr for garchives@archives.gentoo.org; Tue, 29 Sep 2009 12:03:23 +0000 Received: from pigeon.gentoo.org (localhost [127.0.0.1]) by pigeon.gentoo.org (Postfix) with SMTP id EE1C7E0866; Tue, 29 Sep 2009 12:03:22 +0000 (UTC) Received: from smtp.gentoo.org (smtp.gentoo.org [140.211.166.183]) by pigeon.gentoo.org (Postfix) with ESMTP id A336AE0866 for ; Tue, 29 Sep 2009 12:03:22 +0000 (UTC) Received: from stork.gentoo.org (stork.gentoo.org [64.127.104.133]) (using TLSv1 with cipher AES256-SHA (256/256 bits)) (No client certificate requested) by smtp.gentoo.org (Postfix) with ESMTP id 494A767AC7 for ; Tue, 29 Sep 2009 12:03:22 +0000 (UTC) Received: from flameeyes by stork.gentoo.org with local (Exim 4.69) (envelope-from ) id 1MsbQP-0005Vb-R2 for gentoo-commits@lists.gentoo.org; Tue, 29 Sep 2009 12:03:21 +0000 From: "Diego Petteno (flameeyes)" To: gentoo-commits@lists.gentoo.org Reply-To: gentoo-dev@lists.gentoo.org, flameeyes@gentoo.org Subject: [gentoo-commits] gentoo-x86 commit in app-crypt/ekeyd/files: ekey-ulusbd.conf ekey-ulusbd.init X-VCS-Repository: gentoo-x86 X-VCS-Files: ekey-ulusbd.conf ekey-ulusbd.init X-VCS-Directories: app-crypt/ekeyd/files X-VCS-Committer: flameeyes X-VCS-Committer-Name: Diego Petteno Content-Type: text/plain; charset=utf8 Message-Id: Sender: Diego Petteno Date: Tue, 29 Sep 2009 12:03:21 +0000 Precedence: bulk List-Post: List-Help: List-Unsubscribe: List-Subscribe: List-Id: Gentoo Linux mail X-BeenThere: gentoo-commits@lists.gentoo.org Content-Transfer-Encoding: quoted-printable X-Archives-Salt: 0e9cf062-9d16-4eb1-a382-7f818ad41e3c X-Archives-Hash: 4d187296306cfb5cd159061c7d12d989 flameeyes 09/09/29 12:03:21 Modified: ekey-ulusbd.conf ekey-ulusbd.init Log: 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 opt= ions. (Portage version: 2.2_rc42/cvs/Linux x86_64) Revision Changes Path 1.2 app-crypt/ekeyd/files/ekey-ulusbd.conf file : http://sources.gentoo.org/viewcvs.py/gentoo-x86/app-crypt/ekeyd/fi= les/ekey-ulusbd.conf?rev=3D1.2&view=3Dmarkup plain: http://sources.gentoo.org/viewcvs.py/gentoo-x86/app-crypt/ekeyd/fi= les/ekey-ulusbd.conf?rev=3D1.2&content-type=3Dtext/plain diff : http://sources.gentoo.org/viewcvs.py/gentoo-x86/app-crypt/ekeyd/fi= les/ekey-ulusbd.conf?r1=3D1.1&r2=3D1.2 Index: ekey-ulusbd.conf =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D RCS file: /var/cvsroot/gentoo-x86/app-crypt/ekeyd/files/ekey-ulusbd.conf,= v retrieving revision 1.1 retrieving revision 1.2 diff -u -r1.1 -r1.2 --- ekey-ulusbd.conf 28 Sep 2009 18:29:36 -0000 1.1 +++ ekey-ulusbd.conf 29 Sep 2009 12:03:21 -0000 1.2 @@ -1,6 +1,6 @@ # Copyright 2009 Gentoo Foundation # Distributed under the terms of the GNU General Public License v2 -# $Header: /var/cvsroot/gentoo-x86/app-crypt/ekeyd/files/ekey-ulusbd.con= f,v 1.1 2009/09/28 18:29:36 flameeyes Exp $ +# $Header: /var/cvsroot/gentoo-x86/app-crypt/ekeyd/files/ekey-ulusbd.con= f,v 1.2 2009/09/29 12:03:21 flameeyes Exp $ =20 # The userland USB daemon has to know the USB path of the EntopyKey to # work properly; in alternative to providing these statically, they @@ -13,4 +13,4 @@ #USB_BUS=3D"" #USB_DEV=3D"" =20 -SOCKET_PATH=3D"/var/run/ekey.ulusbd.${EKEY_SERIAL}" +SOCKET_PATH=3D"/var/run/ekey-ulusbd-${EKEY_SERIAL}" 1.2 app-crypt/ekeyd/files/ekey-ulusbd.init file : http://sources.gentoo.org/viewcvs.py/gentoo-x86/app-crypt/ekeyd/fi= les/ekey-ulusbd.init?rev=3D1.2&view=3Dmarkup plain: http://sources.gentoo.org/viewcvs.py/gentoo-x86/app-crypt/ekeyd/fi= les/ekey-ulusbd.init?rev=3D1.2&content-type=3Dtext/plain diff : http://sources.gentoo.org/viewcvs.py/gentoo-x86/app-crypt/ekeyd/fi= les/ekey-ulusbd.init?r1=3D1.1&r2=3D1.2 Index: ekey-ulusbd.init =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D RCS file: /var/cvsroot/gentoo-x86/app-crypt/ekeyd/files/ekey-ulusbd.init,= v retrieving revision 1.1 retrieving revision 1.2 diff -u -r1.1 -r1.2 --- ekey-ulusbd.init 28 Sep 2009 18:29:36 -0000 1.1 +++ ekey-ulusbd.init 29 Sep 2009 12:03:21 -0000 1.2 @@ -1,7 +1,7 @@ #!/sbin/runscript # Copyright 2009 Gentoo Foundation # Distributed under the terms of the GNU General Public License v2 -# $Header: /var/cvsroot/gentoo-x86/app-crypt/ekeyd/files/ekey-ulusbd.ini= t,v 1.1 2009/09/28 18:29:36 flameeyes Exp $ +# $Header: /var/cvsroot/gentoo-x86/app-crypt/ekeyd/files/ekey-ulusbd.ini= t,v 1.2 2009/09/29 12:03:21 flameeyes Exp $ =20 INSTANCE=3D"${SVCNAME#*.}" if [ -z "${INSTANCE}" ] || [ "${SVCNAME}" =3D "ekey-ulusbd" ]; then @@ -14,14 +14,13 @@ =20 start() { if [ -z ${USB_BUS} ]; then - local devdir=3D$(fgrep -l 20df /sys/bus/usb/devices/*/idVendor \ - | xargs -n1 dirname \ - | xargs -I{} fgrep -l 0001 {}/idProduct \ - | xargs -n1 dirname \ - | xargs -I{} fgrep -l ${EKEY_SERIAL} {}/serial \ - | xargs -n1 dirname) - USB_BUS=3D$(< ${devdir}/busnum) - USB_DEV=3D$(< ${devdir}/devnum) + set -- $(lsusb -v -d 20df:0001 | \ + egrep '(^Bus|iSerial)' | \ + grep -B1 "${EKEY_SERIAL}" | \ + head -n 1 | \ + cut -c 5-7,15-18) + USB_BUS=3D$1 + USB_DEV=3D$2 fi =20 ebegin "Starting EntropyKey Userland USB Daemon"