[gentoo-commits] gentoo-x86 commit in app-crypt/ekeyd/files: ekeyd-1.1.3-libusb_compat.patch

[Diego Petteno (flameeyes)]

flameeyes    10/09/29 23:54:46

  Added:                ekeyd-1.1.3-libusb_compat.patch
  Log:
  Add patch to that worksaround a libusb-compat bug and allows using the virtual with ekeyd-ulusbd.
  
  (Portage version: 2.2_rc88/cvs/Linux x86_64)

Revision  Changes    Path
1.1                  app-crypt/ekeyd/files/ekeyd-1.1.3-libusb_compat.patch

file : http://sources.gentoo.org/viewvc.cgi/gentoo-x86/app-crypt/ekeyd/files/ekeyd-1.1.3-libusb_compat.patch?rev=1.1&view=markup
plain: http://sources.gentoo.org/viewvc.cgi/gentoo-x86/app-crypt/ekeyd/files/ekeyd-1.1.3-libusb_compat.patch?rev=1.1&content-type=text/plain

Index: ekeyd-1.1.3-libusb_compat.patch
===================================================================
Index: ekeyd-1.1.3/daemon/ekey-ulusbd.c
===================================================================
--- ekeyd-1.1.3.orig/daemon/ekey-ulusbd.c
+++ ekeyd-1.1.3/daemon/ekey-ulusbd.c
@@ -100,7 +100,8 @@ find_usb_device(char *busmatch, char *de
 
 #if LIBUSB_HAS_DETACH_KERNEL_DRIVER_NP
     if ((r = usb_detach_kernel_driver_np(devh, EKEY_IFACE)) != 0) {
-        if (r != -ENODATA) {
+        /* libusb_compat-0.1.3 mistakenly translate ENODATA to ENOENT */
+        if (r != -ENODATA && r != -ENOENT) {
             fprintf(stderr, 
                     "Unable to detach Entropy Key at %s/%s from kernel\n", 
                     busmatch, devmatch);