diff options
| author |   Diego Elio Pettenò <flameeyes@gentoo.org> | 2011-11-01 09:55:12 +0000 |
|---|---|---|
| committer | Diego Elio Pettenò <flameeyes@gentoo.org> | 2011-11-01 09:55:12 +0000 |
| commit | ef7d85b0f9cad601e37ed3047339e87a6e80ea03 (patch) | |
| tree | 87ed5f28d23a6ff8faca544307673707301fa846 /app-crypt | |
| parent | Marked stable on AMD64 based on arch testing by Agostino "ago" Sarubbo & Elij... (diff) | |
| download | gentoo-2-ef7d85b0f9cad601e37ed3047339e87a6e80ea03.tar.gz gentoo-2-ef7d85b0f9cad601e37ed3047339e87a6e80ea03.tar.bz2 gentoo-2-ef7d85b0f9cad601e37ed3047339e87a6e80ea03.zip | |
Patch the udev rules to not use the deprecated BUS match (bug #388821).
(Portage version: 2.2.0_alpha72/cvs/Linux x86_64)
Diffstat (limited to 'app-crypt')
| -rw-r--r-- | app-crypt/ekeyd/ChangeLog | 8 | ||||
| -rw-r--r-- | app-crypt/ekeyd/ekeyd-1.1.4-r2.ebuild (renamed from app-crypt/ekeyd/ekeyd-1.1.4-r1.ebuild) | 2 | ||||
| -rw-r--r-- | app-crypt/ekeyd/files/ekeyd-1.1.4-gentoo.patch | 10 |
3 files changed, 15 insertions, 5 deletions
diff --git a/app-crypt/ekeyd/ChangeLog b/app-crypt/ekeyd/ChangeLog index 4c3dab867d3c..8af7652943bf 100644 --- a/app-crypt/ekeyd/ChangeLog +++ b/app-crypt/ekeyd/ChangeLog @@ -1,6 +1,12 @@ # ChangeLog for app-crypt/ekeyd # Copyright 1999-2011 Gentoo Foundation; Distributed under the GPL v2 -# $Header: /var/cvsroot/gentoo-x86/app-crypt/ekeyd/ChangeLog,v 1.25 2011/10/20 11:40:28 flameeyes Exp $ +# $Header: /var/cvsroot/gentoo-x86/app-crypt/ekeyd/ChangeLog,v 1.26 2011/11/01 09:55:11 flameeyes Exp $ + +*ekeyd-1.1.4-r2 (01 Nov 2011) + + 01 Nov 2011; Diego E. Pettenò <flameeyes@gentoo.org> +ekeyd-1.1.4-r2.ebuild, + -ekeyd-1.1.4-r1.ebuild, files/ekeyd-1.1.4-gentoo.patch: + Patch the udev rules to not use the deprecated BUS match (bug #388821). *ekeyd-1.1.4-r1 (20 Oct 2011) diff --git a/app-crypt/ekeyd/ekeyd-1.1.4-r1.ebuild b/app-crypt/ekeyd/ekeyd-1.1.4-r2.ebuild index 6c6a6fdb7e8d..6ca9b29ac8a2 100644 --- a/app-crypt/ekeyd/ekeyd-1.1.4-r1.ebuild +++ b/app-crypt/ekeyd/ekeyd-1.1.4-r2.ebuild @@ -1,6 +1,6 @@ # Copyright 1999-2011 Gentoo Foundation # Distributed under the terms of the GNU General Public License v2 -# $Header: /var/cvsroot/gentoo-x86/app-crypt/ekeyd/ekeyd-1.1.4-r1.ebuild,v 1.1 2011/10/20 11:40:28 flameeyes Exp $ +# $Header: /var/cvsroot/gentoo-x86/app-crypt/ekeyd/ekeyd-1.1.4-r2.ebuild,v 1.1 2011/11/01 09:55:11 flameeyes Exp $ EAPI=4 diff --git a/app-crypt/ekeyd/files/ekeyd-1.1.4-gentoo.patch b/app-crypt/ekeyd/files/ekeyd-1.1.4-gentoo.patch index f5f9695abcc3..f1491362e83f 100644 --- a/app-crypt/ekeyd/files/ekeyd-1.1.4-gentoo.patch +++ b/app-crypt/ekeyd/files/ekeyd-1.1.4-gentoo.patch @@ -83,8 +83,12 @@ Index: ekeyd-1.1.4/udev/fedora15/60-entropykey.rules =================================================================== --- ekeyd-1.1.4.orig/udev/fedora15/60-entropykey.rules +++ ekeyd-1.1.4/udev/fedora15/60-entropykey.rules -@@ -12,7 +12,7 @@ - ACTION=="add|change|remove", SUBSYSTEM=="tty", KERNEL=="ttyACM[0-9]*", BUS=="usb", ATTRS{idVendor}=="20df", ATTRS{idProduct}=="0001", IMPORT{program}="usb_id --export %p" +@@ -9,10 +9,10 @@ + # For licence terms refer to the COPYING file distributed with the source. + + # Detect an Entropy Key being inserted and add info values to environment +-ACTION=="add|change|remove", SUBSYSTEM=="tty", KERNEL=="ttyACM[0-9]*", BUS=="usb", ATTRS{idVendor}=="20df", ATTRS{idProduct}=="0001", IMPORT{program}="usb_id --export %p" ++ACTION=="add|change|remove", SUBSYSTEM=="tty", KERNEL=="ttyACM[0-9]*", ATTRS{idVendor}=="20df", ATTRS{idProduct}=="0001", IMPORT{program}="usb_id --export %p" # Detect an Entropy Key being inserted and extract serial number -ACTION=="add|change|remove", SUBSYSTEM=="tty", KERNEL=="ttyACM[0-9]*", ATTRS{idVendor}=="20df", ATTRS{idProduct}=="0001", IMPORT{program}="/bin/echo ENTROPY_KEY_SERIAL=$env{ID_SERIAL_SHORT}" @@ -101,7 +105,7 @@ Index: ekeyd-1.1.4/udev/fedora15/60-entropykey-uds.rules # Detect an Entropy Key being inserted and extract serial number -ACTION=="add|change|remove", SUBSYSTEM=="usb", BUS=="usb", ATTRS{idVendor}=="20df", ATTRS{idProduct}=="0001", IMPORT{program}="/bin/echo ENTROPY_KEY_SERIAL=$attr{serial}" -+ACTION=="add|change|remove", SUBSYSTEM=="usb", BUS=="usb", ATTRS{idVendor}=="20df", ATTRS{idProduct}=="0001", IMPORT{program}="/bin/sh -c '/bin/echo ENTROPY_KEY_SERIAL=$env{ID_SERIAL_SHORT} | /bin/sed -e s:/:_:g'" ++ACTION=="add|change|remove", SUBSYSTEM=="usb", ATTRS{idVendor}=="20df", ATTRS{idProduct}=="0001", IMPORT{program}="/bin/sh -c '/bin/echo ENTROPY_KEY_SERIAL=$env{ID_SERIAL_SHORT} | /bin/sed -e s:/:_:g'" # And tell the ekeyd about the device action. ENV{ENTROPY_KEY_SERIAL}!="", RUN+="/lib/udev/entropykey.sh" |