From c8d877dae3c8e3cae50fd3f5d696781c04912f2c Mon Sep 17 00:00:00 2001 From: Michal Hlavinka Date: Jun 08 2021 12:08:15 +0000 Subject: drop snmp-ups support for DES, as required net-snmp no longer supports it --- diff --git a/nut-2.7.4-scratchdes.patch b/nut-2.7.4-scratchdes.patch new file mode 100644 index 0000000..eb793d2 --- /dev/null +++ b/nut-2.7.4-scratchdes.patch @@ -0,0 +1,16 @@ +diff -up nut-2.7.4/drivers/snmp-ups.c.scratchdes nut-2.7.4/drivers/snmp-ups.c +--- nut-2.7.4/drivers/snmp-ups.c.scratchdes 2021-06-08 13:56:32.608702337 +0200 ++++ nut-2.7.4/drivers/snmp-ups.c 2021-06-08 13:56:32.622702201 +0200 +@@ -471,11 +471,7 @@ void nut_snmp_init(const char *type, con + + privProtocol = testvar(SU_VAR_PRIVPROT) ? getval(SU_VAR_PRIVPROT) : "DES"; + +- if (strcmp(privProtocol, "DES") == 0) { +- g_snmp_sess.securityPrivProto = usmDESPrivProtocol; +- g_snmp_sess.securityPrivProtoLen = sizeof(usmDESPrivProtocol)/sizeof(oid); +- } +- else if (strcmp(privProtocol, "AES") == 0) { ++ if (strcmp(privProtocol, "AES") == 0) { + g_snmp_sess.securityPrivProto = usmAESPrivProtocol; + g_snmp_sess.securityPrivProtoLen = sizeof(usmAESPrivProtocol)/sizeof(oid); + } diff --git a/nut.spec b/nut.spec index 0b70251..453218f 100644 --- a/nut.spec +++ b/nut.spec @@ -14,7 +14,7 @@ Summary: Network UPS Tools Name: nut Version: 2.7.4 -Release: 39%{?dist} +Release: 40%{?dist} License: GPLv2+ and GPLv3+ Url: http://www.networkupstools.org/ Source: http://www.networkupstools.org/source/2.7/%{name}-%{version}.tar.gz @@ -32,6 +32,7 @@ Patch8: nut-2.6.5-unreachable.patch Patch9: nut-2.6.5-rmpidf.patch Patch10: nut-2.7.4-cloexec.patch Patch11: nut-2.7.4-nutscanner-FTBFS.patch +Patch12: nut-2.7.4-scratchdes.patch Requires(pre): shadow-utils Requires(post): coreutils systemd @@ -139,6 +140,7 @@ necessary to develop NUT client applications. %patch9 -p1 -b .rmpidf %patch10 -p1 -b .cloexec %patch11 -p1 -b .nutscanner-FTBFS +%patch12 -p1 -b .scratchdes sed -i 's|=NUT-Monitor|=nut-monitor|' scripts/python/app/nut-monitor.desktop sed -i 's|env python|env python3|' scripts/python/app/NUT-Monitor @@ -448,6 +450,9 @@ fi %{_libdir}/pkgconfig/libnutscan.pc %changelog +* Tue Jun 08 2021 Michal Hlavinka - 2.7.4-40 +- drop snmp-ups support for DES, as required net-snmp no longer supports it + * Fri Jun 04 2021 Python Maint - 2.7.4-39 - Rebuilt for Python 3.10