- Update ndpi to 2.4 latest snapshot

- Update ntopng to 3.6 latest snapshot

6 files changed, 76 insertions, 25 deletions

diff --git a/net/ntopng/Makefile b/net/ntopng/Makefile
index 85af3e666e75..e16f91c65c4e 100644
--- a/net/ntopng/Makefile
+++ b/net/ntopng/Makefile
@@ -2,7 +2,7 @@
 # $FreeBSD$
 
 PORTNAME=	ntopng
-PORTVERSION=	3.4.d20180604
+PORTVERSION=	3.6.d20180828
 PORTEPOCH=	1
 CATEGORIES=	net
 
@@ -17,21 +17,24 @@ LIB_DEPENDS=	librrd.so:databases/rrdtool \
 		libcurl.so:ftp/curl \
 		libndpi.so:net/ndpi \
 		libjson-c.so:devel/json-c \
-		libsodium.so:security/libsodium
+		libsodium.so:security/libsodium \
+		libmaxminddb.so:net/libmaxminddb
 BUILD_DEPENDS=  bash:shells/bash
 
 USES=		autoreconf cpe gmake libtool localbase mysql pathfix pkgconfig \
 		shebangfix sqlite ssl
 SUB_FILES=	ntopng-geoipupdate.sh pkg-deinstall
-SHEBANG_FILES=	httpdocs/misc/ntopng-add-user.sh
+SHEBANG_FILES=	httpdocs/misc/ntopng-add-user.sh \
+		httpdocs/misc/ntopng-utils-manage-config.in
 GNU_CONFIGURE=	yes
+CONFIGURE_ARGS=	--with-ndpi-includes=${LOCALBASE}/include/ndpi
 
 USERS=		ntopng
 GROUPS=		ntopng
 
 USE_GITHUB=	yes
 GH_ACCOUNT=	ntop
-GH_TAGNAME=	468d1eb
+GH_TAGNAME=	1358fdc
 
 CPE_VENDOR=	ntop
 
@@ -50,7 +53,7 @@ post-patch:
 	@${REINPLACE_CMD} -e 's|%%LOCALBASE%%|${LOCALBASE}|' \
 		${WRKSRC}/configure.seed
 	@${REINPLACE_CMD} -e 's|^\(export PREFIX=\).*|\1 ${PREFIX}|' \
-		${WRKSRC}/third-party/LuaJIT-2.1.0-beta3/Makefile
+		${WRKSRC}/third-party/LuaJIT-2.1.0-git/Makefile
 	cd ${WRKSRC} && ${SH} autogen.sh
 
 post-install:
diff --git a/net/ntopng/distinfo b/net/ntopng/distinfo
index 784d5029620f..0be8f53ba5dd 100644
--- a/net/ntopng/distinfo
+++ b/net/ntopng/distinfo
@@ -1,3 +1,3 @@
-TIMESTAMP = 1528128970
-SHA256 (ntop-ntopng-3.4.d20180604-468d1eb_GH0.tar.gz) = b021d7d97c2215997559bc164efca801ea889f00247ea3a16f3decf6bb2587d2
-SIZE (ntop-ntopng-3.4.d20180604-468d1eb_GH0.tar.gz) = 30715124
+TIMESTAMP = 1535622311
+SHA256 (ntop-ntopng-3.6.d20180828-1358fdc_GH0.tar.gz) = a665a82618e5d1baaa2c7815a8b356ddd5eccb69c707f463ce6e2b746dbad052
+SIZE (ntop-ntopng-3.6.d20180828-1358fdc_GH0.tar.gz) = 30351736
diff --git a/net/ntopng/files/patch-Makefile.in b/net/ntopng/files/patch-Makefile.in
index f200d6e34a29..8c35f1fb500a 100644
--- a/net/ntopng/files/patch-Makefile.in
+++ b/net/ntopng/files/patch-Makefile.in
@@ -1,16 +1,6 @@
---- Makefile.in.orig	2018-01-12 09:48:20 UTC
+--- Makefile.in.orig	2018-08-22 08:00:26 UTC
 +++ Makefile.in
