CVS commit: pkgsrc/net/ntopng

["Adam Ciarcinski" <adam%netbsd.org@localhost>]

Module Name:    pkgsrc
Committed By:   adam
Date:           Thu Oct 18 16:25:40 UTC 2018

Modified Files:
        pkgsrc/net/ntopng: Makefile PLIST distinfo
        pkgsrc/net/ntopng/patches: patch-Makefile.in patch-configure.seed
            patch-src_Redis.cpp patch-src_Utils.cpp
Added Files:
        pkgsrc/net/ntopng/patches: patch-include_Redis.h
            patch-third-party_mongoose_mongoose.c
Removed Files:
        pkgsrc/net/ntopng/patches: patch-src_DivertInterface.cpp

Log Message:
ntopng: updated to 3.6.1

3.6.1 Stable
Brew formula fixes

3.6 Stable

New features
------------
New pro charts
Ability to compare data with the past (time shift)
Trend lines based on ASAP
Average and percentile lines overlayed on the graph and animated
New color scheme that uses pastel colors for better visualization
https://www.ntop.org/ntopng/ntopng-and-time-series-from-rrd-to-influxdb-new-charts-with-time-shift/
New timeseries API with support for RRD and InfluxDB
Abstracts and handles multiple sources transparently
https://www.ntop.org/guides/ntopng/api/lua/timeseries/index.html
Streaming pcap captures with BPF support
Download live packet captures right from the browser
New SNMP devices caching
Periodically cache information of all the SNMP device configured
Calculate and visualize interfaces throughput

Improvements
------------
Security
Access to the web user interface is controlled with ACLs
Secure ntopng cookies with SameSite and HttpOnly
HTTP cookie authentication
Improved random session id generation
Various SNMP improvemenets
Caching
Interfaces status change alerts
Device interfaces page
Devices and interfaces added to flows
Fixed several library memory leaks
Improved device and interface charts
Interfaces throughput calculation and visualization
Ability to delete all SNMP devices at once
Improved active devices discovery
OS detection via HTTP User-Agent
Alerts
Crypto miners alerts toggle
Detection and alerting of anomalous terminations
Module for sending telegram.org alerts
Slack
Configurable Slack channel names
Added Slack test button
Charts
Active flows vs local hosts chart
Active flows vs interface traffic chart
Ubuntu 18.04 support
Support for ElasticSearch 6 export
Added support for custom categories lists
Added ability to use the non-JIT Lua interpreter
Improved ntopng startup and shutdown time
Support for capturing from interface pairs with PF_RING ZC
Support for variable PPP header lenght
Migrated geolocation to GeoLite2 and libmaxminddb
Configuration backup and restore
Improved IE browser support
Using client SSL certificate for protocol detection
Optimized host/flows purging


To generate a diff of this commit:
cvs rdiff -u -r1.24 -r1.25 pkgsrc/net/ntopng/Makefile
cvs rdiff -u -r1.2 -r1.3 pkgsrc/net/ntopng/PLIST
cvs rdiff -u -r1.4 -r1.5 pkgsrc/net/ntopng/distinfo
cvs rdiff -u -r1.3 -r1.4 pkgsrc/net/ntopng/patches/patch-Makefile.in
cvs rdiff -u -r1.2 -r1.3 pkgsrc/net/ntopng/patches/patch-configure.seed
cvs rdiff -u -r0 -r1.1 pkgsrc/net/ntopng/patches/patch-include_Redis.h
cvs rdiff -u -r1.1 -r0 \
    pkgsrc/net/ntopng/patches/patch-src_DivertInterface.cpp
cvs rdiff -u -r1.1 -r1.2 pkgsrc/net/ntopng/patches/patch-src_Redis.cpp \
    pkgsrc/net/ntopng/patches/patch-src_Utils.cpp
cvs rdiff -u -r0 -r1.3 \
    pkgsrc/net/ntopng/patches/patch-third-party_mongoose_mongoose.c

Please note that diffs are not public domain; they are subject to the
copyright notices on the relevant files.

Modified files:

Index: pkgsrc/net/ntopng/Makefile
diff -u pkgsrc/net/ntopng/Makefile:1.24 pkgsrc/net/ntopng/Makefile:1.25
--- pkgsrc/net/ntopng/Makefile:1.24     Fri Jul 20 03:34:24 2018
+++ pkgsrc/net/ntopng/Makefile  Thu Oct 18 16:25:40 2018
@@ -1,10 +1,8 @@
-# $NetBSD: Makefile,v 1.24 2018/07/20 03:34:24 ryoon Exp $
+# $NetBSD: Makefile,v 1.25 2018/10/18 16:25:40 adam Exp $
 
-DISTNAME=      ntopng-2.4-stable
-PKGNAME=       ntopng-2.4
-PKGREVISION=   18
+DISTNAME=      ntopng-3.6.1
 CATEGORIES=    net
-MASTER_SITES=  ${MASTER_SITE_SOURCEFORGE:=ntop/}
+MASTER_SITES=  ${MASTER_SITE_GITHUB:=ntop/}
 
 MAINTAINER=    adam%NetBSD.org@localhost
 HOMEPAGE=      https://www.ntop.org/
@@ -13,35 +11,41 @@ LICENSE=    gnu-gpl-v3
 
 DEPENDS+=      redis-[0-9]*:../../databases/redis
 
-USE_LANGUAGES=         c c++03
+USE_LANGUAGES=         c c++11
 USE_LIBTOOL=           yes
-USE_TOOLS+=            autoconf automake gmake pkg-config
+USE_TOOLS+=            autoconf automake bash gmake pkg-config
 GNU_CONFIGURE=         yes
+CONFIGURE_ARGS+=       --with-ndpi-includes=${BUILDLINK_PREFIX.ndpi}/include/ndpi
 
 RCD_SCRIPTS+=          ntopng
 
-SUBST_CLASSES+=                fix-vers
-SUBST_STAGE.fix-vers=  pre-configure
-SUBST_MESSAGE.fix-vers=        Setting package version.
-SUBST_FILES.fix-vers=  configure.seed
-SUBST_SED.fix-vers=    -e 's,@VERSION@,${PKGVERSION},g'
-SUBST_SED.fix-vers+=   -e 's,@SHORT_VERSION@,${PKGVERSION_NOREV},g'
+CXXFLAGS+=             -std=c++11  # va_copy()
 
 # Portable types
 CFLAGS.SunOS+=         -Du_int8_t=uint8_t
 CFLAGS.SunOS+=         -Du_int16_t=uint16_t
 CFLAGS.SunOS+=         -Du_int32_t=uint32_t
 CFLAGS.SunOS+=         -Du_int64_t=uint64_t
-
 LDFLAGS.SunOS+=                -lresolv
 
+REPLACE_BASH=          httpdocs/misc/ntopng-add-user.sh
+REPLACE_BASH+=         httpdocs/misc/ntopng-utils-manage-config.in
+
+SUBST_CLASSES+=                fix-vers
+SUBST_STAGE.fix-vers=  pre-configure
+SUBST_MESSAGE.fix-vers=        Setting package version.
+SUBST_FILES.fix-vers=  configure.seed
+SUBST_SED.fix-vers=    -e 's,@VERSION@,${PKGVERSION},g'
+SUBST_SED.fix-vers+=   -e 's,@SHORT_VERSION@,${PKGVERSION_NOREV},g'
+
 pre-configure:
        cd ${WRKSRC} && cp configure.seed configure.ac && autoreconf -fiv
 
 .include "../../databases/hiredis/buildlink3.mk"
 .include "../../databases/rrdtool/buildlink3.mk"
 .include "../../databases/sqlite3/buildlink3.mk"
