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 <bvanassche@acm.org>
+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 <lefif@users.sourceforge.net>
+---
+ 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/SOURCES/net-snmp-5.8-trapsink.patch b/SOURCES/net-snmp-5.8-trapsink.patch
new file mode 100644
index 0000000..5027d7e
--- /dev/null
+++ b/SOURCES/net-snmp-5.8-trapsink.patch
@@ -0,0 +1,21 @@
+diff -urNp old/snmplib/transports/snmpUDPIPv4BaseDomain.c new/snmplib/transports/snmpUDPIPv4BaseDomain.c
+--- old/snmplib/transports/snmpUDPIPv4BaseDomain.c 2019-06-27 08:40:48.663969034 +0200
++++ new/snmplib/transports/snmpUDPIPv4BaseDomain.c 2019-06-27 08:42:05.293723487 +0200
+@@ -317,7 +317,7 @@ netsnmp_udpipv4base_tspec_transport(nets
+ if (NULL != tspec->source) {
+ struct sockaddr_in src_addr, *srcp = &src_addr;
+ /** get sockaddr from source */
+- if (!netsnmp_sockaddr_in2(&src_addr, tspec->source, NULL))
++ if (!netsnmp_sockaddr_in2(&src_addr, tspec->source, ":0"))
+ return NULL;
+ return netsnmp_udpipv4base_transport_with_source(&addr, local, srcp);
+ } else {
+@@ -364,7 +364,7 @@ netsnmp_udpipv4base_transport(const stru
+ strcat(client_address, ":0");
+ have_port = 1;
+ }
+- rc = netsnmp_sockaddr_in2(&client_addr, client_socket, NULL);
++ rc = netsnmp_sockaddr_in2(&client_addr, client_socket, ":0");
+ if (client_address != client_socket)
+ free(client_address);
+ if(rc) {
diff --git a/SOURCES/net-snmp-tmpfs.conf b/SOURCES/net-snmp-tmpfs.conf
index 382f8eb..9f782d6 100644
--- a/SOURCES/net-snmp-tmpfs.conf
+++ b/SOURCES/net-snmp-tmpfs.conf
@@ -1 +1 @@
-d /var/run/net-snmp 0755 root root
+d /run/net-snmp 0755 root root
diff --git a/SPECS/net-snmp.spec b/SPECS/net-snmp.spec
index 0c5178d..e965b62 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: 9%{?dist}
+Release: 12%{?dist}
Epoch: 1
License: BSD
@@ -42,6 +42,8 @@ Patch13: net-snmp-5.8-usage-exit.patch
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
@@ -50,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
@@ -183,6 +185,8 @@ rm -r python
%patch14 -p1 -b .coverity
%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
@@ -230,7 +234,7 @@ MIBS="$MIBS ucd-snmp/lmsensorsMib"
--with-security-modules=tsm \
--with-sys-location="Unknown" \
--with-systemd \
- --with-temp-file-pattern=/var/run/net-snmp/snmp-tmp-XXXXXX \
+ --with-temp-file-pattern=/run/net-snmp/snmp-tmp-XXXXXX \
--with-transports="DTLSUDP TLSTCP" \
--with-sys-contact="root@localhost" <<EOF
EOF
@@ -436,6 +440,15 @@ LD_LIBRARY_PATH=%{buildroot}/%{_libdir} make test
%{_libdir}/libnetsnmptrapd*.so.%{soname}*
%changelog
+* Wed Nov 06 2019 Josef Ridky <jridky@redhat.com> - 1:5.8-12
+- fix tmpfiles path (#1710784)
+
+* Tue Oct 15 2019 Jiri Kucera <jkucera@redhat.com> - 1:5.8-11
+- fix issue with flood messages (#1719350)
+
+* Thu Jun 27 2019 Josef Ridky <jridky@redhat.com> - 1:5.8-10
+- fix trapsink port issue (#1677192)
+
* Fri May 24 2019 Josef Ridky <jridky@redhat.com> - 1:5.8-9
- rebuild for autoconf