CVS commit: pkgsrc/sysutils

["matthew green" <mrg%netbsd.org@localhost>]

Module Name:    pkgsrc
Committed By:   mrg
Date:           Wed Mar 28 06:23:34 UTC 2018

Modified Files:
        pkgsrc/sysutils/ups-nut: distinfo
        pkgsrc/sysutils/ups-nut-usb: Makefile
Added Files:
        pkgsrc/sysutils/ups-nut/patches: patch-drivers_libusb.c

Log Message:
avoid printing "No error" a bunch of times.  this was spamming my syslog.


To generate a diff of this commit:
cvs rdiff -u -r1.30 -r1.31 pkgsrc/sysutils/ups-nut/distinfo
cvs rdiff -u -r1.7 -r1.8 pkgsrc/sysutils/ups-nut-usb/Makefile
cvs rdiff -u -r0 -r1.1 pkgsrc/sysutils/ups-nut/patches/patch-drivers_libusb.c

Please note that diffs are not public domain; they are subject to the
copyright notices on the relevant files.

Modified files:

Index: pkgsrc/sysutils/ups-nut/distinfo
diff -u pkgsrc/sysutils/ups-nut/distinfo:1.30 pkgsrc/sysutils/ups-nut/distinfo:1.31
--- pkgsrc/sysutils/ups-nut/distinfo:1.30       Tue Nov 10 08:52:38 2015
+++ pkgsrc/sysutils/ups-nut/distinfo    Wed Mar 28 06:23:34 2018
@@ -1,4 +1,4 @@
-$NetBSD: distinfo,v 1.30 2015/11/10 08:52:38 mrg Exp $
+$NetBSD: distinfo,v 1.31 2018/03/28 06:23:34 mrg Exp $
 
 SHA1 (nut-2.6.5.tar.gz) = 320debe11df91f04e32824694d0c89a020677f71
 RMD160 (nut-2.6.5.tar.gz) = d6e6acd4696e3c3f8c0ecd998f8676a8625decb9
@@ -7,3 +7,4 @@ Size (nut-2.6.5.tar.gz) = 2038832 bytes
 SHA1 (patch-aa) = 48110f378518edb43a653753eb4ef6ea28344c62
 SHA1 (patch-ab) = 44988118570714ab2c3fffdd75909c2255b94fa6
 SHA1 (patch-drivers_hidparser.c) = c71d84bbf3140db1f82ef155fdf5afec79cbd38d
+SHA1 (patch-drivers_libusb.c) = 4e75bc13123a37aa2a2b5497d51605f88b0c5464

Index: pkgsrc/sysutils/ups-nut-usb/Makefile
diff -u pkgsrc/sysutils/ups-nut-usb/Makefile:1.7 pkgsrc/sysutils/ups-nut-usb/Makefile:1.8
--- pkgsrc/sysutils/ups-nut-usb/Makefile:1.7    Tue Feb 27 23:56:09 2018
+++ pkgsrc/sysutils/ups-nut-usb/Makefile        Wed Mar 28 06:23:34 2018
@@ -1,9 +1,9 @@
-# $NetBSD: Makefile,v 1.7 2018/02/27 23:56:09 khorben Exp $
+# $NetBSD: Makefile,v 1.8 2018/03/28 06:23:34 mrg Exp $
 
 .include "../../sysutils/ups-nut/Makefile.common"
 
 PKGNAME=               ${DISTNAME:S/nut/ups-nut-usb/}
-PKGREVISION=           2
+PKGREVISION=           3
 COMMENT=               Network UPS Tools USB drivers
 
 DEPENDS+=              ups-nut-2.*:../../sysutils/ups-nut

Added files:

Index: pkgsrc/sysutils/ups-nut/patches/patch-drivers_libusb.c
diff -u /dev/null pkgsrc/sysutils/ups-nut/patches/patch-drivers_libusb.c:1.1
--- /dev/null   Wed Mar 28 06:23:34 2018
+++ pkgsrc/sysutils/ups-nut/patches/patch-drivers_libusb.c      Wed Mar 28 06:23:34 2018
@@ -0,0 +1,15 @@
+$NetBSD: patch-drivers_libusb.c,v 1.1 2018/03/28 06:23:34 mrg Exp $
+
+Avoid "No error" messages.
+
+--- drivers/libusb.c.orig      2012-07-31 10:38:59.000000000 -0700
++++ drivers/libusb.c   2016-10-21 01:44:40.000000000 -0700
+@@ -353,7 +353,7 @@
+  */
+ static int libusb_strerror(const int ret, const char *desc)
+ {
+-      if (ret > 0) {
++      if (ret >= 0) {
+               return ret;
+       }
+