diff options
| author |   Slawomir Lis <slis@gentoo.org> | 2019-08-27 05:42:07 +0200 |
|---|---|---|
| committer | Slawomir Lis <slis@gentoo.org> | 2019-08-27 05:42:20 +0200 |
| commit | e4e99e0656d0339ffff8959b89cccdd9d1ec8211 (patch) | |
| tree | a75a0812ec3c06551defa93fe1a3e1d4118f4f51 /net-analyzer/ntopng/files | |
| parent | sys-apps/nvme-cli: keyword on ~ppc64 (diff) | |
| download | gentoo-e4e99e0656d0339ffff8959b89cccdd9d1ec8211.tar.gz gentoo-e4e99e0656d0339ffff8959b89cccdd9d1ec8211.tar.bz2 gentoo-e4e99e0656d0339ffff8959b89cccdd9d1ec8211.zip | |
net-analyzer/ntopng: version bump to 3.8
Package-Manager: Portage-2.3.72, Repoman-2.3.17
Signed-off-by: Slawek Lis <slis@gentoo.org>
Diffstat (limited to 'net-analyzer/ntopng/files')
4 files changed, 62 insertions, 0 deletions
diff --git a/net-analyzer/ntopng/files/ntopng-3.8-missing-min.patch b/net-analyzer/ntopng/files/ntopng-3.8-missing-min.patch new file mode 100644 index 000000000000..303826a918df --- /dev/null +++ b/net-analyzer/ntopng/files/ntopng-3.8-missing-min.patch @@ -0,0 +1,19 @@ +--- 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 <new> + #include <string> ++#include <algorithm> + + #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-mysqltool.patch b/net-analyzer/ntopng/files/ntopng-3.8-mysqltool.patch new file mode 100644 index 000000000000..62c328a3505e --- /dev/null +++ b/net-analyzer/ntopng/files/ntopng-3.8-mysqltool.patch @@ -0,0 +1,17 @@ +--- a/configure.seed ++++ b/configure.seed +@@ -355,13 +355,7 @@ + if test "x$ac_cv_prog_ac_ct_MARIADB" = "xmariadb_config"; then + MYSQLTOOL="mariadb_config" + else +- PATH=$PATH:/usr/local/mysql/bin +- AC_CHECK_TOOL(MYSQL, mysql_config) +- if test "x$ac_cv_prog_ac_ct_MYSQL" = "xmysql_config"; then +- MYSQLTOOL="mysql_config" +- else +- MYSQLTOOL="" +- fi ++ MYSQLTOOL="mysql_config" + fi + + if test -n "$MYSQLTOOL"; then diff --git a/net-analyzer/ntopng/files/ntopng-3.8-ndpi-call.patch b/net-analyzer/ntopng/files/ntopng-3.8-ndpi-call.patch new file mode 100644 index 000000000000..1308a5c2c03f --- /dev/null +++ b/net-analyzer/ntopng/files/ntopng-3.8-ndpi-call.patch @@ -0,0 +1,12 @@ +--- 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); + } + } diff --git a/net-analyzer/ntopng/files/ntopng-3.8-ndpi-includes.patch b/net-analyzer/ntopng/files/ntopng-3.8-ndpi-includes.patch new file mode 100644 index 000000000000..068f1e9fa9b9 --- /dev/null +++ b/net-analyzer/ntopng/files/ntopng-3.8-ndpi-includes.patch @@ -0,0 +1,14 @@ +--- a/configure.seed 2018-10-08 21:33:09.403001834 -0600 ++++ b/configure.seed 2018-10-08 21:35:47.404002203 -0600 +@@ -129,9 +129,9 @@ + fi + + PKG_CHECK_MODULES([NDPI], [libndpi >= 2.0], [ +- NDPI_INC=`echo $NDPI_CFLAGS | sed -e "s/[ ]*$//"`/libndpi ++ NDPI_INC=`echo $NDPI_CFLAGS | sed -e "s/[ ]*$//"` + # Use static libndpi library as building against the dynamic library fails +- NDPI_LIB="-Wl,-Bstatic $NDPI_LIBS -Wl,-Bdynamic" ++ NDPI_LIB="$NDPI_LIBS" + NDPI_LIB_DEP= + ], [ + AC_MSG_CHECKING(for nDPI source) |