Bug#733642: pu: package nut/2.6.4-2.3
Package: release.debian.org
Severity: normal
Tags: wheezy
User: release.debian.org@packages.debian.org
Usertags: pu
Hi,
Please accept this trivial fix for USB timeouts in nut.
It's fixed upstream and in sid, and I've reproduced it in Wheezy on some of
our client sites. The patch fixed the problem there with no other ill
effects.
Debdiff attached.
Thanks,
-- System Information:
Debian Release: 7.3
APT prefers proposed-updates
APT policy: (500, 'proposed-updates'), (500, 'stable'), (500, 'oldstable')
Architecture: amd64 (x86_64)
Foreign Architectures: i386
Kernel: Linux 3.2.0-4-amd64 (SMP w/4 CPU cores)
Locale: LANG=en_GB.UTF-8, LC_CTYPE=en_GB.UTF-8 (charmap=UTF-8)
Shell: /bin/sh linked to /bin/dash
diff -Nru nut-2.6.4/debian/changelog nut-2.6.4/debian/changelog
--- nut-2.6.4/debian/changelog 2013-01-26 19:09:53.000000000 +0000
+++ nut-2.6.4/debian/changelog 2013-12-30 15:37:59.000000000 +0000
@@ -1,3 +1,10 @@
+nut (2.6.4-2.3+deb7u1) stable; urgency=low
+
+ * Non-maintainer upload.
+ * Increase USB timeout to 5 seconds (Closes: #720332)
+
+ -- Jonathan Wiltshire <jmw@tiger-computing.co.uk> Mon, 30 Dec 2013 15:37:11 +0000
+
nut (2.6.4-2.3) unstable; urgency=low
* Non-maintainer upload with fixes for wheezy.
diff -Nru nut-2.6.4/debian/patches/0003-increase-usb-timeout.patch nut-2.6.4/debian/patches/0003-increase-usb-timeout.patch
--- nut-2.6.4/debian/patches/0003-increase-usb-timeout.patch 1970-01-01 01:00:00.000000000 +0100
+++ nut-2.6.4/debian/patches/0003-increase-usb-timeout.patch 2013-12-30 15:36:42.000000000 +0000
@@ -0,0 +1,33 @@
+From 9758dcf10e6ed62958acebe9ac419314b152252b Mon Sep 17 00:00:00 2001
+From: Arnaud Quette <arnaud.quette@free.fr>
+Date: Thu, 11 Apr 2013 23:15:51 +0200
+Subject: [PATCH] Set USB timeout to 5 seconds
+
+Set the low level USB timeout back to the standard
+5 seconds. This was set to 4 seconds, for performance
+reasons, but is now causing issues with some devices
+(reported by Stefan "stevenbg", GitHub issue #23)
+---
+ drivers/libusb.c | 7 +++----
+ 1 file changed, 3 insertions(+), 4 deletions(-)
+
+Index: nut-2.6.4/drivers/libusb.c
+===================================================================
+--- nut-2.6.4.orig/drivers/libusb.c 2012-05-02 22:35:39.000000000 +0100
++++ nut-2.6.4/drivers/libusb.c 2013-12-30 15:36:24.300684472 +0000
+@@ -33,12 +33,11 @@
+ #include "usb-common.h"
+ #include "libusb.h"
+
+-/* USB standard state 5000, but we've decreased it to
+- * improve reactivity */
+-#define USB_TIMEOUT 4000
++/* USB standard timeout */
++#define USB_TIMEOUT 5000
+
+ #define USB_DRIVER_NAME "USB communication driver"
+-#define USB_DRIVER_VERSION "0.31"
++#define USB_DRIVER_VERSION "0.32"
+
+ /* driver description structure */
+ upsdrv_info_t comm_upsdrv_info = {
diff -Nru nut-2.6.4/debian/patches/series nut-2.6.4/debian/patches/series
--- nut-2.6.4/debian/patches/series 2012-12-20 15:10:29.000000000 +0000
+++ nut-2.6.4/debian/patches/series 2013-12-30 15:35:47.000000000 +0000
@@ -1,2 +1,3 @@
0001-fix-upsmon-regression.patch
0002-nut-monitor-paths.patch
+0003-increase-usb-timeout.patch
Reply to: