From owner-svn-ports-head@freebsd.org Sat Dec 9 17:11:11 2017 Return-Path: Delivered-To: svn-ports-head@mailman.ysv.freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2001:1900:2254:206a::19:1]) by mailman.ysv.freebsd.org (Postfix) with ESMTP id A21F5E91DE0; Sat, 9 Dec 2017 17:11:11 +0000 (UTC) (envelope-from madpilot@FreeBSD.org) Received: from repo.freebsd.org (repo.freebsd.org [IPv6:2610:1c1:1:6068::e6a:0]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (Client did not present a certificate) by mx1.freebsd.org (Postfix) with ESMTPS id 3AE346D24F; Sat, 9 Dec 2017 17:11:11 +0000 (UTC) (envelope-from madpilot@FreeBSD.org) Received: from repo.freebsd.org ([127.0.1.37]) by repo.freebsd.org (8.15.2/8.15.2) with ESMTP id vB9HBADR034678; Sat, 9 Dec 2017 17:11:10 GMT (envelope-from madpilot@FreeBSD.org) Received: (from madpilot@localhost) by repo.freebsd.org (8.15.2/8.15.2/Submit) id vB9HB9GV034667; Sat, 9 Dec 2017 17:11:09 GMT (envelope-from madpilot@FreeBSD.org) Message-Id: <201712091711.vB9HB9GV034667@repo.freebsd.org> X-Authentication-Warning: repo.freebsd.org: madpilot set sender to madpilot@FreeBSD.org using -f From: Guido Falsi Date: Sat, 9 Dec 2017 17:11:09 +0000 (UTC) To: ports-committers@freebsd.org, svn-ports-all@freebsd.org, svn-ports-head@freebsd.org Subject: svn commit: r455867 - in head/net: ndpi ndpi/files ntopng ntopng/files X-SVN-Group: ports-head X-SVN-Commit-Author: madpilot X-SVN-Commit-Paths: in head/net: ndpi ndpi/files ntopng ntopng/files X-SVN-Commit-Revision: 455867 X-SVN-Commit-Repository: ports MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit X-BeenThere: svn-ports-head@freebsd.org X-Mailman-Version: 2.1.25 Precedence: list List-Id: SVN commit messages for the ports tree for head List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Sat, 09 Dec 2017 17:11:11 -0000 Author: madpilot Date: Sat Dec 9 17:11:09 2017 New Revision: 455867 URL: https://svnweb.freebsd.org/changeset/ports/455867 Log: - Update net/ndpi to 2.2 (latest snapshot) - Update net/ntopng to 3.2 (latest snapshot) - For ndpi reapply commit reverted upstream to avoid installing include file with wrong relative path - For ntopng use embedded luajit, it requires a newer (beta) version than what we have in the tree Added: head/net/ndpi/files/ head/net/ndpi/files/patch-autogen.sh (contents, props changed) head/net/ndpi/files/patch-fix-libcache.h (contents, props changed) head/net/ndpi/files/patch-libndpi.sym (contents, props changed) head/net/ntopng/files/patch-third-party_LuaJIT-2.1.0-beta3_src_Makefile (contents, props changed) Modified: head/net/ndpi/Makefile head/net/ndpi/distinfo head/net/ndpi/pkg-plist head/net/ntopng/Makefile head/net/ntopng/distinfo head/net/ntopng/files/patch-Makefile.in head/net/ntopng/pkg-plist Modified: head/net/ndpi/Makefile ============================================================================== --- head/net/ndpi/Makefile Sat Dec 9 16:59:14 2017 (r455866) +++ head/net/ndpi/Makefile Sat Dec 9 17:11:09 2017 (r455867) @@ -2,7 +2,7 @@ # $FreeBSD$ PORTNAME= ndpi -PORTVERSION= 2.0.2017.09.13 +PORTVERSION= 2.2.2017.12.05 CATEGORIES= net MAINTAINER= madpilot@FreeBSD.org @@ -13,20 +13,23 @@ LICENSE_FILE= ${WRKSRC}/COPYING LIB_DEPENDS= libjson-c.so:devel/json-c +USES= autoreconf compiler:c++11-lang libtool pathfix pkgconfig CONFIGURE_ARGS= --with-pic CPPFLAGS+= -I${LOCALBASE}/include/json-c LDFLAGS+= -L${LOCALBASE}/lib LIBS+= -ljson-c GNU_CONFIGURE= yes USE_LDCONFIG= yes -USES= autoreconf compiler:c++11-lang libtool pathfix pkgconfig INSTALL_TARGET= install-strip USE_GITHUB= yes GH_ACCOUNT= ntop GH_PROJECT= nDPI -GH_TAGNAME= 6607c33 +GH_TAGNAME= 56dcf65 PLIST_SUB= MAJOR_VER=${PORTVERSION:C/([[:digit:]])+\.([[:digit:]])+.*/\1.\2/}.0 + +post-patch: + cd ${WRKSRC} && ${SH} autogen.sh .include Modified: head/net/ndpi/distinfo ============================================================================== --- head/net/ndpi/distinfo Sat Dec 9 16:59:14 2017 (r455866) +++ head/net/ndpi/distinfo Sat Dec 9 17:11:09 2017 (r455867) @@ -1,3 +1,3 @@ -TIMESTAMP = 1507108385 -SHA256 (ntop-nDPI-2.0.2017.09.13-6607c33_GH0.tar.gz) = 3a71b7b8e20e387afdfca36052e553a98826a0bb345d9cff58b9bffb5649db11 -SIZE (ntop-nDPI-2.0.2017.09.13-6607c33_GH0.tar.gz) = 19281054 +TIMESTAMP = 1512577740 +SHA256 (ntop-nDPI-2.2.2017.12.05-56dcf65_GH0.tar.gz) = 8accd15275879465210cd9e706562918f0b0c4c65b5659037ae28e48e46a858f +SIZE (ntop-nDPI-2.2.2017.12.05-56dcf65_GH0.tar.gz) = 19937661 Added: head/net/ndpi/files/patch-autogen.sh ============================================================================== --- /dev/null 00:00:00 1970 (empty, because file is newly added) +++ head/net/ndpi/files/patch-autogen.sh Sat Dec 9 17:11:09 2017 (r455867) @@ -0,0 +1,37 @@ +--- autogen.sh.orig 2017-12-03 18:07:29 UTC ++++ autogen.sh +@@ -5,34 +5,4 @@ NDPI_MINOR="2" + NDPI_PATCH="0" + NDPI_VERSION_SHORT="$NDPI_MAJOR.$NDPI_MINOR.$NDPI_PATCH" + +-/bin/rm -f configure config.h config.h.in src/lib/Makefile.in +- +-AUTOCONF=$(which autoconf) +-AUTOMAKE=$(which automake) +-LIBTOOL=$(which libtool) +-LIBTOOLIZE=$(which libtoolize) +-AUTORECONF=$(which autoreconf) +- +-if test -z $AUTOCONF; then +- echo "autoconf is missing: please install it and try again" +- exit +-fi +- +-if test -z $AUTOMAKE; then +- echo "automake is missing: please install it and try again" +- exit +-fi +- +-if test -z $LIBTOOL && test -z $LIBTOOLIZE ; then +- echo "libtool and libtoolize is missing: please install it and try again" +- exit +-fi +- +-if test -z $AUTORECONF; then +- echo "autoreconf is missing: please install it and try again" +- exit +-fi +- + cat configure.seed | sed "s/@NDPI_MAJOR@/$NDPI_MAJOR/g" | sed "s/@NDPI_MINOR@/$NDPI_MINOR/g" | sed "s/@NDPI_PATCH@/$NDPI_PATCH/g" | sed "s/@NDPI_VERSION_SHORT@/$NDPI_VERSION_SHORT/g" > configure.ac +-autoreconf -ivf +-./configure $* Added: head/net/ndpi/files/patch-fix-libcache.h ============================================================================== --- /dev/null 00:00:00 1970 (empty, because file is newly added) +++ head/net/ndpi/files/patch-fix-libcache.h Sat Dec 9 17:11:09 2017 (r455867) @@ -0,0 +1,50 @@ +From 2155dd9153457886c4f5dac58dcf269eeb2a8122 Mon Sep 17 00:00:00 2001 +From: Hidde van der Heide +Date: Thu, 19 Oct 2017 16:10:56 +0200 +Subject: [PATCH] Add libcache to installed headers and removed relative import + +--- + example/Makefile.am | 2 +- + src/include/ndpi_typedefs.h | 2 +- + src/lib/Makefile.am | 3 ++- + 3 files changed, 4 insertions(+), 3 deletions(-) + +diff --git a/example/Makefile.am b/example/Makefile.am +index 7fc29402..6cc6a14c 100644 +--- example/Makefile.am ++++ example/Makefile.am +@@ -1,6 +1,6 @@ + bin_PROGRAMS = ndpiReader + +-AM_CPPFLAGS = -I$(top_srcdir)/src/include @PCAP_INC@ ++AM_CPPFLAGS = -I$(top_srcdir)/src/include -I$(top_srcdir)/src/lib/third_party/include @PCAP_INC@ + AM_CFLAGS = @PTHREAD_CFLAGS@ # --coverage + + LDADD = $(top_builddir)/src/lib/libndpi.la @JSON_C_LIB@ @PTHREAD_LIBS@ @PCAP_LIB@ @DL_LIB@ -lm +diff --git a/src/include/ndpi_typedefs.h b/src/include/ndpi_typedefs.h +index 33043fde..0587503f 100644 +--- src/include/ndpi_typedefs.h ++++ src/include/ndpi_typedefs.h +@@ -25,7 +25,7 @@ + #define __NDPI_TYPEDEFS_H__ + + #include "ndpi_define.h" +-#include "../lib/third_party/include/libcache.h" ++#include "libcache.h" + + #define BT_ANNOUNCE + #define SNAP_EXT +diff --git a/src/lib/Makefile.am b/src/lib/Makefile.am +index c2b4e4b1..39823d37 100644 +--- src/lib/Makefile.am ++++ src/lib/Makefile.am +@@ -12,7 +12,8 @@ libndpi_la_include_HEADERS = ../include/ndpi_api.h \ + ../include/ndpi_includes.h \ + ../include/ndpi_protocol_ids.h \ + ../include/ndpi_protocols.h \ +- ../include/ndpi_typedefs.h ++ ../include/ndpi_typedefs.h \ ++ third_party/include/libcache.h + + libndpi_la_SOURCES = ndpi_content_match.c.inc \ + ndpi_main.c \ Added: head/net/ndpi/files/patch-libndpi.sym ============================================================================== --- /dev/null 00:00:00 1970 (empty, because file is newly added) +++ head/net/ndpi/files/patch-libndpi.sym Sat Dec 9 17:11:09 2017 (r455867) @@ -0,0 +1,10 @@ +--- libndpi.sym.orig 2017-12-03 18:07:29 UTC ++++ libndpi.sym +@@ -58,4 +58,5 @@ ndpi_netbios_name_interpret + ndpi_category_set_name + ndpi_category_get_name + ndpi_is_custom_category +-ndpi_is_subprotocol_informative +\ No newline at end of file ++ndpi_is_subprotocol_informative ++ndpi_set_proto_category Modified: head/net/ndpi/pkg-plist ============================================================================== --- head/net/ndpi/pkg-plist Sat Dec 9 16:59:14 2017 (r455866) +++ head/net/ndpi/pkg-plist Sat Dec 9 17:11:09 2017 (r455867) @@ -1,4 +1,5 @@ bin/ndpiReader +include/libndpi-%%MAJOR_VER%%/libndpi/libcache.h include/libndpi-%%MAJOR_VER%%/libndpi/ndpi_api.h include/libndpi-%%MAJOR_VER%%/libndpi/ndpi_define.h include/libndpi-%%MAJOR_VER%%/libndpi/ndpi_includes.h Modified: head/net/ntopng/Makefile ============================================================================== --- head/net/ntopng/Makefile Sat Dec 9 16:59:14 2017 (r455866) +++ head/net/ntopng/Makefile Sat Dec 9 17:11:09 2017 (r455867) @@ -2,7 +2,7 @@ # $FreeBSD$ PORTNAME= ntopng -PORTVERSION= 3.0.2017.11.02 +PORTVERSION= 3.2.2017.12.06 CATEGORIES= net MAINTAINER= madpilot@FreeBSD.org @@ -12,7 +12,6 @@ LICENSE= GPLv3 LICENSE_FILE= ${WRKSRC}/COPYING LIB_DEPENDS= librrd.so:databases/rrdtool \ - libluajit-5.1.so:lang/luajit \ libzmq.so:net/libzmq4 \ libcurl.so:ftp/curl \ libndpi.so:net/ndpi \ @@ -32,7 +31,7 @@ GROUPS= ntopng USE_GITHUB= yes GH_ACCOUNT= ntop -GH_TAGNAME= f0c02af +GH_TAGNAME= 8c03024 CPE_VENDOR= ntop @@ -50,6 +49,8 @@ USE_RC_SUBR= ntopng post-patch: @${REINPLACE_CMD} -e 's|%%LOCALBASE%%|${LOCALBASE}|' \ ${WRKSRC}/configure.seed + @${REINPLACE_CMD} -e 's|^\(export PREFIX=\).*|\1 ${PREFIX}|' \ + ${WRKSRC}/third-party/LuaJIT-2.1.0-beta3/Makefile cd ${WRKSRC} && ${SH} autogen.sh post-install: Modified: head/net/ntopng/distinfo ============================================================================== --- head/net/ntopng/distinfo Sat Dec 9 16:59:14 2017 (r455866) +++ head/net/ntopng/distinfo Sat Dec 9 17:11:09 2017 (r455867) @@ -1,3 +1,3 @@ -TIMESTAMP = 1510582787 -SHA256 (ntop-ntopng-3.0.2017.11.02-f0c02af_GH0.tar.gz) = 93b345190cfa07d13d88d9b5ad41037b40989cd04156f5e9760a9893a890aac6 -SIZE (ntop-ntopng-3.0.2017.11.02-f0c02af_GH0.tar.gz) = 23022605 +TIMESTAMP = 1512577994 +SHA256 (ntop-ntopng-3.2.2017.12.06-8c03024_GH0.tar.gz) = f38c590b6daeb0e1fb0ab21caf276b30465412a351f6d792ebd51e4d45ef5fc6 +SIZE (ntop-ntopng-3.2.2017.12.06-8c03024_GH0.tar.gz) = 24195494 Modified: head/net/ntopng/files/patch-Makefile.in ============================================================================== --- head/net/ntopng/files/patch-Makefile.in Sat Dec 9 16:59:14 2017 (r455866) +++ head/net/ntopng/files/patch-Makefile.in Sat Dec 9 17:11:09 2017 (r455867) @@ -1,8 +1,18 @@ ---- Makefile.in.orig 2017-08-12 15:15:33 UTC +--- Makefile.in.orig 2017-12-06 11:11:19 UTC +++ Makefile.in -@@ -89,7 +89,7 @@ endif - HAS_ZEROMQ=$(shell pkg-config --exists libzmq; echo $$?) - ifeq ($(HAS_ZEROMQ), 0) +@@ -34,7 +34,8 @@ LIBPCAP=-lpcap + MONGOOSE_HOME=${PWD}/third-party/mongoose + MONGOOSE_INC=-I$(MONGOOSE_HOME) + ###### +-HAS_LUAJIT=$(shell pkg-config --exists luajit; echo $$?) ++# Force using embedded luajit ++HAS_LUAJIT=1 + ifeq ($(HAS_LUAJIT), 0) + LUAJIT_INC = $(shell pkg-config --cflags luajit) + LUAJIT_LIB = $(shell pkg-config --libs luajit) +@@ -91,7 +92,7 @@ ifeq (@NEDGE@, 0) + HAS_ZEROMQ=$(shell pkg-config --exists libzmq; echo $$?) + ifeq ($(HAS_ZEROMQ), 0) ZEROMQ_INC = $(shell pkg-config --cflags libzmq) - ZMQ_STATIC=/usr/local/lib/libzmq.a + ZMQ_STATIC=/nonexistent Added: head/net/ntopng/files/patch-third-party_LuaJIT-2.1.0-beta3_src_Makefile ============================================================================== --- /dev/null 00:00:00 1970 (empty, because file is newly added) +++ head/net/ntopng/files/patch-third-party_LuaJIT-2.1.0-beta3_src_Makefile Sat Dec 9 17:11:09 2017 (r455867) @@ -0,0 +1,23 @@ +--- third-party/LuaJIT-2.1.0-beta3/src/Makefile.orig 2017-12-04 09:31:02 UTC ++++ third-party/LuaJIT-2.1.0-beta3/src/Makefile +@@ -24,7 +24,7 @@ NODOTABIVER= 51 + # removing the '#' in front of them. Make sure you force a full recompile + # with "make clean", followed by "make" if you change any options. + # +-DEFAULT_CC = gcc ++DEFAULT_CC = cc + # + # LuaJIT builds as a native 32 or 64 bit binary by default. + CC= $(DEFAULT_CC) +@@ -585,9 +585,9 @@ endif + endif + endif + +-Q= @ ++#Q= @ + E= @echo +-#Q= ++Q= + #E= @: + + ############################################################################## Modified: head/net/ntopng/pkg-plist ============================================================================== --- head/net/ntopng/pkg-plist Sat Dec 9 16:59:14 2017 (r455866) +++ head/net/ntopng/pkg-plist Sat Dec 9 17:11:09 2017 (r455867) @@ -11,7 +11,6 @@ man/man8/ntopng.8.gz %%DATADIR%%/httpdocs/bootstrap/fonts/glyphicons-halflings-regular.woff %%DATADIR%%/httpdocs/bootstrap/img/glyphicons-halflings-white.png %%DATADIR%%/httpdocs/bootstrap/img/glyphicons-halflings.png -%%DATADIR%%/httpdocs/bootstrap/js/bootstrap.js %%DATADIR%%/httpdocs/css/Rickshaw/detail.css %%DATADIR%%/httpdocs/css/Rickshaw/graph.css %%DATADIR%%/httpdocs/css/Rickshaw/legend.css @@ -20,7 +19,6 @@ man/man8/ntopng.8.gz %%DATADIR%%/httpdocs/css/bootstrap-nav-wizard.css %%DATADIR%%/httpdocs/css/bootstrap-slider.css %%DATADIR%%/httpdocs/css/bubble-chart.css -%%DATADIR%%/httpdocs/css/c3.css %%DATADIR%%/httpdocs/css/cal-heatmap.css %%DATADIR%%/httpdocs/css/cubism.css %%DATADIR%%/httpdocs/css/datepicker.css @@ -45,7 +43,6 @@ man/man8/ntopng.8.gz %%DATADIR%%/httpdocs/css/nv.d3.css %%DATADIR%%/httpdocs/css/pagingbar.css %%DATADIR%%/httpdocs/css/pie-chart.css -%%DATADIR%%/httpdocs/css/prettify.css %%DATADIR%%/httpdocs/css/rickshaw.css %%DATADIR%%/httpdocs/css/sequence_sunburst.css %%DATADIR%%/httpdocs/css/tablesorted.css @@ -132,86 +129,65 @@ man/man8/ntopng.8.gz %%DATADIR%%/httpdocs/img/throbber.gif %%DATADIR%%/httpdocs/img/warning.png %%DATADIR%%/httpdocs/inc/as_stats_id.inc -%%DATADIR%%/httpdocs/inc/as_stats_top.inc -%%DATADIR%%/httpdocs/inc/community_stats_bottom.inc -%%DATADIR%%/httpdocs/inc/community_stats_id.inc -%%DATADIR%%/httpdocs/inc/community_stats_top.inc %%DATADIR%%/httpdocs/inc/country_stats_id.inc -%%DATADIR%%/httpdocs/inc/country_stats_top.inc %%DATADIR%%/httpdocs/inc/flows_stats_id.inc %%DATADIR%%/httpdocs/inc/geolocation_disclaimer.inc %%DATADIR%%/httpdocs/inc/header-minimal.inc %%DATADIR%%/httpdocs/inc/header.inc %%DATADIR%%/httpdocs/inc/host_to_server_id.inc %%DATADIR%%/httpdocs/inc/host_to_server_top.inc -%%DATADIR%%/httpdocs/inc/hosts_stats_bottom.inc %%DATADIR%%/httpdocs/inc/hosts_stats_id.inc -%%DATADIR%%/httpdocs/inc/hosts_stats_top.inc %%DATADIR%%/httpdocs/inc/http_servers_stats_id.inc -%%DATADIR%%/httpdocs/inc/http_servers_stats_top.inc %%DATADIR%%/httpdocs/inc/index_TopASNs.inc %%DATADIR%%/httpdocs/inc/index_TopApplications.inc %%DATADIR%%/httpdocs/inc/index_TopFlowSenders.inc %%DATADIR%%/httpdocs/inc/index_TopHosts.inc %%DATADIR%%/httpdocs/inc/index_TopPorts.inc -%%DATADIR%%/httpdocs/inc/mac_stats_bottom.inc %%DATADIR%%/httpdocs/inc/mac_stats_id.inc -%%DATADIR%%/httpdocs/inc/mac_stats_top.inc -%%DATADIR%%/httpdocs/inc/network_stats_bottom.inc %%DATADIR%%/httpdocs/inc/network_stats_id.inc -%%DATADIR%%/httpdocs/inc/network_stats_top.inc %%DATADIR%%/httpdocs/inc/os_stats_id.inc -%%DATADIR%%/httpdocs/inc/os_stats_top.inc %%DATADIR%%/httpdocs/inc/pool_stats_id.inc -%%DATADIR%%/httpdocs/inc/pool_stats_top.inc -%%DATADIR%%/httpdocs/inc/processes_stats_bottom.inc %%DATADIR%%/httpdocs/inc/processes_stats_id.inc -%%DATADIR%%/httpdocs/inc/processes_stats_top.inc -%%DATADIR%%/httpdocs/inc/sflows_stats_bottom.inc -%%DATADIR%%/httpdocs/inc/sflows_stats_top.inc %%DATADIR%%/httpdocs/inc/sprobe_process.inc %%DATADIR%%/httpdocs/inc/sprobe_process_header.inc %%DATADIR%%/httpdocs/inc/vlan_stats_id.inc -%%DATADIR%%/httpdocs/inc/vlan_stats_top.inc +%%DATADIR%%/httpdocs/js/Makefile %%DATADIR%%/httpdocs/js/README.gauge %%DATADIR%%/httpdocs/js/ays_utils.js %%DATADIR%%/httpdocs/js/bootstrap-datatable.js %%DATADIR%%/httpdocs/js/bootstrap-datetimepicker.js %%DATADIR%%/httpdocs/js/bootstrap-slider.js -%%DATADIR%%/httpdocs/js/bootstrap.ajaxpager-0.8.js +%%DATADIR%%/httpdocs/js/bootstrap.js %%DATADIR%%/httpdocs/js/bootstrap3-typeahead.js %%DATADIR%%/httpdocs/js/bubble-chart.js -%%DATADIR%%/httpdocs/js/c3.js %%DATADIR%%/httpdocs/js/cal-heatmap.js -%%DATADIR%%/httpdocs/js/cpu_bar.js %%DATADIR%%/httpdocs/js/crossfilter.js %%DATADIR%%/httpdocs/js/cubism.v1.js %%DATADIR%%/httpdocs/js/cubism_ntop.v1.js %%DATADIR%%/httpdocs/js/d3.v3.js %%DATADIR%%/httpdocs/js/datatable_utils.js %%DATADIR%%/httpdocs/js/dc.js +%%DATADIR%%/httpdocs/js/deps.min.js +%%DATADIR%%/httpdocs/js/deps.min.js.map %%DATADIR%%/httpdocs/js/gauge.js %%DATADIR%%/httpdocs/js/googleMapJson.js -%%DATADIR%%/httpdocs/js/handlebars-1.0.0.0.beta.6.js -%%DATADIR%%/httpdocs/js/highlight.js %%DATADIR%%/httpdocs/js/html5shiv.js %%DATADIR%%/httpdocs/js/jquery-ui.js %%DATADIR%%/httpdocs/js/jquery.are-you-sure.js %%DATADIR%%/httpdocs/js/jquery.bootstrap-duallistbox.js -%%DATADIR%%/httpdocs/js/jquery.form.js %%DATADIR%%/httpdocs/js/jquery.js %%DATADIR%%/httpdocs/js/jquery.peity.js -%%DATADIR%%/httpdocs/js/jquery.sparkline.js %%DATADIR%%/httpdocs/js/jquery.tablesorter.js -%%DATADIR%%/httpdocs/js/line-graph.js +%%DATADIR%%/httpdocs/js/jquery_bootstrap.min.js +%%DATADIR%%/httpdocs/js/jquery_bootstrap.min.js.map %%DATADIR%%/httpdocs/js/markerclusterer.js -%%DATADIR%%/httpdocs/js/matrix_volume.js %%DATADIR%%/httpdocs/js/moment.js +%%DATADIR%%/httpdocs/js/ntop.min.js +%%DATADIR%%/httpdocs/js/ntop.min.js.map %%DATADIR%%/httpdocs/js/ntopng_utils.js %%DATADIR%%/httpdocs/js/nv.d3.js %%DATADIR%%/httpdocs/js/pdfmake.js %%DATADIR%%/httpdocs/js/pie-chart.js -%%DATADIR%%/httpdocs/js/prettify.js %%DATADIR%%/httpdocs/js/rickshaw.js %%DATADIR%%/httpdocs/js/ripe_widget_api.js %%DATADIR%%/httpdocs/js/sankey.js @@ -224,6 +200,7 @@ man/man8/ntopng.8.gz %%DATADIR%%/httpdocs/misc/ntopng-add-user.sh %%DATADIR%%/httpdocs/misc/ntopng_template_elk.json %%DATADIR%%/httpdocs/other/EtherOUI.txt +%%DATADIR%%/httpdocs/other/trackers.txt %%DATADIR%%/httpdocs/ssl/README %%DATADIR%%/httpdocs/ssl/ntopng-cert.pem.dummy %%DATADIR%%/httpdocs/templates/modal_confirm_dialog.html @@ -231,13 +208,19 @@ man/man8/ntopng.8.gz %%DATADIR%%/httpdocs/templates/typeahead_input.html %%DATADIR%%/httpdocs/templates/wizard_dialog.html %%DATADIR%%/httpdocs/test.lp -%%DATADIR%%/scripts/callbacks/5min.lua -%%DATADIR%%/scripts/callbacks/daily.lua -%%DATADIR%%/scripts/callbacks/hourly.lua -%%DATADIR%%/scripts/callbacks/housekeeping.lua -%%DATADIR%%/scripts/callbacks/minute.lua -%%DATADIR%%/scripts/callbacks/second.lua -%%DATADIR%%/scripts/callbacks/startup.lua +%%DATADIR%%/scripts/callbacks/interface/5min.lua +%%DATADIR%%/scripts/callbacks/interface/daily.lua +%%DATADIR%%/scripts/callbacks/interface/hourly.lua +%%DATADIR%%/scripts/callbacks/interface/minute.lua +%%DATADIR%%/scripts/callbacks/system/5min.lua +%%DATADIR%%/scripts/callbacks/system/boot.lua +%%DATADIR%%/scripts/callbacks/system/daily.lua +%%DATADIR%%/scripts/callbacks/system/discover.lua +%%DATADIR%%/scripts/callbacks/system/housekeeping.lua +%%DATADIR%%/scripts/callbacks/system/minute.lua +%%DATADIR%%/scripts/callbacks/system/second.lua +%%DATADIR%%/scripts/callbacks/system/shutdown.lua +%%DATADIR%%/scripts/callbacks/system/startup.lua %%DATADIR%%/scripts/callbacks/user_scripts/inline/default.lua %%DATADIR%%/scripts/callbacks/user_scripts/loader.lua %%DATADIR%%/scripts/callbacks/user_scripts/periodic/default.lua @@ -248,19 +231,24 @@ man/man8/ntopng.8.gz %%DATADIR%%/scripts/lua/admin/add_user.lua %%DATADIR%%/scripts/lua/admin/change_user_prefs.lua %%DATADIR%%/scripts/lua/admin/delete_user.lua +%%DATADIR%%/scripts/lua/admin/edit_ndpi_applications.lua +%%DATADIR%%/scripts/lua/admin/get_ndpi_applications.lua %%DATADIR%%/scripts/lua/admin/get_user_info.lua %%DATADIR%%/scripts/lua/admin/get_users.lua %%DATADIR%%/scripts/lua/admin/host_pools.lua +%%DATADIR%%/scripts/lua/admin/manage_pool_members.lua %%DATADIR%%/scripts/lua/admin/password_reset.lua %%DATADIR%%/scripts/lua/admin/prefs.lua %%DATADIR%%/scripts/lua/admin/users.lua %%DATADIR%%/scripts/lua/admin/validate_new_user.lua +%%DATADIR%%/scripts/lua/as_details.lua %%DATADIR%%/scripts/lua/as_stats.lua %%DATADIR%%/scripts/lua/authorize_captive.lua %%DATADIR%%/scripts/lua/captive_portal.lua %%DATADIR%%/scripts/lua/change_password.lua %%DATADIR%%/scripts/lua/check_update.lua %%DATADIR%%/scripts/lua/country_stats.lua +%%DATADIR%%/scripts/lua/discover.lua %%DATADIR%%/scripts/lua/do_export_data.lua %%DATADIR%%/scripts/lua/examples/debug.lua %%DATADIR%%/scripts/lua/examples/hello_world.lua @@ -268,6 +256,7 @@ man/man8/ntopng.8.gz %%DATADIR%%/scripts/lua/examples/ntop.lua %%DATADIR%%/scripts/lua/examples/sqlite.lua %%DATADIR%%/scripts/lua/export_data.lua +%%DATADIR%%/scripts/lua/find_app.lua %%DATADIR%%/scripts/lua/find_host.lua %%DATADIR%%/scripts/lua/find_member.lua %%DATADIR%%/scripts/lua/find_prefs.lua @@ -286,9 +275,6 @@ man/man8/ntopng.8.gz %%DATADIR%%/scripts/lua/get_grouped_hosts_data.lua %%DATADIR%%/scripts/lua/get_historical_data.lua %%DATADIR%%/scripts/lua/get_historical_favourites.lua -%%DATADIR%%/scripts/lua/get_hitters_data.lua -%%DATADIR%%/scripts/lua/get_host_activitymap.lua -%%DATADIR%%/scripts/lua/get_host_categories.lua %%DATADIR%%/scripts/lua/get_host_contacts.lua %%DATADIR%%/scripts/lua/get_host_daily_activity.lua %%DATADIR%%/scripts/lua/get_host_data.lua @@ -311,10 +297,9 @@ man/man8/ntopng.8.gz %%DATADIR%%/scripts/lua/get_user_info.lua %%DATADIR%%/scripts/lua/get_vlan_data.lua %%DATADIR%%/scripts/lua/get_vlans_data.lua -%%DATADIR%%/scripts/lua/host_category_stats.lua %%DATADIR%%/scripts/lua/host_details.lua -%%DATADIR%%/scripts/lua/host_details_categories.lua %%DATADIR%%/scripts/lua/host_details_ndpi.lua +%%DATADIR%%/scripts/lua/host_details_ndpi_categories.lua %%DATADIR%%/scripts/lua/host_dns_breakdown.lua %%DATADIR%%/scripts/lua/host_get_json.lua %%DATADIR%%/scripts/lua/host_http_breakdown.lua @@ -335,6 +320,7 @@ man/man8/ntopng.8.gz %%DATADIR%%/scripts/lua/if_pkt_distro.lua %%DATADIR%%/scripts/lua/if_stats.lua %%DATADIR%%/scripts/lua/if_stats_ndpi.lua +%%DATADIR%%/scripts/lua/if_stats_ndpi_categories.lua %%DATADIR%%/scripts/lua/if_tcpflags_pkt_distro.lua %%DATADIR%%/scripts/lua/iface_flows_sankey.lua %%DATADIR%%/scripts/lua/iface_hosts_list.lua @@ -358,6 +344,7 @@ man/man8/ntopng.8.gz %%DATADIR%%/scripts/lua/logout.lua %%DATADIR%%/scripts/lua/mac_details.lua %%DATADIR%%/scripts/lua/mac_stats.lua +%%DATADIR%%/scripts/lua/macs_stats.lua %%DATADIR%%/scripts/lua/modules/alert_api.lua %%DATADIR%%/scripts/lua/modules/alert_state_utils.lua %%DATADIR%%/scripts/lua/modules/alert_utils.lua @@ -365,43 +352,49 @@ man/man8/ntopng.8.gz %%DATADIR%%/scripts/lua/modules/blacklist_utils.lua %%DATADIR%%/scripts/lua/modules/callback_utils.lua %%DATADIR%%/scripts/lua/modules/db_utils.lua +%%DATADIR%%/scripts/lua/modules/discover_utils.lua %%DATADIR%%/scripts/lua/modules/dkjson.lua %%DATADIR%%/scripts/lua/modules/flow_aggregation_utils.lua %%DATADIR%%/scripts/lua/modules/flow_utils.lua +%%DATADIR%%/scripts/lua/modules/grafana/index.lua +%%DATADIR%%/scripts/lua/modules/grafana/query.lua +%%DATADIR%%/scripts/lua/modules/grafana/search.lua +%%DATADIR%%/scripts/lua/modules/grafana_utils.lua %%DATADIR%%/scripts/lua/modules/graph_utils.lua %%DATADIR%%/scripts/lua/modules/historical_utils.lua %%DATADIR%%/scripts/lua/modules/host_pools_utils.lua +%%DATADIR%%/scripts/lua/modules/http_bridge_conf_utils.lua %%DATADIR%%/scripts/lua/modules/http_lint.lua +%%DATADIR%%/scripts/lua/modules/i18n/i18n.lua %%DATADIR%%/scripts/lua/modules/i18n/init.lua %%DATADIR%%/scripts/lua/modules/i18n/interpolate.lua %%DATADIR%%/scripts/lua/modules/i18n/plural.lua %%DATADIR%%/scripts/lua/modules/i18n/variants.lua %%DATADIR%%/scripts/lua/modules/i18n/version.lua %%DATADIR%%/scripts/lua/modules/json.lua +%%DATADIR%%/scripts/lua/modules/locales_utils.lua %%DATADIR%%/scripts/lua/modules/lua_trace.lua %%DATADIR%%/scripts/lua/modules/lua_utils.lua %%DATADIR%%/scripts/lua/modules/mac_utils.lua +%%DATADIR%%/scripts/lua/modules/os_utils.lua %%DATADIR%%/scripts/lua/modules/persistence.lua +%%DATADIR%%/scripts/lua/modules/prefs_dump_utils.lua +%%DATADIR%%/scripts/lua/modules/prefs_menu.lua %%DATADIR%%/scripts/lua/modules/prefs_utils.lua %%DATADIR%%/scripts/lua/modules/resty/template.lua %%DATADIR%%/scripts/lua/modules/resty/template/html.lua %%DATADIR%%/scripts/lua/modules/resty/template/microbenchmark.lua +%%DATADIR%%/scripts/lua/modules/rrd_5min_dump_utils.lua +%%DATADIR%%/scripts/lua/modules/rrd_min_dump_utils.lua %%DATADIR%%/scripts/lua/modules/rrd_utils.lua %%DATADIR%%/scripts/lua/modules/slack_utils.lua %%DATADIR%%/scripts/lua/modules/sqlite_utils.lua %%DATADIR%%/scripts/lua/modules/template.lua %%DATADIR%%/scripts/lua/modules/template_utils.lua -%%DATADIR%%/scripts/lua/modules/top_scripts/top_asn.lua -%%DATADIR%%/scripts/lua/modules/top_scripts/top_countries.lua -%%DATADIR%%/scripts/lua/modules/top_scripts/top_networks.lua -%%DATADIR%%/scripts/lua/modules/top_scripts/top_os.lua -%%DATADIR%%/scripts/lua/modules/top_scripts/top_os_local.lua -%%DATADIR%%/scripts/lua/modules/top_scripts/top_talkers.lua -%%DATADIR%%/scripts/lua/modules/top_scripts/top_vlan.lua -%%DATADIR%%/scripts/lua/modules/top_structure.lua -%%DATADIR%%/scripts/lua/modules/top_talkers.lua +%%DATADIR%%/scripts/lua/modules/top_talkers_utils.lua %%DATADIR%%/scripts/lua/modules/vlan_utils.lua %%DATADIR%%/scripts/lua/modules/voip_utils.lua +%%DATADIR%%/scripts/lua/modules/xmlSimple.lua %%DATADIR%%/scripts/lua/network_details.lua %%DATADIR%%/scripts/lua/network_load.lua %%DATADIR%%/scripts/lua/network_stats.lua @@ -420,6 +413,7 @@ man/man8/ntopng.8.gz %%DATADIR%%/scripts/lua/sflow_tree.lua %%DATADIR%%/scripts/lua/sflows_stats.lua %%DATADIR%%/scripts/lua/show_alerts.lua +%%DATADIR%%/scripts/lua/show_geolocation_note.lua %%DATADIR%%/scripts/lua/sprobe.lua %%DATADIR%%/scripts/lua/sprobe_data.lua %%DATADIR%%/scripts/lua/sprobe_flow_data.lua @@ -431,7 +425,6 @@ man/man8/ntopng.8.gz %%DATADIR%%/scripts/lua/sprobe_hosts_interactions_data.lua %%DATADIR%%/scripts/lua/test_locales.lua %%DATADIR%%/scripts/lua/test_snmp.lua -%%DATADIR%%/scripts/lua/top_generic.lua %%DATADIR%%/scripts/lua/top_hosts.lua %%DATADIR%%/scripts/lua/unknown_devices.lua %%DATADIR%%/scripts/lua/user_stats.lua