-.include "../../lang/LuaJIT2/buildlink3.mk"
+.include "../../geography/libmaxminddb/buildlink3.mk"
+.include "../../lang/lua/buildlink3.mk"
 .include "../../net/GeoIP/buildlink3.mk"
 .include "../../net/libpcap/buildlink3.mk"
 .include "../../net/ndpi/buildlink3.mk"

Index: pkgsrc/net/ntopng/PLIST
diff -u pkgsrc/net/ntopng/PLIST:1.2 pkgsrc/net/ntopng/PLIST:1.3
--- pkgsrc/net/ntopng/PLIST:1.2 Fri Jul  1 04:51:15 2016
+++ pkgsrc/net/ntopng/PLIST     Thu Oct 18 16:25:40 2018
@@ -1,4 +1,4 @@
-@comment $NetBSD: PLIST,v 1.2 2016/07/01 04:51:15 adam Exp $
+@comment $NetBSD: PLIST,v 1.3 2018/10/18 16:25:40 adam Exp $
 bin/ntopng
 man/man8/ntopng.8
 share/ntopng/httpdocs/bootstrap/css/bootstrap-theme.css
@@ -11,17 +11,17 @@ share/ntopng/httpdocs/bootstrap/fonts/gl
 share/ntopng/httpdocs/bootstrap/fonts/glyphicons-halflings-regular.woff
 share/ntopng/httpdocs/bootstrap/img/glyphicons-halflings-white.png
 share/ntopng/httpdocs/bootstrap/img/glyphicons-halflings.png
-share/ntopng/httpdocs/bootstrap/js/bootstrap.js
 share/ntopng/httpdocs/css/Rickshaw/detail.css
 share/ntopng/httpdocs/css/Rickshaw/graph.css
 share/ntopng/httpdocs/css/Rickshaw/legend.css
 share/ntopng/httpdocs/css/bootstrap-datetimepicker.css
 share/ntopng/httpdocs/css/bootstrap-duallistbox.css
+share/ntopng/httpdocs/css/bootstrap-nav-wizard.css
 share/ntopng/httpdocs/css/bootstrap-slider.css
 share/ntopng/httpdocs/css/bubble-chart.css
-share/ntopng/httpdocs/css/c3.css
 share/ntopng/httpdocs/css/cal-heatmap.css
 share/ntopng/httpdocs/css/cubism.css
+share/ntopng/httpdocs/css/custom_theme.css
 share/ntopng/httpdocs/css/datepicker.css
 share/ntopng/httpdocs/css/dc.css
 share/ntopng/httpdocs/css/flags.css
@@ -44,7 +44,6 @@ share/ntopng/httpdocs/css/ntopng.css
 share/ntopng/httpdocs/css/nv.d3.css
 share/ntopng/httpdocs/css/pagingbar.css
 share/ntopng/httpdocs/css/pie-chart.css
-share/ntopng/httpdocs/css/prettify.css
 share/ntopng/httpdocs/css/rickshaw.css
 share/ntopng/httpdocs/css/sequence_sunburst.css
 share/ntopng/httpdocs/css/tablesorted.css
@@ -71,6 +70,7 @@ share/ntopng/httpdocs/font-awesome/less/
 share/ntopng/httpdocs/font-awesome/less/mixins.less
 share/ntopng/httpdocs/font-awesome/less/path.less
 share/ntopng/httpdocs/font-awesome/less/rotated-flipped.less
+share/ntopng/httpdocs/font-awesome/less/screen-reader.less
 share/ntopng/httpdocs/font-awesome/less/stacked.less
 share/ntopng/httpdocs/font-awesome/less/variables.less
 share/ntopng/httpdocs/font-awesome/scss/_animated.scss
@@ -83,6 +83,7 @@ share/ntopng/httpdocs/font-awesome/scss/
 share/ntopng/httpdocs/font-awesome/scss/_mixins.scss
 share/ntopng/httpdocs/font-awesome/scss/_path.scss
 share/ntopng/httpdocs/font-awesome/scss/_rotated-flipped.scss
+share/ntopng/httpdocs/font-awesome/scss/_screen-reader.scss
 share/ntopng/httpdocs/font-awesome/scss/_stacked.scss
 share/ntopng/httpdocs/font-awesome/scss/_variables.scss
 share/ntopng/httpdocs/font-awesome/scss/font-awesome.scss
@@ -128,86 +129,71 @@ share/ntopng/httpdocs/img/network_icon.p
 share/ntopng/httpdocs/img/os_icon.png
 share/ntopng/httpdocs/img/throbber.gif
 share/ntopng/httpdocs/img/warning.png
-share/ntopng/httpdocs/inc/aggregated_hosts_stats_bottom.inc
-share/ntopng/httpdocs/inc/aggregated_hosts_stats_id.inc
-share/ntopng/httpdocs/inc/aggregated_hosts_stats_top.inc
 share/ntopng/httpdocs/inc/as_stats_id.inc
-share/ntopng/httpdocs/inc/as_stats_top.inc
-share/ntopng/httpdocs/inc/community_stats_bottom.inc
-share/ntopng/httpdocs/inc/community_stats_id.inc
-share/ntopng/httpdocs/inc/community_stats_top.inc
 share/ntopng/httpdocs/inc/country_stats_id.inc
-share/ntopng/httpdocs/inc/country_stats_top.inc
-share/ntopng/httpdocs/inc/flows_stats_bottom.inc
 share/ntopng/httpdocs/inc/flows_stats_id.inc
-share/ntopng/httpdocs/inc/flows_stats_middle.inc
-share/ntopng/httpdocs/inc/flows_stats_top.inc
 share/ntopng/httpdocs/inc/geolocation_disclaimer.inc
+share/ntopng/httpdocs/inc/header-minimal.inc
 share/ntopng/httpdocs/inc/header.inc
 share/ntopng/httpdocs/inc/host_to_server_id.inc
 share/ntopng/httpdocs/inc/host_to_server_top.inc
-share/ntopng/httpdocs/inc/hosts_stats_bottom.inc
 share/ntopng/httpdocs/inc/hosts_stats_id.inc
-share/ntopng/httpdocs/inc/hosts_stats_top.inc
 share/ntopng/httpdocs/inc/http_servers_stats_id.inc
-share/ntopng/httpdocs/inc/http_servers_stats_top.inc
 share/ntopng/httpdocs/inc/index_TopASNs.inc
 share/ntopng/httpdocs/inc/index_TopApplications.inc
 share/ntopng/httpdocs/inc/index_TopFlowSenders.inc
 share/ntopng/httpdocs/inc/index_TopHosts.inc
 share/ntopng/httpdocs/inc/index_TopPorts.inc
-share/ntopng/httpdocs/inc/mac_stats_bottom.inc
 share/ntopng/httpdocs/inc/mac_stats_id.inc
-share/ntopng/httpdocs/inc/mac_stats_top.inc
-share/ntopng/httpdocs/inc/network_stats_bottom.inc
 share/ntopng/httpdocs/inc/network_stats_id.inc
-share/ntopng/httpdocs/inc/network_stats_top.inc
 share/ntopng/httpdocs/inc/os_stats_id.inc
-share/ntopng/httpdocs/inc/os_stats_top.inc
-share/ntopng/httpdocs/inc/processes_stats_bottom.inc
+share/ntopng/httpdocs/inc/pool_stats_id.inc
 share/ntopng/httpdocs/inc/processes_stats_id.inc
-share/ntopng/httpdocs/inc/processes_stats_top.inc
-share/ntopng/httpdocs/inc/sflows_stats_bottom.inc
-share/ntopng/httpdocs/inc/sflows_stats_top.inc
 share/ntopng/httpdocs/inc/sprobe_process.inc
 share/ntopng/httpdocs/inc/sprobe_process_header.inc
 share/ntopng/httpdocs/inc/vlan_stats_id.inc
-share/ntopng/httpdocs/inc/vlan_stats_top.inc
+share/ntopng/httpdocs/js/ASAP.js
+share/ntopng/httpdocs/js/Makefile
 share/ntopng/httpdocs/js/README.gauge
+share/ntopng/httpdocs/js/ays_utils.js
 share/ntopng/httpdocs/js/bootstrap-datatable.js
 share/ntopng/httpdocs/js/bootstrap-datetimepicker.js
 share/ntopng/httpdocs/js/bootstrap-slider.js
-share/ntopng/httpdocs/js/bootstrap.ajaxpager-0.8.js
+share/ntopng/httpdocs/js/bootstrap.js
 share/ntopng/httpdocs/js/bootstrap3-typeahead.js
 share/ntopng/httpdocs/js/bubble-chart.js
-share/ntopng/httpdocs/js/c3.js
 share/ntopng/httpdocs/js/cal-heatmap.js
-share/ntopng/httpdocs/js/cpu_bar.js
 share/ntopng/httpdocs/js/crossfilter.js
 share/ntopng/httpdocs/js/cubism.v1.js
+share/ntopng/httpdocs/js/cubism_ntop.v1.js
 share/ntopng/httpdocs/js/d3.v3.js
+share/ntopng/httpdocs/js/datatable_utils.js
 share/ntopng/httpdocs/js/dc.js
+share/ntopng/httpdocs/js/deps.min.js
+share/ntopng/httpdocs/js/deps.min.js.map
 share/ntopng/httpdocs/js/gauge.js
 share/ntopng/httpdocs/js/googleMapJson.js
-share/ntopng/httpdocs/js/handlebars-1.0.0.0.beta.6.js
-share/ntopng/httpdocs/js/highlight.js
+share/ntopng/httpdocs/js/graph_utils.js
 share/ntopng/httpdocs/js/html5shiv.js
+share/ntopng/httpdocs/js/ie_fix.js
 share/ntopng/httpdocs/js/jquery-ui.js
+share/ntopng/httpdocs/js/jquery.are-you-sure.js
 share/ntopng/httpdocs/js/jquery.bootstrap-duallistbox.js
-share/ntopng/httpdocs/js/jquery.form.js
 share/ntopng/httpdocs/js/jquery.js
 share/ntopng/httpdocs/js/jquery.peity.js
-share/ntopng/httpdocs/js/jquery.sparkline.js
 share/ntopng/httpdocs/js/jquery.tablesorter.js
-share/ntopng/httpdocs/js/line-graph.js
+share/ntopng/httpdocs/js/jquery_bootstrap.min.js
+share/ntopng/httpdocs/js/jquery_bootstrap.min.js.map
 share/ntopng/httpdocs/js/markerclusterer.js
-share/ntopng/httpdocs/js/matrix_volume.js
 share/ntopng/httpdocs/js/moment.js
+share/ntopng/httpdocs/js/ntop.min.js
+share/ntopng/httpdocs/js/ntop.min.js.map
 share/ntopng/httpdocs/js/ntopng_utils.js
+share/ntopng/httpdocs/js/ntopng_validators.js
 share/ntopng/httpdocs/js/nv.d3.js
 share/ntopng/httpdocs/js/pdfmake.js
 share/ntopng/httpdocs/js/pie-chart.js
-share/ntopng/httpdocs/js/prettify.js
+share/ntopng/httpdocs/js/quotas_utils.js
 share/ntopng/httpdocs/js/rickshaw.js
 share/ntopng/httpdocs/js/ripe_widget_api.js
 share/ntopng/httpdocs/js/sankey.js
@@ -217,30 +203,66 @@ share/ntopng/httpdocs/js/springyui-ntop.
 share/ntopng/httpdocs/js/timeline.js
 share/ntopng/httpdocs/js/validator.js
 share/ntopng/httpdocs/js/vfs_fonts.js
+share/ntopng/httpdocs/misc/ntopng-add-user.sh
+share/ntopng/httpdocs/misc/ntopng-utils-manage-config
+share/ntopng/httpdocs/misc/ntopng-utils-manage-config.in
 share/ntopng/httpdocs/misc/ntopng_template_elk.json
+share/ntopng/httpdocs/misc/ntopng_template_elk6.json
 share/ntopng/httpdocs/other/EtherOUI.txt
+share/ntopng/httpdocs/other/TimeZones.txt
+share/ntopng/httpdocs/other/lists/malware.txt
+share/ntopng/httpdocs/other/lists/web_mining.txt
+share/ntopng/httpdocs/other/trackers.txt
 share/ntopng/httpdocs/ssl/README
 share/ntopng/httpdocs/ssl/ntopng-cert.pem.dummy
+share/ntopng/httpdocs/templates/modal_confirm_dialog.html
+share/ntopng/httpdocs/templates/traffic_report.html
+share/ntopng/httpdocs/templates/typeahead_input.html
+share/ntopng/httpdocs/templates/wizard_dialog.html
 share/ntopng/httpdocs/test.lp
-share/ntopng/scripts/callbacks/daily.lua
-share/ntopng/scripts/callbacks/hourly.lua
-share/ntopng/scripts/callbacks/minute.lua
-share/ntopng/scripts/callbacks/second.lua
+share/ntopng/scripts/callbacks/interface/5min.lua
+share/ntopng/scripts/callbacks/interface/daily.lua
+share/ntopng/scripts/callbacks/interface/hourly.lua
+share/ntopng/scripts/callbacks/interface/minute.lua
+share/ntopng/scripts/callbacks/system/5min.lua
+share/ntopng/scripts/callbacks/system/boot.lua
+share/ntopng/scripts/callbacks/system/daily.lua
+share/ntopng/scripts/callbacks/system/discover.lua
+share/ntopng/scripts/callbacks/system/housekeeping.lua
+share/ntopng/scripts/callbacks/system/minute.lua
+share/ntopng/scripts/callbacks/system/pinger.lua
+share/ntopng/scripts/callbacks/system/recovery.lua
+share/ntopng/scripts/callbacks/system/second.lua
+share/ntopng/scripts/callbacks/system/shutdown.lua
+share/ntopng/scripts/callbacks/system/startup.lua
+share/ntopng/scripts/callbacks/user_scripts/inline/default.lua
+share/ntopng/scripts/callbacks/user_scripts/loader.lua
+share/ntopng/scripts/callbacks/user_scripts/periodic/default.lua
+share/ntopng/scripts/locales/en.lua
 share/ntopng/scripts/lua/API.lua
 share/ntopng/scripts/lua/about.lua
 share/ntopng/scripts/lua/admin/add_user.lua
 share/ntopng/scripts/lua/admin/change_user_prefs.lua
 share/ntopng/scripts/lua/admin/delete_user.lua
+share/ntopng/scripts/lua/admin/edit_ndpi_applications.lua
+share/ntopng/scripts/lua/admin/get_ndpi_applications.lua
 share/ntopng/scripts/lua/admin/get_user_info.lua
 share/ntopng/scripts/lua/admin/get_users.lua
+share/ntopng/scripts/lua/admin/host_pools.lua
+share/ntopng/scripts/lua/admin/manage_pool_members.lua
 share/ntopng/scripts/lua/admin/password_reset.lua
 share/ntopng/scripts/lua/admin/prefs.lua
 share/ntopng/scripts/lua/admin/users.lua
 share/ntopng/scripts/lua/admin/validate_new_user.lua
+share/ntopng/scripts/lua/as_details.lua
 share/ntopng/scripts/lua/as_stats.lua
+share/ntopng/scripts/lua/authorize_captive.lua
+share/ntopng/scripts/lua/captive_portal.lua
+share/ntopng/scripts/lua/change_password.lua
+share/ntopng/scripts/lua/check_update.lua
+share/ntopng/scripts/lua/country_details.lua
 share/ntopng/scripts/lua/country_stats.lua
-share/ntopng/scripts/lua/db.lua
-share/ntopng/scripts/lua/db_query.lua
+share/ntopng/scripts/lua/discover.lua
 share/ntopng/scripts/lua/do_export_data.lua
 share/ntopng/scripts/lua/examples/debug.lua
 share/ntopng/scripts/lua/examples/hello_world.lua
@@ -248,41 +270,56 @@ share/ntopng/scripts/lua/examples/interf
 share/ntopng/scripts/lua/examples/ntop.lua
 share/ntopng/scripts/lua/examples/sqlite.lua
 share/ntopng/scripts/lua/export_data.lua
+share/ntopng/scripts/lua/find_app.lua
+share/ntopng/scripts/lua/find_category.lua
 share/ntopng/scripts/lua/find_host.lua
+share/ntopng/scripts/lua/find_member.lua
+share/ntopng/scripts/lua/find_prefs.lua
 share/ntopng/scripts/lua/flow_details.lua
 share/ntopng/scripts/lua/flow_stats.lua
 share/ntopng/scripts/lua/flows_stats.lua
 share/ntopng/scripts/lua/get_alerts_data.lua
+share/ntopng/scripts/lua/get_arp_data.lua
+share/ntopng/scripts/lua/get_as_data.lua
+share/ntopng/scripts/lua/get_ases_data.lua
+share/ntopng/scripts/lua/get_config.lua
 share/ntopng/scripts/lua/get_db_data.lua
 share/ntopng/scripts/lua/get_db_flows.lua
+share/ntopng/scripts/lua/get_discover_data.lua
+share/ntopng/scripts/lua/get_discover_progress.lua
 share/ntopng/scripts/lua/get_flow_data.lua
+share/ntopng/scripts/lua/get_flow_db_data.lua
 share/ntopng/scripts/lua/get_flows_data.lua
 share/ntopng/scripts/lua/get_geo_hosts.lua
 share/ntopng/scripts/lua/get_grouped_hosts_data.lua
 share/ntopng/scripts/lua/get_historical_data.lua
 share/ntopng/scripts/lua/get_historical_favourites.lua
-share/ntopng/scripts/lua/get_hitters_data.lua
-share/ntopng/scripts/lua/get_host_activitymap.lua
-share/ntopng/scripts/lua/get_host_categories.lua
 share/ntopng/scripts/lua/get_host_contacts.lua
-share/ntopng/scripts/lua/get_host_daily_activity.lua
 share/ntopng/scripts/lua/get_host_data.lua
+share/ntopng/scripts/lua/get_host_pools.lua
 share/ntopng/scripts/lua/get_host_traffic.lua
 share/ntopng/scripts/lua/get_hosts_data.lua
-share/ntopng/scripts/lua/get_hosts_interaction.lua
 share/ntopng/scripts/lua/get_http_hosts.lua
 share/ntopng/scripts/lua/get_http_hosts_data.lua
+share/ntopng/scripts/lua/get_icmp_data.lua
+share/ntopng/scripts/lua/get_mac_data.lua
+share/ntopng/scripts/lua/get_macs_data.lua
 share/ntopng/scripts/lua/get_nbox_data.lua
+share/ntopng/scripts/lua/get_num_alerts.lua
 share/ntopng/scripts/lua/get_process_info.lua
 share/ntopng/scripts/lua/get_processes_data.lua
 share/ntopng/scripts/lua/get_system_hosts_interaction.lua
+share/ntopng/scripts/lua/get_top_realtime.lua
 share/ntopng/scripts/lua/get_top_talkers.lua
 share/ntopng/scripts/lua/get_treemap.lua
+share/ntopng/scripts/lua/get_ts.lua
+share/ntopng/scripts/lua/get_unknown_devices_data.lua
 share/ntopng/scripts/lua/get_user_info.lua
-share/ntopng/scripts/lua/host_category_stats.lua
+share/ntopng/scripts/lua/get_vlan_data.lua
+share/ntopng/scripts/lua/get_vlans_data.lua
 share/ntopng/scripts/lua/host_details.lua
-share/ntopng/scripts/lua/host_details_categories.lua
 share/ntopng/scripts/lua/host_details_ndpi.lua
+share/ntopng/scripts/lua/host_details_ndpi_categories.lua
 share/ntopng/scripts/lua/host_dns_breakdown.lua
 share/ntopng/scripts/lua/host_get_json.lua
 share/ntopng/scripts/lua/host_http_breakdown.lua
@@ -298,10 +335,13 @@ share/ntopng/scripts/lua/hosts_geomap.lu
 share/ntopng/scripts/lua/hosts_matrix.lua
 share/ntopng/scripts/lua/hosts_stats.lua
 share/ntopng/scripts/lua/hosts_treemap.lua
+share/ntopng/scripts/lua/hotspot-detect.lua
 share/ntopng/scripts/lua/http_servers_stats.lua
 share/ntopng/scripts/lua/if_pkt_distro.lua
 share/ntopng/scripts/lua/if_stats.lua
 share/ntopng/scripts/lua/if_stats_ndpi.lua
+share/ntopng/scripts/lua/if_stats_ndpi_categories.lua
+share/ntopng/scripts/lua/if_tcpflags_pkt_distro.lua
 share/ntopng/scripts/lua/iface_flows_sankey.lua
 share/ntopng/scripts/lua/iface_hosts_list.lua
 share/ntopng/scripts/lua/iface_local_stats.lua
@@ -309,61 +349,130 @@ share/ntopng/scripts/lua/iface_ndpi_stat
 share/ntopng/scripts/lua/iface_ports_list.lua
 share/ntopng/scripts/lua/iface_tcp_stats.lua
 share/ntopng/scripts/lua/inc/add_user_dialog.lua
+share/ntopng/scripts/lua/inc/bridge_wizard.lua
 share/ntopng/scripts/lua/inc/change_user_password_form.lua
 share/ntopng/scripts/lua/inc/delete_user_dialog.lua
 share/ntopng/scripts/lua/inc/footer.lua
 share/ntopng/scripts/lua/inc/menu.lua
 share/ntopng/scripts/lua/inc/password_dialog.lua
 share/ntopng/scripts/lua/inc/sankey.lua
-share/ntopng/scripts/lua/inc/search_host_box.lua
 share/ntopng/scripts/lua/inc/sprobe.lua
 share/ntopng/scripts/lua/inc/users.lua
 share/ntopng/scripts/lua/index.lua
