| 1 |
flameeyes 11/11/01 09:55:11 |
| 2 |
|
| 3 |
Modified: ekeyd-1.1.4-gentoo.patch |
| 4 |
Log: |
| 5 |
Patch the udev rules to not use the deprecated BUS match (bug #388821). |
| 6 |
|
| 7 |
(Portage version: 2.2.0_alpha72/cvs/Linux x86_64) |
| 8 |
|
| 9 |
Revision Changes Path |
| 10 |
1.2 app-crypt/ekeyd/files/ekeyd-1.1.4-gentoo.patch |
| 11 |
|
| 12 |
file : http://sources.gentoo.org/viewvc.cgi/gentoo-x86/app-crypt/ekeyd/files/ekeyd-1.1.4-gentoo.patch?rev=1.2&view=markup |
| 13 |
plain: http://sources.gentoo.org/viewvc.cgi/gentoo-x86/app-crypt/ekeyd/files/ekeyd-1.1.4-gentoo.patch?rev=1.2&content-type=text/plain |
| 14 |
diff : http://sources.gentoo.org/viewvc.cgi/gentoo-x86/app-crypt/ekeyd/files/ekeyd-1.1.4-gentoo.patch?r1=1.1&r2=1.2 |
| 15 |
|
| 16 |
Index: ekeyd-1.1.4-gentoo.patch |
| 17 |
=================================================================== |
| 18 |
RCS file: /var/cvsroot/gentoo-x86/app-crypt/ekeyd/files/ekeyd-1.1.4-gentoo.patch,v |
| 19 |
retrieving revision 1.1 |
| 20 |
retrieving revision 1.2 |
| 21 |
diff -u -r1.1 -r1.2 |
| 22 |
--- ekeyd-1.1.4-gentoo.patch 5 Sep 2011 20:10:09 -0000 1.1 |
| 23 |
+++ ekeyd-1.1.4-gentoo.patch 1 Nov 2011 09:55:11 -0000 1.2 |
| 24 |
@@ -83,8 +83,12 @@ |
| 25 |
=================================================================== |
| 26 |
--- ekeyd-1.1.4.orig/udev/fedora15/60-entropykey.rules |
| 27 |
+++ ekeyd-1.1.4/udev/fedora15/60-entropykey.rules |
| 28 |
-@@ -12,7 +12,7 @@ |
| 29 |
- ACTION=="add|change|remove", SUBSYSTEM=="tty", KERNEL=="ttyACM[0-9]*", BUS=="usb", ATTRS{idVendor}=="20df", ATTRS{idProduct}=="0001", IMPORT{program}="usb_id --export %p" |
| 30 |
+@@ -9,10 +9,10 @@ |
| 31 |
+ # For licence terms refer to the COPYING file distributed with the source. |
| 32 |
+ |
| 33 |
+ # Detect an Entropy Key being inserted and add info values to environment |
| 34 |
+-ACTION=="add|change|remove", SUBSYSTEM=="tty", KERNEL=="ttyACM[0-9]*", BUS=="usb", ATTRS{idVendor}=="20df", ATTRS{idProduct}=="0001", IMPORT{program}="usb_id --export %p" |
| 35 |
++ACTION=="add|change|remove", SUBSYSTEM=="tty", KERNEL=="ttyACM[0-9]*", ATTRS{idVendor}=="20df", ATTRS{idProduct}=="0001", IMPORT{program}="usb_id --export %p" |
| 36 |
|
| 37 |
# Detect an Entropy Key being inserted and extract serial number |
| 38 |
-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}" |
| 39 |
@@ -101,7 +105,7 @@ |
| 40 |
|
| 41 |
# Detect an Entropy Key being inserted and extract serial number |
| 42 |
-ACTION=="add|change|remove", SUBSYSTEM=="usb", BUS=="usb", ATTRS{idVendor}=="20df", ATTRS{idProduct}=="0001", IMPORT{program}="/bin/echo ENTROPY_KEY_SERIAL=$attr{serial}" |
| 43 |
-+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'" |
| 44 |
++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'" |
| 45 |
|
| 46 |
# And tell the ekeyd about the device action. |
| 47 |
ENV{ENTROPY_KEY_SERIAL}!="", RUN+="/lib/udev/entropykey.sh" |
Archives