-@@ -34,7 +34,8 @@ LIBPCAP=-lpcap
- MONGOOSE_HOME=${PWD}/third-party/mongoose
- MONGOOSE_INC=-I$(MONGOOSE_HOME)
- ######
--HAS_LUAJIT=$(shell pkg-config --atleast-version=2.1.0 luajit; echo $$?)
-+# Force using embedded luajit
-+HAS_LUAJIT=1
- ifeq ($(HAS_LUAJIT), 0)
- 	LUAJIT_INC = $(shell pkg-config --cflags luajit)
- 	LUAJIT_LIB = $(shell pkg-config --libs luajit)
-@@ -91,7 +92,7 @@ ifeq (@NEDGE@, 0)
+@@ -99,7 +99,7 @@ ifeq (@NEDGE@, 0)
   HAS_ZEROMQ=$(shell pkg-config --exists libzmq; echo $$?)
   ifeq ($(HAS_ZEROMQ), 0)
  	ZEROMQ_INC = $(shell pkg-config --cflags libzmq)
diff --git a/net/ntopng/files/patch-src_NetworkInterface.cpp b/net/ntopng/files/patch-src_NetworkInterface.cpp
new file mode 100644
index 000000000000..d32321970b2f
--- /dev/null
+++ b/net/ntopng/files/patch-src_NetworkInterface.cpp
@@ -0,0 +1,14 @@
+--- src/NetworkInterface.cpp.orig	2018-08-22 08:00:26 UTC
++++ src/NetworkInterface.cpp
+@@ -6591,7 +6591,11 @@ bool NetworkInterface::matchLiveCapture(struct ntopngL
+      || (luactx->live_capture.matching_host == f->get_srv_host())) {
+     if(luactx->live_capture.bpfFilterSet) {
+       if(!bpf_filter(luactx->live_capture.fcode.bf_insns,
++#if __FreeBSD_version >= 1100514
+ 		     (const u_char*)packet, h->caplen, h->caplen)) {
++#else
++		     (u_char*)packet, h->caplen, h->caplen)) {
++#endif
+ 	return(false);
+       }
+     }
diff --git a/net/ntopng/files/patch-third-party_LuaJIT-2.1.0-beta3_src_Makefile b/net/ntopng/files/patch-third-party_LuaJIT-2.1.0-git_src_Makefile
index ab4681b8a090..8482fc0f5c77 100644
--- a/net/ntopng/files/patch-third-party_LuaJIT-2.1.0-beta3_src_Makefile
+++ b/net/ntopng/files/patch-third-party_LuaJIT-2.1.0-git_src_Makefile
@@ -1,5 +1,5 @@
---- third-party/LuaJIT-2.1.0-beta3/src/Makefile.orig	2017-12-04 09:31:02 UTC
-+++ third-party/LuaJIT-2.1.0-beta3/src/Makefile
+--- third-party/LuaJIT-2.1.0-git/src/Makefile.orig	2018-08-22 08:00:26 UTC
++++ third-party/LuaJIT-2.1.0-git/src/Makefile
 @@ -24,7 +24,7 @@ NODOTABIVER= 51
  # removing the '#' in front of them. Make sure you force a full recompile
  # with "make clean", followed by "make" if you change any options.
@@ -9,7 +9,7 @@
  #
  # LuaJIT builds as a native 32 or 64 bit binary by default.
  CC= $(DEFAULT_CC)
-@@ -585,9 +585,9 @@ endif
+@@ -590,9 +590,9 @@ endif
  endif
  endif
  
diff --git a/net/ntopng/pkg-plist b/net/ntopng/pkg-plist
index 32aa4c2488d6..d8c0a77c52c3 100644
--- a/net/ntopng/pkg-plist
+++ b/net/ntopng/pkg-plist
@@ -152,6 +152,7 @@ man/man8/ntopng.8.gz
 %%DATADIR%%/httpdocs/inc/sprobe_process.inc
 %%DATADIR%%/httpdocs/inc/sprobe_process_header.inc
 %%DATADIR%%/httpdocs/inc/vlan_stats_id.inc
+%%DATADIR%%/httpdocs/js/ASAP.js
 %%DATADIR%%/httpdocs/js/Makefile
 %%DATADIR%%/httpdocs/js/README.gauge
 %%DATADIR%%/httpdocs/js/ays_utils.js