+share/ntopng/scripts/lua/info_portal.lua
+share/ntopng/scripts/lua/jsontest.lua
+share/ntopng/scripts/lua/live_capture_data.lua
+share/ntopng/scripts/lua/live_capture_stats.lua
+share/ntopng/scripts/lua/live_traffic.lua
+share/ntopng/scripts/lua/local_hosts_stats.lua
 share/ntopng/scripts/lua/login.lua
 share/ntopng/scripts/lua/logout.lua
+share/ntopng/scripts/lua/mac_details.lua
+share/ntopng/scripts/lua/mac_pkt_distro.lua
 share/ntopng/scripts/lua/mac_stats.lua
-share/ntopng/scripts/lua/mesh_antenna_stats.lua
+share/ntopng/scripts/lua/macs_stats.lua
+share/ntopng/scripts/lua/manage_data.lua
+share/ntopng/scripts/lua/metrics.lua
+share/ntopng/scripts/lua/modules/alert_consts.lua
+share/ntopng/scripts/lua/modules/alert_endpoints/email.lua
+share/ntopng/scripts/lua/modules/alert_endpoints/nagios.lua
+share/ntopng/scripts/lua/modules/alert_endpoints/sample.lua
+share/ntopng/scripts/lua/modules/alert_endpoints/slack.lua
+share/ntopng/scripts/lua/modules/alert_state_utils.lua
 share/ntopng/scripts/lua/modules/alert_utils.lua
+share/ntopng/scripts/lua/modules/as_utils.lua
+share/ntopng/scripts/lua/modules/base64.lua
+share/ntopng/scripts/lua/modules/blacklist_utils.lua
+share/ntopng/scripts/lua/modules/callback_utils.lua
 share/ntopng/scripts/lua/modules/db_utils.lua
+share/ntopng/scripts/lua/modules/delete_data_utils.lua
+share/ntopng/scripts/lua/modules/discover_utils.lua
 share/ntopng/scripts/lua/modules/dkjson.lua
+share/ntopng/scripts/lua/modules/doa_ox.lua
+share/ntopng/scripts/lua/modules/flow_aggregation_utils.lua
+share/ntopng/scripts/lua/modules/flow_dbms/drivers/mysql.lua
+share/ntopng/scripts/lua/modules/flow_dbms/drivers/nindex.lua
+share/ntopng/scripts/lua/modules/flow_dbms/flow_dbms.lua
 share/ntopng/scripts/lua/modules/flow_utils.lua
+share/ntopng/scripts/lua/modules/format_utils.lua
+share/ntopng/scripts/lua/modules/grafana/index.lua
+share/ntopng/scripts/lua/modules/grafana/query.lua
+share/ntopng/scripts/lua/modules/grafana/search.lua
+share/ntopng/scripts/lua/modules/grafana_utils.lua
 share/ntopng/scripts/lua/modules/graph_utils.lua
 share/ntopng/scripts/lua/modules/historical_utils.lua
+share/ntopng/scripts/lua/modules/host_pools_utils.lua
+share/ntopng/scripts/lua/modules/http_bridge_conf_utils.lua
+share/ntopng/scripts/lua/modules/http_lint.lua
+share/ntopng/scripts/lua/modules/i18n/i18n.lua
+share/ntopng/scripts/lua/modules/i18n/init.lua
+share/ntopng/scripts/lua/modules/i18n/interpolate.lua
+share/ntopng/scripts/lua/modules/i18n/plural.lua
+share/ntopng/scripts/lua/modules/i18n/variants.lua
+share/ntopng/scripts/lua/modules/i18n/version.lua
 share/ntopng/scripts/lua/modules/json.lua
+share/ntopng/scripts/lua/modules/lists_utils.lua
+share/ntopng/scripts/lua/modules/live_traffic_utils.lua
+share/ntopng/scripts/lua/modules/locales_utils.lua
 share/ntopng/scripts/lua/modules/lua_trace.lua
 share/ntopng/scripts/lua/modules/lua_utils.lua
+share/ntopng/scripts/lua/modules/mac_utils.lua
+share/ntopng/scripts/lua/modules/ntop_utils.lua
+share/ntopng/scripts/lua/modules/os_utils.lua
 share/ntopng/scripts/lua/modules/persistence.lua
+share/ntopng/scripts/lua/modules/prefs_dump_utils.lua
+share/ntopng/scripts/lua/modules/prefs_menu.lua
 share/ntopng/scripts/lua/modules/prefs_utils.lua
+share/ntopng/scripts/lua/modules/recovery_utils.lua
+share/ntopng/scripts/lua/modules/resty/template.lua
+share/ntopng/scripts/lua/modules/resty/template/html.lua
+share/ntopng/scripts/lua/modules/resty/template/microbenchmark.lua
+share/ntopng/scripts/lua/modules/rrd_5min_dump_utils.lua
+share/ntopng/scripts/lua/modules/rrd_min_dump_utils.lua
+share/ntopng/scripts/lua/modules/rrd_paths.lua
+share/ntopng/scripts/lua/modules/rrd_utils.lua
 share/ntopng/scripts/lua/modules/sqlite_utils.lua
+share/ntopng/scripts/lua/modules/telegram.lua
 share/ntopng/scripts/lua/modules/template.lua
-share/ntopng/scripts/lua/modules/top_scripts/top_asn.lua
-share/ntopng/scripts/lua/modules/top_scripts/top_countries.lua
-share/ntopng/scripts/lua/modules/top_scripts/top_networks.lua
-share/ntopng/scripts/lua/modules/top_scripts/top_os.lua
-share/ntopng/scripts/lua/modules/top_scripts/top_os_local.lua
-share/ntopng/scripts/lua/modules/top_scripts/top_talkers.lua
-share/ntopng/scripts/lua/modules/top_scripts/top_vlan.lua
-share/ntopng/scripts/lua/modules/top_structure.lua
-share/ntopng/scripts/lua/modules/top_talkers.lua
-share/ntopng/scripts/lua/modules/traffic_stats.lua
+share/ntopng/scripts/lua/modules/template_utils.lua
+share/ntopng/scripts/lua/modules/timeseries/drivers/influxdb.lua
+share/ntopng/scripts/lua/modules/timeseries/drivers/rrd.lua
+share/ntopng/scripts/lua/modules/timeseries/drivers/sample.lua
+share/ntopng/scripts/lua/modules/timeseries/schemas/ts_5min.lua
+share/ntopng/scripts/lua/modules/timeseries/schemas/ts_minute.lua
+share/ntopng/scripts/lua/modules/timeseries/schemas/ts_second.lua
+share/ntopng/scripts/lua/modules/timeseries/tests/influxdb_test.lua
+share/ntopng/scripts/lua/modules/timeseries/tests/run.lua
+share/ntopng/scripts/lua/modules/timeseries/tests/utils_test.lua
+share/ntopng/scripts/lua/modules/timeseries/ts_common.lua
+share/ntopng/scripts/lua/modules/timeseries/ts_schema.lua
+share/ntopng/scripts/lua/modules/timeseries/ts_utils.lua
+share/ntopng/scripts/lua/modules/timeseries/ts_utils_core.lua
+share/ntopng/scripts/lua/modules/top_talkers_utils.lua
+share/ntopng/scripts/lua/modules/tz_utils.lua
+share/ntopng/scripts/lua/modules/vlan_utils.lua
 share/ntopng/scripts/lua/modules/voip_utils.lua
