From 129160ec854dca4c3fedb5bcfbcb56930371da0f Mon Sep 17 00:00:00 2001 From: V3n3RiX Date: Fri, 1 Jan 2021 21:06:00 +0000 Subject: gentoo new year resync : 01.01.2021 --- .../ntopng/files/ntopng-3.8-missing-min.patch | 19 ------------------- net-analyzer/ntopng/files/ntopng-3.8-ndpi-call.patch | 12 ------------ 2 files changed, 31 deletions(-) delete mode 100644 net-analyzer/ntopng/files/ntopng-3.8-missing-min.patch delete mode 100644 net-analyzer/ntopng/files/ntopng-3.8-ndpi-call.patch (limited to 'net-analyzer/ntopng/files') diff --git a/net-analyzer/ntopng/files/ntopng-3.8-missing-min.patch b/net-analyzer/ntopng/files/ntopng-3.8-missing-min.patch deleted file mode 100644 index 303826a918df..000000000000 --- a/net-analyzer/ntopng/files/ntopng-3.8-missing-min.patch +++ /dev/null @@ -1,19 +0,0 @@ ---- a/third-party/zeromq-4.1.3/src/tcp_connecter.cpp -+++ b/third-party/zeromq-4.1.3/src/tcp_connecter.cpp -@@ -31,6 +31,7 @@ - - #include - #include -+#include - - #include "tcp_connecter.hpp" - #include "stream_engine.hpp" -@@ -207,7 +208,7 @@ - options.reconnect_ivl_max > options.reconnect_ivl) - // Calculate the next interval - current_reconnect_ivl = -- min (current_reconnect_ivl * 2, options.reconnect_ivl_max); -+ std::min(current_reconnect_ivl * 2, options.reconnect_ivl_max); - return interval; - } - diff --git a/net-analyzer/ntopng/files/ntopng-3.8-ndpi-call.patch b/net-analyzer/ntopng/files/ntopng-3.8-ndpi-call.patch deleted file mode 100644 index 1308a5c2c03f..000000000000 --- a/net-analyzer/ntopng/files/ntopng-3.8-ndpi-call.patch +++ /dev/null @@ -1,12 +0,0 @@ ---- a/src/NetworkInterface.cpp -+++ b/src/NetworkInterface.cpp -@@ -1604,7 +1604,8 @@ - ndpi_protocol icmp_proto = flow->get_detected_protocol(); - - if(icmp_proto.category == NDPI_PROTOCOL_CATEGORY_UNSPECIFIED) { -- ndpi_fill_ip_protocol_category(ndpi_struct, (struct ndpi_iphdr *)ip, &icmp_proto); -+ ndpi_fill_ip_protocol_category(ndpi_struct, ((struct ndpi_iphdr *)ip)->saddr, -+ ((struct ndpi_iphdr*)ip)->daddr, &icmp_proto); - flow->setDetectedProtocol(icmp_proto, false); - } - } -- cgit v1.2.3