CVS commit: pkgsrc/sysutils/ups-nut

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

Module Name:    pkgsrc
Committed By:   gdt
Date:           Sat Nov 26 14:45:47 UTC 2022

Modified Files:
        pkgsrc/sysutils/ups-nut: distinfo
        pkgsrc/sysutils/ups-nut/patches: patch-drivers_usbhid-ups.c

Log Message:
sysutils/ups-nut: Add upstream commit reference to patch


To generate a diff of this commit:
cvs rdiff -u -r1.39 -r1.40 pkgsrc/sysutils/ups-nut/distinfo
cvs rdiff -u -r1.1 -r1.2 \
    pkgsrc/sysutils/ups-nut/patches/patch-drivers_usbhid-ups.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.39 pkgsrc/sysutils/ups-nut/distinfo:1.40
--- pkgsrc/sysutils/ups-nut/distinfo:1.39       Fri Nov 25 07:45:03 2022
+++ pkgsrc/sysutils/ups-nut/distinfo    Sat Nov 26 14:45:47 2022
@@ -1,4 +1,4 @@
-$NetBSD: distinfo,v 1.39 2022/11/25 07:45:03 mrg Exp $
+$NetBSD: distinfo,v 1.40 2022/11/26 14:45:47 gdt Exp $
 
 BLAKE2s (nut-2.8.0.tar.gz) = 244e154d951f4a1d08172e162826fdb4082c3e0a033a426040adc2b9a420feca
 SHA512 (nut-2.8.0.tar.gz) = 3c413ae54088045a713eb80cf1bdda474f41bb3b67c7c0248aa7a0c4d441dce1ff42627a2735273d7e36892d1f2eeb895220cf28af63fec2fa0c7a267f82d577
@@ -8,4 +8,4 @@ SHA1 (patch-clients_upsclient.c) = 9c521
 SHA1 (patch-drivers_libhid.c) = 8b4f773d9b32e4c43f7045a4a83854382b08cb5b
 SHA1 (patch-drivers_libusb0.c) = 71719f12cd8a8efd93d07b6b2d50d8334df7daab
 SHA1 (patch-drivers_libusb1.c) = 58d8ffe9507399802ad885c2e2627641978e5438
-SHA1 (patch-drivers_usbhid-ups.c) = bb5cbdca45606152ea0bd5b94cf6955c0d839936
+SHA1 (patch-drivers_usbhid-ups.c) = 3f1a14cc764ef0dbb5befd19910dd6790ab98df9

Index: pkgsrc/sysutils/ups-nut/patches/patch-drivers_usbhid-ups.c
diff -u pkgsrc/sysutils/ups-nut/patches/patch-drivers_usbhid-ups.c:1.1 pkgsrc/sysutils/ups-nut/patches/patch-drivers_usbhid-ups.c:1.2
--- pkgsrc/sysutils/ups-nut/patches/patch-drivers_usbhid-ups.c:1.1      Fri Nov 25 07:45:03 2022
+++ pkgsrc/sysutils/ups-nut/patches/patch-drivers_usbhid-ups.c  Sat Nov 26 14:45:47 2022
@@ -1,4 +1,4 @@
-$NetBSD: patch-drivers_usbhid-ups.c,v 1.1 2022/11/25 07:45:03 mrg Exp $
+$NetBSD: patch-drivers_usbhid-ups.c,v 1.2 2022/11/26 14:45:47 gdt Exp $
 
 Avoid re-closing a udev that already was closed.  Avoids a double-close
 that triggers a SEGV in a list-delete operation.
@@ -13,6 +13,9 @@ static int nut_libusb_open(libusb_device
 as the same double-free list issue occurs here.
 
 
+Fixed upstream slightly differently, but essentially the same, in:
+https://github.com/networkupstools/nut/commit/89dbdd1e60
+
 --- drivers/usbhid-ups.c.orig  2022-04-26 17:03:31.000000000 -0500
 +++ drivers/usbhid-ups.c       2022-11-25 01:36:52.595626560 -0600
 @@ -1147,6 +1147,7 @@