diff options
author | adam <adam@pkgsrc.org> | 2019-07-12 09:33:22 +0000 |
---|---|---|
committer | adam <adam@pkgsrc.org> | 2019-07-12 09:33:22 +0000 |
commit | 7aff5336540a6343f07529824dc83ce67762150b (patch) | |
tree | 8a02c94ca1185e8c84ff2cdf335a389f8740875e /net/ntopng | |
parent | 499d2eb771d790fb342218c36470cb487697ffe9 (diff) | |
download | pkgsrc-7aff5336540a6343f07529824dc83ce67762150b.tar.gz |
ntopng: updated to 3.8
3.8 Stable
New features
* Remote assistance to temporarily grant encrypted ntopng access to remote
parties
* Custom URLs and IP addresses mappings to traffic categories
* Continuous traffic recording
* User activities logging
* Extended chart metrics
Improvements
* Alerts
* Improved InfluxDB support
* Handles slow and aborted queries
* Uses authentication
* Adds RADIUS and HTTP authenticators
* Options to allow users login via RADIUS and HTTP
* Lua 5.3 support
* Improved performance
* Better memory management
* Native support for 64-bit integers
* Native support for bitwise operations
* Adds the new libmaxminddb geolocation library
* Storage utilization indicators
* Global storage indicator to show the disk used by each interface
* Per-interface storage indicator to show the disk used to store timeseries and flows
* Support for Sonicwall PEN field names
* Option to disable LDAP referrals
* Requests and configures Keepalive support for ZMQ sockets
* Three-way-handshake detection
* Adds SNMP mac addresses to the search function
nEdge
* Implement nEdge policies test page
* Implement device presets
* DNS
Fixes
* Fixes missing flows dump on shutdown
* HTTP dissection fixes
* SNMP
* Properly handles endianness over ZMQ
Diffstat (limited to 'net/ntopng')
-rw-r--r-- | net/ntopng/Makefile | 5 | ||||
-rw-r--r-- | net/ntopng/PLIST | 78 | ||||
-rw-r--r-- | net/ntopng/distinfo | 17 | ||||
-rw-r--r-- | net/ntopng/patches/patch-Makefile.in | 18 | ||||
-rw-r--r-- | net/ntopng/patches/patch-configure.seed | 21 | ||||
-rw-r--r-- | net/ntopng/patches/patch-src_NetworkInterface.cpp | 16 | ||||
-rw-r--r-- | net/ntopng/patches/patch-src_Utils.cpp | 45 | ||||
-rw-r--r-- | net/ntopng/patches/patch-third-party_mongoose_mongoose.c | 16 |
8 files changed, 103 insertions, 113 deletions
diff --git a/net/ntopng/Makefile b/net/ntopng/Makefile index 3660581f8f7..d5f345c072a 100644 --- a/net/ntopng/Makefile +++ b/net/ntopng/Makefile @@ -1,7 +1,6 @@ -# $NetBSD: Makefile,v 1.31 2019/07/01 04:08:42 ryoon Exp $ +# $NetBSD: Makefile,v 1.32 2019/07/12 09:33:22 adam Exp $ -DISTNAME= ntopng-3.6.1 -PKGREVISION= 6 +DISTNAME= ntopng-3.8 CATEGORIES= net MASTER_SITES= ${MASTER_SITE_GITHUB:=ntop/} diff --git a/net/ntopng/PLIST b/net/ntopng/PLIST index 84f07adf9b9..7f40b8efe1d 100644 --- a/net/ntopng/PLIST +++ b/net/ntopng/PLIST @@ -1,4 +1,4 @@ -@comment $NetBSD: PLIST,v 1.3 2018/10/18 16:25:40 adam Exp $ +@comment $NetBSD: PLIST,v 1.4 2019/07/12 09:33:22 adam Exp $ bin/ntopng man/man8/ntopng.8 share/ntopng/httpdocs/bootstrap/css/bootstrap-theme.css @@ -15,7 +15,6 @@ 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 @@ -42,7 +41,6 @@ share/ntopng/httpdocs/css/images/ui-icons_ffffff_256x240.png share/ntopng/httpdocs/css/jquery-ui.css 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/rickshaw.css share/ntopng/httpdocs/css/sequence_sunburst.css @@ -133,8 +131,6 @@ share/ntopng/httpdocs/inc/as_stats_id.inc share/ntopng/httpdocs/inc/country_stats_id.inc share/ntopng/httpdocs/inc/flows_stats_id.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_id.inc @@ -156,6 +152,7 @@ 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/binary-indicators.js share/ntopng/httpdocs/js/bootstrap-datatable.js share/ntopng/httpdocs/js/bootstrap-datetimepicker.js share/ntopng/httpdocs/js/bootstrap-slider.js @@ -171,6 +168,7 @@ 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/ebpf_utils.js share/ntopng/httpdocs/js/gauge.js share/ntopng/httpdocs/js/googleMapJson.js share/ntopng/httpdocs/js/graph_utils.js @@ -178,7 +176,6 @@ 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.js share/ntopng/httpdocs/js/jquery.peity.js share/ntopng/httpdocs/js/jquery.tablesorter.js @@ -191,18 +188,14 @@ 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/quotas_utils.js share/ntopng/httpdocs/js/rickshaw.js share/ntopng/httpdocs/js/ripe_widget_api.js share/ntopng/httpdocs/js/sankey.js share/ntopng/httpdocs/js/sequence_sunburst.js -share/ntopng/httpdocs/js/springy-ntop.js -share/ntopng/httpdocs/js/springyui-ntop.js 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 @@ -212,10 +205,12 @@ 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/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/templates/modal_confirm_dialog.html +share/ntopng/httpdocs/templates/traffic_extraction_dialog.html share/ntopng/httpdocs/templates/traffic_report.html share/ntopng/httpdocs/templates/typeahead_input.html share/ntopng/httpdocs/templates/wizard_dialog.html @@ -228,6 +223,7 @@ 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/hourly.lua share/ntopng/scripts/callbacks/system/housekeeping.lua share/ntopng/scripts/callbacks/system/minute.lua share/ntopng/scripts/callbacks/system/pinger.lua @@ -235,16 +231,17 @@ 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/edit_categories.lua +share/ntopng/scripts/lua/admin/edit_device_protocols.lua +share/ntopng/scripts/lua/admin/edit_profiles.lua +share/ntopng/scripts/lua/admin/get_custom_categories_hosts.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 @@ -252,13 +249,16 @@ 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/remote_assistance.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/assistant_test.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_recording_data.lua share/ntopng/scripts/lua/check_update.lua share/ntopng/scripts/lua/country_details.lua share/ntopng/scripts/lua/country_stats.lua @@ -287,8 +287,10 @@ 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_extracted_traffic.lua share/ntopng/scripts/lua/get_flow_data.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_geo_hosts.lua share/ntopng/scripts/lua/get_grouped_hosts_data.lua @@ -302,12 +304,14 @@ share/ntopng/scripts/lua/get_hosts_data.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_influxdb_info.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_data.lua share/ntopng/scripts/lua/get_process_info.lua share/ntopng/scripts/lua/get_processes_data.lua +share/ntopng/scripts/lua/get_processes_graph_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 @@ -315,8 +319,10 @@ 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/get_username_data.lua share/ntopng/scripts/lua/get_vlan_data.lua share/ntopng/scripts/lua/get_vlans_data.lua +share/ntopng/scripts/lua/google_assistant_utils.lua share/ntopng/scripts/lua/host_details.lua share/ntopng/scripts/lua/host_details_ndpi.lua share/ntopng/scripts/lua/host_details_ndpi_categories.lua @@ -329,7 +335,6 @@ share/ntopng/scripts/lua/host_sflow_distro.lua share/ntopng/scripts/lua/host_stats.lua share/ntopng/scripts/lua/host_top_peers_protocols.lua share/ntopng/scripts/lua/hosts_comparison.lua -share/ntopng/scripts/lua/hosts_comparison_bubble.lua share/ntopng/scripts/lua/hosts_comparison_sankey.lua share/ntopng/scripts/lua/hosts_geomap.lua share/ntopng/scripts/lua/hosts_matrix.lua @@ -349,14 +354,19 @@ share/ntopng/scripts/lua/iface_ndpi_stats.lua 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/edit_categories.lua +share/ntopng/scripts/lua/inc/edit_ndpi_applications.lua +share/ntopng/scripts/lua/inc/edit_presets.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/sprobe.lua +share/ntopng/scripts/lua/inc/traffic_recording_config.lua +share/ntopng/scripts/lua/inc/traffic_recording_jobs.lua +share/ntopng/scripts/lua/inc/traffic_recording_status.lua share/ntopng/scripts/lua/inc/users.lua share/ntopng/scripts/lua/index.lua share/ntopng/scripts/lua/info_portal.lua @@ -364,6 +374,7 @@ 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/live_traffic_extraction.lua share/ntopng/scripts/lua/local_hosts_stats.lua share/ntopng/scripts/lua/login.lua share/ntopng/scripts/lua/logout.lua @@ -378,23 +389,28 @@ 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_endpoints/syslog.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/categories_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/ebpf_utils.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_field_value_maps.lua +share/ntopng/scripts/lua/modules/flow_field_value_maps/sonicwall_app_id.lua share/ntopng/scripts/lua/modules/flow_utils.lua share/ntopng/scripts/lua/modules/format_utils.lua +share/ntopng/scripts/lua/modules/google_assistant_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 @@ -419,11 +435,15 @@ 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/page_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/presets_utils.lua +share/ntopng/scripts/lua/modules/recording_utils.lua share/ntopng/scripts/lua/modules/recovery_utils.lua +share/ntopng/scripts/lua/modules/remote_assistance.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 @@ -432,32 +452,38 @@ 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/storage_utils.lua share/ntopng/scripts/lua/modules/telegram.lua share/ntopng/scripts/lua/modules/template.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/nindex.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_custom.lua +share/ntopng/scripts/lua/modules/timeseries/schemas/ts_hour.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/influxdb2series.lua +share/ntopng/scripts/lua/modules/timeseries/tests/influxdb_queries.lua share/ntopng/scripts/lua/modules/timeseries/tests/run.lua +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_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/tracker.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_state.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 @@ -465,28 +491,26 @@ 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/process_details.lua share/ntopng/scripts/lua/processes_stats.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/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 share/ntopng/scripts/lua/sprobe_host_process.lua share/ntopng/scripts/lua/sprobe_host_process_data.lua -share/ntopng/scripts/lua/sprobe_hosts.lua -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/stop_live_capture.lua share/ntopng/scripts/lua/test_locales.lua share/ntopng/scripts/lua/test_snmp.lua share/ntopng/scripts/lua/top_hosts.lua +share/ntopng/scripts/lua/traffic_extraction.lua +share/ntopng/scripts/lua/traffic_extraction_data.lua share/ntopng/scripts/lua/unknown_devices.lua share/ntopng/scripts/lua/user_stats.lua +share/ntopng/scripts/lua/username_details.lua share/ntopng/scripts/lua/vlan_details.lua share/ntopng/scripts/lua/vlan_stats.lua diff --git a/net/ntopng/distinfo b/net/ntopng/distinfo index 327ce13222c..38628f1ce0c 100644 --- a/net/ntopng/distinfo +++ b/net/ntopng/distinfo @@ -1,15 +1,14 @@ -$NetBSD: distinfo,v 1.5 2018/10/18 16:25:40 adam Exp $ +$NetBSD: distinfo,v 1.6 2019/07/12 09:33:22 adam Exp $ -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 (ntopng-3.8.tar.gz) = d2695e3a6f2bd8d4f4985c486f24320bc2df1fca +RMD160 (ntopng-3.8.tar.gz) = ce26ea39420738bd1d6917f58584f4449cb87810 +SHA512 (ntopng-3.8.tar.gz) = 2236f9931fc606e4d0a6da379c480a48bacd441cf199a310ea690a03d74d08f369825ea02e3c13828a10f716a5531d4e6774876f253ab348a52bcf8bd8d5107f +Size (ntopng-3.8.tar.gz) = 33910329 bytes +SHA1 (patch-configure.seed) = 467d93d5d01f61f23273979e9d54e107eae76fef SHA1 (patch-include_Redis.h) = 949631615604e6a67c326e11fcdbdbbb2cd7bc7a SHA1 (patch-include_ntop__includes.h) = 2bf588dba941f25b71381c7848b237d964d77f31 +SHA1 (patch-src_NetworkInterface.cpp) = 6f2a266c9cde9ed4dc4e45063acbc7167d08fed3 SHA1 (patch-src_PacketDumperTuntap.cpp) = 76415461ebbe88d886111aa2d6508c7eec66b11d SHA1 (patch-src_Redis.cpp) = d863e6a2e02f9c6f7990c715a91881257f918033 -SHA1 (patch-src_Utils.cpp) = 4b5be995c81659611682d5b37209a2957435f8a4 -SHA1 (patch-third-party_mongoose_mongoose.c) = c1745b7700c0d1c7fe7dba1388025b6312ff144e +SHA1 (patch-src_Utils.cpp) = 781a8c34da630ef7dd22be3b3b9f461f24cd44ba SHA1 (patch-third-party_snmp_net.c) = defaacb719c2fb0276932554a7951f02a19ba4ef diff --git a/net/ntopng/patches/patch-Makefile.in b/net/ntopng/patches/patch-Makefile.in deleted file mode 100644 index e1b0c2881da..00000000000 --- a/net/ntopng/patches/patch-Makefile.in +++ /dev/null @@ -1,18 +0,0 @@ -$NetBSD: patch-Makefile.in,v 1.4 2018/10/18 16:25:40 adam Exp $ - -Use Lua instead of LuaJIT2. - ---- Makefile.in.orig 2018-09-19 15:35:27.000000000 +0000 -+++ Makefile.in -@@ -29,11 +29,7 @@ MONGOOSE_INC=-I$(MONGOOSE_HOME) - ###### - - # 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 diff --git a/net/ntopng/patches/patch-configure.seed b/net/ntopng/patches/patch-configure.seed index c0162dd3e1f..3d1318f0d50 100644 --- a/net/ntopng/patches/patch-configure.seed +++ b/net/ntopng/patches/patch-configure.seed @@ -1,12 +1,13 @@ -$NetBSD: patch-configure.seed,v 1.3 2018/10/18 16:25:40 adam Exp $ +$NetBSD: patch-configure.seed,v 1.4 2019/07/12 09:33:22 adam Exp $ Portability fix. Detect system hiredis. +Link against dynamkc libndpi (-Bstatic is not portable). On Darwin, install into man/. ---- configure.seed.orig 2018-09-19 15:35:27.000000000 +0000 +--- configure.seed.orig 2018-12-21 18:14:10.000000000 +0000 +++ configure.seed -@@ -67,7 +67,7 @@ fi +@@ -75,7 +75,7 @@ fi if [ test -f /usr/bin/lsb_release ]; then CODENAME=`/usr/bin/lsb_release -c|cut -f 2` @@ -15,7 +16,17 @@ On Darwin, install into man/. CPPFLAGS="${CPPFLAGS} -DOLD_NETFILTER_INTERFACE=1" fi fi -@@ -273,7 +273,7 @@ fi +@@ -130,8 +130,7 @@ fi + + PKG_CHECK_MODULES([NDPI], [libndpi >= 2.0], [ + NDPI_INC=`echo $NDPI_CFLAGS | sed -e "s/[ ]*$//"`/libndpi +- # Use static libndpi library as building against the dynamic library fails +- NDPI_LIB="-Wl,-Bstatic $NDPI_LIBS -Wl,-Bdynamic" ++ NDPI_LIB="$NDPI_LIBS" + NDPI_LIB_DEP= + ], [ + AC_MSG_CHECKING(for nDPI source) +@@ -285,7 +284,7 @@ fi DATE=`date +"%Y-%m-%d"` @@ -24,7 +35,7 @@ On Darwin, install into man/. 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 +@@ -552,11 +551,7 @@ then INSTALL_DIR=${ac_default_prefix} fi diff --git a/net/ntopng/patches/patch-src_NetworkInterface.cpp b/net/ntopng/patches/patch-src_NetworkInterface.cpp new file mode 100644 index 00000000000..9b90cbd0452 --- /dev/null +++ b/net/ntopng/patches/patch-src_NetworkInterface.cpp @@ -0,0 +1,16 @@ +$NetBSD: patch-src_NetworkInterface.cpp,v 1.1 2019/07/12 09:33:22 adam Exp $ + +Fix for newer ndpi. + +--- src/NetworkInterface.cpp.orig 2019-07-11 16:55:03.000000000 +0000 ++++ src/NetworkInterface.cpp +@@ -1604,7 +1604,8 @@ bool NetworkInterface::processPacket(u_i + ndpi_protocol icmp_proto = flow->get_detected_protocol(); + + if(icmp_proto.category == NDPI_PROTOCOL_CATEGORY_UNSPECIFIED) { +- ndpi_fill_ip_protocol_category(ndpi_struct, (struct ndpi_iphdr *)ip, &icmp_proto); ++ ndpi_fill_ip_protocol_category(ndpi_struct, ++ ((struct ndpi_iphdr*)ip)->saddr, ((struct ndpi_iphdr*)ip)->daddr, &icmp_proto); + flow->setDetectedProtocol(icmp_proto, false); + } + } diff --git a/net/ntopng/patches/patch-src_Utils.cpp b/net/ntopng/patches/patch-src_Utils.cpp index 36c131a6520..33cd5255afa 100644 --- a/net/ntopng/patches/patch-src_Utils.cpp +++ b/net/ntopng/patches/patch-src_Utils.cpp @@ -1,13 +1,13 @@ -$NetBSD: patch-src_Utils.cpp,v 1.2 2018/10/18 16:25:40 adam Exp $ +$NetBSD: patch-src_Utils.cpp,v 1.3 2019/07/12 09:33:22 adam Exp $ Fix building on NetBSD. d_type is not POSIX, provide workaround for SunOS. ---- src/Utils.cpp.orig 2018-09-19 15:35:27.000000000 +0000 +--- src/Utils.cpp.orig 2018-12-21 18:14:10.000000000 +0000 +++ src/Utils.cpp -@@ -21,10 +21,13 @@ - - #include "ntop_includes.h" +@@ -25,10 +25,13 @@ extern "C" { + #include "third-party/fast-sha1/sha1-fast.c" + } -#if defined(__OpenBSD__) || defined(__APPLE__) +#if defined(__NetBSD__) || defined(__OpenBSD__) || defined(__APPLE__) @@ -20,7 +20,7 @@ d_type is not POSIX, provide workaround for SunOS. // A simple struct for strings. typedef struct { -@@ -1747,7 +1750,12 @@ static bool scan_dir(const char * dir_na +@@ -1948,7 +1951,12 @@ static bool scan_dir(const char * dir_na if(!entry) break; d_name = entry->d_name; @@ -31,10 +31,10 @@ d_type is not POSIX, provide workaround for SunOS. if(entry->d_type & DT_REG) { +#endif snprintf(path, sizeof(path), "%s/%s", dir_name, entry->d_name); - if(!stat(path, &file_stats)) { + if(!stat(path, &buf)) { struct dirent *temp = (struct dirent *)malloc(sizeof(struct dirent)); -@@ -1757,7 +1765,11 @@ static bool scan_dir(const char * dir_na - *total += file_stats.st_size; +@@ -1958,7 +1966,11 @@ static bool scan_dir(const char * dir_na + *total += buf.st_size; } +#ifdef __sun @@ -43,30 +43,5 @@ d_type is not POSIX, provide workaround for SunOS. } else if(entry->d_type & DT_DIR) { +#endif if(strncmp (d_name, "..", 2) != 0 && - strncmp (d_name, ".", 1) != 0) { + strncmp (d_name, ".", 1) != 0) { 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); diff --git a/net/ntopng/patches/patch-third-party_mongoose_mongoose.c b/net/ntopng/patches/patch-third-party_mongoose_mongoose.c deleted file mode 100644 index b2bab11f1dd..00000000000 --- a/net/ntopng/patches/patch-third-party_mongoose_mongoose.c +++ /dev/null @@ -1,16 +0,0 @@ -$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 |