diff --git a/SOURCES/net-snmp-5.8-flood-messages.patch b/SOURCES/net-snmp-5.8-flood-messages.patch new file mode 100644 index 0000000..49e8e44 --- /dev/null +++ b/SOURCES/net-snmp-5.8-flood-messages.patch @@ -0,0 +1,26 @@ +From cd09fd82522861830aaf9d237b26eef5f9ba50d2 Mon Sep 17 00:00:00 2001 +From: Bart Van Assche +Date: Wed, 21 Nov 2018 20:47:42 -0800 +Subject: [PATCH] MIB-II: Only log once that opening /proc/net/if_inet6 failed + +If IPv6 has been disabled (ipv6.disable=1) then opening /proc/net/if_inet6 +fails. Only log this once instead of thousand of times a day. + +Reported-by: Fif +--- + agent/mibgroup/ip-mib/data_access/ipaddress_linux.c | 2 +- + 1 file changed, 1 insertion(+), 1 deletion(-) + +diff --git a/agent/mibgroup/ip-mib/data_access/ipaddress_linux.c b/agent/mibgroup/ip-mib/data_access/ipaddress_linux.c +index 5ddead3e0..280575ce3 100644 +--- a/agent/mibgroup/ip-mib/data_access/ipaddress_linux.c ++++ b/agent/mibgroup/ip-mib/data_access/ipaddress_linux.c +@@ -234,7 +234,7 @@ _load_v6(netsnmp_container *container, int idx_offset) + + #define PROCFILE "/proc/net/if_inet6" + if (!(in = fopen(PROCFILE, "r"))) { +- snmp_log_perror("ipaddress_linux: could not open " PROCFILE); ++ NETSNMP_LOGONCE((LOG_ERR, "ipaddress_linux: could not open " PROCFILE)); + return -2; + } + diff --git a/SPECS/net-snmp.spec b/SPECS/net-snmp.spec index 1822f37..88e4dd6 100644 --- a/SPECS/net-snmp.spec +++ b/SPECS/net-snmp.spec @@ -10,7 +10,7 @@ Summary: A collection of SNMP protocol tools and libraries Name: net-snmp Version: 5.8 -Release: 10%{?dist} +Release: 12%{?dist} Epoch: 1 License: BSD @@ -43,6 +43,7 @@ Patch14: net-snmp-5.8-coverity.patch Patch15: net-snmp-5.8-ipv6-clientaddr.patch Patch16: net-snmp-5.8-agent-of-death.patch Patch17: net-snmp-5.8-trapsink.patch +Patch18: net-snmp-5.8-flood-messages.patch # Modern RPM API means at least EL6 Patch101: net-snmp-5.8-modern-rpm-api.patch @@ -51,7 +52,7 @@ Requires: %{name}-libs%{?_isa} = %{epoch}:%{version}-%{release} Requires: %{name}-agent-libs%{?_isa} = %{epoch}:%{version}-%{release} BuildRequires: gcc # This is actually needed for the %%triggerun script but Requires(triggerun) -# is not valid. We can use %%post because this particular %triggerun script +# is not valid. We can use %%post because this particular %%triggerun script # should fire just after this package is installed. %{?systemd_requires} BuildRequires: systemd @@ -185,6 +186,7 @@ rm -r python %patch15 -p1 -b .ipv6-clientaddr %patch16 -p1 -b .agent-of-death %patch17 -p1 -b .trapsink +%patch18 -p1 -b .flood-messages %patch101 -p1 -b .modern-rpm-api @@ -438,6 +440,12 @@ LD_LIBRARY_PATH=%{buildroot}/%{_libdir} make test %{_libdir}/libnetsnmptrapd*.so.%{soname}* %changelog +* Wed Oct 16 2019 Jiri Kucera - 1:5.8-12 +- rebuild to ensure correct disttag (#1755359) + +* Tue Oct 15 2019 Jiri Kucera - 1:5.8-11 +- fix issue with flood messages (#1755359) + * Thu Jun 27 2019 Josef Ridky - 1:5.8-10 - fix trapsink port issue (#1677192)