git: 4d4b05685b71 - main - sysutils/nut-devel: Update to the latest networkupstools/nut github commit
- Go to: [ bottom of page ] [ top of archives ] [ this month ]
Date: Thu, 18 Jul 2024 21:19:21 UTC
The branch main has been updated by cy:
URL: https://cgit.FreeBSD.org/ports/commit/?id=4d4b05685b71e9888efae80c4ef8b2754e679bae
commit 4d4b05685b71e9888efae80c4ef8b2754e679bae
Author: Cy Schubert <cy@FreeBSD.org>
AuthorDate: 2024-07-18 20:58:33 +0000
Commit: Cy Schubert <cy@FreeBSD.org>
CommitDate: 2024-07-18 20:58:33 +0000
sysutils/nut-devel: Update to the latest networkupstools/nut github commit
---
sysutils/nut-devel/Makefile | 4 ++--
sysutils/nut-devel/distinfo | 6 ++---
.../files/patch-tools_nut-scanner_nutscan-init.c | 28 +++++++++++-----------
sysutils/nut-devel/pkg-plist | 10 ++++++--
4 files changed, 27 insertions(+), 21 deletions(-)
diff --git a/sysutils/nut-devel/Makefile b/sysutils/nut-devel/Makefile
index 67dc576ad917..bc2c89a83f0a 100644
--- a/sysutils/nut-devel/Makefile
+++ b/sysutils/nut-devel/Makefile
@@ -18,8 +18,8 @@ CONFLICTS= nut-[0-9]*
USE_GITHUB= yes
GH_ACCOUNT= networkupstools
-GH_TAGNAME= d683bc1da
-NUT_COMMIT_DATE= 2024.06.25
+GH_TAGNAME= 831704015
+NUT_COMMIT_DATE= 2024.06.17
MAKE_JOBS_UNSAFE= yes
GNU_CONFIGURE= yes
diff --git a/sysutils/nut-devel/distinfo b/sysutils/nut-devel/distinfo
index f4aca38a7e41..cd512bb402f3 100644
--- a/sysutils/nut-devel/distinfo
+++ b/sysutils/nut-devel/distinfo
@@ -1,3 +1,3 @@
-TIMESTAMP = 1719406646
-SHA256 (networkupstools-nut-2024.06.25-d683bc1da_GH0.tar.gz) = 4c96b8da47ae5b1f5f648c758ba737d7d95037743715d7733823986240be3530
-SIZE (networkupstools-nut-2024.06.25-d683bc1da_GH0.tar.gz) = 4323344
+TIMESTAMP = 1721335070
+SHA256 (networkupstools-nut-2024.06.17-831704015_GH0.tar.gz) = a47dee26baf6afb674165dab94a31f27d4b73ab5b194fb978e08c709f77832ff
+SIZE (networkupstools-nut-2024.06.17-831704015_GH0.tar.gz) = 4371604
diff --git a/sysutils/nut-devel/files/patch-tools_nut-scanner_nutscan-init.c b/sysutils/nut-devel/files/patch-tools_nut-scanner_nutscan-init.c
index 40de4a19cde7..bcd884c3b786 100644
--- a/sysutils/nut-devel/files/patch-tools_nut-scanner_nutscan-init.c
+++ b/sysutils/nut-devel/files/patch-tools_nut-scanner_nutscan-init.c
@@ -1,14 +1,14 @@
---- tools/nut-scanner/nutscan-init.c.orig 2022-08-15 05:15:58.000000000 -0700
-+++ tools/nut-scanner/nutscan-init.c 2022-08-15 07:11:39.489088000 -0700
-@@ -135,7 +135,11 @@
- char *libname = NULL;
- #ifdef WITH_USB
- #if WITH_LIBUSB_1_0
-+ #ifdef __FreeBSD__
-+ libname = get_libname("libusb.so");
-+ #else
- libname = get_libname("libusb-1.0" SOEXT);
-+ #endif
- #else
- libname = get_libname("libusb-0.1" SOEXT);
- #endif
+--- tools/nut-scanner/nutscan-init.c.orig 2024-07-17 06:41:06.000000000 -0700
++++ tools/nut-scanner/nutscan-init.c 2024-07-18 13:41:55.306142000 -0700
+@@ -216,7 +216,11 @@
+ }
+ # endif /* SOFILE_LIBUSB1 */
+ if (!libname) {
++# ifdef __FreeBSD__
++ libname = get_libname("libusb.so");
++# else
+ libname = get_libname("libusb-1.0" SOEXT);
++# endif
+ }
+ # ifdef SOPATH_LIBUSB1
+ if (!libname) {
diff --git a/sysutils/nut-devel/pkg-plist b/sysutils/nut-devel/pkg-plist
index 28088d3bded3..82a885a54f4a 100644
--- a/sysutils/nut-devel/pkg-plist
+++ b/sysutils/nut-devel/pkg-plist
@@ -52,8 +52,8 @@ lib/libnutclientstub.so.1
lib/libnutclientstub.so.1.0.1
lib/libnutscan.a
lib/libnutscan.so
-lib/libnutscan.so.1
-lib/libnutscan.so.1.1.5
+lib/libnutscan.so.2
+lib/libnutscan.so.2.0.6
%%PYTHON_SITELIBDIR%%/PyNUT.py
%%PYTHON_SITELIBDIR%%/test_nutclient.py
%%DEV%%libdata/pkgconfig/libnutclient.pc
@@ -160,6 +160,7 @@ lib/libnutscan.so.1.1.5
%%MANPAGES%%%%DEV%%share/man/man3/nutscan.3.gz
%%MANPAGES%%%%DEV%%share/man/man3/nutscan_add_commented_option_to_device.3.gz
%%MANPAGES%%%%DEV%%share/man/man3/nutscan_add_device_to_device.3.gz
+%%MANPAGES%%%%DEV%%share/man/man3/nutscan_add_ip_range.3.gz
%%MANPAGES%%%%DEV%%share/man/man3/nutscan_add_option_to_device.3.gz
%%MANPAGES%%%%DEV%%share/man/man3/nutscan_cidr_to_ip.3.gz
%%MANPAGES%%%%DEV%%share/man/man3/nutscan_display_parsable.3.gz
@@ -168,8 +169,12 @@ lib/libnutscan.so.1.1.5
%%MANPAGES%%%%DEV%%share/man/man3/nutscan_display_ups_conf_with_sanity_check.3.gz
%%MANPAGES%%%%DEV%%share/man/man3/nutscan_display_ups_conf.3.gz
%%MANPAGES%%%%DEV%%share/man/man3/nutscan_free_device.3.gz
+%%MANPAGES%%%%DEV%%share/man/man3/nutscan_free_ip_ranges.3.gz
%%MANPAGES%%%%DEV%%share/man/man3/nutscan_get_serial_ports_list.3.gz
%%MANPAGES%%%%DEV%%share/man/man3/nutscan_init.3.gz
+%%MANPAGES%%%%DEV%%share/man/man3/nutscan_init_ip_ranges.3.gz
+%%MANPAGES%%%%DEV%%share/man/man3/nutscan_ip_ranges_iter_inc.3.gz
+%%MANPAGES%%%%DEV%%share/man/man3/nutscan_ip_ranges_iter_init.3.gz
%%MANPAGES%%%%DEV%%share/man/man3/nutscan_new_device.3.gz
%%MANPAGES%%%%DEV%%share/man/man3/nutscan_scan_avahi.3.gz
%%MANPAGES%%%%DEV%%share/man/man3/nutscan_scan_eaton_serial.3.gz
@@ -177,6 +182,7 @@ lib/libnutscan.so.1.1.5
%%MANPAGES%%%%DEV%%share/man/man3/nutscan_scan_nut.3.gz
%%MANPAGES%%%%DEV%%share/man/man3/nutscan_scan_nut_simulation.3.gz
%%MANPAGES%%%%DEV%%share/man/man3/nutscan_scan_snmp.3.gz
+%%MANPAGES%%%%DEV%%share/man/man3/nutscan_stringify_ip_ranges.3.gz
%%MANPAGES%%%%DEV%%share/man/man3/nutscan_scan_usb.3.gz
%%MANPAGES%%%%DEV%%share/man/man3/nutscan_scan_xml_http_range.3.gz
%%MANPAGES%%%%DEV%%share/man/man3/upscli_add_host_cert.3.gz