diff -ruN ntopng.orig/Makefile ntopng/Makefile --- ntopng.orig/Makefile 2020-05-22 21:20:42.000000000 +0200 +++ ntopng/Makefile 2020-05-29 10:17:26.086739000 +0200 @@ -2,8 +2,7 @@ # $FreeBSD: head/net/ntopng/Makefile 536219 2020-05-22 19:20:42Z sunpoet $ PORTNAME= ntopng -PORTVERSION= 4.0.d20200414 -PORTREVISION= 1 +PORTVERSION= 4.0.d20200528 PORTEPOCH= 1 CATEGORIES= net @@ -20,7 +19,7 @@ libjson-c.so:devel/json-c \ libsodium.so:security/libsodium \ libmaxminddb.so:net/libmaxminddb -BUILD_DEPENDS= bash:shells/bash +BUILD_DEPENDS= bash:shells/bash USES= autoreconf compiler:c++11-lang cpe gmake libtool localbase \ mysql pathfix pkgconfig shebangfix sqlite ssl @@ -37,7 +36,7 @@ USE_GITHUB= yes GH_ACCOUNT= ntop -GH_TAGNAME= e7f6b4a +GH_TAGNAME= cb880a2 CPE_VENDOR= ntop diff -ruN ntopng.orig/distinfo ntopng/distinfo --- ntopng.orig/distinfo 2020-04-15 13:11:26.000000000 +0200 +++ ntopng/distinfo 2020-05-29 10:16:46.267408000 +0200 @@ -1,3 +1,3 @@ -TIMESTAMP = 1586892413 -SHA256 (ntop-ntopng-4.0.d20200414-e7f6b4a_GH0.tar.gz) = 1fa0daf4442fe9ef48fa81267c5d60bff2dec05dc67d3cde59227963d3a53391 -SIZE (ntop-ntopng-4.0.d20200414-e7f6b4a_GH0.tar.gz) = 43234438 +TIMESTAMP = 1590700116 +SHA256 (ntop-ntopng-4.0.d20200528-cb880a2_GH0.tar.gz) = 5fc05bc9871dce24983050cc3a0d318ed5bf45c621585fbed18bdf73d9e593bd +SIZE (ntop-ntopng-4.0.d20200528-cb880a2_GH0.tar.gz) = 43401681 diff -ruN ntopng.orig/files/patch-src_ParsedFlow.cpp ntopng/files/patch-src_ParsedFlow.cpp --- ntopng.orig/files/patch-src_ParsedFlow.cpp 2020-04-14 00:58:17.000000000 +0200 +++ ntopng/files/patch-src_ParsedFlow.cpp 1970-01-01 01:00:00.000000000 +0100 @@ -1,25 +0,0 @@ ---- src/ParsedFlow.cpp.orig 2020-03-26 13:52:23 UTC -+++ src/ParsedFlow.cpp -@@ -127,17 +127,17 @@ void ParsedFlow::fromLua(lua_State *L, int index) { - if(!strcmp(key, "vlan_id")) - vlan_id = lua_tonumber(L, -1); - else if(!strcmp(key, "version")) -- version = htons(lua_tonumber(L, -1)); -+ version = htons(lua_tointeger(L, -1)); - else if(!strcmp(key, "src_port")) -- src_port = htons(lua_tonumber(L, -1)); -+ src_port = htons(lua_tointeger(L, -1)); - else if(!strcmp(key, "dst_port")) -- dst_port = htons(lua_tonumber(L, -1)); -+ dst_port = htons(lua_tointeger(L, -1)); - else if(!strcmp(key, "l4_proto")) - l4_proto = lua_tonumber(L, -1); - else if(!strcmp(key, "tcp_flags")) -- tcp.tcp_flags = htons(lua_tonumber(L, -1)); -+ tcp.tcp_flags = htons(lua_tointeger(L, -1)); - else if(!strcmp(key, "direction")) -- direction = htons(lua_tonumber(L, -1)); -+ direction = htons(lua_tointeger(L, -1)); - else if(!strcmp(key, "first_switched")) - first_switched = lua_tonumber(L, -1); - else if(!strcmp(key, "last_switched")) diff -ruN ntopng.orig/pkg-plist ntopng/pkg-plist --- ntopng.orig/pkg-plist 2020-04-15 13:11:26.000000000 +0200 +++ ntopng/pkg-plist 2020-05-29 10:16:52.027193000 +0200 @@ -21,7 +21,6 @@ %%DATADIR%%/httpdocs/bootstrap-4.4.0-dist/js/bootstrap.js.map %%DATADIR%%/httpdocs/bootstrap-4.4.0-dist/js/bootstrap.min.js %%DATADIR%%/httpdocs/bootstrap-4.4.0-dist/js/bootstrap.min.js.map -%%DATADIR%%/httpdocs/css/ntopng.min.css %%DATADIR%%/httpdocs/css/Rickshaw/detail.css %%DATADIR%%/httpdocs/css/Rickshaw/graph.css %%DATADIR%%/httpdocs/css/Rickshaw/legend.css @@ -53,12 +52,13 @@ %%DATADIR%%/httpdocs/css/images/ui-icons_ffd27a_256x240.png %%DATADIR%%/httpdocs/css/images/ui-icons_ffffff_256x240.png %%DATADIR%%/httpdocs/css/jquery-ui.css -%%DATADIR%%/httpdocs/css/minified/ntopng.min.css %%DATADIR%%/httpdocs/css/minified/fontawesome-custom.min.css %%DATADIR%%/httpdocs/css/minified/heatmap.min.css +%%DATADIR%%/httpdocs/css/minified/ntopng.min.css %%DATADIR%%/httpdocs/css/minified/rickshaw.min.css %%DATADIR%%/httpdocs/css/minified/tempusdominus.min.css %%DATADIR%%/httpdocs/css/ntopng.css +%%DATADIR%%/httpdocs/css/ntopng.min.css %%DATADIR%%/httpdocs/css/nv.d3.css %%DATADIR%%/httpdocs/css/pie-chart.css %%DATADIR%%/httpdocs/css/rickshaw.css @@ -1759,7 +1759,6 @@ %%DATADIR%%/httpdocs/img/warning.png %%DATADIR%%/httpdocs/inc/as_stats_id.inc %%DATADIR%%/httpdocs/inc/country_stats_id.inc -%%DATADIR%%/httpdocs/inc/flows_stats_id.inc %%DATADIR%%/httpdocs/inc/geolocation_disclaimer.inc %%DATADIR%%/httpdocs/inc/host_to_server_id.inc %%DATADIR%%/httpdocs/inc/host_to_server_top.inc @@ -1855,12 +1854,12 @@ %%DATADIR%%/httpdocs/leaflet/leaflet.js.map %%DATADIR%%/httpdocs/leaflet/leaflet.markercluster.js %%DATADIR%%/httpdocs/leaflet/leaflet.markercluster.js.map -%%DATADIR%%/httpdocs/misc/ntopng_template_elk7.json %%DATADIR%%/httpdocs/misc/ntopng-add-user.sh %%DATADIR%%/httpdocs/misc/ntopng-utils-manage-config %%DATADIR%%/httpdocs/misc/ntopng-utils-manage-config.in %%DATADIR%%/httpdocs/misc/ntopng_template_elk.json %%DATADIR%%/httpdocs/misc/ntopng_template_elk6.json +%%DATADIR%%/httpdocs/misc/ntopng_template_elk7.json %%DATADIR%%/httpdocs/monaco-editor/editor.main.nls.js %%DATADIR%%/httpdocs/monaco-editor/min/vs/base/worker/workerMain.js %%DATADIR%%/httpdocs/monaco-editor/min/vs/basic-languages/lua/lua.js @@ -1961,8 +1960,8 @@ %%DATADIR%%/scripts/lua/bubble.lua %%DATADIR%%/scripts/lua/captive_portal.lua %%DATADIR%%/scripts/lua/change_password.lua -%%DATADIR%%/scripts/lua/check_recording_data.lua %%DATADIR%%/scripts/lua/check_major_release.lua +%%DATADIR%%/scripts/lua/check_recording_data.lua %%DATADIR%%/scripts/lua/check_update.lua %%DATADIR%%/scripts/lua/code_viewer.lua %%DATADIR%%/scripts/lua/container_details.lua @@ -2005,7 +2004,6 @@ %%DATADIR%%/scripts/lua/get_discover_progress.lua %%DATADIR%%/scripts/lua/get_extracted_traffic.lua %%DATADIR%%/scripts/lua/get_fingerprint_data.lua -%%DATADIR%%/scripts/lua/get_flow_data.lua %%DATADIR%%/scripts/lua/get_flow_db_data.lua %%DATADIR%%/scripts/lua/get_flow_process_tree.lua %%DATADIR%%/scripts/lua/get_flows_data.lua @@ -2107,6 +2105,7 @@ %%DATADIR%%/scripts/lua/manage_data.lua %%DATADIR%%/scripts/lua/modules/alert_consts.lua %%DATADIR%%/scripts/lua/modules/alert_endpoints_utils.lua +%%DATADIR%%/scripts/lua/modules/alert_keys.lua %%DATADIR%%/scripts/lua/modules/alert_utils.lua %%DATADIR%%/scripts/lua/modules/alerts_api.lua %%DATADIR%%/scripts/lua/modules/as_utils.lua @@ -2135,6 +2134,7 @@ %%DATADIR%%/scripts/lua/modules/flow_dbms/flow_dbms.lua %%DATADIR%%/scripts/lua/modules/flow_field_value_maps.lua %%DATADIR%%/scripts/lua/modules/flow_field_value_maps/sonicwall_app_id.lua +%%DATADIR%%/scripts/lua/modules/flow_keys.lua %%DATADIR%%/scripts/lua/modules/flow_utils.lua %%DATADIR%%/scripts/lua/modules/format_utils.lua %%DATADIR%%/scripts/lua/modules/google_assistant_utils.lua @@ -2166,7 +2166,6 @@ %%DATADIR%%/scripts/lua/modules/page_utils.lua %%DATADIR%%/scripts/lua/modules/periodic_activities_utils.lua %%DATADIR%%/scripts/lua/modules/persistence.lua -%%DATADIR%%/scripts/lua/modules/plugins_consts_utils.lua %%DATADIR%%/scripts/lua/modules/plugins_utils.lua %%DATADIR%%/scripts/lua/modules/prefs_dump_utils.lua %%DATADIR%%/scripts/lua/modules/prefs_menu.lua