+share/ntopng/scripts/lua/modules/xmlSimple.lua
 share/ntopng/scripts/lua/network_details.lua
 share/ntopng/scripts/lua/network_load.lua
 share/ntopng/scripts/lua/network_stats.lua
+share/ntopng/scripts/lua/nindex.lua
+share/ntopng/scripts/lua/nindex_topk.lua
 share/ntopng/scripts/lua/os_stats.lua
 share/ntopng/scripts/lua/page_not_found.lua
 share/ntopng/scripts/lua/pid_stats.lua
-share/ntopng/scripts/lua/popKeys.lua
+share/ntopng/scripts/lua/please_wait.lua
+share/ntopng/scripts/lua/pool_details.lua
+share/ntopng/scripts/lua/pool_stats.lua
 share/ntopng/scripts/lua/port_details.lua
 share/ntopng/scripts/lua/processes_stats.lua
-share/ntopng/scripts/lua/protocols/dns_aggregations.lua
-share/ntopng/scripts/lua/protocols/epp_aggregations.lua
+share/ntopng/scripts/lua/reset_stats.lua
 share/ntopng/scripts/lua/resolve_address.lua
 share/ntopng/scripts/lua/runtime.lua
-share/ntopng/scripts/lua/set_if_prefs.lua
 share/ntopng/scripts/lua/sflow_tree.lua
 share/ntopng/scripts/lua/sflows_stats.lua
 share/ntopng/scripts/lua/show_alerts.lua
+share/ntopng/scripts/lua/show_geolocation_note.lua
 share/ntopng/scripts/lua/sprobe.lua
 share/ntopng/scripts/lua/sprobe_data.lua
 share/ntopng/scripts/lua/sprobe_flow_data.lua
@@ -373,10 +482,11 @@ share/ntopng/scripts/lua/sprobe_hosts.lu
 share/ntopng/scripts/lua/sprobe_hosts_data.lua
 share/ntopng/scripts/lua/sprobe_hosts_interactions.lua
 share/ntopng/scripts/lua/sprobe_hosts_interactions_data.lua
-share/ntopng/scripts/lua/system_hosts_interaction.lua
+share/ntopng/scripts/lua/stop_live_capture.lua
+share/ntopng/scripts/lua/test_locales.lua
 share/ntopng/scripts/lua/test_snmp.lua
-share/ntopng/scripts/lua/top_generic.lua
 share/ntopng/scripts/lua/top_hosts.lua
+share/ntopng/scripts/lua/unknown_devices.lua
 share/ntopng/scripts/lua/user_stats.lua
 share/ntopng/scripts/lua/vlan_details.lua
 share/ntopng/scripts/lua/vlan_stats.lua

Index: pkgsrc/net/ntopng/distinfo
diff -u pkgsrc/net/ntopng/distinfo:1.4 pkgsrc/net/ntopng/distinfo:1.5
--- pkgsrc/net/ntopng/distinfo:1.4      Thu Jun 15 14:54:44 2017
+++ pkgsrc/net/ntopng/distinfo  Thu Oct 18 16:25:40 2018
@@ -1,14 +1,15 @@
-$NetBSD: distinfo,v 1.4 2017/06/15 14:54:44 fhajny Exp $
+$NetBSD: distinfo,v 1.5 2018/10/18 16:25:40 adam Exp $
 
-SHA1 (ntopng-2.4-stable.tar.gz) = ceb08377f98e8d149e39f5546a62e2f6ca980a31
-RMD160 (ntopng-2.4-stable.tar.gz) = 14940d0ea398cd43d7c31868f34b833b214386e7
-SHA512 (ntopng-2.4-stable.tar.gz) = 515dd7889ae3aaf2482371bb2c55ab7300cf4207fe07f37029b7529bfb710379c19a54f58cf6df87e42454c0c99d15291af334adff676252301d9edd0acf3c7a
-Size (ntopng-2.4-stable.tar.gz) = 134074662 bytes
-SHA1 (patch-Makefile.in) = 9ef39a98e77d4bbf5afdde4e2a23e72d80fe9fd0
-SHA1 (patch-configure.seed) = b2c6e07c21f234c089e8a6319cb4dd476ba7890b
+SHA1 (ntopng-3.6.1.tar.gz) = deaf038d06132e7a297dc4a386745b975ef02fa7
+RMD160 (ntopng-3.6.1.tar.gz) = b244adca2eacc8a210961fd5c798d15fd78f2f14
+SHA512 (ntopng-3.6.1.tar.gz) = d4a2d24ab3ba0bd3af571afc5d68fda78d346f835b19d262da82805aca130b597bde6097eb69dcfd4e4a0b62da09e1d54d8db2039d0a0ff5ae50bafc5b768ef1
+Size (ntopng-3.6.1.tar.gz) = 30352006 bytes
+SHA1 (patch-Makefile.in) = 2a3df198cccc3e677657656b6608b42a23b5e1e3
+SHA1 (patch-configure.seed) = b31a9f2126371518ace2fd45d9c43191f8c39e68
+SHA1 (patch-include_Redis.h) = 949631615604e6a67c326e11fcdbdbbb2cd7bc7a
 SHA1 (patch-include_ntop__includes.h) = 2bf588dba941f25b71381c7848b237d964d77f31
-SHA1 (patch-src_DivertInterface.cpp) = 0a0ba0510b284fe40c432cf6db02a9906b03f236
 SHA1 (patch-src_PacketDumperTuntap.cpp) = 76415461ebbe88d886111aa2d6508c7eec66b11d
-SHA1 (patch-src_Redis.cpp) = 10f04cb1b300cd400905df993bb7d4f20431569b
-SHA1 (patch-src_Utils.cpp) = a3a0f86956dba31e23b0dc4a7739777a9479386f
+SHA1 (patch-src_Redis.cpp) = d863e6a2e02f9c6f7990c715a91881257f918033
+SHA1 (patch-src_Utils.cpp) = 4b5be995c81659611682d5b37209a2957435f8a4
+SHA1 (patch-third-party_mongoose_mongoose.c) = c1745b7700c0d1c7fe7dba1388025b6312ff144e
 SHA1 (patch-third-party_snmp_net.c) = defaacb719c2fb0276932554a7951f02a19ba4ef

Index: pkgsrc/net/ntopng/patches/patch-Makefile.in
diff -u pkgsrc/net/ntopng/patches/patch-Makefile.in:1.3 pkgsrc/net/ntopng/patches/patch-Makefile.in:1.4
--- pkgsrc/net/ntopng/patches/patch-Makefile.in:1.3     Fri Jul  1 04:51:15 2016
+++ pkgsrc/net/ntopng/patches/patch-Makefile.in Thu Oct 18 16:25:40 2018
@@ -1,15 +1,18 @@
-$NetBSD: patch-Makefile.in,v 1.3 2016/07/01 04:51:15 adam Exp $
+$NetBSD: patch-Makefile.in,v 1.4 2018/10/18 16:25:40 adam Exp $
 
-Use external nDPI.
+Use Lua instead of LuaJIT2.
 
---- Makefile.in.orig   2016-06-27 19:31:18.000000000 +0000
+--- Makefile.in.orig   2018-09-19 15:35:27.000000000 +0000
 +++ Makefile.in
-@@ -11,7 +11,7 @@ MAN_DIR=$(DESTDIR)@MAN_DIR@
+@@ -29,11 +29,7 @@ MONGOOSE_INC=-I$(MONGOOSE_HOME)
  ######
- HAS_NDPI=$(shell pkg-config --exists libndpi; echo $$?)
- ifeq ($(HAS_NDPI), 0)
--    NDPI_INC = $(shell pkg-config --cflags libndpi | sed -e 's/\(-I[^ \t]*\)/\1\/libndpi/g')
-+    NDPI_INC = $(shell pkg-config --cflags libndpi | sed -e 's/\(-I[^ ]*\)/\1\/libndpi/g')
-     NDPI_LIB = $(shell pkg-config --libs libndpi)
-     NDPI_LIB_DEP =
- else
+ 
+ # Set USE_LUAJIT=0 to use the standard Lua (no JIT)
+-USE_LUAJIT=1
+-
+-ifeq ($(OS),Darwin)
+ USE_LUAJIT=0
+-endif
+ 
+ ifeq ($(USE_LUAJIT), 0)
+   LUAJIT_INC = $(shell pkg-config --cflags lua) -DDONT_USE_LUAJIT

Index: pkgsrc/net/ntopng/patches/patch-configure.seed
diff -u pkgsrc/net/ntopng/patches/patch-configure.seed:1.2 pkgsrc/net/ntopng/patches/patch-configure.seed:1.3
--- pkgsrc/net/ntopng/patches/patch-configure.seed:1.2  Fri Jul  1 04:51:15 2016
+++ pkgsrc/net/ntopng/patches/patch-configure.seed      Thu Oct 18 16:25:40 2018
@@ -1,13 +1,12 @@
-$NetBSD: patch-configure.seed,v 1.2 2016/07/01 04:51:15 adam Exp $
+$NetBSD: patch-configure.seed,v 1.3 2018/10/18 16:25:40 adam Exp $
 
 Portability fix.
-Do not use included nDPI.
-Do not use -O0 for clang.
+Detect system hiredis.
 On Darwin, install into man/.
 
---- configure.seed.orig        2016-06-27 19:31:18.000000000 +0000
+--- configure.seed.orig        2018-09-19 15:35:27.000000000 +0000
 +++ configure.seed
-@@ -33,7 +33,7 @@ fi
+@@ -67,7 +67,7 @@ fi
  
  if [ test -f /usr/bin/lsb_release ]; then
     CODENAME=`/usr/bin/lsb_release -c|cut -f 2`
@@ -16,52 +15,16 @@ On Darwin, install into man/.
       CPPFLAGS="${CPPFLAGS} -DOLD_NETFILTER_INTERFACE=1"
     fi
  fi
-@@ -46,35 +46,6 @@ GIT_BRANCH="@GIT_BRANCH@"
- PRO_GIT_RELEASE="@PRO_GIT_RELEASE@"
- PRO_GIT_DATE="@PRO_GIT_DATE@"
+@@ -273,7 +273,7 @@ fi
  
--AC_MSG_CHECKING(for nDPI)
--NDPI_HOME=./nDPI
--if test -d "$NDPI_HOME" ; then :
--   AC_MSG_RESULT(found in $NDPI_HOME)
--else
--   NDPI_HOME=../nDPI
--   if test -d "$NDPI_HOME"; then :
--      AC_MSG_RESULT(found in $NDPI_HOME)
--   else
--      NDPI_HOME=$HOME/nDPI
--      if test -d "$NDPI_HOME"; then :
--        AC_MSG_RESULT(found in $NDPI_HOME)
--      else
--        AC_MSG_RESULT(not found)
--        echo "Please do cd ..; git clone https://github.com/ntop/nDPI.git; cd nDPI; ./autogen.sh; make; cd ../ntopng"
--        echo " and try again"
--        exit
--      fi
--   fi
--fi
--
--NDPI_LIB=$NDPI_HOME/src/lib/.libs/libndpi.a
--AC_MSG_CHECKING(for $NDPI_LIB)
--if test -f "$NDPI_LIB" ; then :
--  AC_MSG_RESULT(found $NDPI_LIB)
--else
--  AC_MSG_RESULT(not found $NDPI_LIB: compiling)
--  cd $NDPI_HOME; ./autogen.sh; make; cd -
--fi
- 
- AC_MSG_CHECKING(for ntopng professional edition)
- if test -d "pro"; then :
-@@ -359,7 +330,7 @@ if test x$GPP = x
- then
-       GPP="g++"
- else
--      GPP="$GPP -O0"
-+      GPP="$GPP"
- fi
+ DATE=`date +"%Y-%m-%d"`
  
- GIT=`which git`
-@@ -382,11 +353,7 @@ then
+-if test -d "/usr/include/hiredis"; then
++if `pkg-config --exists hiredis`; then
+  AC_DEFINE_UNQUOTED(HAVE_HIREDIS, 1, [Local hiredis package present])
+  HIREDIS_INC="`pkg-config --cflags hiredis` -I/usr/include/hiredis"
+  HIREDIS_LIB="`pkg-config --libs hiredis` -lhiredis"
+@@ -522,11 +522,7 @@ then
   INSTALL_DIR=${ac_default_prefix}
  fi
  

Index: pkgsrc/net/ntopng/patches/patch-src_Redis.cpp
diff -u pkgsrc/net/ntopng/patches/patch-src_Redis.cpp:1.1 pkgsrc/net/ntopng/patches/patch-src_Redis.cpp:1.2
--- pkgsrc/net/ntopng/patches/patch-src_Redis.cpp:1.1   Fri Apr  8 16:59:07 2016
+++ pkgsrc/net/ntopng/patches/patch-src_Redis.cpp       Thu Oct 18 16:25:40 2018
@@ -1,20 +1,44 @@
-$NetBSD: patch-src_Redis.cpp,v 1.1 2016/04/08 16:59:07 adam Exp $
+$NetBSD: patch-src_Redis.cpp,v 1.2 2018/10/18 16:25:40 adam Exp $
 
-Allow Redis connection through unix socket.
+Allow Redis connection through a socket.
 
---- src/Redis.cpp.orig 2016-04-06 11:41:42.000000000 +0000
+--- src/Redis.cpp.orig 2018-09-19 15:35:27.000000000 +0000
 +++ src/Redis.cpp
-@@ -75,7 +75,12 @@ void Redis::reconnectRedis() {
+@@ -35,9 +35,7 @@ Redis::Redis(const char *_redis_host, co
+   redis_host = _redis_host ? strdup(_redis_host) : NULL;
+   redis_password = _redis_password ? strdup(_redis_password) : NULL;
+   redis_port = _redis_port, redis_db_id = _redis_db_id;
+-#ifdef __linux__
+   is_socket_connection = false;
+-#endif
+ 
+   num_requests = num_reconnections = 0;
+   redis = NULL, operational = false;
+@@ -75,13 +73,11 @@ void Redis::reconnectRedis() {
+     ntop->getTrace()->traceEvent(TRACE_NORMAL, "Redis has disconnected: reconnecting...");
      redisFree(redis);
    }
+-#ifdef __linux__
+   struct stat buf;
  
--  redis = redisConnectWithTimeout(redis_host, redis_port, timeout);
-+  if (redis_host[0] == '/') {
-+    redis = redisConnectUnixWithTimeout(redis_host, timeout);
-+  }
-+  else {
-+    redis = redisConnectWithTimeout(redis_host, redis_port, timeout);
-+  }
+   if(!stat(redis_host, &buf) && S_ISSOCK(buf.st_mode))
+     redis = redisConnectUnixWithTimeout(redis_host, timeout), is_socket_connection = true;
+   else
+-#endif
+     redis = redisConnectWithTimeout(redis_host, redis_port, timeout);
  
-   while(num_attemps > 0) {
-     if(redis) reply = (redisReply*)redisCommand(redis, "PING"); else reply = NULL;
+   if(redis_password) {
+@@ -122,13 +118,11 @@ void Redis::reconnectRedis() {
+       goto redis_error_handler;
+     } else {
+       freeReplyObject(reply);
+-#ifdef __linux__
+       if(!is_socket_connection)
+       ntop->getTrace()->traceEvent(TRACE_NORMAL,
+                                    "Successfully connected to redis %s:%u@%u",
+                                    redis_host, redis_port, redis_db_id);
+       else
+-#endif
+       ntop->getTrace()->traceEvent(TRACE_NORMAL,
+                                    "Successfully connected to redis %s@%u",
+                                    redis_host, redis_db_id);
Index: pkgsrc/net/ntopng/patches/patch-src_Utils.cpp
diff -u pkgsrc/net/ntopng/patches/patch-src_Utils.cpp:1.1 pkgsrc/net/ntopng/patches/patch-src_Utils.cpp:1.2
--- pkgsrc/net/ntopng/patches/patch-src_Utils.cpp:1.1   Thu Jun 15 14:54:45 2017
+++ pkgsrc/net/ntopng/patches/patch-src_Utils.cpp       Thu Oct 18 16:25:40 2018
@@ -1,42 +1,72 @@
-$NetBSD: patch-src_Utils.cpp,v 1.1 2017/06/15 14:54:45 fhajny Exp $
+$NetBSD: patch-src_Utils.cpp,v 1.2 2018/10/18 16:25:40 adam Exp $
 
+Fix building on NetBSD.
 d_type is not POSIX, provide workaround for SunOS.
 
---- src/Utils.cpp.orig 2016-06-27 19:31:18.000000000 +0000
+--- src/Utils.cpp.orig 2018-09-19 15:35:27.000000000 +0000
 +++ src/Utils.cpp
-@@ -23,6 +23,9 @@
+@@ -21,10 +21,13 @@
  
- #include <curl/curl.h>
- #include <string.h>
+ #include "ntop_includes.h"
+ 
+-#if defined(__OpenBSD__) || defined(__APPLE__)
++#if defined(__NetBSD__) || defined(__OpenBSD__) || defined(__APPLE__)
+ #include <net/if_dl.h>
+ #include <ifaddrs.h>
+ #endif
 +#ifdef __sun
 +struct stat s;
 +#endif
  
  // A simple struct for strings.
  typedef struct {
-@@ -1232,7 +1235,12 @@ bool scan_dir(const char * dir_name, lis
-     entry = readdir (d);
+@@ -1747,7 +1750,12 @@ static bool scan_dir(const char * dir_na
      if(!entry) break;
      d_name = entry->d_name;
+ 
 +#ifdef __sun
 +    stat(entry->d_name, &s);
-+    if (!(s.st_mode & S_IFDIR)) {
++    if (s.st_mode & S_IFREG) {
 +#else
-     if(!(entry->d_type & DT_DIR)) {
+     if(entry->d_type & DT_REG) {
 +#endif
-       if(!stat(entry->d_name, &file_stats)) {
+       snprintf(path, sizeof(path), "%s/%s", dir_name, entry->d_name);
+       if(!stat(path, &file_stats)) {
          struct dirent *temp = (struct dirent *)malloc(sizeof(struct dirent));
-         memcpy(temp, entry, sizeof(struct dirent));
-@@ -1241,7 +1249,12 @@ bool scan_dir(const char * dir_name, lis
+@@ -1757,7 +1765,11 @@ static bool scan_dir(const char * dir_na
+         *total += file_stats.st_size;
        }
-     }
  
 +#ifdef __sun
-+    stat(entry->d_name, &s);
-+    if (s.st_mode & S_IFDIR) {
++    } else if (s.st_mode & S_IFDIR) {
 +#else
-     if(entry->d_type & DT_DIR) {
+     } else if(entry->d_type & DT_DIR) {
 +#endif
        if(strncmp (d_name, "..", 2) != 0 &&
            strncmp (d_name, ".", 1) != 0) {
-         int path_length;
+         path_length = snprintf (path, MAX_PATH,
+@@ -1849,7 +1861,12 @@ bool ntop_delete_old_files(const char *d
+   if(!d) return false;
+ 
+   while((result = readdir(d)) != NULL) {
++#ifdef __sun
++    stat(entry->d_name, &s);
++    if (s.st_mode & S_IFREG) {
++#else
+     if(result->d_type & DT_REG) {
++#endif
+       if((path_length = snprintf(path, MAX_PATH, "%s/%s", dir_name, result->d_name)) <= MAX_PATH) {
+       ntop->fixPath(path);
+ 
+@@ -1858,7 +1875,11 @@ bool ntop_delete_old_files(const char *d
+           unlink(path);
+       }
+       }
++#ifdef __sun
++    } else if (s.st_mode & S_IFDIR) {
++#else
+     } else if(result->d_type & DT_DIR) {
++#endif
+       if(strncmp(result->d_name, "..", 2) && strncmp(result->d_name, ".", 1)) {
+         if((path_length = snprintf(path, MAX_PATH, "%s/%s", dir_name, result->d_name)) <= MAX_PATH) {
+         ntop->fixPath(path);

Added files:

Index: pkgsrc/net/ntopng/patches/patch-include_Redis.h
diff -u /dev/null pkgsrc/net/ntopng/patches/patch-include_Redis.h:1.1
--- /dev/null   Thu Oct 18 16:25:40 2018
+++ pkgsrc/net/ntopng/patches/patch-include_Redis.h     Thu Oct 18 16:25:40 2018
@@ -0,0 +1,16 @@
+$NetBSD: patch-include_Redis.h,v 1.1 2018/10/18 16:25:40 adam Exp $
+
+Allow Redis connection through a socket.
+
+--- include/Redis.h.orig       2018-10-18 14:09:01.000000000 +0000
++++ include/Redis.h
+@@ -31,9 +31,7 @@ class Redis {
+   redisContext *redis;
+   Mutex *l;
+   char *redis_host, *redis_password, *redis_version;
+-#ifdef __linux__
+   bool is_socket_connection;
+-#endif
+   u_int32_t num_requests, num_reconnections, num_redis_version;
+   u_int16_t redis_port;
+   u_int8_t redis_db_id;

Index: pkgsrc/net/ntopng/patches/patch-third-party_mongoose_mongoose.c
diff -u /dev/null pkgsrc/net/ntopng/patches/patch-third-party_mongoose_mongoose.c:1.3
--- /dev/null   Thu Oct 18 16:25:40 2018
+++ pkgsrc/net/ntopng/patches/patch-third-party_mongoose_mongoose.c     Thu Oct 18 16:25:40 2018
@@ -0,0 +1,16 @@
+$NetBSD: patch-third-party_mongoose_mongoose.c,v 1.3 2018/10/18 16:25:40 adam Exp $
+
+Do not redefine SOCKET.
+
+--- third-party/mongoose/mongoose.c.orig       2018-10-18 15:46:36.000000000 +0000
++++ third-party/mongoose/mongoose.c
+@@ -270,7 +270,9 @@ struct pollfd {
+ #endif
+ 
+ //#define INT64_FMT PRId64
++#ifndef SOCKET
+ typedef int SOCKET;
++#endif
+ #define WINCDECL
+ 
+ #endif // End of Windows and UNIX specific includes