Received: by mail.netbsd.org (Postfix, from userid 605) id 0D9D384DAC; Fri, 3 Apr 2020 20:39:05 +0000 (UTC) Received: from localhost (localhost [127.0.0.1]) by mail.netbsd.org (Postfix) with ESMTP id 8A42C84D82 for ; Fri, 3 Apr 2020 20:39:04 +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 D2Kh1izZIrWG for ; Fri, 3 Apr 2020 20:39:04 +0000 (UTC) Received: from cvs.NetBSD.org (ivanova.netbsd.org [199.233.217.197]) by mail.netbsd.org (Postfix) with ESMTP id 07C1B84D5E for ; Fri, 3 Apr 2020 20:39:04 +0000 (UTC) Received: by cvs.NetBSD.org (Postfix, from userid 500) id 018D5FB27; Fri, 3 Apr 2020 20:39:03 +0000 (UTC) Content-Transfer-Encoding: 7bit Content-Type: multipart/mixed; boundary="_----------=_158594634346020" MIME-Version: 1.0 Date: Fri, 3 Apr 2020 20:39:03 +0000 From: "Nia Alarie" Subject: CVS commit: pkgsrc/devel/libusb1 To: pkgsrc-changes@NetBSD.org Reply-To: nia@netbsd.org X-Mailer: log_accum Message-Id: <20200403203904.018D5FB27@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. --_----------=_158594634346020 Content-Disposition: inline Content-Transfer-Encoding: 8bit Content-Type: text/plain; charset="US-ASCII" Module Name: pkgsrc Committed By: nia Date: Fri Apr 3 20:39:03 UTC 2020 Modified Files: pkgsrc/devel/libusb1: Makefile distinfo pkgsrc/devel/libusb1/patches: patch-libusb_os_netbsd__usb.c Log Message: libusb1: Recognize ETIMEDOUT as a connection timeout on NetBSD Helps py-adb work over USB. Bump PKGREVISION. To generate a diff of this commit: cvs rdiff -u -r1.24 -r1.25 pkgsrc/devel/libusb1/Makefile cvs rdiff -u -r1.14 -r1.15 pkgsrc/devel/libusb1/distinfo cvs rdiff -u -r1.3 -r1.4 \ pkgsrc/devel/libusb1/patches/patch-libusb_os_netbsd__usb.c Please note that diffs are not public domain; they are subject to the copyright notices on the relevant files. --_----------=_158594634346020 Content-Disposition: inline Content-Length: 2518 Content-Transfer-Encoding: binary Content-Type: text/x-diff; charset=us-ascii Modified files: Index: pkgsrc/devel/libusb1/Makefile diff -u pkgsrc/devel/libusb1/Makefile:1.24 pkgsrc/devel/libusb1/Makefile:1.25 --- pkgsrc/devel/libusb1/Makefile:1.24 Fri Apr 3 20:32:57 2020 +++ pkgsrc/devel/libusb1/Makefile Fri Apr 3 20:39:03 2020 @@ -1,7 +1,8 @@ -# $NetBSD: Makefile,v 1.24 2020/04/03 20:32:57 nia Exp $ +# $NetBSD: Makefile,v 1.25 2020/04/03 20:39:03 nia Exp $ DISTNAME= libusb-1.0.23 PKGNAME= ${DISTNAME:S/libusb/libusb1/} +PKGREVISION= 1 CATEGORIES= devel MASTER_SITES= ${MASTER_SITE_GITHUB:=libusb/} GITHUB_PROJECT= libusb Index: pkgsrc/devel/libusb1/distinfo diff -u pkgsrc/devel/libusb1/distinfo:1.14 pkgsrc/devel/libusb1/distinfo:1.15 --- pkgsrc/devel/libusb1/distinfo:1.14 Fri Apr 3 20:05:41 2020 +++ pkgsrc/devel/libusb1/distinfo Fri Apr 3 20:39:03 2020 @@ -1,7 +1,7 @@ -$NetBSD: distinfo,v 1.14 2020/04/03 20:05:41 nia Exp $ +$NetBSD: distinfo,v 1.15 2020/04/03 20:39:03 nia Exp $ SHA1 (libusb-1.0.23.tar.bz2) = 0140200398306b5e91c294d4a3c0f63aa0ef07b3 RMD160 (libusb-1.0.23.tar.bz2) = b6ffe2441951d37d671bfbb1d84821269e8aef7c SHA512 (libusb-1.0.23.tar.bz2) = 73430ad31dd405e76a9c6c55086961003989c44964e2735b5076f9ca849e3f6fe71d10a66b74b111f0c34a0d2cb744b9ca105863c552123fce4ec0bbdd2ec15b Size (libusb-1.0.23.tar.bz2) = 602860 bytes -SHA1 (patch-libusb_os_netbsd__usb.c) = 8b1a71ceec1b96089ebfaa0fa900845b2e3ff572 +SHA1 (patch-libusb_os_netbsd__usb.c) = 2cac7171e088f5d433c8a683b93168694c7fc8de Index: pkgsrc/devel/libusb1/patches/patch-libusb_os_netbsd__usb.c diff -u pkgsrc/devel/libusb1/patches/patch-libusb_os_netbsd__usb.c:1.3 pkgsrc/devel/libusb1/patches/patch-libusb_os_netbsd__usb.c:1.4 --- pkgsrc/devel/libusb1/patches/patch-libusb_os_netbsd__usb.c:1.3 Fri Apr 3 20:05:41 2020 +++ pkgsrc/devel/libusb1/patches/patch-libusb_os_netbsd__usb.c Fri Apr 3 20:39:03 2020 @@ -1,4 +1,4 @@ -$NetBSD: patch-libusb_os_netbsd__usb.c,v 1.3 2020/04/03 20:05:41 nia Exp $ +$NetBSD: patch-libusb_os_netbsd__usb.c,v 1.4 2020/04/03 20:39:03 nia Exp $ * Set structure values by name * Do not emit log messages from netbsd_clock_gettime as it is called from @@ -101,11 +101,12 @@ $NetBSD: patch-libusb_os_netbsd__usb.c,v if (clkid == USBI_CLOCK_REALTIME) return clock_gettime(CLOCK_REALTIME, tp); -@@ -521,6 +499,8 @@ _errno_to_libusb(int err) +@@ -521,6 +499,9 @@ _errno_to_libusb(int err) return (LIBUSB_ERROR_NO_DEVICE); case ENOMEM: return (LIBUSB_ERROR_NO_MEM); + case EWOULDBLOCK: ++ case ETIMEDOUT: + return (LIBUSB_ERROR_TIMEOUT); } --_----------=_158594634346020--