CVS commit: pkgsrc/sysutils

["Greg Troxel" <gdt%netbsd.org@localhost>]

Module Name:    pkgsrc
Committed By:   gdt
Date:           Sat May 17 23:56:37 UTC 2025

Modified Files:
        pkgsrc/sysutils/p5-UPS-Nut: Makefile
        pkgsrc/sysutils/ups-nut: Makefile Makefile.common PLIST distinfo
        pkgsrc/sysutils/ups-nut-cgi: Makefile
        pkgsrc/sysutils/ups-nut/patches: patch-conf_Makefile.in
            patch-drivers_libusb0.c

Log Message:
ups-nut*: Update to 2.8.3

Upstream NEWS, attempting to filter out minor improvments and
bugfixes:

Release notes for NUT 2.8.3 - what's new since 2.8.2
----------------------------------------------------

https://github.com/networkupstools/nut/milestone/11

 - Large parts of the NUT User Manual and NUT Developer Guide were relocated
   into the new NUT Quality Assurance and Build Automation Guide (maintained
   in `docs/qa-guide.adoc`), accompanied by new chapters written and detailed
   for this subject; the chapter about `ci_build.sh` script became a separate
   `ci_build.adoc` document included into the new document. Overall, this guide
   intended to help the current and future maintainers of NUT itself, as well
   as to inspire any other projects that investigate similar solutions. [#2832]

 - A technologically and practically interesting revamp of NUT mesh of
   link:https://www.gnu.org/software/automake/[automake] (`Makefile.am`)
   recipes was completed, allowing for a more parallelizable build routine
   on multi-CPU machines -- utilizing more cores and completing in less
   "wall-clock" time that the standard `SUBDIRS` driven approach -- when
   running `make -j (N)` from the project root directory to build everything
   enabled by the `configure` script.

 - Revised behaviors for the `upsnotify()` common code introduced in recent NUT
   releases (integrating with service management frameworks, etc.):
   * It was a bit cryptic when it reported a *failure to notify* (e.g. when a
     NUT program was not running as a service currently), fixed now to report
     human-friendly text instead of internal enum codes. Follow-up to [issue
     #1590, PR #1777, PR #2136]
   * Drivers should no longer print warning messages about not-initializing
     the notification subsystem because not running as a service when they
     are either started explicitly to show the help message, or when their
     CLI arguments are fatally wrong (no UPS name, no `port`, invalid trailing
     keywords...)
   * NUT programs generally should default to not "spam" about lack of known
     notification technology if our first message to be suppressed is already
     about stopping that program.  This might help nag distros into getting
     a service framework, or integrating theirs with NUT, but is generally
     annoying to end-users where there's little they can do about it (other
     than suppressing the message with `NUT_QUIET_INIT_UPSNOTIFY` envvar).

 - Drivers started with the `-FF` command-line option (e.g. wrapped into the
   systemd units to stay "foregrounded" *and* save a PID file anyway) should
   now also handle an existing PID file to interact with the earlier instance
   of the driver program, if still running (e.g. started manually). [#2384]

 - A new `NUT_QUIET_INIT_BANNER` envvar (presence or "true" value) can now
   prevent the tool name and NUT version banner from being unilaterally
   printed out when NUT programs start. [issues #1789 vs. #316; #2573]

 - The `upsdrvctl` tool improvements:
   * It should now warn if executed on systems where NUT was built with
     support for service management frameworks like systemd or SMF, so
     nut-driver service units prepared by `nut-driver-enumerator` would
     conflict with manually-executed driver programs. This warning can
     be hushed by exporting a `NUT_QUIET_INIT_NDE_WARNING` environment
     variable with any value.
   * Extended `upsdrvctl` with a `list` operation (or `-l` option) to report
     manageable device configuration names (possible `<ups>` arguments to
     `start`, `stop` etc. operations), or to confirm a single name that it
     is known, and a `status` operation for more information. [#2567]
   * Fixed support of `maxstartdelay` at the level of driver section in
     `ups.conf`; added support of `maxretry` and `retrydelay` at this
     level; bumped the default `maxstartdelay` from 45 to 75 seconds to
     accommodate for longer device initialization (e.g. due to support of
     more Megatec Qx dialects by `nutdrv_qx`). [#2885, #2888]

 - `nutdrv_qx` updates:
   * Added Visench C1K (using serial port converter with USB ID `1a86:7523`)
     as known supported by `nutdrv_qx` (Megatec protocol) since at least
     NUT v2.7.4 release. [#2395]
   * Introduced `innovart31` protocol support for Innova RT 3/1 UPSes. [#2712, #2798]
   * Introduced `q2` and `q6` protocol support; currently also based/tested
     on Innova devices, but other models than RT 3/1. [#2798]
   * Introduced a `gtec` subdriver and protocol, tested over USB with a
     Gtec ZP120N device. [#2818]
   * Fixed `hunnox_protocol()` to honour the optional `novendor` setting for
     devices that are confused by such query, e.g. DEXP LCD EURO 1200VA. [#2839]
   * Extended Voltronic protocol to support longer numbers as remaining
     `battery.runtime` value. [#2765]

 - New NUT drivers:
   * `bicker_ser`: added new driver for Bicker 12/24Vdc UPS via RS-232 serial
     communication protocol, which supports any UPS shipped with the PSZ-1053
     extension module. [PR #2448]
   * `liebert-gxe`: added new driver with support for Liebert GXE Series UPS
     (serial or USB posing as a serial port). [#2629]
   * `nhs_ser`: added new driver for numerous NHS Nobreaks, senoidal line -- UPS
     models with serial port, made by NHS Sistemas Eletronicos LTDA and popular
     in Brazil. Currently this driver only builds on Linux. [#2692]
   * `phoenixcontact_modbus` driver: Introduced Phoenix Contact QUINT4-UPS/24DC
     management (only new modbus addresses). [#2689, #2716]

 - Added `scripts/external_apis` with an example script integrating a
   non-native protocol with NUT (as live-stream input for `dummy-ups`
   NUT driver to publish further); that example can be installed using
   `configure --enable-extapi-enphase`. [issue #2807, PR #2813]

 - `usbhid-ups` and `netxml-ups` updated to handle "No battery installed!"
   alarm also to set the `RB` (Replace Battery) value in `ups.status`.
   This may cause dual triggering of notifications (as an `ALARM` generally
   and as an important `REPLBATT` status in particular) in `upsmon`, but
   better safe than sorry. [#415]

 - Introduced a new driver concept for interaction with OS-reported hardware
   monitoring readings. Currently instantiated as `hwmon_ina219` specifically
   made for Texas Instruments INA219 chip as exposed in the Linux "hwmon"
   subsystem of its "sysfs" interface (and talking I2C under the hood), this
   approach seems to have good potential to expand into covering more devices
   and perhaps platforms. [#2430]

 - Introduced `ECO` status concept for "ECO mode" (or "High Efficiency" mode,
   or "Energy Saver System"...) as named and defined by hardware vendors.
   One common aspect is that this is a balance of electrical efficiency vs.
   robust outage protection (which may be overkill for IT equipment whose
   PSU can survive several milliseconds on capacitors alone) which can be
   selected at run-time.  Previously such choice was made at the time of
   purchase, with the UPSes only supporting some one protection strategy.
   [issue #2495, PR #2637]
   * Updated documentation, end-user clients (CGI, NUT-Monitor UI);
   * Updated `upsmon` client with ability to report entering and exiting
     the ECO mode if reported by the driver;
   * Initial implementation for Eaton devices with `usbhid-ups` driver.

 - The `upsmon` client can now also report entering and exiting the `OVER`
   (UPS overloaded), `TRIM` and `BOOST` (adjusting for bad input voltage)
   states. A setting `OVERDURATION` was introduced to define a timeout
   after which a non-communicating UPS that was last seen in state `OVER`
   should be considered critical (or not). [PR #1074, issue #2877]

 - Revised `upssched` timer handler that can be called from `upsmon` as its
   `NOTIFYCMD` to not report confusing environment variable values of
   `NOTIFYTYPE` and `UPSNAME` from the original call when a timer eventually
   fires -- these values are irrelevant at that distant future. The NIT (NUT
   Integration Tests) suite was extended to configure and call this tool,
   facilitating its development and troubleshooting. Also the `upssched`
   timer daemon part can now save its PID file (so that NIT can terminate
   it after tests). [#2890]

 - Several NUT clients including `upscmd`, `upsrw`, `upsimage`, `upsset`,
   `upsstats`, and `upslog` (during reconnection), did not `UPSCLI_CONN_TRYSSL`
   so went plaintext even when secure connections were possible. Fixed to at
   least try being secure, same way as `upsc` does for a long time. [#2847]

 - NUT binding for Python and the `NUT-Monitor` Python UI client updates:
   * The `PyNUTClient` module should no longer rely on presence of a `telnetlib`
     module in the build or execution environment (deprecated in Python 3.11,
     removed since Python 3.13). [issue #2183, PR #2792]
   * The PyPI distribution of the `PyNUTClient` module tarball should now use a
     lower-cased file name (and immediate versioned directory name inside) to
     match the requirements of link:https://peps.python.org/pep-0625/[PEP-0625].
     The Python module name (and its directory) should remain camel-cased. [#2773]


To generate a diff of this commit:
cvs rdiff -u -r1.20 -r1.21 pkgsrc/sysutils/p5-UPS-Nut/Makefile
cvs rdiff -u -r1.79 -r1.80 pkgsrc/sysutils/ups-nut/Makefile
cvs rdiff -u -r1.18 -r1.19 pkgsrc/sysutils/ups-nut/Makefile.common
cvs rdiff -u -r1.34 -r1.35 pkgsrc/sysutils/ups-nut/PLIST
cvs rdiff -u -r1.42 -r1.43 pkgsrc/sysutils/ups-nut/distinfo
cvs rdiff -u -r1.79 -r1.80 pkgsrc/sysutils/ups-nut-cgi/Makefile
cvs rdiff -u -r1.1 -r1.2 \
    pkgsrc/sysutils/ups-nut/patches/patch-conf_Makefile.in \
    pkgsrc/sysutils/ups-nut/patches/patch-drivers_libusb0.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/p5-UPS-Nut/Makefile
diff -u pkgsrc/sysutils/p5-UPS-Nut/Makefile:1.20 pkgsrc/sysutils/p5-UPS-Nut/Makefile:1.21
--- pkgsrc/sysutils/p5-UPS-Nut/Makefile:1.20    Sat Nov 16 12:06:41 2024
+++ pkgsrc/sysutils/p5-UPS-Nut/Makefile Sat May 17 23:56:37 2025
@@ -1,6 +1,5 @@
-# $NetBSD: Makefile,v 1.20 2024/11/16 12:06:41 wiz Exp $
+# $NetBSD: Makefile,v 1.21 2025/05/17 23:56:37 gdt Exp $
 
-PKGREVISION= 1
 .include "../../sysutils/ups-nut/Makefile.common"
 
 PKGNAME=               ${DISTNAME:S/nut/p5-UPS-Nut/}

Index: pkgsrc/sysutils/ups-nut/Makefile
diff -u pkgsrc/sysutils/ups-nut/Makefile:1.79 pkgsrc/sysutils/ups-nut/Makefile:1.80
--- pkgsrc/sysutils/ups-nut/Makefile:1.79       Sat May 17 23:34:12 2025
+++ pkgsrc/sysutils/ups-nut/Makefile    Sat May 17 23:56:37 2025
@@ -1,9 +1,8 @@
-# $NetBSD: Makefile,v 1.79 2025/05/17 23:34:12 gdt Exp $
+# $NetBSD: Makefile,v 1.80 2025/05/17 23:56:37 gdt Exp $
 
 .include "Makefile.common"
 
 PKGNAME=               ups-${DISTNAME}
-PKGREVISION=           1
 COMMENT=               Network UPS Tools
 
 PLIST_VARS+=           python

Index: pkgsrc/sysutils/ups-nut/Makefile.common
diff -u pkgsrc/sysutils/ups-nut/Makefile.common:1.18 pkgsrc/sysutils/ups-nut/Makefile.common:1.19
--- pkgsrc/sysutils/ups-nut/Makefile.common:1.18        Sat May 17 23:34:12 2025
+++ pkgsrc/sysutils/ups-nut/Makefile.common     Sat May 17 23:56:37 2025
@@ -1,11 +1,11 @@
-# $NetBSD: Makefile.common,v 1.18 2025/05/17 23:34:12 gdt Exp $
+# $NetBSD: Makefile.common,v 1.19 2025/05/17 23:56:37 gdt Exp $
 # used by sysutils/ups-nut/Makefile
 # used by sysutils/ups-nut-cgi/Makefile
 # used by sysutils/ups-nut-snmp/Makefile
 # used by sysutils/ups-nut-usb/Makefile
 # used by sysutils/p5-UPS-Nut/Makefile
 
-DISTNAME=              nut-2.8.2
+DISTNAME=              nut-2.8.3
 CATEGORIES=            sysutils
 MASTER_SITES=          https://networkupstools.org/source/${PKGVERSION_NOREV:R}/
 

Index: pkgsrc/sysutils/ups-nut/PLIST
diff -u pkgsrc/sysutils/ups-nut/PLIST:1.34 pkgsrc/sysutils/ups-nut/PLIST:1.35
--- pkgsrc/sysutils/ups-nut/PLIST:1.34  Fri May 16 16:55:21 2025
+++ pkgsrc/sysutils/ups-nut/PLIST       Sat May 17 23:56:37 2025
@@ -1,4 +1,4 @@
-@comment $NetBSD: PLIST,v 1.34 2025/05/16 16:55:21 martin Exp $
+@comment $NetBSD: PLIST,v 1.35 2025/05/17 23:56:37 gdt Exp $
 bin/nut-scanner
 bin/nutconf
 bin/upsc
@@ -36,6 +36,7 @@ libexec/nut/bestfcom
 libexec/nut/bestfortress
 libexec/nut/bestuferrups
 libexec/nut/bestups
+libexec/nut/bicker_ser
 libexec/nut/blazer_ser
 libexec/nut/clone
 libexec/nut/clone-outlet
@@ -48,6 +49,7 @@ libexec/nut/isbmex
 libexec/nut/ivtscd
 libexec/nut/liebert
 libexec/nut/liebert-esp2
+libexec/nut/liebert-gxe
 libexec/nut/masterguard
 libexec/nut/metasys
 libexec/nut/mge-shut
@@ -108,6 +110,7 @@ man/man3/nutclient_tcp_set_timeout.3
 man/man3/nutscan.3
 man/man3/nutscan_add_commented_option_to_device.3
 man/man3/nutscan_add_device_to_device.3
+man/man3/nutscan_add_ip_range.3
 man/man3/nutscan_add_option_to_device.3
 man/man3/nutscan_cidr_to_ip.3
 man/man3/nutscan_display_parsable.3
@@ -116,8 +119,12 @@ man/man3/nutscan_display_sanity_check_se
 man/man3/nutscan_display_ups_conf.3
 man/man3/nutscan_display_ups_conf_with_sanity_check.3
 man/man3/nutscan_free_device.3
+man/man3/nutscan_free_ip_ranges.3
 man/man3/nutscan_get_serial_ports_list.3
 man/man3/nutscan_init.3
+man/man3/nutscan_init_ip_ranges.3
+man/man3/nutscan_ip_ranges_iter_inc.3
+man/man3/nutscan_ip_ranges_iter_init.3
 man/man3/nutscan_new_device.3
 man/man3/nutscan_scan_avahi.3
 man/man3/nutscan_scan_eaton_serial.3
@@ -127,23 +134,30 @@ man/man3/nutscan_scan_nut_simulation.3
 man/man3/nutscan_scan_snmp.3
 man/man3/nutscan_scan_usb.3
 man/man3/nutscan_scan_xml_http_range.3
+man/man3/nutscan_stringify_ip_ranges.3
 man/man3/upscli_add_host_cert.3
 man/man3/upscli_cleanup.3
 man/man3/upscli_connect.3
 man/man3/upscli_disconnect.3
 man/man3/upscli_fd.3
 man/man3/upscli_get.3
+man/man3/upscli_get_default_connect_timeout.3
 man/man3/upscli_init.3
+man/man3/upscli_init_default_connect_timeout.3
 man/man3/upscli_list_next.3
 man/man3/upscli_list_start.3
 man/man3/upscli_readline.3
 man/man3/upscli_readline_timeout.3
 man/man3/upscli_sendline.3
 man/man3/upscli_sendline_timeout.3
+man/man3/upscli_set_default_connect_timeout.3
 man/man3/upscli_splitaddr.3
 man/man3/upscli_splitname.3
 man/man3/upscli_ssl.3
+man/man3/upscli_str_add_unique_token.3
+man/man3/upscli_str_contains_token.3
 man/man3/upscli_strerror.3
+man/man3/upscli_tryconnect.3
 man/man3/upscli_upserror.3
 man/man3/upsclient.3
 man/man5/nut.conf.5
@@ -163,7 +177,9 @@ man/man8/bestfcom.8
 man/man8/bestfortress.8
 man/man8/bestuferrups.8
 man/man8/bestups.8
+man/man8/bicker_ser.8
 man/man8/blazer_ser.8
+man/man8/clone-outlet.8
 man/man8/clone.8
 man/man8/dummy-ups.8
 man/man8/etapro.8
@@ -173,6 +189,7 @@ man/man8/genericups.8
 man/man8/isbmex.8
 man/man8/ivtscd.8
 man/man8/liebert-esp2.8
+man/man8/liebert-gxe.8
 man/man8/liebert.8
 man/man8/masterguard.8
 man/man8/metasys.8
@@ -259,6 +276,7 @@ share/doc/nut/detailed/packager-guide.tx
 share/doc/nut/detailed/release-notes.txt
 share/doc/nut/detailed/scheduling.txt
 share/doc/nut/detailed/security.txt
+share/doc/nut/detailed/sms-brazil-protocol.txt
 share/doc/nut/detailed/snmp-subdrivers.txt
 share/doc/nut/detailed/snmp.txt
 share/doc/nut/detailed/sock-protocol.txt
@@ -273,5 +291,6 @@ share/examples/nut/upsmon.conf.sample
 share/examples/nut/upssched.conf.sample
 share/nut/cmdvartab
 share/nut/driver.list
+@pkgdir share/doc/nut/html-man
 @pkgdir share/doc/nut/drivers
 @pkgdir etc/nut

Index: pkgsrc/sysutils/ups-nut/distinfo
diff -u pkgsrc/sysutils/ups-nut/distinfo:1.42 pkgsrc/sysutils/ups-nut/distinfo:1.43
--- pkgsrc/sysutils/ups-nut/distinfo:1.42       Wed Apr  3 17:42:53 2024
+++ pkgsrc/sysutils/ups-nut/distinfo    Sat May 17 23:56:37 2025
@@ -1,11 +1,11 @@
-$NetBSD: distinfo,v 1.42 2024/04/03 17:42:53 gdt Exp $
+$NetBSD: distinfo,v 1.43 2025/05/17 23:56:37 gdt Exp $
 
-BLAKE2s (nut-2.8.2.tar.gz) = e61241dfd7c0400daad742a5b081f995c828fdfbe59d4d108bf4e0011f25142d
-SHA512 (nut-2.8.2.tar.gz) = b6f8f22318e4a4fcb8073a63132b1cb083952c665191b82a7d6765a61b859575a4b0c2ba84ed17cfb8c88d34179876d64520dd2f75f02fe8707b406da2c0821c
-Size (nut-2.8.2.tar.gz) = 5599935 bytes
+BLAKE2s (nut-2.8.3.tar.gz) = 55bcfa51223db52023290041da578cdc32d3c2398a2172edb7079e443148a542
+SHA512 (nut-2.8.3.tar.gz) = 0aeafad02ab323b02041a370c586dede91483cab57e0a9d1256a685716ca9f0d0f114df904ef472d48fa53ac1896690b7878828eb3b00934959c7aeaa63af99f
+Size (nut-2.8.3.tar.gz) = 6240908 bytes
 SHA1 (patch-clients_upsclient.c) = 45eee24ed3cc06bbf5ec81344d0db62a3da3a827
-SHA1 (patch-conf_Makefile.in) = c6a232fd9b0ec73825e16f35b142f7195b35a3fe
+SHA1 (patch-conf_Makefile.in) = 8d02a0b05659cb210a77e863a28a3b9caa596dfc
 SHA1 (patch-drivers_libhid.c) = 8b4f773d9b32e4c43f7045a4a83854382b08cb5b
-SHA1 (patch-drivers_libusb0.c) = 71719f12cd8a8efd93d07b6b2d50d8334df7daab
+SHA1 (patch-drivers_libusb0.c) = bdd6fcb145386598b4ac5474d4c866ded5f6d5fa
 SHA1 (patch-drivers_libusb1.c) = 58d8ffe9507399802ad885c2e2627641978e5438
 SHA1 (patch-server_sockdebug.c) = 788efc0a519a6a0256b80156fff415d91a359098

Index: pkgsrc/sysutils/ups-nut-cgi/Makefile
diff -u pkgsrc/sysutils/ups-nut-cgi/Makefile:1.79 pkgsrc/sysutils/ups-nut-cgi/Makefile:1.80
--- pkgsrc/sysutils/ups-nut-cgi/Makefile:1.79   Thu Apr 24 14:15:51 2025
+++ pkgsrc/sysutils/ups-nut-cgi/Makefile        Sat May 17 23:56:37 2025
@@ -1,6 +1,5 @@
-# $NetBSD: Makefile,v 1.79 2025/04/24 14:15:51 wiz Exp $
+# $NetBSD: Makefile,v 1.80 2025/05/17 23:56:37 gdt Exp $
 
-PKGREVISION= 2
 .include "../../sysutils/ups-nut/Makefile.common"
 
 PKGNAME=               ${DISTNAME:S/nut/ups-nut-cgi/}

Index: pkgsrc/sysutils/ups-nut/patches/patch-conf_Makefile.in
diff -u pkgsrc/sysutils/ups-nut/patches/patch-conf_Makefile.in:1.1 pkgsrc/sysutils/ups-nut/patches/patch-conf_Makefile.in:1.2
--- pkgsrc/sysutils/ups-nut/patches/patch-conf_Makefile.in:1.1  Thu Nov  9 16:41:15 2023
+++ pkgsrc/sysutils/ups-nut/patches/patch-conf_Makefile.in      Sat May 17 23:56:37 2025
@@ -1,14 +1,14 @@
-$NetBSD: patch-conf_Makefile.in,v 1.1 2023/11/09 16:41:15 gdt Exp $
+$NetBSD: patch-conf_Makefile.in,v 1.2 2025/05/17 23:56:37 gdt Exp $
 
 Place example configs in example directory, not etcdir.
 This is a pkgsrc norms adjustment and thus not reportable upstream.
 
---- conf/Makefile.in.orig      2023-10-31 22:03:30.000000000 +0000
+--- conf/Makefile.in.orig      2025-03-31 12:16:18.000000000 +0000
 +++ conf/Makefile.in
-@@ -218,7 +218,7 @@ CC = @CC@
- CCDEPMODE = @CCDEPMODE@
- CFLAGS = @CFLAGS@
+@@ -229,7 +229,7 @@ CONFIG_CPPFLAGS = @CONFIG_CPPFLAGS@
+ CONFIG_CXXFLAGS = @CONFIG_CXXFLAGS@
  CONFIG_FLAGS = @CONFIG_FLAGS@
+ CONFIG_LDFLAGS = @CONFIG_LDFLAGS@
 -CONFPATH = @CONFPATH@
 +CONFPATH = $(DESTDIR)@prefix@/share/examples/nut
  CPP = @CPP@
Index: pkgsrc/sysutils/ups-nut/patches/patch-drivers_libusb0.c
diff -u pkgsrc/sysutils/ups-nut/patches/patch-drivers_libusb0.c:1.1 pkgsrc/sysutils/ups-nut/patches/patch-drivers_libusb0.c:1.2
--- pkgsrc/sysutils/ups-nut/patches/patch-drivers_libusb0.c:1.1 Tue Apr 26 23:28:25 2022
+++ pkgsrc/sysutils/ups-nut/patches/patch-drivers_libusb0.c     Sat May 17 23:56:37 2025
@@ -1,10 +1,10 @@
-$NetBSD: patch-drivers_libusb0.c,v 1.1 2022/04/26 23:28:25 gdt Exp $
+$NetBSD: patch-drivers_libusb0.c,v 1.2 2025/05/17 23:56:37 gdt Exp $
 
---- drivers/libusb0.c.orig     2022-03-27 12:59:49.000000000 +0000
+--- drivers/libusb0.c.orig     2024-12-02 14:39:55.000000000 +0000
 +++ drivers/libusb0.c
-@@ -532,6 +532,7 @@ static int libusb_open(usb_dev_handle **
+@@ -765,6 +765,7 @@ static int nut_libusb_open(usb_dev_handl
   */
- static int libusb_strerror(const int ret, const char *desc)
+ static int nut_libusb_strerror(const int ret, const char *desc)
  {
 +      /* \todo: Possibly change to >= */
        if (ret > 0) {