CVS commit: pkgsrc/net/ntopng

To: pkgsrc-changes%NetBSD.org@localhost
Subject: CVS commit: pkgsrc/net/ntopng
From: "Adam Ciarcinski" <adam%netbsd.org@localhost>
Date: Mon, 20 Nov 2023 17:59:35 +0000

Module Name:    pkgsrc
Committed By:   adam
Date:           Mon Nov 20 17:59:35 UTC 2023

Modified Files:
        pkgsrc/net/ntopng: Makefile PLIST distinfo
        pkgsrc/net/ntopng/patches: patch-Makefile.in patch-include_Redis.h
            patch-src_PacketDumperTuntap.cpp patch-src_Redis.cpp
            patch-src_Utils.cpp

Log Message:
ntopng: updated to 6.0

6.0 Stable

Breakthroughs

New configurable Dashboard with new built-in templates
New configurable Traffic Report
New Vulnerability Scans & CVEs support
Add support to Periodic Reports notified via Recipients (e.g. email)
Add Inactive Hosts
Add PagerDuty integration
Add TheHive integration
Add support to Modbus and Modbus alerts
Add Server Ports Analysis page
Enable multithreading in active measurements (more accurate)
Migrate frontend chart timeseries library to Dygraph
Add support for MAC Address based RADIUS accounting
Improve OT, ICS, Scada support
Trigger External Host alerts directly from Lua (also for inactive hosts)
Add multicast forwarders
Implement host blackhole
Add support for LLDP id to MIB-II InterfaceId mapping
Add support for bidirectional rules
Add support for Enterprise XL bundle

Improvements

Implement asynchronous VS scanning
Implement Ms Teams call detection
Optimize blacklist handling
Improve Network Map charts physics
Extend support to deliver notification to specific recipients
Improve traffic recording settings
Add support for Host Pools and Networks in Local Traffic Rules
Add search map
Add custom queries for Top Local/Remote hosts
Add Top receiver/sender networks custom queries
Add openvas support
Add new Vulners vulnerability scanner
Add ability to set probes aliases
Add MDNS, NETBios, HTTP historical filters
Improve FreeBSD clickhouse installation
Implement -L <path> for logging HTTP requests
Add -z for enabling timestamp reforge when reading pcap files
Improve dark mode css
Optimize ElasticSearch export (removed locks, increase export queue to 64K to handle spikes)
Add Radius chap validation
Add Radius auth protocol preference
Automated commit of clang-format CI changes
Add tool for creating nProbe topics in a kafka broker
Implement host score in Host scripts
Improvements for No-RX traffic analysis
Improve nProbe time drift check
Implement clickhouse retention
Add new page with snmp device rules
Add limit to discard clickhouse dump files
Improve IP/MAC association in SNMP

Changes

Support multilple -m options
Rework nDPI stats
Add support for multiple email recipients
Add logic to enable generic checks if without a configuration
Add malware host contacted check
Use REST API to enable/disable checks
Disabled the reset of the email notification modal upon failed edit submission
Whitelisted locale page
Add ability to reset blacklist stats
Implement blacklist stats
Add mining currency in flow info
Add flag to use proxy in email settings
Reduced in simulate vlans option, the number of vlans
Restricted top flow chart for community version
Add input with suggestions component
Set capture direction for n2disk in zmq interfaces
Add explicit flag to enable flow export when recording on zmq interfaces
Add support for %NPROBE_INSTANCE_NAME
Add Ellio blocklist configuration (disabled by default)
Update to the latest nDPI risks
Email endpoint improvements
Improve notification message
Add download/upload buttons
Add possibility to send notification to recipients
Add multicast broadcast filter
Updated checks lists per license
Add feedback of correctly host inserted or already present
Take the score into account when computing the top alerted hosts
Add backend autorefresh support
Add flow exporter mapping to timeseries
Update default aggregation criteria in Aggregated live flows.
Add missing protocol mapping
Exported IP country information when using -F syslog
Change js formatting function for 'number' type, using thousands separator
Disabled LDAP support for FreeBSD
Add VLAN bidirectional traffic alert
Handle JSON format for NXLOG in Kerberos plugin

nEdge

Add dashboard templates for nedge pro and enterprise
Enable CH support on nEdge Enterprise
Enable throughput charts on nedge
Make Multicast repeater configurable
Add MDNS and multicast repeater
Major cleanup of (deprecated) nedge host pools code
Add support for custom informative captive portal
Set multiple LAN addresses in case of multiple LAN interfaces
Add inter-LANs policies
Always redirect somewhere on captive success, instead of displaying an empty page
nf_config API improvements

Fixes

Fix edit rest in multicast forwarding
Fix missing validation functions
Fix traffic timeseries labels
Fix RedHat OS-name detection
Fix prototype pollution vulnerability
Fix thread pool spawning on freebsd
Fix Zoom handling
Fix behavior alert not triggered
Fix naming with timeseries
Fix nDPI protocol id issues
Fix RRD computation of sampled series with MAX as consolidated function
Fix flow alert where clause in write mode
Fix alert silencing not working
Fix application protocol ID using minor and major protocol
Fix UI spinner on loading
Fix recursive problem in active monitoring
Fix ts with vlans
Fix shutting down doesn't insert alerts in CH
Fix checks configuration initialization (default values) for new risks
Fix traffic behavior total not working in charts
Fix timeseries chart date format
Fix SSH flow swap heuristic
Fix avg empty value and added extra check for nan values in js
Fix pcap dynamically loaded not triggering alert
Fix ZMQ linking on Win
Fix date format
Fix blacklist counter stats
Fix flow alert queries on SQLite
Fix interface and local networks alerts not released
Fix flow devices not working with view interface
Fix flow exporters not seen with aggregated interfaces
Fix js regexes
Fix for validating correctly host and VLAN
Fix segv with custom protocols
Fix l7 metadata ingestion (e.g. dns query) when collecting from ZMQ
Fix hostname resolving
Fix ApexCharts formatter
Fix heap-buffer-overflow in MDNS packet dissection
Fix exclusion bitmap not correctly set
Fix some errors and leaks found while fuzzing locally
Fix Heap buffer overflow in IEC104Stats
Fix for memory management in packet-mode


To generate a diff of this commit:
cvs rdiff -u -r1.67 -r1.68 pkgsrc/net/ntopng/Makefile
cvs rdiff -u -r1.8 -r1.9 pkgsrc/net/ntopng/PLIST
cvs rdiff -u -r1.14 -r1.15 pkgsrc/net/ntopng/distinfo
cvs rdiff -u -r1.8 -r1.9 pkgsrc/net/ntopng/patches/patch-Makefile.in
cvs rdiff -u -r1.2 -r1.3 pkgsrc/net/ntopng/patches/patch-include_Redis.h \
    pkgsrc/net/ntopng/patches/patch-src_PacketDumperTuntap.cpp
cvs rdiff -u -r1.3 -r1.4 pkgsrc/net/ntopng/patches/patch-src_Redis.cpp
cvs rdiff -u -r1.6 -r1.7 pkgsrc/net/ntopng/patches/patch-src_Utils.cpp

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.67 pkgsrc/net/ntopng/Makefile:1.68
--- pkgsrc/net/ntopng/Makefile:1.67     Tue Nov 14 14:02:40 2023
+++ pkgsrc/net/ntopng/Makefile  Mon Nov 20 17:59:35 2023
@@ -1,7 +1,6 @@
-# $NetBSD: Makefile,v 1.67 2023/11/14 14:02:40 wiz Exp $
+# $NetBSD: Makefile,v 1.68 2023/11/20 17:59:35 adam Exp $
 
-DISTNAME=      ntopng-5.6
-PKGREVISION=   4
+DISTNAME=      ntopng-6.0
 CATEGORIES=    net
 MASTER_SITES=  ${MASTER_SITE_GITHUB:=ntop/}
 
@@ -31,7 +30,8 @@ SITES.${HTTPDOCS_DIST}=       ${MASTER_SITE_LO
 # comment out this when running make update-ui
 DISTFILES=             ${DEFAULT_DISTFILES} ${HTTPDOCS_DIST}
 
-USE_LANGUAGES=         c c++11
+USE_CXX_FEATURES=      c++11
+USE_LANGUAGES=         c c++
 USE_LIBTOOL=           yes
 USE_TOOLS+=            autoconf automake bash gmake pkg-config
 GNU_CONFIGURE=         yes
@@ -73,6 +73,7 @@ post-install:
 .include "../../databases/rrdtool/buildlink3.mk"
 .include "../../databases/sqlite3/buildlink3.mk"
 .include "../../geography/libmaxminddb/buildlink3.mk"
+.include "../../graphics/png/buildlink3.mk"
 .include "../../lang/lua54/buildlink3.mk"
 .include "../../net/GeoIP/buildlink3.mk"
 .include "../../net/libpcap/buildlink3.mk"
@@ -82,5 +83,6 @@ post-install:
 .include "../../security/libgcrypt/buildlink3.mk"
 .include "../../www/curl/buildlink3.mk"
 .include "../../mk/dlopen.buildlink3.mk"
+.include "../../mk/jpeg.buildlink3.mk"
 .include "../../mk/mysql.buildlink3.mk"
 .include "../../mk/bsd.pkg.mk"

Index: pkgsrc/net/ntopng/PLIST
diff -u pkgsrc/net/ntopng/PLIST:1.8 pkgsrc/net/ntopng/PLIST:1.9
--- pkgsrc/net/ntopng/PLIST:1.8 Thu Jun 29 18:06:21 2023
+++ pkgsrc/net/ntopng/PLIST     Mon Nov 20 17:59:35 2023
@@ -1,4 +1,4 @@
-@comment $NetBSD: PLIST,v 1.8 2023/06/29 18:06:21 adam Exp $
+@comment $NetBSD: PLIST,v 1.9 2023/11/20 17:59:35 adam Exp $
 bin/ntopng
 man/man8/ntopng.8
 share/ntopng/httpdocs/css/README.md
@@ -6,7 +6,9 @@ share/ntopng/httpdocs/css/select2.min.cs
 share/ntopng/httpdocs/dist/0a1b701f5563c2288281.ttf
 share/ntopng/httpdocs/dist/15d98c18221c8bcb2334.ttf
 share/ntopng/httpdocs/dist/2bd53024cba1f2355d53.png
+share/ntopng/httpdocs/dist/3d503f89ccaf1b224aa5.woff2
 share/ntopng/httpdocs/dist/4896d4b04430cc3dfb06.woff2
+share/ntopng/httpdocs/dist/52eba2c567c521b8d58a.ttf
 share/ntopng/httpdocs/dist/73879eafee8fd84e7c13.png
 share/ntopng/httpdocs/dist/79da213423ac0def2058.ttf
 share/ntopng/httpdocs/dist/8dbb811c120eea1560c8.png
@@ -87,6 +89,7 @@ share/ntopng/httpdocs/misc/lists/builtin
 share/ntopng/httpdocs/misc/lists/builtin/antiwebminer.list
 share/ntopng/httpdocs/misc/lists/builtin/disconnect_me.list
 share/ntopng/httpdocs/misc/lists/builtin/dshield_7days.list
+share/ntopng/httpdocs/misc/lists/builtin/ellio.list
 share/ntopng/httpdocs/misc/lists/builtin/emerging_threats.list
 share/ntopng/httpdocs/misc/lists/builtin/feodo.list
 share/ntopng/httpdocs/misc/lists/builtin/feodo_c2.list
@@ -96,7 +99,6 @@ share/ntopng/httpdocs/misc/lists/builtin
 share/ntopng/httpdocs/misc/lists/builtin/sslbl_ja3.list
 share/ntopng/httpdocs/misc/lists/builtin/stratosphere.list
 share/ntopng/httpdocs/misc/lists/builtin/threatfox.list
-share/ntopng/httpdocs/misc/lists/builtin/urlhaus.list
 share/ntopng/httpdocs/misc/lists/custom/README.txt
 share/ntopng/httpdocs/misc/ntopng-add-user.sh
 share/ntopng/httpdocs/misc/ntopng-utils-manage-config
@@ -107,12 +109,31 @@ share/ntopng/httpdocs/misc/ntopng_templa
 share/ntopng/httpdocs/misc/ntopng_template_elk6.json
 share/ntopng/httpdocs/misc/ntopng_template_elk7.json
 share/ntopng/httpdocs/misc/ntopng_template_elk8.json
+share/ntopng/httpdocs/misc/rest-api-v2.json
 share/ntopng/httpdocs/other/EtherOUI.txt
 share/ntopng/httpdocs/other/TimeZones.txt
 share/ntopng/httpdocs/other/radcli_dictionary.txt
 share/ntopng/httpdocs/other/trackers.txt
 share/ntopng/httpdocs/ssl/README
 share/ntopng/httpdocs/ssl/ntopng-cert.pem.dummy
+share/ntopng/httpdocs/tables_config/aggregated_live_flows.json
+share/ntopng/httpdocs/tables_config/alert_all.json
+share/ntopng/httpdocs/tables_config/alert_am_host.json
+share/ntopng/httpdocs/tables_config/alert_flow.json
+share/ntopng/httpdocs/tables_config/alert_host.json
+share/ntopng/httpdocs/tables_config/alert_interface.json
+share/ntopng/httpdocs/tables_config/alert_mac.json
+share/ntopng/httpdocs/tables_config/alert_network.json
+share/ntopng/httpdocs/tables_config/alert_snmp_device.json
+share/ntopng/httpdocs/tables_config/alert_system.json
+share/ntopng/httpdocs/tables_config/alert_user.json
+share/ntopng/httpdocs/tables_config/device_exclusions.json
+share/ntopng/httpdocs/tables_config/flow_historical.json
+share/ntopng/httpdocs/tables_config/flow_historical_aggregated.json
+share/ntopng/httpdocs/tables_config/hosts_to_scan.json
+share/ntopng/httpdocs/tables_config/inactive_hosts.json
+share/ntopng/httpdocs/tables_config/open_ports.json
+share/ntopng/httpdocs/tables_config/server_ports_analysis.json
 share/ntopng/httpdocs/templates/active_monitoring_stats.template
 share/ntopng/httpdocs/templates/am_add_host_modal.html
 share/ntopng/httpdocs/templates/am_delete_host_modal.html
@@ -152,7 +173,6 @@ share/ntopng/httpdocs/templates/pages/ar
 share/ntopng/httpdocs/templates/pages/components/add-user-dialog.template
 share/ntopng/httpdocs/templates/pages/components/blog-dropdown.template
 share/ntopng/httpdocs/templates/pages/components/breadcrumb.template
-share/ntopng/httpdocs/templates/pages/components/datatable.template
 share/ntopng/httpdocs/templates/pages/components/db-analysis.template
 share/ntopng/httpdocs/templates/pages/components/edit-categories.template
 share/ntopng/httpdocs/templates/pages/components/export-policy-configuration-link.template
@@ -170,6 +190,7 @@ share/ntopng/httpdocs/templates/pages/co
 share/ntopng/httpdocs/templates/pages/components/toast.template
 share/ntopng/httpdocs/templates/pages/components/toasts-container.template
 share/ntopng/httpdocs/templates/pages/discover/discover.template
+share/ntopng/httpdocs/templates/pages/edit-applications.template
 share/ntopng/httpdocs/templates/pages/edit_check.template
 share/ntopng/httpdocs/templates/pages/edit_configset.template
 share/ntopng/httpdocs/templates/pages/endpoint_notifications_list.template
@@ -181,9 +202,13 @@ share/ntopng/httpdocs/templates/pages/ho
 share/ntopng/httpdocs/templates/pages/hosts/ports_stats.template
 share/ntopng/httpdocs/templates/pages/hosts/traffic_stats.template
 share/ntopng/httpdocs/templates/pages/hosts_geomap.template
+share/ntopng/httpdocs/templates/pages/hosts_ports_analysis.template
+share/ntopng/httpdocs/templates/pages/inactive_host_details.template
+share/ntopng/httpdocs/templates/pages/inactive_hosts.template
 share/ntopng/httpdocs/templates/pages/interface_nprobes.template
 share/ntopng/httpdocs/templates/pages/license.template
 share/ntopng/httpdocs/templates/pages/manage_configurations.template
+share/ntopng/httpdocs/templates/pages/manage_configurations_backup.template
 share/ntopng/httpdocs/templates/pages/manage_data.template
 share/ntopng/httpdocs/templates/pages/manage_host_members.template
 share/ntopng/httpdocs/templates/pages/modals/alerts/acknowledge_alert.template
@@ -222,6 +247,10 @@ share/ntopng/httpdocs/templates/pages/no
 share/ntopng/httpdocs/templates/pages/notifications/email/email_recipient.template
 share/ntopng/httpdocs/templates/pages/notifications/fail2ban/fail2ban_endpoint.template
 share/ntopng/httpdocs/templates/pages/notifications/fail2ban/fail2ban_recipient.template
+share/ntopng/httpdocs/templates/pages/notifications/mattermost/mattermost_endpoint.template
+share/ntopng/httpdocs/templates/pages/notifications/mattermost/mattermost_recipient.template
+share/ntopng/httpdocs/templates/pages/notifications/pagerduty/pagerduty_endpoint.template
+share/ntopng/httpdocs/templates/pages/notifications/pagerduty/pagerduty_recipient.template
 share/ntopng/httpdocs/templates/pages/notifications/shell/shell_endpoint.template
 share/ntopng/httpdocs/templates/pages/notifications/shell/shell_recipient.template
 share/ntopng/httpdocs/templates/pages/notifications/slack/slack_endpoint.template
@@ -232,6 +261,8 @@ share/ntopng/httpdocs/templates/pages/no
 share/ntopng/httpdocs/templates/pages/notifications/teams/teams_recipient.template
 share/ntopng/httpdocs/templates/pages/notifications/telegram/telegram_endpoint.template
 share/ntopng/httpdocs/templates/pages/notifications/telegram/telegram_recipient.template
+share/ntopng/httpdocs/templates/pages/notifications/thehive/thehive_endpoint.template
+share/ntopng/httpdocs/templates/pages/notifications/thehive/thehive_recipient.template
 share/ntopng/httpdocs/templates/pages/notifications/webhook/webhook_endpoint.template
 share/ntopng/httpdocs/templates/pages/notifications/webhook/webhook_recipient.template
 share/ntopng/httpdocs/templates/pages/observation_points_config.template
@@ -245,6 +276,7 @@ share/ntopng/httpdocs/templates/pages/ta
 share/ntopng/httpdocs/templates/pages/tabs/manage_data/system_interface_data.template
 share/ntopng/httpdocs/templates/pages/test_gui_widgets.template
 share/ntopng/httpdocs/templates/pages/top_sites.template
+share/ntopng/httpdocs/templates/pages/vue_page.template
 share/ntopng/httpdocs/templates/prefs_search.template
 share/ntopng/httpdocs/templates/traffic_extraction_dialog.html
 share/ntopng/httpdocs/templates/traffic_report.html
@@ -253,9 +285,6 @@ share/ntopng/httpdocs/templates/upload_p
 share/ntopng/httpdocs/templates/widgets/chart-widget.template
 share/ntopng/httpdocs/templates/widgets/geomap-widget.template
 share/ntopng/httpdocs/templates/wizard_dialog.html
-share/ntopng/httpdocs/tmp/bootstrap-select/bootstrap-select.css.map
-share/ntopng/httpdocs/tmp/bootstrap-select/bootstrap-select.js
-share/ntopng/httpdocs/tmp/bootstrap-select/bootstrap-select.min.css
 share/ntopng/scripts/callbacks/5minute-delayed/interface/interface_checks.lua
 share/ntopng/scripts/callbacks/5minute-delayed/interface/local_network_checks.lua
 share/ntopng/scripts/callbacks/5minute/interface/timeseries.lua
@@ -271,16 +300,17 @@ share/ntopng/scripts/callbacks/5second/s
 share/ntopng/scripts/callbacks/checks/flows/custom_flow_end_script.lua.sample
 share/ntopng/scripts/callbacks/checks/flows/custom_flow_periodic_script.lua.sample
 share/ntopng/scripts/callbacks/checks/flows/custom_flow_protocol_detected_script.lua.sample
-share/ntopng/scripts/callbacks/checks/hosts/custom_host_lua_script.lua
 share/ntopng/scripts/callbacks/checks/hosts/custom_host_lua_script.lua.sample
 share/ntopng/scripts/callbacks/daily-delayed/interface/interface_checks.lua
 share/ntopng/scripts/callbacks/daily-delayed/interface/local_network_checks.lua
 share/ntopng/scripts/callbacks/daily-delayed/interface/stats_retention.lua
 share/ntopng/scripts/callbacks/daily-delayed/interface/timeseries_retention.lua
+share/ntopng/scripts/callbacks/daily-delayed/system/backup_configurations.lua
 share/ntopng/scripts/callbacks/daily-delayed/system/fetch_blog_feed.lua
 share/ntopng/scripts/callbacks/daily-delayed/system/mysql_retention.lua
 share/ntopng/scripts/callbacks/daily-delayed/system/stats_retention.lua
 share/ntopng/scripts/callbacks/daily-delayed/system/system_checks.lua
+share/ntopng/scripts/callbacks/daily/system/reset_blacklists.lua
 share/ntopng/scripts/callbacks/hourly-delayed/interface/checks_cleanup.lua
 share/ntopng/scripts/callbacks/hourly-delayed/interface/interface_checks.lua
 share/ntopng/scripts/callbacks/hourly-delayed/interface/local_network_checks.lua
@@ -290,19 +320,28 @@ share/ntopng/scripts/callbacks/hourly-de
 share/ntopng/scripts/callbacks/hourly/system/disk_monitor.lua
 share/ntopng/scripts/callbacks/minute-delayed/interface/interface_checks.lua
 share/ntopng/scripts/callbacks/minute-delayed/interface/local_network_checks.lua
+share/ntopng/scripts/callbacks/minute-delayed/system/radius_accounting.lua
 share/ntopng/scripts/callbacks/minute/interface/localhosts_stats.lua
 share/ntopng/scripts/callbacks/minute/interface/timeseries.lua
 share/ntopng/scripts/callbacks/minute/system/active_monitoring.lua
+share/ntopng/scripts/callbacks/minute/system/dispatch_message_example.lua
 share/ntopng/scripts/callbacks/minute/system/drop_host_pool.lua
 share/ntopng/scripts/callbacks/minute/system/influxdb_checks.lua
 share/ntopng/scripts/callbacks/minute/system/redis_timeseries.lua
 share/ntopng/scripts/callbacks/minute/system/system_checks.lua
 share/ntopng/scripts/callbacks/minute/system/timeseries.lua
+share/ntopng/scripts/callbacks/minute/system/vulnerability_scan.lua
 share/ntopng/scripts/callbacks/second/system/timeseries.lua
 share/ntopng/scripts/callbacks/system/boot.lua
 share/ntopng/scripts/callbacks/system/shutdown.lua
 share/ntopng/scripts/callbacks/system/startup.lua
 share/ntopng/scripts/callbacks/system/syslog.lua
+share/ntopng/scripts/historical/alerts/flow/alert_types.json
+share/ntopng/scripts/historical/alerts/flow/contacts.json
+share/ntopng/scripts/historical/alerts/flow/contacts_by_type.json
+share/ntopng/scripts/historical/alerts/flow/contacts_with_port.json
+share/ntopng/scripts/historical/alerts/flow/info.json
+share/ntopng/scripts/historical/alerts/host/host_by_type.json
 share/ntopng/scripts/historical/analysis/README
 share/ntopng/scripts/historical/analysis/asn.json
 share/ntopng/scripts/historical/analysis/flow_geomap.json
@@ -311,15 +350,26 @@ share/ntopng/scripts/historical/analysis
 share/ntopng/scripts/historical/analysis/score.json
 share/ntopng/scripts/historical/analysis/sites.json
 share/ntopng/scripts/historical/tables/README
+share/ntopng/scripts/historical/tables/alerted_domains.json
+share/ntopng/scripts/historical/tables/clients.json
+share/ntopng/scripts/historical/tables/conversations.json
+share/ntopng/scripts/historical/tables/l7_contacts.json
 share/ntopng/scripts/historical/tables/latency_by_asn.json
 share/ntopng/scripts/historical/tables/number_of_hosts.json
-share/ntopng/scripts/historical/tables/top_alerted_domains.json
+share/ntopng/scripts/historical/tables/server_contacts.json
+share/ntopng/scripts/historical/tables/server_ports.json
+share/ntopng/scripts/historical/tables/servers.json
+share/ntopng/scripts/historical/tables/sites.json
 share/ntopng/scripts/historical/tables/top_clients.json
-share/ntopng/scripts/historical/tables/top_conversations.json
-share/ntopng/scripts/historical/tables/top_l7_contacts.json
-share/ntopng/scripts/historical/tables/top_server_ports.json
+share/ntopng/scripts/historical/tables/top_local_talkers.json
+share/ntopng/scripts/historical/tables/top_receiver_as.json
+share/ntopng/scripts/historical/tables/top_receiver_countries.json
+share/ntopng/scripts/historical/tables/top_receiver_networks.json
+share/ntopng/scripts/historical/tables/top_remote_destinations.json
+share/ntopng/scripts/historical/tables/top_sender_as.json
+share/ntopng/scripts/historical/tables/top_sender_countries.json
+share/ntopng/scripts/historical/tables/top_sender_networks.json
 share/ntopng/scripts/historical/tables/top_servers.json
-share/ntopng/scripts/historical/tables/top_sites.json
 share/ntopng/scripts/locales/cn.lua
 share/ntopng/scripts/locales/cz.lua
 share/ntopng/scripts/locales/de.lua
@@ -342,10 +392,8 @@ share/ntopng/scripts/lua/admin/edit_devi
 share/ntopng/scripts/lua/admin/endpoint_notifications_list.lua
 share/ntopng/scripts/lua/admin/get_category_lists.lua
 share/ntopng/scripts/lua/admin/get_device_protocols.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_configurations.lua
 share/ntopng/scripts/lua/admin/manage_host_members.lua
 share/ntopng/scripts/lua/admin/manage_pool_members.lua
@@ -412,7 +460,6 @@ share/ntopng/scripts/lua/get_dhcp_config
 share/ntopng/scripts/lua/get_discover_progress.lua
 share/ntopng/scripts/lua/get_endpoint_configs.lua
 share/ntopng/scripts/lua/get_extracted_traffic.lua
-share/ntopng/scripts/lua/get_flow_db_data.lua
 share/ntopng/scripts/lua/get_flow_process_tree.lua
 share/ntopng/scripts/lua/get_flows_data.lua
 share/ntopng/scripts/lua/get_historical_data.lua
@@ -460,6 +507,7 @@ share/ntopng/scripts/lua/host_stats.lua
 share/ntopng/scripts/lua/host_top_peers_protocols.lua
 share/ntopng/scripts/lua/hosts_comparison_sankey.lua
 share/ntopng/scripts/lua/hosts_geomap.lua
+share/ntopng/scripts/lua/hosts_ports_analysis.lua
 share/ntopng/scripts/lua/hosts_stats.lua
 share/ntopng/scripts/lua/hotspot-detect.lua
 share/ntopng/scripts/lua/http_servers_stats.lua
@@ -474,6 +522,7 @@ share/ntopng/scripts/lua/iface_hosts_lis
 share/ntopng/scripts/lua/iface_local_stats.lua
 share/ntopng/scripts/lua/iface_ports_list.lua
 share/ntopng/scripts/lua/iface_tcp_stats.lua
+share/ntopng/scripts/lua/inactive_host_details.lua
 share/ntopng/scripts/lua/inc/add_user_dialog.lua
 share/ntopng/scripts/lua/inc/container_columns.lua
 share/ntopng/scripts/lua/inc/delete_user_dialog.lua
@@ -528,21 +577,29 @@ share/ntopng/scripts/lua/modules/alert_d
 share/ntopng/scripts/lua/modules/alert_definitions/flow/alert_known_proto_on_non_std_port.lua
 share/ntopng/scripts/lua/modules/alert_definitions/flow/alert_lateral_movement.lua
 share/ntopng/scripts/lua/modules/alert_definitions/flow/alert_longlived.lua
-share/ntopng/scripts/lua/modules/alert_definitions/flow/alert_malicious_signature.lua
+share/ntopng/scripts/lua/modules/alert_definitions/flow/alert_modbus_invalid_transition.lua
+share/ntopng/scripts/lua/modules/alert_definitions/flow/alert_modbus_too_many_exceptions.lua
+share/ntopng/scripts/lua/modules/alert_definitions/flow/alert_modbus_unexpected_function_code.lua
 share/ntopng/scripts/lua/modules/alert_definitions/flow/alert_ndpi_anonymous_subscriber.lua
 share/ntopng/scripts/lua/modules/alert_definitions/flow/alert_ndpi_clear_text_credentials.lua
+share/ntopng/scripts/lua/modules/alert_definitions/flow/alert_ndpi_desktop_or_file_sharing_session.lua
 share/ntopng/scripts/lua/modules/alert_definitions/flow/alert_ndpi_dns_fragmented.lua
 share/ntopng/scripts/lua/modules/alert_definitions/flow/alert_ndpi_dns_invalid_characters.lua
 share/ntopng/scripts/lua/modules/alert_definitions/flow/alert_ndpi_dns_large_packet.lua
 share/ntopng/scripts/lua/modules/alert_definitions/flow/alert_ndpi_dns_suspicious_traffic.lua
 share/ntopng/scripts/lua/modules/alert_definitions/flow/alert_ndpi_error_code.lua
 share/ntopng/scripts/lua/modules/alert_definitions/flow/alert_ndpi_http_crawler_bot.lua
-share/ntopng/scripts/lua/modules/alert_definitions/flow/alert_ndpi_http_numeric_ip_host.lua
+share/ntopng/scripts/lua/modules/alert_definitions/flow/alert_ndpi_http_obsolete_server.lua
 share/ntopng/scripts/lua/modules/alert_definitions/flow/alert_ndpi_http_suspicious_content.lua
 share/ntopng/scripts/lua/modules/alert_definitions/flow/alert_ndpi_http_suspicious_header.lua
 share/ntopng/scripts/lua/modules/alert_definitions/flow/alert_ndpi_http_suspicious_url.lua
 share/ntopng/scripts/lua/modules/alert_definitions/flow/alert_ndpi_http_suspicious_user_agent.lua
 share/ntopng/scripts/lua/modules/alert_definitions/flow/alert_ndpi_malformed_packet.lua
+share/ntopng/scripts/lua/modules/alert_definitions/flow/alert_ndpi_malicious_ja3.lua
+share/ntopng/scripts/lua/modules/alert_definitions/flow/alert_ndpi_malicious_sha1_certificate.lua
+share/ntopng/scripts/lua/modules/alert_definitions/flow/alert_ndpi_malware_host_contacted.lua
+share/ntopng/scripts/lua/modules/alert_definitions/flow/alert_ndpi_numeric_ip_host.lua
+share/ntopng/scripts/lua/modules/alert_definitions/flow/alert_ndpi_periodic_flow.lua
 share/ntopng/scripts/lua/modules/alert_definitions/flow/alert_ndpi_possible_exploit.lua
 share/ntopng/scripts/lua/modules/alert_definitions/flow/alert_ndpi_punicody_idn.lua
 share/ntopng/scripts/lua/modules/alert_definitions/flow/alert_ndpi_risky_asn.lua
@@ -554,9 +611,13 @@ share/ntopng/scripts/lua/modules/alert_d
 share/ntopng/scripts/lua/modules/alert_definitions/flow/alert_ndpi_suspicious_entropy.lua
 share/ntopng/scripts/lua/modules/alert_definitions/flow/alert_ndpi_tls_cert_validity_too_long.lua
 share/ntopng/scripts/lua/modules/alert_definitions/flow/alert_ndpi_tls_certificate_about_to_expire.lua
+share/ntopng/scripts/lua/modules/alert_definitions/flow/alert_ndpi_tls_fatal_alert.lua
 share/ntopng/scripts/lua/modules/alert_definitions/flow/alert_ndpi_tls_missing_sni.lua
 share/ntopng/scripts/lua/modules/alert_definitions/flow/alert_ndpi_tls_not_carrying_https.lua
+share/ntopng/scripts/lua/modules/alert_definitions/flow/alert_ndpi_tls_old_protocol_version.lua
 share/ntopng/scripts/lua/modules/alert_definitions/flow/alert_ndpi_tls_suspicious_esni_usage.lua
+share/ntopng/scripts/lua/modules/alert_definitions/flow/alert_ndpi_tls_suspicious_extension.lua
+share/ntopng/scripts/lua/modules/alert_definitions/flow/alert_ndpi_tls_uncommon_alpn.lua
 share/ntopng/scripts/lua/modules/alert_definitions/flow/alert_ndpi_unidirectional_traffic.lua
 share/ntopng/scripts/lua/modules/alert_definitions/flow/alert_ndpi_unsafe_protocol.lua
 share/ntopng/scripts/lua/modules/alert_definitions/flow/alert_ndpi_url_possible_rce_injection.lua
@@ -564,6 +625,7 @@ share/ntopng/scripts/lua/modules/alert_d
 share/ntopng/scripts/lua/modules/alert_definitions/flow/alert_ndpi_url_possible_xss.lua
 share/ntopng/scripts/lua/modules/alert_definitions/flow/alert_packets_issues.lua
 share/ntopng/scripts/lua/modules/alert_definitions/flow/alert_periodicity_changed.lua
+share/ntopng/scripts/lua/modules/alert_definitions/flow/alert_rare_destination.lua
 share/ntopng/scripts/lua/modules/alert_definitions/flow/alert_remote_access.lua
 share/ntopng/scripts/lua/modules/alert_definitions/flow/alert_remote_to_local_insecure_proto.lua
 share/ntopng/scripts/lua/modules/alert_definitions/flow/alert_remote_to_remote.lua
@@ -572,12 +634,12 @@ share/ntopng/scripts/lua/modules/alert_d
 share/ntopng/scripts/lua/modules/alert_definitions/flow/alert_tls_certificate_expired.lua
 share/ntopng/scripts/lua/modules/alert_definitions/flow/alert_tls_certificate_mismatch.lua
 share/ntopng/scripts/lua/modules/alert_definitions/flow/alert_tls_certificate_selfsigned.lua
-share/ntopng/scripts/lua/modules/alert_definitions/flow/alert_tls_old_protocol_version.lua
 share/ntopng/scripts/lua/modules/alert_definitions/flow/alert_tls_unsafe_ciphers.lua
 share/ntopng/scripts/lua/modules/alert_definitions/flow/alert_unexpected_dhcp_server.lua
 share/ntopng/scripts/lua/modules/alert_definitions/flow/alert_unexpected_dns_server.lua
 share/ntopng/scripts/lua/modules/alert_definitions/flow/alert_unexpected_ntp_server.lua
 share/ntopng/scripts/lua/modules/alert_definitions/flow/alert_unexpected_smtp_server.lua
+share/ntopng/scripts/lua/modules/alert_definitions/flow/alert_vlan_bidirectional_traffic.lua
 share/ntopng/scripts/lua/modules/alert_definitions/flow/alert_web_mining.lua
 share/ntopng/scripts/lua/modules/alert_definitions/flow/alert_zero_tcp_window.lua
 share/ntopng/scripts/lua/modules/alert_definitions/host/host_alert_countries_contacts.lua
@@ -609,8 +671,8 @@ share/ntopng/scripts/lua/modules/alert_d
 share/ntopng/scripts/lua/modules/alert_definitions/host/host_alert_traffic_volume.lua
 share/ntopng/scripts/lua/modules/alert_definitions/other/alert_am_threshold_cross.lua
 share/ntopng/scripts/lua/modules/alert_definitions/other/alert_attack_mitigation_via_snmp.lua
-share/ntopng/scripts/lua/modules/alert_definitions/other/alert_behavior_anomaly.lua
 share/ntopng/scripts/lua/modules/alert_definitions/other/alert_broadcast_domain_too_large.lua
+share/ntopng/scripts/lua/modules/alert_definitions/other/alert_cidr_rule_threshold_crossed.lua
 share/ntopng/scripts/lua/modules/alert_definitions/other/alert_contacts_anomaly.lua
 share/ntopng/scripts/lua/modules/alert_definitions/other/alert_device_connection_disconnection.lua
 share/ntopng/scripts/lua/modules/alert_definitions/other/alert_dhcp_storm.lua
@@ -619,8 +681,8 @@ share/ntopng/scripts/lua/modules/alert_d
 share/ntopng/scripts/lua/modules/alert_definitions/other/alert_flow_flood_victim.lua
 share/ntopng/scripts/lua/modules/alert_definitions/other/alert_gateway_unreachable.lua
 share/ntopng/scripts/lua/modules/alert_definitions/other/alert_ghost_network.lua
-share/ntopng/scripts/lua/modules/alert_definitions/other/alert_host_pool_connection.lua
 share/ntopng/scripts/lua/modules/alert_definitions/other/alert_host_pool_disconnection.lua
+share/ntopng/scripts/lua/modules/alert_definitions/other/alert_host_pool_rule_threshold_crossed.lua
 share/ntopng/scripts/lua/modules/alert_definitions/other/alert_ids_ips_jail_add.lua
 share/ntopng/scripts/lua/modules/alert_definitions/other/alert_ids_ips_jail_remove.lua
 share/ntopng/scripts/lua/modules/alert_definitions/other/alert_influxdb_error.lua
@@ -633,6 +695,8 @@ share/ntopng/scripts/lua/modules/alert_d
 share/ntopng/scripts/lua/modules/alert_definitions/other/alert_mac_ip_association_change.lua
 share/ntopng/scripts/lua/modules/alert_definitions/other/alert_misconfigured_app.lua
 share/ntopng/scripts/lua/modules/alert_definitions/other/alert_network_discovery_executed.lua
+share/ntopng/scripts/lua/modules/alert_definitions/other/alert_network_issues.lua
+share/ntopng/scripts/lua/modules/alert_definitions/other/alert_network_rule_threshold_cross.lua
 share/ntopng/scripts/lua/modules/alert_definitions/other/alert_network_score_per_host.lua
 share/ntopng/scripts/lua/modules/alert_definitions/other/alert_nfq_flushed.lua
 share/ntopng/scripts/lua/modules/alert_definitions/other/alert_ngi_trust_event.lua
@@ -648,18 +712,22 @@ share/ntopng/scripts/lua/modules/alert_d
 share/ntopng/scripts/lua/modules/alert_definitions/other/alert_port_too_many_macs.lua
 share/ntopng/scripts/lua/modules/alert_definitions/other/alert_process_notification.lua
 share/ntopng/scripts/lua/modules/alert_definitions/other/alert_quota_exceeded.lua
+share/ntopng/scripts/lua/modules/alert_definitions/other/alert_score_behavior_anomaly.lua
 share/ntopng/scripts/lua/modules/alert_definitions/other/alert_shell_script_executed.lua
 share/ntopng/scripts/lua/modules/alert_definitions/other/alert_slow_periodic_activity.lua
 share/ntopng/scripts/lua/modules/alert_definitions/other/alert_slow_purge.lua
 share/ntopng/scripts/lua/modules/alert_definitions/other/alert_snmp_device_reset.lua
 share/ntopng/scripts/lua/modules/alert_definitions/other/alert_snmp_device_traffic_change.lua
 share/ntopng/scripts/lua/modules/alert_definitions/other/alert_snmp_interface_errors.lua
+share/ntopng/scripts/lua/modules/alert_definitions/other/alert_snmp_interface_threshold_crossed.lua
 share/ntopng/scripts/lua/modules/alert_definitions/other/alert_snmp_topology_changed.lua
 share/ntopng/scripts/lua/modules/alert_definitions/other/alert_tcp_syn_flood_victim.lua
 share/ntopng/scripts/lua/modules/alert_definitions/other/alert_tcp_syn_scan_victim.lua
 share/ntopng/scripts/lua/modules/alert_definitions/other/alert_threshold_cross.lua
 share/ntopng/scripts/lua/modules/alert_definitions/other/alert_too_many_drops.lua
+share/ntopng/scripts/lua/modules/alert_definitions/other/alert_traffic_behavior_anomaly.lua
 share/ntopng/scripts/lua/modules/alert_definitions/other/alert_user_activity.lua
+share/ntopng/scripts/lua/modules/alert_definitions/other/alert_vulnerability_scan.lua
 share/ntopng/scripts/lua/modules/alert_entities.lua
 share/ntopng/scripts/lua/modules/alert_exclusions.lua
 share/ntopng/scripts/lua/modules/alert_keys/flow_alert_keys.lua
@@ -707,18 +775,24 @@ share/ntopng/scripts/lua/modules/check_d
 share/ntopng/scripts/lua/modules/check_definitions/flow/low_goodput.lua
 share/ntopng/scripts/lua/modules/check_definitions/flow/ndpi_anonymous_subscriber.lua
 share/ntopng/scripts/lua/modules/check_definitions/flow/ndpi_clear_text_credentials.lua
+share/ntopng/scripts/lua/modules/check_definitions/flow/ndpi_desktop_or_file_sharing_session.lua
 share/ntopng/scripts/lua/modules/check_definitions/flow/ndpi_dns_fragmented.lua
 share/ntopng/scripts/lua/modules/check_definitions/flow/ndpi_dns_large_packet.lua
 share/ntopng/scripts/lua/modules/check_definitions/flow/ndpi_dns_suspicious_traffic.lua
 share/ntopng/scripts/lua/modules/check_definitions/flow/ndpi_error_code_detected.lua
 share/ntopng/scripts/lua/modules/check_definitions/flow/ndpi_http_crawler_bot.lua
-share/ntopng/scripts/lua/modules/check_definitions/flow/ndpi_http_numeric_ip_host.lua
+share/ntopng/scripts/lua/modules/check_definitions/flow/ndpi_http_obsolete_server.lua
 share/ntopng/scripts/lua/modules/check_definitions/flow/ndpi_http_suspicious_content.lua
 share/ntopng/scripts/lua/modules/check_definitions/flow/ndpi_http_suspicious_header.lua
 share/ntopng/scripts/lua/modules/check_definitions/flow/ndpi_http_suspicious_url.lua
 share/ntopng/scripts/lua/modules/check_definitions/flow/ndpi_http_suspicious_user_agent.lua
 share/ntopng/scripts/lua/modules/check_definitions/flow/ndpi_invalid_characters.lua
 share/ntopng/scripts/lua/modules/check_definitions/flow/ndpi_malformed_packet.lua
+share/ntopng/scripts/lua/modules/check_definitions/flow/ndpi_malicious_ja3.lua
+share/ntopng/scripts/lua/modules/check_definitions/flow/ndpi_malicious_sha1_certificate.lua
+share/ntopng/scripts/lua/modules/check_definitions/flow/ndpi_malware_host_contacted.lua
+share/ntopng/scripts/lua/modules/check_definitions/flow/ndpi_numeric_ip_host.lua
+share/ntopng/scripts/lua/modules/check_definitions/flow/ndpi_periodic_flow.lua
 share/ntopng/scripts/lua/modules/check_definitions/flow/ndpi_possible_exploit.lua
 share/ntopng/scripts/lua/modules/check_definitions/flow/ndpi_punicody_idn.lua
 share/ntopng/scripts/lua/modules/check_definitions/flow/ndpi_risky_asn.lua
@@ -738,6 +812,7 @@ share/ntopng/scripts/lua/modules/check_d
 share/ntopng/scripts/lua/modules/check_definitions/flow/ndpi_url_possible_sql_injection.lua
 share/ntopng/scripts/lua/modules/check_definitions/flow/ndpi_url_possible_xss.lua
 share/ntopng/scripts/lua/modules/check_definitions/flow/not_purged.lua
+share/ntopng/scripts/lua/modules/check_definitions/flow/rare_destination.lua
 share/ntopng/scripts/lua/modules/check_definitions/flow/remote_access.lua
 share/ntopng/scripts/lua/modules/check_definitions/flow/remote_to_local_insecure_proto.lua
 share/ntopng/scripts/lua/modules/check_definitions/flow/remote_to_remote.lua
@@ -747,6 +822,7 @@ share/ntopng/scripts/lua/modules/check_d
 share/ntopng/scripts/lua/modules/check_definitions/flow/unexpected_dns.lua
 share/ntopng/scripts/lua/modules/check_definitions/flow/unexpected_ntp.lua
 share/ntopng/scripts/lua/modules/check_definitions/flow/unexpected_smtp.lua
+share/ntopng/scripts/lua/modules/check_definitions/flow/vlan_bidirectional_traffic.lua
 share/ntopng/scripts/lua/modules/check_definitions/flow/web_mining.lua
 share/ntopng/scripts/lua/modules/check_definitions/flow/zero_tcp_window.lua
 share/ntopng/scripts/lua/modules/check_definitions/host/countries_contacts.lua
@@ -785,9 +861,11 @@ share/ntopng/scripts/lua/modules/check_d
 share/ntopng/scripts/lua/modules/check_definitions/network/inner.lua
 share/ntopng/scripts/lua/modules/check_definitions/network/ip_reassignment.lua
 share/ntopng/scripts/lua/modules/check_definitions/network/network_discovery.lua
+share/ntopng/scripts/lua/modules/check_definitions/network/network_issues.lua
 share/ntopng/scripts/lua/modules/check_definitions/network/syn_flood_victim.lua
 share/ntopng/scripts/lua/modules/check_definitions/network/syn_scan_victim.lua
 share/ntopng/scripts/lua/modules/check_definitions/syslog/host_log.lua
+share/ntopng/scripts/lua/modules/check_definitions/syslog/nbox.lua
 share/ntopng/scripts/lua/modules/check_definitions/syslog/suricata.lua
 share/ntopng/scripts/lua/modules/check_definitions/system/dropped_alerts.lua
 share/ntopng/scripts/lua/modules/check_definitions/system/ids_ips_log.lua
@@ -821,6 +899,7 @@ share/ntopng/scripts/lua/modules/country
 share/ntopng/scripts/lua/modules/country_utils.lua
 share/ntopng/scripts/lua/modules/cpu_utils.lua
 share/ntopng/scripts/lua/modules/custom_column_utils.lua
+share/ntopng/scripts/lua/modules/dashboard_utils.lua
 share/ntopng/scripts/lua/modules/data_retention_utils.lua
 share/ntopng/scripts/lua/modules/datamodel/datamodel.lua
 share/ntopng/scripts/lua/modules/datamodel/heatmap.lua
@@ -840,9 +919,6 @@ share/ntopng/scripts/lua/modules/ebpf_ut
 share/ntopng/scripts/lua/modules/file_utils.lua
 share/ntopng/scripts/lua/modules/fingerprint_utils.lua
 share/ntopng/scripts/lua/modules/flow_consts.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_field_value_maps.lua
 share/ntopng/scripts/lua/modules/flow_field_value_maps/sonicwall_app_id.lua
 share/ntopng/scripts/lua/modules/flow_risk_simple_alert_definition.lua
@@ -854,7 +930,6 @@ share/ntopng/scripts/lua/modules/graph_c
 share/ntopng/scripts/lua/modules/graph_utils.lua
 share/ntopng/scripts/lua/modules/historical_flow_details_formatter.lua
 share/ntopng/scripts/lua/modules/historical_flow_utils.lua
-share/ntopng/scripts/lua/modules/host_pools_migration.lua
 share/ntopng/scripts/lua/modules/host_pools_nedge.lua
 share/ntopng/scripts/lua/modules/http_bridge_conf_utils.lua
 share/ntopng/scripts/lua/modules/http_lint.lua
@@ -874,6 +949,7 @@ share/ntopng/scripts/lua/modules/import_
 share/ntopng/scripts/lua/modules/import_export/notifications_import_export.lua
 share/ntopng/scripts/lua/modules/import_export/pool_import_export.lua
 share/ntopng/scripts/lua/modules/import_export/snmp_import_export.lua
+share/ntopng/scripts/lua/modules/inactive_hosts_utils.lua
 share/ntopng/scripts/lua/modules/influxdb_export_api.lua
 share/ntopng/scripts/lua/modules/internals_utils.lua
 share/ntopng/scripts/lua/modules/ipv4_utils.lua
@@ -901,6 +977,7 @@ share/ntopng/scripts/lua/modules/notific
 share/ntopng/scripts/lua/modules/notifications/endpoints/alert_store_db.lua
 share/ntopng/scripts/lua/modules/notifications/endpoints/discord.lua
 share/ntopng/scripts/lua/modules/notifications/endpoints/email.lua
+share/ntopng/scripts/lua/modules/notifications/endpoints/mattermost.lua
 share/ntopng/scripts/lua/modules/notifications/endpoints/shell.lua
 share/ntopng/scripts/lua/modules/notifications/endpoints/slack.lua
 share/ntopng/scripts/lua/modules/notifications/endpoints/syslog.lua
@@ -927,6 +1004,7 @@ share/ntopng/scripts/lua/modules/prefs_r
 share/ntopng/scripts/lua/modules/prefs_utils.lua
 share/ntopng/scripts/lua/modules/presets_utils.lua
 share/ntopng/scripts/lua/modules/protos_utils.lua
+share/ntopng/scripts/lua/modules/radius_handler.lua
 share/ntopng/scripts/lua/modules/recording_utils.lua
 share/ntopng/scripts/lua/modules/recovery_utils.lua
 share/ntopng/scripts/lua/modules/redis_api.lua
@@ -945,6 +1023,7 @@ share/ntopng/scripts/lua/modules/storage
 share/ntopng/scripts/lua/modules/sys_utils.lua
 share/ntopng/scripts/lua/modules/syslog_utils.lua
 share/ntopng/scripts/lua/modules/system_config/appliance_config.lua
+share/ntopng/scripts/lua/modules/system_config/backup_config.lua
 share/ntopng/scripts/lua/modules/system_config/system_config.lua
 share/ntopng/scripts/lua/modules/system_setup_ui_utils.lua
 share/ntopng/scripts/lua/modules/tag_utils.lua
@@ -971,6 +1050,7 @@ share/ntopng/scripts/lua/modules/timeser
 share/ntopng/scripts/lua/modules/timeseries/tests/test_utils.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_data.lua
 share/ntopng/scripts/lua/modules/timeseries/ts_rest_utils.lua
 share/ntopng/scripts/lua/modules/timeseries/ts_schema.lua
 share/ntopng/scripts/lua/modules/timeseries/ts_utils.lua
@@ -990,6 +1070,12 @@ share/ntopng/scripts/lua/modules/tz_util
 share/ntopng/scripts/lua/modules/ui_utils.lua
 share/ntopng/scripts/lua/modules/vlan_utils.lua
 share/ntopng/scripts/lua/modules/voip_utils.lua
+share/ntopng/scripts/lua/modules/vulnerability_scan/cve_utils.lua
+share/ntopng/scripts/lua/modules/vulnerability_scan/modules/cve.lua
+share/ntopng/scripts/lua/modules/vulnerability_scan/modules/tcp_portscan.lua
+share/ntopng/scripts/lua/modules/vulnerability_scan/modules/udp_portscan.lua
+share/ntopng/scripts/lua/modules/vulnerability_scan/modules/vulners.lua
+share/ntopng/scripts/lua/modules/vulnerability_scan/vs_utils.lua
 share/ntopng/scripts/lua/modules/widget_gui_utils.lua
 share/ntopng/scripts/lua/modules/widgets_utils.lua
 share/ntopng/scripts/lua/modules/xmlSimple.lua
@@ -1109,7 +1195,6 @@ share/ntopng/scripts/lua/rest/v1/get/nto
 share/ntopng/scripts/lua/rest/v1/get/pcap/.dontdelete
 share/ntopng/scripts/lua/rest/v1/get/pcap/live_extraction.lua
 share/ntopng/scripts/lua/rest/v1/get/pool/.dontdelete
-share/ntopng/scripts/lua/rest/v1/get/pool/config.lua
 share/ntopng/scripts/lua/rest/v1/get/pools.lua
 share/ntopng/scripts/lua/rest/v1/get/system/.dontdelete
 share/ntopng/scripts/lua/rest/v1/get/system/alert/list.lua
@@ -1134,13 +1219,11 @@ share/ntopng/scripts/lua/rest/v1/reset/a
 share/ntopng/scripts/lua/rest/v1/reset/checks/config.lua
 share/ntopng/scripts/lua/rest/v1/reset/infrastructure/config.lua
 share/ntopng/scripts/lua/rest/v1/reset/notifications/config.lua
-share/ntopng/scripts/lua/rest/v1/reset/pool/config.lua
 share/ntopng/scripts/lua/rest/v1/reset/snmp/config.lua
 share/ntopng/scripts/lua/rest/v1/set/checks/.dontdelete
 share/ntopng/scripts/lua/rest/v1/set/checks/config.lua
 share/ntopng/scripts/lua/rest/v1/set/host/alias.lua
 share/ntopng/scripts/lua/rest/v1/set/pool/.dontdelete
-share/ntopng/scripts/lua/rest/v1/set/pool/config.lua
 share/ntopng/scripts/lua/rest/v2/acknowledge/am_host/alerts.lua
 share/ntopng/scripts/lua/rest/v2/acknowledge/flow/alerts.lua
 share/ntopng/scripts/lua/rest/v2/acknowledge/host/alerts.lua
@@ -1150,16 +1233,21 @@ share/ntopng/scripts/lua/rest/v2/acknowl
 share/ntopng/scripts/lua/rest/v2/acknowledge/system/alerts.lua
 share/ntopng/scripts/lua/rest/v2/acknowledge/user/alerts.lua
 share/ntopng/scripts/lua/rest/v2/add/host/pool.lua
+share/ntopng/scripts/lua/rest/v2/add/host/to_scan.lua
 share/ntopng/scripts/lua/rest/v2/add/ntopng/user.lua
+share/ntopng/scripts/lua/rest/v2/add/tables/user_columns_config.lua
 share/ntopng/scripts/lua/rest/v2/bind/host/pool/member.lua
-share/ntopng/scripts/lua/rest/v2/charts/time/data.lua
+share/ntopng/scripts/lua/rest/v2/connect/test.lua
 share/ntopng/scripts/lua/rest/v2/create/ntopng/api_token.lua
 share/ntopng/scripts/lua/rest/v2/create/ntopng/session.lua
 share/ntopng/scripts/lua/rest/v2/delete/all/alerts.lua
 share/ntopng/scripts/lua/rest/v2/delete/am_host/alerts.lua
+share/ntopng/scripts/lua/rest/v2/delete/application/application.lua
 share/ntopng/scripts/lua/rest/v2/delete/endpoints.lua
 share/ntopng/scripts/lua/rest/v2/delete/flow/alerts.lua
 share/ntopng/scripts/lua/rest/v2/delete/host/alerts.lua
+share/ntopng/scripts/lua/rest/v2/delete/host/delete_host_to_scan.lua
+share/ntopng/scripts/lua/rest/v2/delete/host/inactive_host.lua
 share/ntopng/scripts/lua/rest/v2/delete/host/new_devices.lua
 share/ntopng/scripts/lua/rest/v2/delete/host/pool.lua
 share/ntopng/scripts/lua/rest/v2/delete/interface/alerts.lua
@@ -1171,12 +1259,15 @@ share/ntopng/scripts/lua/rest/v2/delete/
 share/ntopng/scripts/lua/rest/v2/delete/system/alerts.lua
 share/ntopng/scripts/lua/rest/v2/delete/user/alerts.lua
 share/ntopng/scripts/lua/rest/v2/disable/check.lua
+share/ntopng/scripts/lua/rest/v2/edit/application/application.lua
 share/ntopng/scripts/lua/rest/v2/edit/category/category.lua
 share/ntopng/scripts/lua/rest/v2/edit/host/pool.lua
+share/ntopng/scripts/lua/rest/v2/edit/host/update_va_scan_period.lua
 share/ntopng/scripts/lua/rest/v2/edit/ntopng/incr_flows.lua
 share/ntopng/scripts/lua/rest/v2/edit/ntopng/incr_hosts.lua
 share/ntopng/scripts/lua/rest/v2/edit/ntopng/user.lua
 share/ntopng/scripts/lua/rest/v2/enable/check.lua
+share/ntopng/scripts/lua/rest/v2/exec/host/schedule_vulnerability_scan.lua
 share/ntopng/scripts/lua/rest/v2/export/active_monitoring/config.lua
 share/ntopng/scripts/lua/rest/v2/export/all/config.lua
 share/ntopng/scripts/lua/rest/v2/export/checks/config.lua
@@ -1201,13 +1292,15 @@ share/ntopng/scripts/lua/rest/v2/get/asn
 share/ntopng/scripts/lua/rest/v2/get/category/list.lua
 share/ntopng/scripts/lua/rest/v2/get/checks/config.lua
 share/ntopng/scripts/lua/rest/v2/get/country/country_name.lua
-share/ntopng/scripts/lua/rest/v2/get/datasource/datasource.lua
-share/ntopng/scripts/lua/rest/v2/get/datasource/interface/packet_distro.lua
+share/ntopng/scripts/lua/rest/v2/get/dashboard/template/data.lua
+share/ntopng/scripts/lua/rest/v2/get/dashboard/template/list.lua
 share/ntopng/scripts/lua/rest/v2/get/dns/resolve.lua
 share/ntopng/scripts/lua/rest/v2/get/flow/active.lua
 share/ntopng/scripts/lua/rest/v2/get/flow/aggregated_live_flows.lua
+share/ntopng/scripts/lua/rest/v2/get/flow/aggregated_live_flows_filters.lua
 share/ntopng/scripts/lua/rest/v2/get/flow/alert/list.lua
 share/ntopng/scripts/lua/rest/v2/get/flow/alert/ts.lua
+share/ntopng/scripts/lua/rest/v2/get/flow/graph.lua
 share/ntopng/scripts/lua/rest/v2/get/flow/l4/counters.lua
 share/ntopng/scripts/lua/rest/v2/get/flow/l7/counters.lua
 share/ntopng/scripts/lua/rest/v2/get/flow/l7/iec104.lua
@@ -1221,7 +1314,12 @@ share/ntopng/scripts/lua/rest/v2/get/hos
 share/ntopng/scripts/lua/rest/v2/get/host/dscp/stats.lua
 share/ntopng/scripts/lua/rest/v2/get/host/find.lua
 share/ntopng/scripts/lua/rest/v2/get/host/fingerprint/data.lua
-share/ntopng/scripts/lua/rest/v2/get/host/fingerprint/ja3.lua
+share/ntopng/scripts/lua/rest/v2/get/host/inactive/active_inactive.lua
+share/ntopng/scripts/lua/rest/v2/get/host/inactive/inactive_manufacturer.lua
+share/ntopng/scripts/lua/rest/v2/get/host/inactive/inactivity_period.lua
+share/ntopng/scripts/lua/rest/v2/get/host/inactive_filters.lua
+share/ntopng/scripts/lua/rest/v2/get/host/inactive_host.lua
+share/ntopng/scripts/lua/rest/v2/get/host/inactive_list.lua
 share/ntopng/scripts/lua/rest/v2/get/host/interfaces.lua
 share/ntopng/scripts/lua/rest/v2/get/host/l4/contacted_hosts_data.lua
 share/ntopng/scripts/lua/rest/v2/get/host/l4/data.lua
@@ -1232,17 +1330,25 @@ share/ntopng/scripts/lua/rest/v2/get/hos
 share/ntopng/scripts/lua/rest/v2/get/host/l7/data.lua
 share/ntopng/scripts/lua/rest/v2/get/host/l7/proto_data.lua
 share/ntopng/scripts/lua/rest/v2/get/host/l7/stats.lua
+share/ntopng/scripts/lua/rest/v2/get/host/no_tx_peers.lua
 share/ntopng/scripts/lua/rest/v2/get/host/packets/arp_data.lua
 share/ntopng/scripts/lua/rest/v2/get/host/packets/rcvd_data.lua
 share/ntopng/scripts/lua/rest/v2/get/host/packets/sent_data.lua
 share/ntopng/scripts/lua/rest/v2/get/host/packets/tcp_flags_data.lua
 share/ntopng/scripts/lua/rest/v2/get/host/pool/members.lua
+share/ntopng/scripts/lua/rest/v2/get/host/pool/pools.lua
 share/ntopng/scripts/lua/rest/v2/get/host/pool_by_member.lua
 share/ntopng/scripts/lua/rest/v2/get/host/pools.lua
 share/ntopng/scripts/lua/rest/v2/get/host/port/cli_port_data.lua
 share/ntopng/scripts/lua/rest/v2/get/host/port/srv_port_data.lua
 share/ntopng/scripts/lua/rest/v2/get/host/port/table_port_data.lua
+share/ntopng/scripts/lua/rest/v2/get/host/ports_by_nmap.lua
 share/ntopng/scripts/lua/rest/v2/get/host/processes/listening_ports.lua
+share/ntopng/scripts/lua/rest/v2/get/host/resolve_host_name.lua
+share/ntopng/scripts/lua/rest/v2/get/host/to_scan_list.lua
+share/ntopng/scripts/lua/rest/v2/get/host/vulnerability_scan_result.lua
+share/ntopng/scripts/lua/rest/v2/get/host/vulnerability_scan_status.lua
+share/ntopng/scripts/lua/rest/v2/get/host/vulnerability_scan_type_list.lua
 share/ntopng/scripts/lua/rest/v2/get/interface/address.lua
 share/ntopng/scripts/lua/rest/v2/get/interface/alert/list.lua
 share/ntopng/scripts/lua/rest/v2/get/interface/alert/ts.lua
@@ -1252,6 +1358,7 @@ share/ntopng/scripts/lua/rest/v2/get/int
 share/ntopng/scripts/lua/rest/v2/get/interface/dscp/stats.lua
 share/ntopng/scripts/lua/rest/v2/get/interface/l7/stats.lua
 share/ntopng/scripts/lua/rest/v2/get/interface/nprobes/data.lua
+share/ntopng/scripts/lua/rest/v2/get/interface/top/hosts.lua
 share/ntopng/scripts/lua/rest/v2/get/l4/protocol/consts.lua
 share/ntopng/scripts/lua/rest/v2/get/l7/application/consts.lua
 share/ntopng/scripts/lua/rest/v2/get/l7/category/consts.lua
@@ -1260,21 +1367,28 @@ share/ntopng/scripts/lua/rest/v2/get/mac
 share/ntopng/scripts/lua/rest/v2/get/network/alert/list.lua
 share/ntopng/scripts/lua/rest/v2/get/network/alert/ts.lua
 share/ntopng/scripts/lua/rest/v2/get/network/discovery/discover.lua
+share/ntopng/scripts/lua/rest/v2/get/network/discovery/run_discovery.lua
+share/ntopng/scripts/lua/rest/v2/get/network/networks.lua
+share/ntopng/scripts/lua/rest/v2/get/ntopng/applications.lua
 share/ntopng/scripts/lua/rest/v2/get/ntopng/interfaces.lua
 share/ntopng/scripts/lua/rest/v2/get/ntopng/users.lua
 share/ntopng/scripts/lua/rest/v2/get/pcap/live_extraction.lua
 share/ntopng/scripts/lua/rest/v2/get/pcap/live_traffic.lua
-share/ntopng/scripts/lua/rest/v2/get/pool/config.lua
 share/ntopng/scripts/lua/rest/v2/get/pools.lua
+share/ntopng/scripts/lua/rest/v2/get/redis/read_hash_values.lua
 share/ntopng/scripts/lua/rest/v2/get/redis/redis_stats.lua
 share/ntopng/scripts/lua/rest/v2/get/syslog/producer/consts.lua
 share/ntopng/scripts/lua/rest/v2/get/syslog/producer/list.lua
 share/ntopng/scripts/lua/rest/v2/get/system/alert/list.lua
 share/ntopng/scripts/lua/rest/v2/get/system/alert/ts.lua
+share/ntopng/scripts/lua/rest/v2/get/system/configurations/download_backup.lua
+share/ntopng/scripts/lua/rest/v2/get/system/configurations/list_available_backups.lua
 share/ntopng/scripts/lua/rest/v2/get/system/health/influxdb.lua
 share/ntopng/scripts/lua/rest/v2/get/system/health/interfaces.lua
 share/ntopng/scripts/lua/rest/v2/get/system/health/redis.lua
 share/ntopng/scripts/lua/rest/v2/get/system/health/stats.lua
+share/ntopng/scripts/lua/rest/v2/get/tables/user_columns_config.lua
+share/ntopng/scripts/lua/rest/v2/get/timeseries/date_format.lua
 share/ntopng/scripts/lua/rest/v2/get/timeseries/ts.lua
 share/ntopng/scripts/lua/rest/v2/get/timeseries/type/consts.lua
 share/ntopng/scripts/lua/rest/v2/get/user/alert/list.lua
@@ -1292,13 +1406,11 @@ share/ntopng/scripts/lua/rest/v2/reset/a
 share/ntopng/scripts/lua/rest/v2/reset/checks/config.lua
 share/ntopng/scripts/lua/rest/v2/reset/infrastructure/config.lua
 share/ntopng/scripts/lua/rest/v2/reset/notifications/config.lua
-share/ntopng/scripts/lua/rest/v2/reset/pool/config.lua
 share/ntopng/scripts/lua/rest/v2/reset/snmp/config.lua
-share/ntopng/scripts/lua/rest/v2/set/checks/auto_refresh.lua
 share/ntopng/scripts/lua/rest/v2/set/checks/config.lua
 share/ntopng/scripts/lua/rest/v2/set/host/alias.lua
 share/ntopng/scripts/lua/rest/v2/set/host/notes.lua
-share/ntopng/scripts/lua/rest/v2/set/pool/config.lua
+share/ntopng/scripts/lua/rest/v2/set/pool/members.lua
 share/ntopng/scripts/lua/rest/v2/trigger/host/alert.lua
 share/ntopng/scripts/lua/rest/version.lua
 share/ntopng/scripts/lua/self_test.lua
@@ -1306,6 +1418,7 @@ share/ntopng/scripts/lua/show_geolocatio
 share/ntopng/scripts/lua/sidebar-handler.lua
 share/ntopng/scripts/lua/sprobe_host_process_data.lua
 share/ntopng/scripts/lua/stop_live_capture.lua
+share/ntopng/scripts/lua/swagger.lua
 share/ntopng/scripts/lua/syslog_producers.lua
 share/ntopng/scripts/lua/system_interfaces_stats.lua
 share/ntopng/scripts/lua/system_setup_ui/date_time.lua
@@ -1317,7 +1430,6 @@ share/ntopng/scripts/lua/system_setup_ui
 share/ntopng/scripts/lua/system_stats.lua
 share/ntopng/scripts/lua/system_stats_data.lua
 share/ntopng/scripts/lua/toggle_all_checks.lua
-share/ntopng/scripts/lua/toggle_check.lua
 share/ntopng/scripts/lua/traffic_extraction.lua
 share/ntopng/scripts/lua/traffic_extraction_data.lua
 share/ntopng/scripts/lua/traffic_recording_config.lua
@@ -1328,4 +1440,13 @@ share/ntopng/scripts/lua/upload_pcap.lua
 share/ntopng/scripts/lua/username_details.lua
 share/ntopng/scripts/lua/vlan_details.lua
 share/ntopng/scripts/lua/vlan_stats.lua
+share/ntopng/scripts/lua/vulnerability_scan.lua
 share/ntopng/scripts/shell/README
+share/ntopng/scripts/templates/dashboard/community.json
+share/ntopng/scripts/templates/dashboard/enterprise-with-db.json
+share/ntopng/scripts/templates/dashboard/enterprise.json
+share/ntopng/scripts/templates/dashboard/nedge-enterprise.json
+share/ntopng/scripts/templates/dashboard/nedge.json
+share/ntopng/scripts/templates/dashboard/pro.json
+share/ntopng/scripts/templates/report/default.json
+share/ntopng/scripts/templates/report/vs_result.json

Index: pkgsrc/net/ntopng/distinfo
diff -u pkgsrc/net/ntopng/distinfo:1.14 pkgsrc/net/ntopng/distinfo:1.15
--- pkgsrc/net/ntopng/distinfo:1.14     Thu Jun 29 18:06:21 2023
+++ pkgsrc/net/ntopng/distinfo  Mon Nov 20 17:59:35 2023
@@ -1,17 +1,17 @@
-$NetBSD: distinfo,v 1.14 2023/06/29 18:06:21 adam Exp $
+$NetBSD: distinfo,v 1.15 2023/11/20 17:59:35 adam Exp $
 
-BLAKE2s (ntopng-5.6-httpdocs.tar.gz) = b9b8e68300070ef755e2a4e5490011697bb1ce8fe4c858c346abdab3b2dd3643
-SHA512 (ntopng-5.6-httpdocs.tar.gz) = 0faf7c595e2fb0b5b002d2ac6b026d96aeece7eb4c99bd12c67777a51def91f8170151231c460c773846265304a436fc3a290812c6745827a5b3ee5440f60138
-Size (ntopng-5.6-httpdocs.tar.gz) = 6267539 bytes
-BLAKE2s (ntopng-5.6.tar.gz) = 6bdb09709dba03e31f27cde44c2389e8d35123af67a0463e4ec07c93dddfeea6
-SHA512 (ntopng-5.6.tar.gz) = c4ab79f98b2dc99218cd0c7ac0ed7275d23e7a161de742632f3ec7a538ea4948ba906d40e7fd2ba36fb4bd9be86ecc69f5df65e7f81607e6da489863947b2da5
-Size (ntopng-5.6.tar.gz) = 46318113 bytes
-SHA1 (patch-Makefile.in) = 7b0d8c56d5d33f948696a338b3347a70f04e0483
+BLAKE2s (ntopng-6.0-httpdocs.tar.gz) = ef953c738bd7119929d9e3874488591ca5378fa45d772e38bd226c8328cad6ae
+SHA512 (ntopng-6.0-httpdocs.tar.gz) = e11c4a25153ab5a85f4393d8ce36308e6d0ca4e16f7aacf676764886607dd3a12168aeca384138626cf23cb23d1f1d42b0f1b67cc5c7715a06217c2f71088432
+Size (ntopng-6.0-httpdocs.tar.gz) = 6833487 bytes
+BLAKE2s (ntopng-6.0.tar.gz) = 9a581ccf56b3923a062df8c7f5c402913f01cb84af5bb7143d0759b7b399211e
+SHA512 (ntopng-6.0.tar.gz) = d9d27bed0706d36c82a5b22b2b918014fed7d614e11c79cc47ee1033ae5fd2f703a67f3c5205c63c014bbd2839eb7c78616137ee6cc11d09ebcf6fafc7a658d2
+Size (ntopng-6.0.tar.gz) = 68289620 bytes
+SHA1 (patch-Makefile.in) = 0c07d15959a8b15b20529ee73c96979fefd15773
 SHA1 (patch-configure.ac.in) = 08ba8383478fe58ce8cedf8c5466bbb6a1be59c3
 SHA1 (patch-httpdocs_misc_ntopng-utils-manage-updates.in) = dd58ec396c6e2471c064307fd9bf1f31b0e0c9cf
-SHA1 (patch-include_Redis.h) = ad7b03b9ebfb8b9786cca3f8c49ea24dc559ba12
+SHA1 (patch-include_Redis.h) = cf73f5e53abdeb096d93449327365931ba99ae2b
 SHA1 (patch-include_ntop__includes.h) = 2bf588dba941f25b71381c7848b237d964d77f31
-SHA1 (patch-src_PacketDumperTuntap.cpp) = 76415461ebbe88d886111aa2d6508c7eec66b11d
-SHA1 (patch-src_Redis.cpp) = 61d6c54c0e81e4936b777895d2d8408febdb519e
-SHA1 (patch-src_Utils.cpp) = 3ac13f9d4762e7f577a8c9f8a9b9aeb443567dfe
+SHA1 (patch-src_PacketDumperTuntap.cpp) = baaec78bfbc898fad95e019a28d94490fe278c74
+SHA1 (patch-src_Redis.cpp) = 9b8ad39359107c5a96f72fbd403799a11138fd90
+SHA1 (patch-src_Utils.cpp) = daee7d08960d36f1095a36628738e2c66423883f
 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.8 pkgsrc/net/ntopng/patches/patch-Makefile.in:1.9
--- pkgsrc/net/ntopng/patches/patch-Makefile.in:1.8     Thu Jun 29 18:06:21 2023
+++ pkgsrc/net/ntopng/patches/patch-Makefile.in Mon Nov 20 17:59:35 2023
@@ -1,8 +1,8 @@
-$NetBSD: patch-Makefile.in,v 1.8 2023/06/29 18:06:21 adam Exp $
+$NetBSD: patch-Makefile.in,v 1.9 2023/11/20 17:59:35 adam Exp $
 
 Don't build an internal copy of Lua.
 
---- Makefile.in.orig   2023-02-02 13:33:21.000000000 +0000
+--- Makefile.in.orig   2023-11-02 14:11:55.000000000 +0000
 +++ Makefile.in
 @@ -29,19 +29,6 @@ MONGOOSE_HOME=${PWD}/third-party/mongoos
  MONGOOSE_INC=-I$(MONGOOSE_HOME)
@@ -24,7 +24,7 @@ Don't build an internal copy of Lua.
  
  
  ######
-@@ -99,8 +86,6 @@ RPM_PKG = $(TARGET)-$(NTOPNG_VERSION)-@R
+@@ -102,8 +89,6 @@ RPM_PKG = $(TARGET)-$(NTOPNG_VERSION)-@R
  RPM_DATA_PKG = $(TARGET)-data-$(NTOPNG_VERSION)-@REVISION@.noarch.rpm
  ######
  
@@ -33,9 +33,9 @@ Don't build an internal copy of Lua.
  ifneq ($(HAS_ZEROMQ), 0)
  LIB_TARGETS += $(ZEROMQ_LIB)
  endif
-@@ -147,8 +132,6 @@ test_alert_engine: $(OBJECTS_NO_MAIN) $(
+@@ -150,8 +135,6 @@ test_alert_engine: $(OBJECTS_NO_MAIN) $(
        $(MAKE) CPPFLAGS="${CPPFLAGS} -DTEST_CHECK_ENGINE" src/AlertCheckLuaEngine.o
-       $(CPP) $(CPPFLAGS) $(LDFLAGS) $(OBJECTS_NO_MAIN) -Wall $(LIBS) -o $@
+       $(CXX) $(CPPFLAGS) $(CXXFLAGS) $(LDFLAGS) $(OBJECTS_NO_MAIN) -Wall $(LIBS) -o $@
  
 -$(LUA_LIB):
 -      $(MAKE) -C $(LUA_HOME) $(LUA_PLATFORM)

Index: pkgsrc/net/ntopng/patches/patch-include_Redis.h
diff -u pkgsrc/net/ntopng/patches/patch-include_Redis.h:1.2 pkgsrc/net/ntopng/patches/patch-include_Redis.h:1.3
--- pkgsrc/net/ntopng/patches/patch-include_Redis.h:1.2 Mon May 25 20:26:51 2020
+++ pkgsrc/net/ntopng/patches/patch-include_Redis.h     Mon Nov 20 17:59:35 2023
@@ -1,8 +1,8 @@
-$NetBSD: patch-include_Redis.h,v 1.2 2020/05/25 20:26:51 adam Exp $
+$NetBSD: patch-include_Redis.h,v 1.3 2023/11/20 17:59:35 adam Exp $
 
 Allow Redis connection through a socket.
 
---- include/Redis.h.orig       2020-03-27 16:51:24.000000000 +0000
+--- include/Redis.h.orig       2023-11-02 14:11:55.000000000 +0000
 +++ include/Redis.h
 @@ -31,9 +31,7 @@ class Redis {
    redisContext *redis;
@@ -12,5 +12,5 @@ Allow Redis connection through a socket.
    bool is_socket_connection;
 -#endif
    struct {
-     u_int32_t num_expire, num_get, num_ttl, num_del,
-       num_hget, num_hset, num_hdel, num_set,
+     u_int32_t num_expire, num_get, num_ttl, num_del, num_hget, num_hset,
+         num_hdel, num_set, num_keys, num_hkeys, num_llen, num_other,
Index: pkgsrc/net/ntopng/patches/patch-src_PacketDumperTuntap.cpp
diff -u pkgsrc/net/ntopng/patches/patch-src_PacketDumperTuntap.cpp:1.2 pkgsrc/net/ntopng/patches/patch-src_PacketDumperTuntap.cpp:1.3
--- pkgsrc/net/ntopng/patches/patch-src_PacketDumperTuntap.cpp:1.2      Thu Jun 15 14:54:45 2017
+++ pkgsrc/net/ntopng/patches/patch-src_PacketDumperTuntap.cpp  Mon Nov 20 17:59:35 2023
@@ -1,15 +1,15 @@
-$NetBSD: patch-src_PacketDumperTuntap.cpp,v 1.2 2017/06/15 14:54:45 fhajny Exp $
+$NetBSD: patch-src_PacketDumperTuntap.cpp,v 1.3 2023/11/20 17:59:35 adam Exp $
 
 Add NetBSD and SunOS support.
 
---- src/PacketDumperTuntap.cpp.orig    2016-06-27 19:31:18.000000000 +0000
+--- src/PacketDumperTuntap.cpp.orig    2023-11-02 14:11:55.000000000 +0000
 +++ src/PacketDumperTuntap.cpp
-@@ -127,7 +127,7 @@ int PacketDumperTuntap::openTap(char *de
+@@ -133,7 +133,7 @@ int PacketDumperTuntap::openTap(
  
  /* ********************************************* */
  
 -#ifdef __OpenBSD__
 +#if defined(__NetBSD__) || defined(__OpenBSD__) || defined(__sun)
  #define OPENBSD_TAPDEVICE_SIZE 32
- int PacketDumperTuntap::openTap(char *dev, /* user-definable interface name, eg. edge0 */ int mtu) {
-   int i;
+ int PacketDumperTuntap::openTap(
+     char *dev, /* user-definable interface name, eg. edge0 */ int mtu) {

Index: pkgsrc/net/ntopng/patches/patch-src_Redis.cpp
diff -u pkgsrc/net/ntopng/patches/patch-src_Redis.cpp:1.3 pkgsrc/net/ntopng/patches/patch-src_Redis.cpp:1.4
--- pkgsrc/net/ntopng/patches/patch-src_Redis.cpp:1.3   Mon May 25 20:26:51 2020
+++ pkgsrc/net/ntopng/patches/patch-src_Redis.cpp       Mon Nov 20 17:59:35 2023
@@ -1,10 +1,10 @@
-$NetBSD: patch-src_Redis.cpp,v 1.3 2020/05/25 20:26:51 adam Exp $
+$NetBSD: patch-src_Redis.cpp,v 1.4 2023/11/20 17:59:35 adam Exp $
 
 Allow Redis connection through a socket.
 
---- src/Redis.cpp.orig 2020-03-27 16:51:24.000000000 +0000
+--- src/Redis.cpp.orig 2023-11-02 14:11:55.000000000 +0000
 +++ src/Redis.cpp
-@@ -36,9 +36,7 @@ Redis::Redis(const char *_redis_host, co
+@@ -31,9 +31,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;
@@ -14,31 +14,32 @@ Allow Redis connection through a socket.
  
    memset(&stats, 0, sizeof(stats));
  
-@@ -85,13 +83,11 @@ void Redis::reconnectRedis(bool giveup_o
+@@ -83,14 +81,12 @@ void Redis::reconnectRedis(bool giveup_o
        redisFree(redis);
      }
  
 -#ifdef __linux__
      struct stat buf;
  
-     if(!stat(redis_host, &buf) && S_ISSOCK(buf.st_mode))
-       redis = redisConnectUnixWithTimeout(redis_host, timeout), is_socket_connection = true;
+     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);
  
-     if(redis == NULL || redis->err) {
-@@ -152,13 +148,11 @@ void Redis::reconnectRedis(bool giveup_o
+     if (redis == NULL || redis->err) {
+@@ -159,13 +155,11 @@ void Redis::reconnectRedis(bool giveup_o
      exit(1);
    }
  
 -#ifdef __linux__
-   if(!is_socket_connection)
+   if (!is_socket_connection)
      ntop->getTrace()->traceEvent(TRACE_NORMAL,
-                                "Successfully connected to redis %s:%u@%u",
-                                redis_host, redis_port, redis_db_id);
+                                  "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);
+                                  "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.6 pkgsrc/net/ntopng/patches/patch-src_Utils.cpp:1.7
--- pkgsrc/net/ntopng/patches/patch-src_Utils.cpp:1.6   Mon Mar 28 19:32:25 2022
+++ pkgsrc/net/ntopng/patches/patch-src_Utils.cpp       Mon Nov 20 17:59:35 2023
@@ -1,9 +1,9 @@
-$NetBSD: patch-src_Utils.cpp,v 1.6 2022/03/28 19:32:25 adam Exp $
+$NetBSD: patch-src_Utils.cpp,v 1.7 2023/11/20 17:59:35 adam Exp $
 
 Fix building on NetBSD.
 d_type is not POSIX, provide workaround for SunOS.
 
---- src/Utils.cpp.orig 2022-02-02 17:01:08.000000000 +0000
+--- src/Utils.cpp.orig 2023-11-02 14:11:55.000000000 +0000
 +++ src/Utils.cpp
 @@ -21,9 +21,12 @@
  
@@ -19,28 +19,28 @@ d_type is not POSIX, provide workaround 
  
  #ifndef WIN32
  #include <ifaddrs.h>
-@@ -2402,7 +2405,12 @@ static bool scan_dir(const char * dir_na
-     if(!entry) break;
+@@ -2605,7 +2608,12 @@ static bool scan_dir(const char *dir_nam
+     if (!entry) break;
      d_name = entry->d_name;
  
 +#ifdef __sun
 +    stat(entry->d_name, &s);
 +    if (s.st_mode & S_IFREG) {
 +#else
-     if(entry->d_type & DT_REG) {
+     if (entry->d_type & DT_REG) {
 +#endif
        snprintf(path, sizeof(path), "%s/%s", dir_name, entry->d_name);
-       if(!stat(path, &buf)) {
+       if (!stat(path, &buf)) {
          struct dirent *temp = (struct dirent *)malloc(sizeof(struct dirent));
-@@ -2412,7 +2420,11 @@ static bool scan_dir(const char * dir_na
-         *total += buf.st_size;
+@@ -2614,7 +2622,11 @@ static bool scan_dir(const char *dir_nam
+         if (total) *total += buf.st_size;
        }
  
 +#ifdef __sun
 +    } else if (s.st_mode & S_IFDIR) {
 +#else
-     } 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) {
-         path_length = snprintf (path, MAX_PATH,
+       if (strncmp(d_name, "..", 2) != 0 && strncmp(d_name, ".", 1) != 0) {
+         path_length = snprintf(path, MAX_PATH, "%s/%s", dir_name, d_name);
+

Prev by Date: CVS commit: pkgsrc/net/ndpi
Next by Date: CVS commit: pkgsrc/doc
Previous by Thread: CVS commit: pkgsrc/net/ndpi
Next by Thread: CVS commit: pkgsrc/doc
Indexes:

Home | Main Index | Thread Index | Old Index