From nobody Tue Apr 2 17:03:28 2024 X-Original-To: dev-commits-ports-all@mlmmj.nyi.freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2610:1c1:1:606c::19:1]) by mlmmj.nyi.freebsd.org (Postfix) with ESMTP id 4V8DjX67nfz5FHZw; Tue, 2 Apr 2024 17:03:28 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from mxrelay.nyi.freebsd.org (mxrelay.nyi.freebsd.org [IPv6:2610:1c1:1:606c::19:3]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256 client-signature RSA-PSS (4096 bits) client-digest SHA256) (Client CN "mxrelay.nyi.freebsd.org", Issuer "R3" (verified OK)) by mx1.freebsd.org (Postfix) with ESMTPS id 4V8DjX5Ds2z4g6f; Tue, 2 Apr 2024 17:03:28 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1712077408; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=Hld5li5krQnkTfMEnkwHy6thnMshckuZaW+C466/z7g=; b=rUkwFRVstHkwAskR8vYmeUvViPvLxDCe1zikqhCS+XKIKGAAjtvk2yTXpGnv6hbhZM2awR NGZIn62vEhMesAsNrk30eox8+IGg5kDZAGdAgYwAj/r5EW8Fr7rBZd/MvZPM4hrpsN8cpM er/W6bhYW14pRSzQaKsa0dDwyKo/4WM9Gn9V/y2SY4/UwIE+fEfDeEM7GdimtpZlshzj/j 9k1MRTfNdamGaUkWfN9qY14WSD0aFxf8spxANGzPag2LIqdF3jPwfPU+V+6I89vEatw0Xs lSjnR9NINIteJ+N2uH8ftdUQNZqHu1jCh69DiMyg5vT8HbFnTT6C5U1Sg3BYRw== ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1712077408; a=rsa-sha256; cv=none; b=hUyR6Ee4awq/zV0OZ/dmg20h8yMRkme56nGrhUc7DMEtPIfs/x3aEQep5vdFOlUIY4TyEW v+rI6kYX9q9/os9OZ7QIC5FCwR/4Vmo7mRK19dLSET4HxSoPFyog58znMuOpzELDLJs35B Wxbrfxgfoo3NPXOguk6quaS18RSaXWN44TijVbv/AKRI9cPBFKOrsfcmsjq7botHsa+Pn3 osmnfU3Ny6culZC2PjsUH3tAjXE4K2O6bqFr2JNkTMkxX3mThQbSRoNvxU3rW8DSiYX2vE NUwmTTXbGrQpKWW1rArTQgQeG0N9ne3bom0ftws95wlg0bizvKUT79O24qXjkg== ARC-Authentication-Results: i=1; mx1.freebsd.org; none ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1712077408; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=Hld5li5krQnkTfMEnkwHy6thnMshckuZaW+C466/z7g=; b=v/vj4YAzffIUxf+LBdnr+jgqqVdRQjrBwL6sm6lkRZqCLj5z1TBwIHraiqWHYuUOqNAlLc B7t9dN127hwzfKDP/eRPF7i+e/0/W1oSsUGC1W/FYDXUjLjGVTVEyxia8ja60GfrkgQSn9 poVy3cjMy+mUNAXQ2RYIeN2D/fgm6M4Z5L7gpjZ1Haqq4T6fCMngZIimPb/GnKEdggxgdC XRLJIMmFNoDgZwUehss89jKQIVjPwJf9kPMtiatLb1YsHp3JtE6FLs0HqJVzUvDCeVG/2+ qAa2pZieliwAkDBc/hBXyr5G+RWYFgjhz+YMrgT/WVqf4vbW0C+rlFO1aOJNiQ== Received: from gitrepo.freebsd.org (gitrepo.freebsd.org [IPv6:2610:1c1:1:6068::e6a:5]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256) (Client did not present a certificate) by mxrelay.nyi.freebsd.org (Postfix) with ESMTPS id 4V8DjX4mpRzxrq; Tue, 2 Apr 2024 17:03:28 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from gitrepo.freebsd.org ([127.0.1.44]) by gitrepo.freebsd.org (8.17.1/8.17.1) with ESMTP id 432H3SXB043652; Tue, 2 Apr 2024 17:03:28 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.17.1/8.17.1/Submit) id 432H3SKH043649; Tue, 2 Apr 2024 17:03:28 GMT (envelope-from git) Date: Tue, 2 Apr 2024 17:03:28 GMT Message-Id: <202404021703.432H3SKH043649@gitrepo.freebsd.org> To: ports-committers@FreeBSD.org, dev-commits-ports-all@FreeBSD.org, dev-commits-ports-main@FreeBSD.org From: Cy Schubert Subject: git: 1b043a9b1eb3 - main - sysutils/nut: Update to 2.8.2 List-Id: Commit messages for all branches of the ports repository List-Archive: https://lists.freebsd.org/archives/dev-commits-ports-all List-Help: List-Post: List-Subscribe: List-Unsubscribe: Sender: owner-dev-commits-ports-all@freebsd.org X-BeenThere: dev-commits-ports-all@freebsd.org MIME-Version: 1.0 Content-Type: text/plain; charset=utf-8 Content-Transfer-Encoding: 8bit X-Git-Committer: cy X-Git-Repository: ports X-Git-Refname: refs/heads/main X-Git-Reftype: branch X-Git-Commit: 1b043a9b1eb350c6cd5811edbac1c46c603d813b Auto-Submitted: auto-generated The branch main has been updated by cy: URL: https://cgit.FreeBSD.org/ports/commit/?id=1b043a9b1eb350c6cd5811edbac1c46c603d813b commit 1b043a9b1eb350c6cd5811edbac1c46c603d813b Author: Cy Schubert AuthorDate: 2024-04-02 15:17:36 +0000 Commit: Cy Schubert CommitDate: 2024-04-02 17:02:46 +0000 sysutils/nut: Update to 2.8.2 --- sysutils/nut-devel/pkg-plist | 2 ++ sysutils/nut/Makefile | 3 +-- sysutils/nut/distinfo | 6 +++--- sysutils/nut/files/patch-drivers_libusb1.c | 18 ------------------ sysutils/nut/pkg-plist | 10 +++++++--- 5 files changed, 13 insertions(+), 26 deletions(-) diff --git a/sysutils/nut-devel/pkg-plist b/sysutils/nut-devel/pkg-plist index 58f885881df5..ad70a66cdca6 100644 --- a/sysutils/nut-devel/pkg-plist +++ b/sysutils/nut-devel/pkg-plist @@ -108,6 +108,7 @@ lib/libnutscan.so.2.0.5 %%SERIAL%%libexec/nut/safenet %%SERIAL%%libexec/nut/skel %%SNMP%%libexec/nut/snmp-ups +%%SERIAL%%libexec/nut/sms_ser %%SERIAL%%libexec/nut/solis %%SERIAL%%libexec/nut/tripplite %%USB%%libexec/nut/tripplite_usb @@ -218,6 +219,7 @@ lib/libnutscan.so.2.0.5 %%MANPAGES%%share/man/man8/nutupsdrv.8.gz %%MANPAGES%%%%SERIAL%%share/man/man8/riello_ser.8.gz %%MANPAGES%%%%USB%%share/man/man8/riello_usb.8.gz +%%MANPAGES%%%%SERIAL%%share/man/man8/sms_ser.8.gz %%MANPAGES%%%%MODBUS%%share/man/man8/apc_modbus.8.gz %%MANPAGES%%%%MODBUS%%share/man/man8/adelsystem_cbi.8.gz %%MANPAGES%%%%MODBUS%%share/man/man8/generic_modbus.8.gz diff --git a/sysutils/nut/Makefile b/sysutils/nut/Makefile index d93528170746..791d13b6f804 100644 --- a/sysutils/nut/Makefile +++ b/sysutils/nut/Makefile @@ -1,6 +1,5 @@ PORTNAME= nut -PORTVERSION= 2.8.1 -PORTREVISION= 3 +PORTVERSION= 2.8.2 CATEGORIES= sysutils MASTER_SITES= http://www.networkupstools.org/source/${PORTVERSION:R}/ diff --git a/sysutils/nut/distinfo b/sysutils/nut/distinfo index 91721deab284..a6539cf5526e 100644 --- a/sysutils/nut/distinfo +++ b/sysutils/nut/distinfo @@ -1,3 +1,3 @@ -TIMESTAMP = 1699981499 -SHA256 (nut-2.8.1.tar.gz) = 7da48ee23b1f0d8d72560bb0af84f5c5ae4dbe35452b84cb49840132e47f099c -SIZE (nut-2.8.1.tar.gz) = 4125263 +TIMESTAMP = 1712029991 +SHA256 (nut-2.8.2.tar.gz) = e4b4b0cbe7dd39ba9097be7f7d787bb2fffbe35df64dff53b5fe393d659c597d +SIZE (nut-2.8.2.tar.gz) = 5599935 diff --git a/sysutils/nut/files/patch-drivers_libusb1.c b/sysutils/nut/files/patch-drivers_libusb1.c deleted file mode 100644 index 8e778ecf8707..000000000000 --- a/sysutils/nut/files/patch-drivers_libusb1.c +++ /dev/null @@ -1,18 +0,0 @@ ---- drivers/libusb1.c.orig 2023-11-24 07:19:04.377537000 -0800 -+++ drivers/libusb1.c 2023-11-24 07:20:06.065188000 -0800 -@@ -263,14 +263,7 @@ - libusb_free_device_list(devlist, 1); - fatal_with_errno(EXIT_FAILURE, "Out of memory"); - } -- if (bus_num > 0) { -- sprintf(curDevice->Bus, "%03d", bus_num); -- } else { -- upsdebugx(1, "%s: invalid libusb bus number %i", -- __func__, bus_num); -- free(curDevice->Bus); -- curDevice->Bus = NULL; -- } -+ sprintf(curDevice->Bus, "%03d", bus_num); - - device_addr = libusb_get_device_address(device); - curDevice->Device = (char *)malloc(4); diff --git a/sysutils/nut/pkg-plist b/sysutils/nut/pkg-plist index ee950b01a582..ad70a66cdca6 100644 --- a/sysutils/nut/pkg-plist +++ b/sysutils/nut/pkg-plist @@ -22,6 +22,7 @@ @sample %%EXAMPLESDIR%%/syslog.sample etc/syslog.d/nut %%USB%%etc/devd/nut-usb.conf bin/nut-scanner +bin/nutconf bin/upsc bin/upscmd bin/upslog @@ -52,7 +53,7 @@ lib/libnutclientstub.so.1.0.1 lib/libnutscan.a lib/libnutscan.so lib/libnutscan.so.2 -lib/libnutscan.so.2.0.2 +lib/libnutscan.so.2.0.5 %%PYTHON_SITELIBDIR%%/PyNUT.py %%PYTHON_SITELIBDIR%%/test_nutclient.py %%DEV%%libdata/pkgconfig/libnutclient.pc @@ -106,8 +107,8 @@ lib/libnutscan.so.2.0.2 %%USB%%libexec/nut/richcomm_usb %%SERIAL%%libexec/nut/safenet %%SERIAL%%libexec/nut/skel -%%SERIAL%%libexec/nut/sms_ser %%SNMP%%libexec/nut/snmp-ups +%%SERIAL%%libexec/nut/sms_ser %%SERIAL%%libexec/nut/solis %%SERIAL%%libexec/nut/tripplite %%USB%%libexec/nut/tripplite_usb @@ -157,6 +158,7 @@ lib/libnutscan.so.2.0.2 %%MANPAGES%%%%DEV%%share/man/man3/nutclient_tcp_reconnect.3.gz %%MANPAGES%%%%DEV%%share/man/man3/nutclient_tcp_set_timeout.3.gz %%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_option_to_device.3.gz %%MANPAGES%%%%DEV%%share/man/man3/nutscan_cidr_to_ip.3.gz @@ -173,6 +175,7 @@ lib/libnutscan.so.2.0.2 %%MANPAGES%%%%DEV%%share/man/man3/nutscan_scan_eaton_serial.3.gz %%MANPAGES%%%%DEV%%share/man/man3/nutscan_scan_ipmi.3.gz %%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_scan_usb.3.gz %%MANPAGES%%%%DEV%%share/man/man3/nutscan_scan_xml_http_range.3.gz @@ -209,12 +212,14 @@ lib/libnutscan.so.2.0.2 %%MANPAGES%%share/man/man8/nut-driver-enumerator.8.gz %%MANPAGES%%share/man/man8/nut-recorder.8.gz %%MANPAGES%%share/man/man8/nut-scanner.8.gz +%%MANPAGES%%share/man/man8/nutconf.8.gz %%MANPAGES%%%%USB%%share/man/man8/nutdrv_atcl_usb.8.gz %%MANPAGES%%%%USB%%share/man/man8/nutdrv_qx.8.gz %%MANPAGES%%%%SERIAL%%share/man/man8/nutdrv_siemens_sitop.8.gz %%MANPAGES%%share/man/man8/nutupsdrv.8.gz %%MANPAGES%%%%SERIAL%%share/man/man8/riello_ser.8.gz %%MANPAGES%%%%USB%%share/man/man8/riello_usb.8.gz +%%MANPAGES%%%%SERIAL%%share/man/man8/sms_ser.8.gz %%MANPAGES%%%%MODBUS%%share/man/man8/apc_modbus.8.gz %%MANPAGES%%%%MODBUS%%share/man/man8/adelsystem_cbi.8.gz %%MANPAGES%%%%MODBUS%%share/man/man8/generic_modbus.8.gz @@ -267,7 +272,6 @@ lib/libnutscan.so.2.0.2 %%MANPAGES%%%%SERIAL%%share/man/man8/powerpanel.8.gz %%MANPAGES%%%%SERIAL%%share/man/man8/rhino.8.gz %%MANPAGES%%%%SERIAL%%share/man/man8/safenet.8.gz -%%MANPAGES%%%%SERIAL%%share/man/man8/sms_ser.8.gz %%MANPAGES%%%%SERIAL%%share/man/man8/solis.8.gz %%MANPAGES%%%%SERIAL%%share/man/man8/tripplite.8.gz %%MANPAGES%%%%SERIAL%%share/man/man8/tripplitesu.8.gz