@@ -172,7 +173,9 @@ man/man8/ntopng.8.gz
 %%DATADIR%%/httpdocs/js/deps.min.js.map
 %%DATADIR%%/httpdocs/js/gauge.js
 %%DATADIR%%/httpdocs/js/googleMapJson.js
+%%DATADIR%%/httpdocs/js/graph_utils.js
 %%DATADIR%%/httpdocs/js/html5shiv.js
+%%DATADIR%%/httpdocs/js/ie_fix.js
 %%DATADIR%%/httpdocs/js/jquery-ui.js
 %%DATADIR%%/httpdocs/js/jquery.are-you-sure.js
 %%DATADIR%%/httpdocs/js/jquery.bootstrap-duallistbox.js
@@ -201,9 +204,14 @@ man/man8/ntopng.8.gz
 %%DATADIR%%/httpdocs/js/validator.js
 %%DATADIR%%/httpdocs/js/vfs_fonts.js
 %%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/other/EtherOUI.txt
 %%DATADIR%%/httpdocs/other/TimeZones.txt
+%%DATADIR%%/httpdocs/other/lists/malware.txt
+%%DATADIR%%/httpdocs/other/lists/web_mining.txt
 %%DATADIR%%/httpdocs/other/trackers.txt
 %%DATADIR%%/httpdocs/ssl/README
 %%DATADIR%%/httpdocs/ssl/ntopng-cert.pem.dummy
@@ -223,6 +231,7 @@ man/man8/ntopng.8.gz
 %%DATADIR%%/scripts/callbacks/system/housekeeping.lua
 %%DATADIR%%/scripts/callbacks/system/minute.lua
 %%DATADIR%%/scripts/callbacks/system/pinger.lua
+%%DATADIR%%/scripts/callbacks/system/recovery.lua
 %%DATADIR%%/scripts/callbacks/system/second.lua
 %%DATADIR%%/scripts/callbacks/system/shutdown.lua
 %%DATADIR%%/scripts/callbacks/system/startup.lua
@@ -273,16 +282,19 @@ man/man8/ntopng.8.gz
 %%DATADIR%%/scripts/lua/get_arp_data.lua
 %%DATADIR%%/scripts/lua/get_as_data.lua
 %%DATADIR%%/scripts/lua/get_ases_data.lua
+%%DATADIR%%/scripts/lua/get_config.lua
 %%DATADIR%%/scripts/lua/get_db_data.lua
 %%DATADIR%%/scripts/lua/get_db_flows.lua
+%%DATADIR%%/scripts/lua/get_discover_data.lua
+%%DATADIR%%/scripts/lua/get_discover_progress.lua
 %%DATADIR%%/scripts/lua/get_flow_data.lua
+%%DATADIR%%/scripts/lua/get_flow_db_data.lua
 %%DATADIR%%/scripts/lua/get_flows_data.lua
 %%DATADIR%%/scripts/lua/get_geo_hosts.lua
 %%DATADIR%%/scripts/lua/get_grouped_hosts_data.lua
 %%DATADIR%%/scripts/lua/get_historical_data.lua
 %%DATADIR%%/scripts/lua/get_historical_favourites.lua
 %%DATADIR%%/scripts/lua/get_host_contacts.lua
-%%DATADIR%%/scripts/lua/get_host_daily_activity.lua
 %%DATADIR%%/scripts/lua/get_host_data.lua
 %%DATADIR%%/scripts/lua/get_host_pools.lua
 %%DATADIR%%/scripts/lua/get_host_traffic.lua
@@ -300,6 +312,7 @@ man/man8/ntopng.8.gz
 %%DATADIR%%/scripts/lua/get_top_realtime.lua
 %%DATADIR%%/scripts/lua/get_top_talkers.lua
 %%DATADIR%%/scripts/lua/get_treemap.lua
+%%DATADIR%%/scripts/lua/get_ts.lua
 %%DATADIR%%/scripts/lua/get_unknown_devices_data.lua
 %%DATADIR%%/scripts/lua/get_user_info.lua
 %%DATADIR%%/scripts/lua/get_vlan_data.lua
