[pkgsrc/trunk]: pkgsrc/devel/libusb Make usb_control_msg() return the number ...

[drochner <drochner%pkgsrc.org@localhost>]

details:   https://anonhg.NetBSD.org/pkgsrc/rev/4f9e083e5ae2
branches:  trunk
changeset: 534098:4f9e083e5ae2
user:      drochner <drochner%pkgsrc.org@localhost>
date:      Thu Oct 11 18:25:19 2007 +0000

description:
Make usb_control_msg() return the number of bytes actually transferred
rather than the requested transfer length (USBD_SHORT_XFER_OK is
set, so this may happen). This is the documented behaviour, and it is
appearently what the Linux version does. Bump PKGREVISION. From
Erik Berls per PR pkg/37053.

diffstat:

 devel/libusb/Makefile         |   4 ++--
 devel/libusb/distinfo         |   4 ++--
 devel/libusb/patches/patch-ad |  13 +++++++++++--
 3 files changed, 15 insertions(+), 6 deletions(-)

diffs (57 lines):

diff -r 1ced34b44081 -r 4f9e083e5ae2 devel/libusb/Makefile
--- a/devel/libusb/Makefile     Thu Oct 11 18:15:50 2007 +0000
+++ b/devel/libusb/Makefile     Thu Oct 11 18:25:19 2007 +0000
@@ -1,7 +1,7 @@
-# $NetBSD: Makefile,v 1.27 2006/05/26 10:06:13 joerg Exp $
+# $NetBSD: Makefile,v 1.28 2007/10/11 18:25:19 drochner Exp $
 
 DISTNAME=      libusb-0.1.12
-PKGREVISION=   1
+PKGREVISION=   2
 CATEGORIES=    devel
 MASTER_SITES=  ${MASTER_SITE_SOURCEFORGE:=libusb/}
 
diff -r 1ced34b44081 -r 4f9e083e5ae2 devel/libusb/distinfo
--- a/devel/libusb/distinfo     Thu Oct 11 18:15:50 2007 +0000
+++ b/devel/libusb/distinfo     Thu Oct 11 18:25:19 2007 +0000
@@ -1,4 +1,4 @@
-$NetBSD: distinfo,v 1.18 2006/05/26 10:06:13 joerg Exp $
+$NetBSD: distinfo,v 1.19 2007/10/11 18:25:19 drochner Exp $
 
 SHA1 (libusb-0.1.12.tar.gz) = 599a5168590f66bc6f1f9a299579fd8500614807
 RMD160 (libusb-0.1.12.tar.gz) = 63848df717e00fff67ab30ba86a85466370d4e8e
@@ -6,5 +6,5 @@
 SHA1 (patch-aa) = 1da6c46e8b41d7846032922bbef8a0b5eb1ae68b
 SHA1 (patch-ab) = bc4756536ce7b2cc49d0c7c48c249f146f185839
 SHA1 (patch-ac) = cc92318e0979779f6ef03ee653bc94ee2b96a055
-SHA1 (patch-ad) = 56a4beb9047f4e1e3e098d2b9aa2c7d0ece34045
+SHA1 (patch-ad) = f81135a5f92bf0c2e1ca921368bd39482bd3b580
 SHA1 (patch-ae) = 49a01ebe66de4965f3611cf42db09703aa68c415
diff -r 1ced34b44081 -r 4f9e083e5ae2 devel/libusb/patches/patch-ad
--- a/devel/libusb/patches/patch-ad     Thu Oct 11 18:15:50 2007 +0000
+++ b/devel/libusb/patches/patch-ad     Thu Oct 11 18:25:19 2007 +0000
@@ -1,6 +1,6 @@
-$NetBSD: patch-ad,v 1.8 2006/05/26 10:06:13 joerg Exp $
+$NetBSD: patch-ad,v 1.9 2007/10/11 18:25:19 drochner Exp $
 
---- bsd.c.orig 2006-03-04 02:52:46.000000000 +0000
+--- bsd.c.orig 2006-03-04 03:52:46.000000000 +0100
 +++ bsd.c
 @@ -25,8 +25,8 @@
   *    for both read and write.
@@ -145,6 +145,15 @@
  
    return retrieved;
  }
+@@ -477,7 +482,7 @@ int usb_control_msg(usb_dev_handle *dev,
+     USB_ERROR_STR(-errno, "error sending control message: %s",
+                   strerror(errno));
+ 
+-  return UGETW(req.ucr_request.wLength);
++  return req.ucr_actlen;
+ }
+ 
+ int usb_os_find_busses(struct usb_bus **busses)
 @@ -548,7 +553,7 @@ int usb_os_find_devices(struct usb_bus *
        /* best not to play with things we don't understand */
        continue;