svn commit: r442671 - in head/net: ndpi ntopng ntopng/files
Guido Falsi
madpilot at FreeBSD.org
Mon Jun 5 15:43:47 UTC 2017
Author: madpilot
Date: Mon Jun 5 15:43:45 2017
New Revision: 442671
URL: https://svnweb.freebsd.org/changeset/ports/442671
Log:
- Update net/ndpi to new 2.0 branch
- Update net/ntopng to new 3.0 branch
- Don't hardcode /usr/local in configuration script
- Greatly simplify Makefile.in patch
Modified:
head/net/ndpi/Makefile
head/net/ndpi/distinfo
head/net/ntopng/Makefile
head/net/ntopng/distinfo
head/net/ntopng/files/patch-Makefile.in
head/net/ntopng/files/patch-configure.seed
head/net/ntopng/pkg-plist
Modified: head/net/ndpi/Makefile
==============================================================================
--- head/net/ndpi/Makefile Mon Jun 5 15:40:59 2017 (r442670)
+++ head/net/ndpi/Makefile Mon Jun 5 15:43:45 2017 (r442671)
@@ -2,8 +2,7 @@
# $FreeBSD$
PORTNAME= ndpi
-PORTVERSION= 1.8.2016.07.13
-PORTREVISION= 1
+PORTVERSION= 2.0.2017.05.23
CATEGORIES= net
MAINTAINER= madpilot at FreeBSD.org
@@ -26,7 +25,7 @@ INSTALL_TARGET= install-strip
USE_GITHUB= yes
GH_ACCOUNT= ntop
GH_PROJECT= nDPI
-GH_TAGNAME= 6450ae2
+GH_TAGNAME= 3cfcc05
PLIST_SUB= MAJOR_VER=${PORTVERSION:C/([[:digit:]])+\.([[:digit:]])+.*/\1.\2/}.0
Modified: head/net/ndpi/distinfo
==============================================================================
--- head/net/ndpi/distinfo Mon Jun 5 15:40:59 2017 (r442670)
+++ head/net/ndpi/distinfo Mon Jun 5 15:43:45 2017 (r442671)
@@ -1,3 +1,3 @@
-TIMESTAMP = 1481800146
-SHA256 (ntop-nDPI-1.8.2016.07.13-6450ae2_GH0.tar.gz) = 46abbd598f9f5f66ccc0304034a1d210ec3f3fa021ae02b67f5d873bad17d254
-SIZE (ntop-nDPI-1.8.2016.07.13-6450ae2_GH0.tar.gz) = 10220235
+TIMESTAMP = 1496419175
+SHA256 (ntop-nDPI-2.0.2017.05.23-3cfcc05_GH0.tar.gz) = 93d8b2705346f7f11714ec4637bac3236de78a42b9bf46d7fcb50b3228d1d07d
+SIZE (ntop-nDPI-2.0.2017.05.23-3cfcc05_GH0.tar.gz) = 19281078
Modified: head/net/ntopng/Makefile
==============================================================================
--- head/net/ntopng/Makefile Mon Jun 5 15:40:59 2017 (r442670)
+++ head/net/ntopng/Makefile Mon Jun 5 15:43:45 2017 (r442671)
@@ -2,7 +2,7 @@
# $FreeBSD$
PORTNAME= ntopng
-PORTVERSION= 2.4.2017.05.12
+PORTVERSION= 3.0.2017.06.01
CATEGORIES= net
MAINTAINER= madpilot at FreeBSD.org
@@ -16,19 +16,23 @@ LIB_DEPENDS= librrd.so:databases/rrdtool \
libzmq.so:net/libzmq4 \
libcurl.so:ftp/curl \
libndpi.so:net/ndpi \
- libjson-c.so:devel/json-c
+ libjson-c.so:devel/json-c \
+ libsodium.so:security/libsodium
+BUILD_DEPENDS= bash:shells/bash
GNU_CONFIGURE= yes
USE_LDCONFIG= yes
-USES= autoreconf cpe gmake libtool localbase mysql pathfix pkgconfig sqlite
+USES= autoreconf cpe gmake libtool localbase mysql pathfix pkgconfig \
+ shebangfix sqlite ssl
SUB_FILES= ntopng-geoipupdate.sh pkg-deinstall
+SHEBANG_FILES= httpdocs/misc/ntopng-add-user.sh
USERS= ntopng
GROUPS= ntopng
USE_GITHUB= yes
GH_ACCOUNT= ntop
-GH_TAGNAME= 00c19bd
+GH_TAGNAME= a4a0d44
CPE_VENDOR= ntop
@@ -44,6 +48,8 @@ NLS_USES= gettext
USE_RC_SUBR= ntopng
post-patch:
+ @${REINPLACE_CMD} -e 's|%%LOCALBASE%%|${LOCALBASE}|' \
+ ${WRKSRC}/configure.seed
cd ${WRKSRC} && ${SH} autogen.sh
post-install:
Modified: head/net/ntopng/distinfo
==============================================================================
--- head/net/ntopng/distinfo Mon Jun 5 15:40:59 2017 (r442670)
+++ head/net/ntopng/distinfo Mon Jun 5 15:43:45 2017 (r442671)
@@ -1,3 +1,3 @@
-TIMESTAMP = 1495439609
-SHA256 (ntop-ntopng-2.4.2017.05.12-00c19bd_GH0.tar.gz) = 4800530c7029c9cd00aa7cd6e67d75efc7a70ffed3b609aec248a6bda7a2a014
-SIZE (ntop-ntopng-2.4.2017.05.12-00c19bd_GH0.tar.gz) = 21819806
+TIMESTAMP = 1496419513
+SHA256 (ntop-ntopng-3.0.2017.06.01-a4a0d44_GH0.tar.gz) = 0349f441bba52da86a012c3cf44422e5344a9fa4472c9d31aa2b33b1e03cedd7
+SIZE (ntop-ntopng-3.0.2017.06.01-a4a0d44_GH0.tar.gz) = 23019560
Modified: head/net/ntopng/files/patch-Makefile.in
==============================================================================
--- head/net/ntopng/files/patch-Makefile.in Mon Jun 5 15:40:59 2017 (r442670)
+++ head/net/ntopng/files/patch-Makefile.in Mon Jun 5 15:43:45 2017 (r442671)
@@ -1,149 +1,28 @@
---- Makefile.in.orig 2016-05-05 13:23:53 UTC
+--- Makefile.in.orig 2017-06-01 07:18:57 UTC
+++ Makefile.in
-@@ -9,72 +9,28 @@ INSTALL_DIR=$(DESTDIR)$(prefix)
- MAN_DIR=$(DESTDIR)@MAN_DIR@
-
+@@ -51,8 +51,10 @@ else
+ endif
######
--HAS_NDPI=$(shell pkg-config --exists libndpi; echo $$?)
--ifeq ($(HAS_NDPI), 0)
-- NDPI_INC = $(shell pkg-config --cflags libndpi | sed -e 's/\(-I[^ \t]*\)/\1\/libndpi/g')
-- NDPI_LIB = $(shell pkg-config --libs libndpi)
-- NDPI_LIB_DEP =
--else
-- NDPI_INC=-I at NDPI_HOME@/src/include
-- NDPI_LIB=@NDPI_HOME@/src/lib/.libs/libndpi.a
-- NDPI_LIB_DEP=$(NDPI_LIB)
--endif
-+NDPI_INC = $(shell pkg-config --cflags libndpi | sed -e 's/\(-I[^ \t]*\)/\1\/libndpi/g')
-+NDPI_LIB = $(shell pkg-config --libs libndpi)
-+NDPI_LIB_DEP =
+ ifeq ($(OS), $(filter $(OS), FreeBSD))
+- LIBNBPF_HOME=${PWD}/../PF_RING/userland/nbpf
+- LIBNBPF_LIB=$(LIBNBPF_HOME)/libnbpf.a
++ ifneq (, $(wildcard "${PWD}/../PF_RING/userland/nbpf/libnbpf.a"))
++ LIBNBPF_HOME=${PWD}/../PF_RING/userland/nbpf
++ LIBNBPF_LIB=$(LIBNBPF_HOME)/libnbpf.a
++ endif
+ endif
######
- LIBPCAP=-lpcap
- ######
- MONGOOSE_HOME=${PWD}/third-party/mongoose
- MONGOOSE_INC=-I$(MONGOOSE_HOME)
- ######
--HAS_LUAJIT=$(shell pkg-config --exists luajit; echo $$?)
--ifeq ($(HAS_LUAJIT), 0)
-- LUAJIT_INC = $(shell pkg-config --cflags luajit)
-- LUAJIT_LIB = $(shell pkg-config --libs luajit)
--else
-- LUAJIT_HOME=${PWD}/third-party/LuaJIT-2.0.3
-- LUAJIT_INC=-I$(LUAJIT_HOME)/src
-- LUAJIT_LIB=$(LUAJIT_HOME)/src/libluajit.a
--endif
-+LUAJIT_INC = $(shell pkg-config --cflags luajit)
-+LUAJIT_LIB = $(shell pkg-config --libs luajit)
- ######
--LIBRRDTOOL_HOME=${PWD}/third-party/rrdtool-1.4.8
--HAS_LIBRRDTOOL=$(shell pkg-config --exists librrd; echo $$?)
--ifeq ($(HAS_LIBRRDTOOL), 0)
-- LIBRRDTOOL_INC = $(shell pkg-config --cflags librrd)
-- LIBRRDTOOL_LIB = $(shell pkg-config --libs librrd)
--else
-- LIBRRDTOOL_INC=-I$(LIBRRDTOOL_HOME)/src/
-- ifeq ($(OS), OpenBSD)
-- LIBRRDTOOL_LIB=$(LIBRRDTOOL_HOME)/src/.libs/librrd_th.a -lm -lgobject-2.0 -lgmodule-2.0 -lglib-2.0
-- else
-- LIBRRDTOOL_LIB=$(LIBRRDTOOL_HOME)/src/.libs/librrd_th.a -lm -lgobject-2.0 -lgmodule-2.0 -ldl -lglib-2.0
-- endif
--endif
-+LIBRRDTOOL_INC = $(shell pkg-config --cflags librrd)
-+LIBRRDTOOL_LIB = $(shell pkg-config --libs librrd)
- ######
HTTPCLIENT_INC=${PWD}/third-party/http-client-c/src/
- ######
--HAS_JSON=$(shell pkg-config --exists json-c; echo $$?)
--ifeq ($(HAS_JSON), 0)
-- JSON_INC = $(shell pkg-config --cflags json-c)
-- JSON_LIB = $(shell pkg-config --libs json-c)
--else
-- JSON_HOME=${PWD}/third-party/json-c
-- JSON_INC=-I$(JSON_HOME)
-- JSON_LIB=$(JSON_HOME)/.libs/libjson-c.a
--endif
-+JSON_INC = $(shell pkg-config --cflags json-c)
-+JSON_LIB = $(shell pkg-config --libs json-c)
- ######
--HAS_ZEROMQ=$(shell pkg-config --exists libzmq; echo $$?)
--ifeq ($(HAS_ZEROMQ), 0)
-- ZEROMQ_INC = $(shell pkg-config --cflags libzmq)
+@@ -79,7 +81,7 @@ endif
+ 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
-- ifeq ($(wildcard $(ZMQ_STATIC)),)
-- ZEROMQ_LIB = $(shell pkg-config --libs libzmq)
-- else
-- ZEROMQ_LIB = $(ZMQ_STATIC)
-- endif
--else
-- ZEROMQ_HOME=${PWD}/third-party/zeromq-4.1.3
-- ZEROMQ_INC=-I$(ZEROMQ_HOME)/include
-- ZEROMQ_LIB=$(ZEROMQ_HOME)/.libs/libzmq.a
--endif
-+ZEROMQ_INC = $(shell pkg-config --cflags libzmq)
-+ZEROMQ_LIB = $(shell pkg-config --libs libzmq)
- ######
- TARGET = ntopng
- LIBS = $(NDPI_LIB) $(LIBPCAP) $(LUAJIT_LIB) $(LIBRRDTOOL_LIB) $(ZEROMQ_LIB) $(JSON_LIB) @HIREDIS_LIB@ @SQLITE_LIB@ @MYSQL_LIB@ @LINK_OPTS@ @GEOIP_LIB@ @LDFLAGS@ @PRO_LIBS@ -lm -lpthread
-@@ -93,29 +49,11 @@ ifeq ($(OS),Darwin)
- LIBS += -lstdc++.6
- endif
-
--LIB_TARGETS =
--
--ifneq ($(HAS_LUAJIT), 0)
--LIB_TARGETS += $(LUAJIT_LIB)
-- endif
--
--ifneq ($(HAS_ZEROMQ), 0)
--LIB_TARGETS += $(ZEROMQ_LIB)
--endif
--
--ifneq ($(HAS_LIBRRDTOOL), 0)
--LIB_TARGETS += $(LIBRRDTOOL_LIB)
--endif
--
--ifneq ($(HAS_JSON), 0)
--LIB_TARGETS += $(JSON_LIB)
--endif
--
- .PHONY: default all clean docs test
-
- .NOTPARALLEL: default all
-
--default: $(NDPI_LIB_DEP) $(LIB_TARGETS) $(TARGET)
-+default: $(TARGET)
-
- all: default
-
-@@ -133,19 +71,6 @@ HEADERS = $(wildcard include/*.h) @PRO_H
- $(TARGET): $(OBJECTS) $(LIBRRDTOOL) Makefile
- $(GPP) $(OBJECTS) -Wall $(LIBS) -o $@
-
--$(LUAJIT_LIB):
-- cd $(LUAJIT_HOME); @GMAKE@
--
--$(ZEROMQ_LIB):
-- cd $(ZEROMQ_HOME); ./configure --without-documentation --without-libsodium; @GMAKE@
--
--# --disable-rrd_graph
--$(LIBRRDTOOL_LIB):
-- cd $(LIBRRDTOOL_HOME); ./configure --disable-libdbi --disable-libwrap --disable-rrdcgi --disable-libtool-lock --disable-nls --disable-rpath --disable-perl --disable-ruby --disable-lua --disable-tcl --disable-python --disable-dependency-tracking --disable-rrd_graph ; cd src; @GMAKE@ librrd_th.la
--
--$(JSON_LIB):
-- cd $(JSON_HOME); ./autogen.sh; ./configure; @GMAKE@
--
- clean:
- -rm -f src/*.o src/*~ include/*~ *~ #config.h
- -rm -f $(TARGET)
-@@ -155,18 +80,15 @@ cert:
- cat privkey.pem cert.pem > httpdocs/ssl/ntopng-cert.pem
- /bin/rm -f privkey.pem cert.pem
-
--veryclean: clean
-- -rm -rf nDPI
--
- geoip:
- @if test -d ~/dat_files ; then \
++ ZMQ_STATIC=/nonexistent
+ ifeq ($(wildcard $(ZMQ_STATIC)),)
+ ZEROMQ_LIB = $(shell pkg-config --libs libzmq)
+ else
+@@ -178,10 +180,10 @@ geoip:
cp ~/dat_files/* httpdocs/geoip; gunzip -f httpdocs/geoip/*.dat.gz ; \
else \
cd httpdocs/geoip; \
Modified: head/net/ntopng/files/patch-configure.seed
==============================================================================
--- head/net/ntopng/files/patch-configure.seed Mon Jun 5 15:40:59 2017 (r442670)
+++ head/net/ntopng/files/patch-configure.seed Mon Jun 5 15:43:45 2017 (r442671)
@@ -1,14 +1,18 @@
---- configure.seed.orig 2016-05-05 13:23:53 UTC
+--- configure.seed.orig 2017-06-01 07:18:57 UTC
+++ configure.seed
-@@ -14,22 +14,7 @@ NTOPNG_SHORT_VERSION="@SHORT_VERSION@"
+@@ -19,26 +19,8 @@ SYSTEM=`uname -s`
# On CentOS 6 `git rev-list HEAD --count` does not work
#
#
-REVISION=`git log --pretty=oneline | wc -l`
--
++#REVISION=`git log --pretty=oneline | wc -l`
+
-if test -d "/usr/local/include"; then
-CFLAGS="${CFLAGS} -I/usr/local/include"
-CPPFLAGS="${CPPFLAGS} -I/usr/local/include"
+-fi
+-
+-if test -d "/usr/local/lib"; then
-LDFLAGS="${LDFLAGS} -L/usr/local/lib"
-fi
-
@@ -20,11 +24,11 @@
-if test -d /opt/local/lib; then :
- LDFLAGS="${LDFLAGS} -L/opt/local/lib"
-fi
-+#REVISION=`git log --pretty=oneline | wc -l`
-
+-
if [ test -f /usr/bin/lsb_release ]; then
CODENAME=`/usr/bin/lsb_release -c|cut -f 2`
-@@ -46,28 +31,9 @@ GIT_BRANCH="@GIT_BRANCH@"
+ if [[ $CODENAME == "wheezy" ]]; then :
+@@ -54,26 +36,7 @@ GIT_BRANCH="@GIT_BRANCH@"
PRO_GIT_RELEASE="@PRO_GIT_RELEASE@"
PRO_GIT_DATE="@PRO_GIT_DATE@"
@@ -48,18 +52,14 @@
- fi
- fi
-fi
-+NDPI_HOME=/usr/local
++NDPI_HOME=%%LOCALBASE%%
--NDPI_LIB=$NDPI_HOME/src/lib/.libs/libndpi.a
-+NDPI_LIB=$NDPI_HOME/lib/libndpi.so
- AC_MSG_CHECKING(for $NDPI_LIB)
- if test -f "$NDPI_LIB" ; then :
- AC_MSG_RESULT(found $NDPI_LIB)
-@@ -359,19 +325,7 @@ if test x$GPP = x
+ if test -d "/usr/include/openssl"; then :
+ AC_DEFINE_UNQUOTED(NO_SSL_DL, 1, [has openssl])
+@@ -378,18 +341,6 @@ GMAKE=`which gmake`
+ if test x$GMAKE = x
then
- GPP="g++"
- else
-- GPP="$GPP -O0"
+ GMAKE="make"
-fi
-
-GIT=`which git`
@@ -72,7 +72,6 @@
-if test x$WGET = x
-then
- AC_MSG_RESULT(ERROR. wget is not installed on your host: you cannot download GeoIP data)
-+ GPP="$GPP ${CFLAGS}"
fi
umask 002
Modified: head/net/ntopng/pkg-plist
==============================================================================
--- head/net/ntopng/pkg-plist Mon Jun 5 15:40:59 2017 (r442670)
+++ head/net/ntopng/pkg-plist Mon Jun 5 15:43:45 2017 (r442671)
@@ -17,6 +17,7 @@ man/man8/ntopng.8.gz
%%DATADIR%%/httpdocs/css/Rickshaw/legend.css
%%DATADIR%%/httpdocs/css/bootstrap-datetimepicker.css
%%DATADIR%%/httpdocs/css/bootstrap-duallistbox.css
+%%DATADIR%%/httpdocs/css/bootstrap-nav-wizard.css
%%DATADIR%%/httpdocs/css/bootstrap-slider.css
%%DATADIR%%/httpdocs/css/bubble-chart.css
%%DATADIR%%/httpdocs/css/c3.css
@@ -71,6 +72,7 @@ man/man8/ntopng.8.gz
%%DATADIR%%/httpdocs/font-awesome/less/mixins.less
%%DATADIR%%/httpdocs/font-awesome/less/path.less
%%DATADIR%%/httpdocs/font-awesome/less/rotated-flipped.less
+%%DATADIR%%/httpdocs/font-awesome/less/screen-reader.less
%%DATADIR%%/httpdocs/font-awesome/less/stacked.less
%%DATADIR%%/httpdocs/font-awesome/less/variables.less
%%DATADIR%%/httpdocs/font-awesome/scss/_animated.scss
@@ -83,6 +85,7 @@ man/man8/ntopng.8.gz
%%DATADIR%%/httpdocs/font-awesome/scss/_mixins.scss
%%DATADIR%%/httpdocs/font-awesome/scss/_path.scss
%%DATADIR%%/httpdocs/font-awesome/scss/_rotated-flipped.scss
+%%DATADIR%%/httpdocs/font-awesome/scss/_screen-reader.scss
%%DATADIR%%/httpdocs/font-awesome/scss/_stacked.scss
%%DATADIR%%/httpdocs/font-awesome/scss/_variables.scss
%%DATADIR%%/httpdocs/font-awesome/scss/font-awesome.scss
@@ -128,9 +131,6 @@ man/man8/ntopng.8.gz
%%DATADIR%%/httpdocs/img/os_icon.png
%%DATADIR%%/httpdocs/img/throbber.gif
%%DATADIR%%/httpdocs/img/warning.png
-%%DATADIR%%/httpdocs/inc/aggregated_hosts_stats_bottom.inc
-%%DATADIR%%/httpdocs/inc/aggregated_hosts_stats_id.inc
-%%DATADIR%%/httpdocs/inc/aggregated_hosts_stats_top.inc
%%DATADIR%%/httpdocs/inc/as_stats_id.inc
%%DATADIR%%/httpdocs/inc/as_stats_top.inc
%%DATADIR%%/httpdocs/inc/community_stats_bottom.inc
@@ -138,11 +138,9 @@ man/man8/ntopng.8.gz
%%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_bottom.inc
%%DATADIR%%/httpdocs/inc/flows_stats_id.inc
-%%DATADIR%%/httpdocs/inc/flows_stats_middle.inc
-%%DATADIR%%/httpdocs/inc/flows_stats_top.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
@@ -164,6 +162,8 @@ man/man8/ntopng.8.gz
%%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
@@ -174,6 +174,7 @@ man/man8/ntopng.8.gz
%%DATADIR%%/httpdocs/inc/vlan_stats_id.inc
%%DATADIR%%/httpdocs/inc/vlan_stats_top.inc
%%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
@@ -185,7 +186,9 @@ man/man8/ntopng.8.gz
%%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/gauge.js
%%DATADIR%%/httpdocs/js/googleMapJson.js
@@ -193,6 +196,7 @@ man/man8/ntopng.8.gz
%%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
@@ -217,15 +221,28 @@ man/man8/ntopng.8.gz
%%DATADIR%%/httpdocs/js/timeline.js
%%DATADIR%%/httpdocs/js/validator.js
%%DATADIR%%/httpdocs/js/vfs_fonts.js
+%%DATADIR%%/httpdocs/misc/ntopng-add-user.sh
%%DATADIR%%/httpdocs/misc/ntopng_template_elk.json
%%DATADIR%%/httpdocs/other/EtherOUI.txt
%%DATADIR%%/httpdocs/ssl/README
%%DATADIR%%/httpdocs/ssl/ntopng-cert.pem.dummy
+%%DATADIR%%/httpdocs/templates/modal_confirm_dialog.html
+%%DATADIR%%/httpdocs/templates/traffic_report.html
+%%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/user_scripts/inline/default.lua
+%%DATADIR%%/scripts/callbacks/user_scripts/loader.lua
+%%DATADIR%%/scripts/callbacks/user_scripts/periodic/default.lua
+%%DATADIR%%/scripts/locales/en.lua
+%%DATADIR%%/scripts/locales/it.lua
%%DATADIR%%/scripts/lua/API.lua
%%DATADIR%%/scripts/lua/about.lua
%%DATADIR%%/scripts/lua/admin/add_user.lua
@@ -233,14 +250,17 @@ man/man8/ntopng.8.gz
%%DATADIR%%/scripts/lua/admin/delete_user.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/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_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/db.lua
-%%DATADIR%%/scripts/lua/db_query.lua
%%DATADIR%%/scripts/lua/do_export_data.lua
%%DATADIR%%/scripts/lua/examples/debug.lua
%%DATADIR%%/scripts/lua/examples/hello_world.lua
@@ -249,10 +269,15 @@ man/man8/ntopng.8.gz
%%DATADIR%%/scripts/lua/examples/sqlite.lua
%%DATADIR%%/scripts/lua/export_data.lua
%%DATADIR%%/scripts/lua/find_host.lua
+%%DATADIR%%/scripts/lua/find_member.lua
+%%DATADIR%%/scripts/lua/find_prefs.lua
%%DATADIR%%/scripts/lua/flow_details.lua
%%DATADIR%%/scripts/lua/flow_stats.lua
%%DATADIR%%/scripts/lua/flows_stats.lua
%%DATADIR%%/scripts/lua/get_alerts_data.lua
+%%DATADIR%%/scripts/lua/get_arp_data.lua
+%%DATADIR%%/scripts/lua/get_as_data.lua
+%%DATADIR%%/scripts/lua/get_ases_data.lua
%%DATADIR%%/scripts/lua/get_db_data.lua
%%DATADIR%%/scripts/lua/get_db_flows.lua
%%DATADIR%%/scripts/lua/get_flow_data.lua
@@ -267,18 +292,25 @@ man/man8/ntopng.8.gz
%%DATADIR%%/scripts/lua/get_host_contacts.lua
%%DATADIR%%/scripts/lua/get_host_daily_activity.lua
%%DATADIR%%/scripts/lua/get_host_data.lua
+%%DATADIR%%/scripts/lua/get_host_pools.lua
%%DATADIR%%/scripts/lua/get_host_traffic.lua
%%DATADIR%%/scripts/lua/get_hosts_data.lua
-%%DATADIR%%/scripts/lua/get_hosts_interaction.lua
%%DATADIR%%/scripts/lua/get_http_hosts.lua
%%DATADIR%%/scripts/lua/get_http_hosts_data.lua
+%%DATADIR%%/scripts/lua/get_icmp_data.lua
+%%DATADIR%%/scripts/lua/get_mac_data.lua
+%%DATADIR%%/scripts/lua/get_macs_data.lua
%%DATADIR%%/scripts/lua/get_nbox_data.lua
+%%DATADIR%%/scripts/lua/get_num_alerts.lua
%%DATADIR%%/scripts/lua/get_process_info.lua
%%DATADIR%%/scripts/lua/get_processes_data.lua
%%DATADIR%%/scripts/lua/get_system_hosts_interaction.lua
%%DATADIR%%/scripts/lua/get_top_talkers.lua
%%DATADIR%%/scripts/lua/get_treemap.lua
+%%DATADIR%%/scripts/lua/get_unknown_devices_data.lua
%%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
@@ -298,10 +330,12 @@ man/man8/ntopng.8.gz
%%DATADIR%%/scripts/lua/hosts_matrix.lua
%%DATADIR%%/scripts/lua/hosts_stats.lua
%%DATADIR%%/scripts/lua/hosts_treemap.lua
+%%DATADIR%%/scripts/lua/hotspot-detect.lua
%%DATADIR%%/scripts/lua/http_servers_stats.lua
%%DATADIR%%/scripts/lua/if_pkt_distro.lua
%%DATADIR%%/scripts/lua/if_stats.lua
%%DATADIR%%/scripts/lua/if_stats_ndpi.lua
+%%DATADIR%%/scripts/lua/if_tcpflags_pkt_distro.lua
%%DATADIR%%/scripts/lua/iface_flows_sankey.lua
%%DATADIR%%/scripts/lua/iface_hosts_list.lua
%%DATADIR%%/scripts/lua/iface_local_stats.lua
@@ -309,33 +343,54 @@ man/man8/ntopng.8.gz
%%DATADIR%%/scripts/lua/iface_ports_list.lua
%%DATADIR%%/scripts/lua/iface_tcp_stats.lua
%%DATADIR%%/scripts/lua/inc/add_user_dialog.lua
+%%DATADIR%%/scripts/lua/inc/bridge_wizard.lua
%%DATADIR%%/scripts/lua/inc/change_user_password_form.lua
%%DATADIR%%/scripts/lua/inc/delete_user_dialog.lua
%%DATADIR%%/scripts/lua/inc/footer.lua
%%DATADIR%%/scripts/lua/inc/menu.lua
%%DATADIR%%/scripts/lua/inc/password_dialog.lua
%%DATADIR%%/scripts/lua/inc/sankey.lua
-%%DATADIR%%/scripts/lua/inc/search_host_box.lua
%%DATADIR%%/scripts/lua/inc/sprobe.lua
%%DATADIR%%/scripts/lua/inc/users.lua
%%DATADIR%%/scripts/lua/index.lua
+%%DATADIR%%/scripts/lua/local_hosts_stats.lua
%%DATADIR%%/scripts/lua/login.lua
%%DATADIR%%/scripts/lua/logout.lua
+%%DATADIR%%/scripts/lua/mac_details.lua
%%DATADIR%%/scripts/lua/mac_stats.lua
-%%DATADIR%%/scripts/lua/mesh_antenna_stats.lua
+%%DATADIR%%/scripts/lua/modules/alert_api.lua
+%%DATADIR%%/scripts/lua/modules/alert_state_utils.lua
%%DATADIR%%/scripts/lua/modules/alert_utils.lua
+%%DATADIR%%/scripts/lua/modules/as_utils.lua
+%%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/dkjson.lua
+%%DATADIR%%/scripts/lua/modules/flow_aggregation_utils.lua
%%DATADIR%%/scripts/lua/modules/flow_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_lint.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/lua_trace.lua
%%DATADIR%%/scripts/lua/modules/lua_utils.lua
+%%DATADIR%%/scripts/lua/modules/mac_utils.lua
%%DATADIR%%/scripts/lua/modules/persistence.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_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
@@ -345,7 +400,7 @@ man/man8/ntopng.8.gz
%%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/traffic_stats.lua
+%%DATADIR%%/scripts/lua/modules/vlan_utils.lua
%%DATADIR%%/scripts/lua/modules/voip_utils.lua
%%DATADIR%%/scripts/lua/network_details.lua
%%DATADIR%%/scripts/lua/network_load.lua
@@ -354,14 +409,14 @@ man/man8/ntopng.8.gz
%%DATADIR%%/scripts/lua/page_not_found.lua
%%DATADIR%%/scripts/lua/pid_stats.lua
%%DATADIR%%/scripts/lua/please_wait.lua
+%%DATADIR%%/scripts/lua/pool_details.lua
+%%DATADIR%%/scripts/lua/pool_stats.lua
%%DATADIR%%/scripts/lua/popKeys.lua
%%DATADIR%%/scripts/lua/port_details.lua
%%DATADIR%%/scripts/lua/processes_stats.lua
-%%DATADIR%%/scripts/lua/protocols/dns_aggregations.lua
-%%DATADIR%%/scripts/lua/protocols/epp_aggregations.lua
+%%DATADIR%%/scripts/lua/reset_stats.lua
%%DATADIR%%/scripts/lua/resolve_address.lua
%%DATADIR%%/scripts/lua/runtime.lua
-%%DATADIR%%/scripts/lua/set_if_prefs.lua
%%DATADIR%%/scripts/lua/sflow_tree.lua
%%DATADIR%%/scripts/lua/sflows_stats.lua
%%DATADIR%%/scripts/lua/show_alerts.lua
@@ -374,10 +429,11 @@ man/man8/ntopng.8.gz
%%DATADIR%%/scripts/lua/sprobe_hosts_data.lua
%%DATADIR%%/scripts/lua/sprobe_hosts_interactions.lua
%%DATADIR%%/scripts/lua/sprobe_hosts_interactions_data.lua
-%%DATADIR%%/scripts/lua/system_hosts_interaction.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
%%DATADIR%%/scripts/lua/vlan_details.lua
%%DATADIR%%/scripts/lua/vlan_stats.lua
More information about the svn-ports-all
mailing list