@@ -346,6 +359,11 @@ man/man8/ntopng.8.gz
 %%DATADIR%%/scripts/lua/inc/sprobe.lua
 %%DATADIR%%/scripts/lua/inc/users.lua
 %%DATADIR%%/scripts/lua/index.lua
+%%DATADIR%%/scripts/lua/info_portal.lua
+%%DATADIR%%/scripts/lua/jsontest.lua
+%%DATADIR%%/scripts/lua/live_capture_data.lua
+%%DATADIR%%/scripts/lua/live_capture_stats.lua
+%%DATADIR%%/scripts/lua/live_traffic.lua
 %%DATADIR%%/scripts/lua/local_hosts_stats.lua
 %%DATADIR%%/scripts/lua/login.lua
 %%DATADIR%%/scripts/lua/logout.lua
@@ -353,10 +371,12 @@ man/man8/ntopng.8.gz
 %%DATADIR%%/scripts/lua/mac_pkt_distro.lua
 %%DATADIR%%/scripts/lua/mac_stats.lua
 %%DATADIR%%/scripts/lua/macs_stats.lua
+%%DATADIR%%/scripts/lua/manage_data.lua
 %%DATADIR%%/scripts/lua/metrics.lua
 %%DATADIR%%/scripts/lua/modules/alert_consts.lua
 %%DATADIR%%/scripts/lua/modules/alert_endpoints/email.lua
 %%DATADIR%%/scripts/lua/modules/alert_endpoints/nagios.lua
+%%DATADIR%%/scripts/lua/modules/alert_endpoints/sample.lua
 %%DATADIR%%/scripts/lua/modules/alert_endpoints/slack.lua
 %%DATADIR%%/scripts/lua/modules/alert_state_utils.lua
 %%DATADIR%%/scripts/lua/modules/alert_utils.lua
@@ -365,10 +385,14 @@ man/man8/ntopng.8.gz
 %%DATADIR%%/scripts/lua/modules/blacklist_utils.lua
 %%DATADIR%%/scripts/lua/modules/callback_utils.lua
 %%DATADIR%%/scripts/lua/modules/db_utils.lua
+%%DATADIR%%/scripts/lua/modules/delete_data_utils.lua
 %%DATADIR%%/scripts/lua/modules/discover_utils.lua
 %%DATADIR%%/scripts/lua/modules/dkjson.lua
 %%DATADIR%%/scripts/lua/modules/doa_ox.lua
 %%DATADIR%%/scripts/lua/modules/flow_aggregation_utils.lua
+%%DATADIR%%/scripts/lua/modules/flow_dbms/drivers/mysql.lua
+%%DATADIR%%/scripts/lua/modules/flow_dbms/drivers/nindex.lua
+%%DATADIR%%/scripts/lua/modules/flow_dbms/flow_dbms.lua
 %%DATADIR%%/scripts/lua/modules/flow_utils.lua
 %%DATADIR%%/scripts/lua/modules/format_utils.lua
 %%DATADIR%%/scripts/lua/modules/grafana/index.lua
@@ -387,24 +411,43 @@ man/man8/ntopng.8.gz
 %%DATADIR%%/scripts/lua/modules/i18n/variants.lua
 %%DATADIR%%/scripts/lua/modules/i18n/version.lua
 %%DATADIR%%/scripts/lua/modules/json.lua
+%%DATADIR%%/scripts/lua/modules/lists_utils.lua
+%%DATADIR%%/scripts/lua/modules/live_traffic_utils.lua
 %%DATADIR%%/scripts/lua/modules/locales_utils.lua
 %%DATADIR%%/scripts/lua/modules/lua_trace.lua
 %%DATADIR%%/scripts/lua/modules/lua_utils.lua
 %%DATADIR%%/scripts/lua/modules/mac_utils.lua
+%%DATADIR%%/scripts/lua/modules/ntop_utils.lua
 %%DATADIR%%/scripts/lua/modules/os_utils.lua
 %%DATADIR%%/scripts/lua/modules/persistence.lua
 %%DATADIR%%/scripts/lua/modules/prefs_dump_utils.lua
 %%DATADIR%%/scripts/lua/modules/prefs_menu.lua
 %%DATADIR%%/scripts/lua/modules/prefs_utils.lua
