summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authormrg <mrg@pkgsrc.org>2018-03-28 06:23:34 +0000
committermrg <mrg@pkgsrc.org>2018-03-28 06:23:34 +0000
commit49041bcf5be500cfd9c1f982079f20a709ed5606 (patch)
tree74b94d489da2bf307621ed0cf1157cc9deaf7ff1
parentcd7a20a2da0c2f3198346b440527a2ef26110c2d (diff)
downloadpkgsrc-49041bcf5be500cfd9c1f982079f20a709ed5606.tar.gz
avoid printing "No error" a bunch of times. this was spamming my syslog.
-rw-r--r--sysutils/ups-nut-usb/Makefile4
-rw-r--r--sysutils/ups-nut/distinfo3
-rw-r--r--sysutils/ups-nut/patches/patch-drivers_libusb.c15
3 files changed, 19 insertions, 3 deletions
diff --git a/sysutils/ups-nut-usb/Makefile b/sysutils/ups-nut-usb/Makefile
index ff68fafe7a8..bf4dd672f23 100644
--- a/sysutils/ups-nut-usb/Makefile
+++ b/sysutils/ups-nut-usb/Makefile
@@ -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
diff --git a/sysutils/ups-nut/distinfo b/sysutils/ups-nut/distinfo
index 64f9872e2f0..e1ff30565c0 100644
--- a/sysutils/ups-nut/distinfo
+++ b/sysutils/ups-nut/distinfo
@@ -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
diff --git a/sysutils/ups-nut/patches/patch-drivers_libusb.c b/sysutils/ups-nut/patches/patch-drivers_libusb.c
new file mode 100644
index 00000000000..e56893a39f1
--- /dev/null
+++ b/sysutils/ups-nut/patches/patch-drivers_libusb.c
@@ -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;
+ }
+