Received: by mail.netbsd.org (Postfix, from userid 605) id 4936E84E62; Mon, 19 Feb 2018 17:59:25 +0000 (UTC) Received: from localhost (localhost [127.0.0.1]) by mail.netbsd.org (Postfix) with ESMTP id C8B4084E58 for ; Mon, 19 Feb 2018 17:59:24 +0000 (UTC) X-Virus-Scanned: amavisd-new at netbsd.org Received: from mail.netbsd.org ([IPv6:::1]) by localhost (mail.netbsd.org [IPv6:::1]) (amavisd-new, port 10025) with ESMTP id umgVMzjdOzVq for ; Mon, 19 Feb 2018 17:59:24 +0000 (UTC) Received: from cvs.NetBSD.org (ivanova.NetBSD.org [IPv6:2001:470:a085:999:28c:faff:fe03:5984]) by mail.netbsd.org (Postfix) with ESMTP id EA14B84D40 for ; Mon, 19 Feb 2018 17:59:23 +0000 (UTC) Received: by cvs.NetBSD.org (Postfix, from userid 500) id D9C31FB40; Mon, 19 Feb 2018 17:59:23 +0000 (UTC) Content-Transfer-Encoding: 7bit Content-Type: multipart/mixed; boundary="_----------=_151906316325520" MIME-Version: 1.0 Date: Mon, 19 Feb 2018 17:59:23 +0000 From: "matthew green" Subject: CVS commit: pkgsrc/devel/libusb To: pkgsrc-changes@NetBSD.org Reply-To: mrg@netbsd.org X-Mailer: log_accum Message-Id: <20180219175923.D9C31FB40@cvs.NetBSD.org> Sender: pkgsrc-changes-owner@NetBSD.org List-Id: pkgsrc-changes.NetBSD.org Precedence: bulk List-Unsubscribe: This is a multi-part message in MIME format. --_----------=_151906316325520 Content-Disposition: inline Content-Transfer-Encoding: 8bit Content-Type: text/plain; charset="US-ASCII" Module Name: pkgsrc Committed By: mrg Date: Mon Feb 19 17:59:23 UTC 2018 Modified Files: pkgsrc/devel/libusb: Makefile distinfo pkgsrc/devel/libusb/patches: patch-ad Log Message: eat EAGAIN messages and simply retry. this fixes libusb / ups-nut-usb from flooding my syslog with multiple messages per second. bump pkg version. To generate a diff of this commit: cvs rdiff -u -r1.40 -r1.41 pkgsrc/devel/libusb/Makefile cvs rdiff -u -r1.26 -r1.27 pkgsrc/devel/libusb/distinfo cvs rdiff -u -r1.10 -r1.11 pkgsrc/devel/libusb/patches/patch-ad Please note that diffs are not public domain; they are subject to the copyright notices on the relevant files. --_----------=_151906316325520 Content-Disposition: inline Content-Length: 9220 Content-Transfer-Encoding: binary Content-Type: text/x-diff; charset=us-ascii Modified files: Index: pkgsrc/devel/libusb/Makefile diff -u pkgsrc/devel/libusb/Makefile:1.40 pkgsrc/devel/libusb/Makefile:1.41 --- pkgsrc/devel/libusb/Makefile:1.40 Fri Aug 11 22:17:34 2017 +++ pkgsrc/devel/libusb/Makefile Mon Feb 19 17:59:23 2018 @@ -1,7 +1,7 @@ -# $NetBSD: Makefile,v 1.40 2017/08/11 22:17:34 maya Exp $ +# $NetBSD: Makefile,v 1.41 2018/02/19 17:59:23 mrg Exp $ DISTNAME= libusb-0.1.12 -PKGREVISION= 4 +PKGREVISION= 5 CATEGORIES= devel MASTER_SITES= ${MASTER_SITE_SOURCEFORGE:=libusb/} Index: pkgsrc/devel/libusb/distinfo diff -u pkgsrc/devel/libusb/distinfo:1.26 pkgsrc/devel/libusb/distinfo:1.27 --- pkgsrc/devel/libusb/distinfo:1.26 Tue Nov 3 03:27:46 2015 +++ pkgsrc/devel/libusb/distinfo Mon Feb 19 17:59:23 2018 @@ -1,4 +1,4 @@ -$NetBSD: distinfo,v 1.26 2015/11/03 03:27:46 agc Exp $ +$NetBSD: distinfo,v 1.27 2018/02/19 17:59:23 mrg Exp $ SHA1 (libusb-0.1.12.tar.gz) = 599a5168590f66bc6f1f9a299579fd8500614807 RMD160 (libusb-0.1.12.tar.gz) = 63848df717e00fff67ab30ba86a85466370d4e8e @@ -7,7 +7,7 @@ Size (libusb-0.1.12.tar.gz) = 389343 byt SHA1 (patch-aa) = 1da6c46e8b41d7846032922bbef8a0b5eb1ae68b SHA1 (patch-ab) = bc4756536ce7b2cc49d0c7c48c249f146f185839 SHA1 (patch-ac) = cc92318e0979779f6ef03ee653bc94ee2b96a055 -SHA1 (patch-ad) = 7cfa10d66f2257da55249fb8c7b20d313e560302 +SHA1 (patch-ad) = 8ea70b0501ccd725d19a735699437f67ae76d13d SHA1 (patch-ae) = 49a01ebe66de4965f3611cf42db09703aa68c415 SHA1 (patch-af) = e46e576a589fb65488011a41df95f744230c0c6c SHA1 (patch-darwin.c) = 20df5d5970bf86f6f4ada002ca16a3bccf5bb4ff Index: pkgsrc/devel/libusb/patches/patch-ad diff -u pkgsrc/devel/libusb/patches/patch-ad:1.10 pkgsrc/devel/libusb/patches/patch-ad:1.11 --- pkgsrc/devel/libusb/patches/patch-ad:1.10 Sun Oct 25 10:18:34 2015 +++ pkgsrc/devel/libusb/patches/patch-ad Mon Feb 19 17:59:23 2018 @@ -1,7 +1,10 @@ -$NetBSD: patch-ad,v 1.10 2015/10/25 10:18:34 wiz Exp $ +$NetBSD: patch-ad,v 1.11 2018/02/19 17:59:23 mrg Exp $ ---- bsd.c.orig 2006-03-04 02:52:46.000000000 +0000 -+++ bsd.c +Fix build on some platforms. +Eat EAGAIN returns. + +--- bsd.c.orig 2006-03-03 18:52:46.000000000 -0800 ++++ bsd.c 2016-10-21 01:20:19.000000000 -0700 @@ -25,8 +25,8 @@ * for both read and write. */ @@ -33,7 +36,7 @@ $NetBSD: patch-ad,v 1.10 2015/10/25 10:1 /* * It appears some of the BSD's (OpenBSD atleast) have switched over to a * new naming convention, so we setup some macro's for backward -@@ -146,7 +150,7 @@ int usb_os_open(usb_dev_handle *dev) +@@ -146,7 +150,7 @@ USB_ERROR(-ENOMEM); dev->impl_info = info; @@ -42,7 +45,7 @@ $NetBSD: patch-ad,v 1.10 2015/10/25 10:1 snprintf(ctlpath, PATH_MAX, "%s", dev->device->filename); #else snprintf(ctlpath, PATH_MAX, "%s.00", dev->device->filename); -@@ -259,7 +263,7 @@ static int ensure_ep_open(usb_dev_handle +@@ -259,7 +263,7 @@ ep = UE_GET_ADDR(ep); if (info->ep_fd[ep] < 0) { @@ -51,7 +54,7 @@ $NetBSD: patch-ad,v 1.10 2015/10/25 10:1 snprintf(buf, sizeof(buf) - 1, "%s.%d", dev->device->filename, ep); #else snprintf(buf, sizeof(buf) - 1, "%s.%02d", dev->device->filename, ep); -@@ -290,7 +294,7 @@ int usb_bulk_write(usb_dev_handle *dev, +@@ -290,7 +294,7 @@ fd = ensure_ep_open(dev, ep, O_WRONLY); if (fd < 0) { if (usb_debug >= 2) { @@ -60,7 +63,7 @@ $NetBSD: patch-ad,v 1.10 2015/10/25 10:1 fprintf (stderr, "usb_bulk_write: got negative open file descriptor for endpoint %d\n", UE_GET_ADDR(ep)); #else fprintf (stderr, "usb_bulk_write: got negative open file descriptor for endpoint %02d\n", UE_GET_ADDR(ep)); -@@ -306,7 +310,7 @@ int usb_bulk_write(usb_dev_handle *dev, +@@ -306,7 +310,7 @@ ret = write(fd, bytes, size); if (ret < 0) @@ -69,7 +72,7 @@ $NetBSD: patch-ad,v 1.10 2015/10/25 10:1 USB_ERROR_STR(-errno, "error writing to bulk endpoint %s.%d: %s", dev->device->filename, UE_GET_ADDR(ep), strerror(errno)); #else -@@ -328,7 +332,7 @@ int usb_bulk_read(usb_dev_handle *dev, i +@@ -328,7 +332,7 @@ fd = ensure_ep_open(dev, ep, O_RDONLY); if (fd < 0) { if (usb_debug >= 2) { @@ -78,7 +81,7 @@ $NetBSD: patch-ad,v 1.10 2015/10/25 10:1 fprintf (stderr, "usb_bulk_read: got negative open file descriptor for endpoint %d\n", UE_GET_ADDR(ep)); #else fprintf (stderr, "usb_bulk_read: got negative open file descriptor for endpoint %02d\n", UE_GET_ADDR(ep)); -@@ -347,7 +351,7 @@ int usb_bulk_read(usb_dev_handle *dev, i +@@ -347,7 +351,7 @@ ret = read(fd, bytes, size); if (ret < 0) @@ -87,7 +90,7 @@ $NetBSD: patch-ad,v 1.10 2015/10/25 10:1 USB_ERROR_STR(-errno, "error reading from bulk endpoint %s.%d: %s", dev->device->filename, UE_GET_ADDR(ep), strerror(errno)); #else -@@ -369,7 +373,7 @@ int usb_interrupt_write(usb_dev_handle * +@@ -369,7 +373,7 @@ fd = ensure_ep_open(dev, ep, O_WRONLY); if (fd < 0) { if (usb_debug >= 2) { @@ -96,7 +99,7 @@ $NetBSD: patch-ad,v 1.10 2015/10/25 10:1 fprintf (stderr, "usb_interrupt_write: got negative open file descriptor for endpoint %d\n", UE_GET_ADDR(ep)); #else fprintf (stderr, "usb_interrupt_write: got negative open file descriptor for endpoint %02d\n", UE_GET_ADDR(ep)); -@@ -386,7 +390,7 @@ int usb_interrupt_write(usb_dev_handle * +@@ -386,7 +390,7 @@ do { ret = write(fd, bytes+sent, size-sent); if (ret < 0) @@ -105,7 +108,7 @@ $NetBSD: patch-ad,v 1.10 2015/10/25 10:1 USB_ERROR_STR(-errno, "error writing to interrupt endpoint %s.%d: %s", dev->device->filename, UE_GET_ADDR(ep), strerror(errno)); #else -@@ -403,7 +407,7 @@ int usb_interrupt_write(usb_dev_handle * +@@ -403,7 +407,7 @@ int usb_interrupt_read(usb_dev_handle *dev, int ep, char *bytes, int size, int timeout) { @@ -114,7 +117,7 @@ $NetBSD: patch-ad,v 1.10 2015/10/25 10:1 /* Ensure the endpoint address is correct */ ep |= USB_ENDPOINT_IN; -@@ -411,7 +415,7 @@ int usb_interrupt_read(usb_dev_handle *d +@@ -411,7 +415,7 @@ fd = ensure_ep_open(dev, ep, O_RDONLY); if (fd < 0) { if (usb_debug >= 2) { @@ -123,31 +126,40 @@ $NetBSD: patch-ad,v 1.10 2015/10/25 10:1 fprintf (stderr, "usb_interrupt_read: got negative open file descriptor for endpoint %d\n", UE_GET_ADDR(ep)); #else fprintf (stderr, "usb_interrupt_read: got negative open file descriptor for endpoint %02d\n", UE_GET_ADDR(ep)); -@@ -429,17 +433,19 @@ int usb_interrupt_read(usb_dev_handle *d +@@ -429,17 +433,21 @@ USB_ERROR_STR(-errno, "error setting short xfer: %s", strerror(errno)); do { - ret = read(fd, bytes+retrieved, size-retrieved); -+ requested = size - retrieved; -+ ret = read(fd, bytes+retrieved, requested); - if (ret < 0) +- if (ret < 0) -#ifdef __FreeBSD_kernel__ -+#ifdef FreeBSD_like_device_names - USB_ERROR_STR(-errno, "error reading from interrupt endpoint %s.%d: %s", - dev->device->filename, UE_GET_ADDR(ep), strerror(errno)); - #else - USB_ERROR_STR(-errno, "error reading from interrupt endpoint %s.%02d: %s", - dev->device->filename, UE_GET_ADDR(ep), strerror(errno)); - #endif +- USB_ERROR_STR(-errno, "error reading from interrupt endpoint %s.%d: %s", +- dev->device->filename, UE_GET_ADDR(ep), strerror(errno)); +-#else +- USB_ERROR_STR(-errno, "error reading from interrupt endpoint %s.%02d: %s", +- dev->device->filename, UE_GET_ADDR(ep), strerror(errno)); +-#endif - retrieved += ret; - } while (ret > 0 && retrieved < size); -+ else ++ requested = size - retrieved; ++ ret = read(fd, bytes+retrieved, requested); ++ if (ret < 0) { ++ if (errno != EAGAIN) { ++#ifdef FreeBSD_like_device_names ++ USB_ERROR_STR(-errno, "error reading from interrupt endpoint %s.%d: %s", ++ dev->device->filename, UE_GET_ADDR(ep), strerror(errno)); ++#else ++ USB_ERROR_STR(-errno, "error reading from interrupt endpoint %s.%02d: %s", ++ dev->device->filename, UE_GET_ADDR(ep), strerror(errno)); ++#endif ++ } ++ } else + retrieved += ret; + } while (ret > 0 && retrieved < size && ret != requested); return retrieved; } -@@ -477,7 +483,7 @@ int usb_control_msg(usb_dev_handle *dev, +@@ -477,7 +485,7 @@ USB_ERROR_STR(-errno, "error sending control message: %s", strerror(errno)); @@ -156,7 +168,7 @@ $NetBSD: patch-ad,v 1.10 2015/10/25 10:1 } int usb_os_find_busses(struct usb_bus **busses) -@@ -548,7 +554,7 @@ int usb_os_find_devices(struct usb_bus * +@@ -548,7 +556,7 @@ /* best not to play with things we don't understand */ continue; @@ -165,7 +177,7 @@ $NetBSD: patch-ad,v 1.10 2015/10/25 10:1 snprintf(buf, sizeof(buf) - 1, "/dev/%s", di.udi_devnames[0]); #else snprintf(buf, sizeof(buf) - 1, "/dev/%s.00", di.udi_devnames[0]); -@@ -574,7 +580,7 @@ int usb_os_find_devices(struct usb_bus * +@@ -574,7 +582,7 @@ /* we need to report the device name as /dev/ugenx NOT /dev/ugenx.00 * This seemed easier than having 2 variables... */ --_----------=_151906316325520--