+%%DATADIR%%/scripts/lua/modules/recovery_utils.lua
 %%DATADIR%%/scripts/lua/modules/resty/template.lua
 %%DATADIR%%/scripts/lua/modules/resty/template/html.lua
 %%DATADIR%%/scripts/lua/modules/resty/template/microbenchmark.lua
 %%DATADIR%%/scripts/lua/modules/rrd_5min_dump_utils.lua
 %%DATADIR%%/scripts/lua/modules/rrd_min_dump_utils.lua
+%%DATADIR%%/scripts/lua/modules/rrd_paths.lua
 %%DATADIR%%/scripts/lua/modules/rrd_utils.lua
 %%DATADIR%%/scripts/lua/modules/sqlite_utils.lua
+%%DATADIR%%/scripts/lua/modules/telegram.lua
 %%DATADIR%%/scripts/lua/modules/template.lua
 %%DATADIR%%/scripts/lua/modules/template_utils.lua
+%%DATADIR%%/scripts/lua/modules/timeseries/drivers/influxdb.lua
+%%DATADIR%%/scripts/lua/modules/timeseries/drivers/rrd.lua
+%%DATADIR%%/scripts/lua/modules/timeseries/drivers/sample.lua
+%%DATADIR%%/scripts/lua/modules/timeseries/schemas/ts_5min.lua
+%%DATADIR%%/scripts/lua/modules/timeseries/schemas/ts_minute.lua
+%%DATADIR%%/scripts/lua/modules/timeseries/schemas/ts_second.lua
+%%DATADIR%%/scripts/lua/modules/timeseries/tests/influxdb_test.lua
+%%DATADIR%%/scripts/lua/modules/timeseries/tests/run.lua
+%%DATADIR%%/scripts/lua/modules/timeseries/tests/utils_test.lua
+%%DATADIR%%/scripts/lua/modules/timeseries/ts_common.lua
+%%DATADIR%%/scripts/lua/modules/timeseries/ts_schema.lua
+%%DATADIR%%/scripts/lua/modules/timeseries/ts_utils.lua
+%%DATADIR%%/scripts/lua/modules/timeseries/ts_utils_core.lua
 %%DATADIR%%/scripts/lua/modules/top_talkers_utils.lua
 %%DATADIR%%/scripts/lua/modules/tz_utils.lua
 %%DATADIR%%/scripts/lua/modules/vlan_utils.lua
@@ -414,13 +457,13 @@ man/man8/ntopng.8.gz
 %%DATADIR%%/scripts/lua/network_load.lua
 %%DATADIR%%/scripts/lua/network_stats.lua
 %%DATADIR%%/scripts/lua/nindex.lua
+%%DATADIR%%/scripts/lua/nindex_topk.lua
 %%DATADIR%%/scripts/lua/os_stats.lua
 %%DATADIR%%/scripts/lua/page_not_found.lua
 %%DATADIR%%/scripts/lua/pid_stats.lua
 %%DATADIR%%/scripts/lua/please_wait.lua
 %%DATADIR%%/scripts/lua/pool_details.lua
 %%DATADIR%%/scripts/lua/pool_stats.lua
-%%DATADIR%%/scripts/lua/popKeys.lua
 %%DATADIR%%/scripts/lua/port_details.lua
 %%DATADIR%%/scripts/lua/processes_stats.lua
 %%DATADIR%%/scripts/lua/reset_stats.lua
@@ -439,6 +482,7 @@ man/man8/ntopng.8.gz
 %%DATADIR%%/scripts/lua/sprobe_hosts_data.lua
 %%DATADIR%%/scripts/lua/sprobe_hosts_interactions.lua
 %%DATADIR%%/scripts/lua/sprobe_hosts_interactions_data.lua
+%%DATADIR%%/scripts/lua/stop_live_capture.lua
 %%DATADIR%%/scripts/lua/test_locales.lua
 %%DATADIR%%/scripts/lua/test_snmp.lua
 %%DATADIR%%/scripts/lua/top_hosts.lua