Merge branch 'rawhide' into f37

nut-2.8.0-cyberpowertable.patch

@@ -0,0 +1,42 @@
+From 6a6888e9b5fd995e79e3db335ff4c9c524f31b51 Mon Sep 17 00:00:00 2001
+From: Jim Klimov <jim@jimklimov.com>
+Date: Tue, 24 May 2022 00:51:58 +0200
+Subject: [PATCH] Update cyberpower-mib.c
+
+Closes: #1427
+---
+ drivers/cyberpower-mib.c | 7 +++++--
+ 1 file changed, 5 insertions(+), 2 deletions(-)
+
+diff --git a/drivers/cyberpower-mib.c b/drivers/cyberpower-mib.c
+index aa43295a31..cff6d64d88 100644
+--- a/drivers/cyberpower-mib.c
++++ b/drivers/cyberpower-mib.c
+@@ -24,7 +24,7 @@
+ 
+ #include "cyberpower-mib.h"
+ 
+-#define CYBERPOWER_MIB_VERSION		"0.51"
++#define CYBERPOWER_MIB_VERSION		"0.52"
+ #define CYBERPOWER_OID_MODEL_NAME	".1.3.6.1.4.1.3808.1.1.1.1.1.1.0"
+ 
+ /* CPS-MIB::ups */
+@@ -33,7 +33,6 @@
+ /* https://www.cyberpowersystems.com/products/software/mib-files/ */
+ /* Per CPS MIB 2.9 upsBaseOutputStatus OBJECT-TYPE: */
+ static info_lkp_t cyberpower_power_status[] = {
+-	{ 1, "NULL", NULL, NULL },	/* unknown */
+ 	{ 2, "OL", NULL, NULL },	/* onLine */
+ 	{ 3, "OB", NULL, NULL },	/* onBattery */
+ 	{ 4, "OL BOOST", NULL, NULL },	/* onBoost */
+@@ -44,6 +43,10 @@ static info_lkp_t cyberpower_power_status[] = {
+ 	{ 9, "OL BYPASS", NULL, NULL },	/* onBypass */
+ 	{ 10, "OL TRIM", NULL, NULL },	/* onBuck */
+ 	{ 11, "OL OVER", NULL, NULL },	/* onOverload */
++
++	/* Note: a "NULL" string must be last due to snmp-ups.c parser logic */
++	{ 1, "NULL", NULL, NULL },	/* unknown */
++
+ 	{ 0, NULL, NULL, NULL }
+ } ;
+ 

nut.spec

@@ -24,6 +24,7 @@ Patch2: nut-2.8.0-piddir-owner.patch
 #quick fix. TODO: fix it properly
 Patch9: nut-2.6.5-rmpidf.patch
 Patch15: nut-c99-strdup.patch
+Patch16:	nut-2.8.0-cyberpowertable.patch
 
 Requires(pre): shadow-utils
 Requires(post): coreutils systemd