Index: head/net/ndpi/Makefile =================================================================== --- head/net/ndpi/Makefile (revision 471571) +++ head/net/ndpi/Makefile (revision 471572) @@ -1,35 +1,43 @@ # Created by: Muhammad Moinur Rahman <5u623l20@gmail.com> # $FreeBSD$ PORTNAME= ndpi -PORTVERSION= 2.2.2018.01.31 +PORTVERSION= 2.2.2.d20180406 +PORTEPOCH= 1 CATEGORIES= net MAINTAINER= madpilot@FreeBSD.org COMMENT= NTOP-maintained superset of the popular OpenDPI library LICENSE= LGPL3+ 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 INSTALL_TARGET= install-strip USE_GITHUB= yes GH_ACCOUNT= ntop GH_PROJECT= nDPI -GH_TAGNAME= cf06823 +GH_TAGNAME= 0e11abc -PLIST_SUB= MAJOR_VER=${PORTVERSION:C/([[:digit:]])+\.([[:digit:]])+.*/\1.\2/}.0 +PLIST_SUB= MAJOR_VER=${PORTVERSION:R} post-patch: + @${REINPLACE_CMD} '/ndpi_config\.h/d' \ + ${WRKSRC}/src/include/ndpi_main.h cd ${WRKSRC} && ${SH} autogen.sh + +post-configure: + @${REINPLACE_CMD} -e 's/#define PACKAGE/#define NDPI_PACKAGE/g' \ + -e 's/#define VERSION/#define NDPI_VERSION/g' \ + ${WRKSRC}/configure .include Index: head/net/ndpi/distinfo =================================================================== --- head/net/ndpi/distinfo (revision 471571) +++ head/net/ndpi/distinfo (revision 471572) @@ -1,3 +1,3 @@ -TIMESTAMP = 1521102931 -SHA256 (ntop-nDPI-2.2.2018.01.31-cf06823_GH0.tar.gz) = 8fd272ec7d65daa636dd63762b15b65fe062115e51560dd73f94a9fc55ff5a57 -SIZE (ntop-nDPI-2.2.2018.01.31-cf06823_GH0.tar.gz) = 19938657 +TIMESTAMP = 1528128978 +SHA256 (ntop-nDPI-2.2.2.d20180406-0e11abc_GH0.tar.gz) = f59b8b4d960fb6fe3bbf8d67785c6798c34165e12c217105de3860d8fac5c372 +SIZE (ntop-nDPI-2.2.2.d20180406-0e11abc_GH0.tar.gz) = 20449092 Index: head/net/ndpi/files/patch-fix-libcache.h =================================================================== --- head/net/ndpi/files/patch-fix-libcache.h (revision 471571) +++ head/net/ndpi/files/patch-fix-libcache.h (nonexistent) @@ -1,50 +0,0 @@ -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 \ Property changes on: head/net/ndpi/files/patch-fix-libcache.h ___________________________________________________________________ Deleted: fbsd:nokeywords ## -1 +0,0 ## -yes \ No newline at end of property Deleted: svn:eol-style ## -1 +0,0 ## -native \ No newline at end of property Deleted: svn:mime-type ## -1 +0,0 ## -text/plain \ No newline at end of property Index: head/net/ndpi/files/patch-libndpi.sym =================================================================== --- head/net/ndpi/files/patch-libndpi.sym (revision 471571) +++ head/net/ndpi/files/patch-libndpi.sym (nonexistent) @@ -1,10 +0,0 @@ ---- 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 Property changes on: head/net/ndpi/files/patch-libndpi.sym ___________________________________________________________________ Deleted: fbsd:nokeywords ## -1 +0,0 ## -yes \ No newline at end of property Deleted: svn:eol-style ## -1 +0,0 ## -native \ No newline at end of property Deleted: svn:mime-type ## -1 +0,0 ## -text/plain \ No newline at end of property Index: head/net/ndpi/files/patch-autogen.sh =================================================================== --- head/net/ndpi/files/patch-autogen.sh (revision 471571) +++ head/net/ndpi/files/patch-autogen.sh (revision 471572) @@ -1,37 +1,47 @@ ---- autogen.sh.orig 2017-12-03 18:07:29 UTC +--- autogen.sh.orig 2018-04-06 15:23:12 UTC +++ autogen.sh -@@ -5,34 +5,4 @@ NDPI_MINOR="2" - NDPI_PATCH="0" +@@ -5,44 +5,9 @@ NDPI_MINOR="2" + NDPI_PATCH="2" NDPI_VERSION_SHORT="$NDPI_MAJOR.$NDPI_MINOR.$NDPI_PATCH" --/bin/rm -f configure config.h config.h.in src/lib/Makefile.in +-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) +-AUTOCONF=$(command -v autoconf) +-AUTOMAKE=$(command -v automake) +-LIBTOOL=$(command -v libtool) +-LIBTOOLIZE=$(command -v libtoolize) +-AUTORECONF=$(command -v 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 + cat configure.seed | sed \ + -e "s/@NDPI_MAJOR@/$NDPI_MAJOR/g" \ + -e "s/@NDPI_MINOR@/$NDPI_MINOR/g" \ + -e "s/@NDPI_PATCH@/$NDPI_PATCH/g" \ + -e "s/@NDPI_VERSION_SHORT@/$NDPI_VERSION_SHORT/g" \ + > configure.ac +- -autoreconf -ivf +-cat configure | sed "s/#define PACKAGE/#define NDPI_PACKAGE/g" | sed "s/#define VERSION/#define NDPI_VERSION/g" > configure.tmp +-cat configure.tmp > configure +- +-chmod +x configure -./configure $* Index: head/net/ndpi/pkg-plist =================================================================== --- head/net/ndpi/pkg-plist (revision 471571) +++ head/net/ndpi/pkg-plist (revision 471572) @@ -1,14 +1,15 @@ bin/ndpiReader include/libndpi-%%MAJOR_VER%%/libndpi/libcache.h include/libndpi-%%MAJOR_VER%%/libndpi/ndpi_api.h +include/libndpi-%%MAJOR_VER%%/libndpi/ndpi_config.h include/libndpi-%%MAJOR_VER%%/libndpi/ndpi_define.h include/libndpi-%%MAJOR_VER%%/libndpi/ndpi_includes.h include/libndpi-%%MAJOR_VER%%/libndpi/ndpi_main.h include/libndpi-%%MAJOR_VER%%/libndpi/ndpi_protocol_ids.h include/libndpi-%%MAJOR_VER%%/libndpi/ndpi_protocols.h include/libndpi-%%MAJOR_VER%%/libndpi/ndpi_typedefs.h lib/libndpi.a lib/libndpi.so lib/libndpi.so.1 lib/libndpi.so.1.0.0 libdata/pkgconfig/libndpi.pc Index: head/net/ntopng/Makefile =================================================================== --- head/net/ntopng/Makefile (revision 471571) +++ head/net/ntopng/Makefile (revision 471572) @@ -1,62 +1,62 @@ # Created by: Muhammad Moinur Rahman <5u623l20@gmail.com> # $FreeBSD$ PORTNAME= ntopng -PORTVERSION= 3.2.2018.03.13 +PORTVERSION= 3.4.d20180604 +PORTEPOCH= 1 CATEGORIES= net MAINTAINER= madpilot@FreeBSD.org COMMENT= Network monitoring tool with command line and web interfaces LICENSE= GPLv3 LICENSE_FILE= ${WRKSRC}/COPYING LIB_DEPENDS= librrd.so:databases/rrdtool \ libzmq.so:net/libzmq4 \ libcurl.so:ftp/curl \ libndpi.so:net/ndpi \ libjson-c.so:devel/json-c \ libsodium.so:security/libsodium BUILD_DEPENDS= bash:shells/bash 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 GNU_CONFIGURE= yes -USE_LDCONFIG= yes USERS= ntopng GROUPS= ntopng USE_GITHUB= yes GH_ACCOUNT= ntop -GH_TAGNAME= a7d7655 +GH_TAGNAME= 468d1eb CPE_VENDOR= ntop OPTIONS_DEFINE= GEOIP NLS OPTIONS_DEFAULT= GEOIP OPTIONS_SUB= yes GEOIP_LIB_DEPENDS= libGeoIP.so:net/GeoIP NLS_USES= gettext 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: ${STRIP_CMD} ${STAGEDIR}${PREFIX}/bin/ntopng post-install-GEOIP-on: ${INSTALL_SCRIPT} ${WRKDIR}/ntopng-geoipupdate.sh ${STAGEDIR}${PREFIX}/bin .include Index: head/net/ntopng/distinfo =================================================================== --- head/net/ntopng/distinfo (revision 471571) +++ head/net/ntopng/distinfo (revision 471572) @@ -1,3 +1,3 @@ -TIMESTAMP = 1521103085 -SHA256 (ntop-ntopng-3.2.2018.03.13-a7d7655_GH0.tar.gz) = 36d9fbd9135a7519d7eef85c6b9780387721c9253b9f29f97b4bcfb78e26a7f7 -SIZE (ntop-ntopng-3.2.2018.03.13-a7d7655_GH0.tar.gz) = 24195839 +TIMESTAMP = 1528128970 +SHA256 (ntop-ntopng-3.4.d20180604-468d1eb_GH0.tar.gz) = b021d7d97c2215997559bc164efca801ea889f00247ea3a16f3decf6bb2587d2 +SIZE (ntop-ntopng-3.4.d20180604-468d1eb_GH0.tar.gz) = 30715124 Index: head/net/ntopng/files/patch-src_DivertInterface.cpp =================================================================== --- head/net/ntopng/files/patch-src_DivertInterface.cpp (revision 471571) +++ head/net/ntopng/files/patch-src_DivertInterface.cpp (nonexistent) @@ -1,11 +0,0 @@ ---- src/DivertInterface.cpp.orig 2018-01-18 14:31:32 UTC -+++ src/DivertInterface.cpp -@@ -101,7 +101,7 @@ DivertInterface::DivertInterface(const char *name) : N - sin.sin_family = AF_INET, sin.sin_port = htons(port); - sin_len = sizeof(struct sockaddr_in); - -- if(bind(sock, (struct sockaddr *) &sin, sin_len) == -1) { -+ if(::bind(sock, (struct sockaddr *) &sin, sin_len) == -1) { - ntop->getTrace()->traceEvent(TRACE_ERROR, "Unable to bind divert socket to port %d", port); - throw 1; - } Property changes on: head/net/ntopng/files/patch-src_DivertInterface.cpp ___________________________________________________________________ Deleted: fbsd:nokeywords ## -1 +0,0 ## -yes \ No newline at end of property Deleted: svn:eol-style ## -1 +0,0 ## -native \ No newline at end of property Deleted: svn:mime-type ## -1 +0,0 ## -text/plain \ No newline at end of property Index: head/net/ntopng/files/patch-third-party_snmp_net.c =================================================================== --- head/net/ntopng/files/patch-third-party_snmp_net.c (revision 471571) +++ head/net/ntopng/files/patch-third-party_snmp_net.c (nonexistent) @@ -1,11 +0,0 @@ ---- third-party/snmp/net.c.orig 2018-01-12 09:48:20 UTC -+++ third-party/snmp/net.c -@@ -64,7 +64,7 @@ int open_udp_socket(int port) - si_me.sin_family = AF_INET; - si_me.sin_port = htons(port); - si_me.sin_addr.s_addr = htonl(INADDR_ANY); -- if (bind(s, (struct sockaddr *) &si_me, sizeof(si_me)) != 0) -+ if (::bind(s, (struct sockaddr *) &si_me, sizeof(si_me)) != 0) - return(-1); //diep("bind"); - - return s; Property changes on: head/net/ntopng/files/patch-third-party_snmp_net.c ___________________________________________________________________ Deleted: fbsd:nokeywords ## -1 +0,0 ## -yes \ No newline at end of property Deleted: svn:eol-style ## -1 +0,0 ## -native \ No newline at end of property Deleted: svn:mime-type ## -1 +0,0 ## -text/plain \ No newline at end of property Index: head/net/ntopng/files/patch-third-party_mongoose_mongoose.c =================================================================== --- head/net/ntopng/files/patch-third-party_mongoose_mongoose.c (revision 471571) +++ head/net/ntopng/files/patch-third-party_mongoose_mongoose.c (nonexistent) @@ -1,29 +0,0 @@ ---- third-party/mongoose/mongoose.c.orig 2018-01-12 09:48:20 UTC -+++ third-party/mongoose/mongoose.c -@@ -730,7 +730,7 @@ struct mg_request_info *mg_get_request_info(struct mg_ - return &conn->request_info; - } - --static void mg_strlcpy(register char *dst, register const char *src, size_t n) { -+static void mg_strlcpy(char *dst, const char *src, size_t n) { - for (; *src != '\0' && n > 1; n--) { - *dst++ = *src++; - } -@@ -2139,7 +2139,7 @@ static void MD5Init(MD5_CTX *ctx) { - } - - static void MD5Transform(uint32_t buf[4], uint32_t const in[16]) { -- register uint32_t a, b, c, d; -+ uint32_t a, b, c, d; - - a = buf[0]; - b = buf[1]; -@@ -4511,7 +4511,7 @@ static int set_ports_option(struct mg_context *ctx) { - (void *) - #endif - &on, sizeof(on))) != 0 || -- (rc_bind = bind(so.sock, -+ (rc_bind = ::bind(so.sock, - &sa->sa, - (sa->sa.sa_family == AF_INET) ? sizeof(sa->sin) : sizeof(sa->sin6)) - ) != 0 || Property changes on: head/net/ntopng/files/patch-third-party_mongoose_mongoose.c ___________________________________________________________________ Deleted: fbsd:nokeywords ## -1 +0,0 ## -yes \ No newline at end of property Deleted: svn:eol-style ## -1 +0,0 ## -native \ No newline at end of property Deleted: svn:mime-type ## -1 +0,0 ## -text/plain \ No newline at end of property Index: head/net/ntopng/files/patch-src_Utils.cpp =================================================================== --- head/net/ntopng/files/patch-src_Utils.cpp (revision 471571) +++ head/net/ntopng/files/patch-src_Utils.cpp (nonexistent) @@ -1,11 +0,0 @@ ---- src/Utils.cpp.orig 2018-01-12 09:48:20 UTC -+++ src/Utils.cpp -@@ -2370,7 +2370,7 @@ int Utils::bindSockToDevice(int sock, int family, cons - - if(pAdapterFound != NULL) { - int addrsize = (family == AF_INET6) ? sizeof(sockaddr_in6) : sizeof(sockaddr_in); -- bindresult = bind(sock, pAdapterFound->ifa_addr, addrsize); -+ bindresult = ::bind(sock, pAdapterFound->ifa_addr, addrsize); - } - - freeifaddrs(pList); Property changes on: head/net/ntopng/files/patch-src_Utils.cpp ___________________________________________________________________ Deleted: fbsd:nokeywords ## -1 +0,0 ## -yes \ No newline at end of property Deleted: svn:eol-style ## -1 +0,0 ## -native \ No newline at end of property Deleted: svn:mime-type ## -1 +0,0 ## -text/plain \ No newline at end of property Index: head/net/ntopng/files/patch-autogen.sh =================================================================== --- head/net/ntopng/files/patch-autogen.sh (revision 471571) +++ head/net/ntopng/files/patch-autogen.sh (revision 471572) @@ -1,11 +1,11 @@ ---- autogen.sh.orig 2016-05-05 13:23:53 UTC +--- autogen.sh.orig 2018-06-04 09:56:33 UTC +++ autogen.sh -@@ -30,8 +30,3 @@ fi - cat configure.seed | sed "s/@VERSION@/$VERSION/g" | sed "s/@SHORT_VERSION@/$SHORT_VERSION/g" | sed "s/@GIT_TAG@/$GIT_TAG/g" | sed "s/@GIT_DATE@/$GIT_DATE/g" | sed "s/@GIT_RELEASE@/$GIT_RELEASE/g" | sed "s/@GIT_BRANCH@/$GIT_BRANCH/g" | sed "s/@PRO_GIT_RELEASE@/$PRO_GIT_RELEASE/g" | sed "s/@PRO_GIT_DATE@/$PRO_GIT_DATE/g" > configure.ac +@@ -38,8 +38,3 @@ cat configure.seed | sed \ + > configure.ac - /bin/rm -f config.h config.h.in *~ #* + rm -f config.h config.h.in *~ #* - -echo "Wait please..." -autoreconf -if -echo "" -echo "Now run ./configure" Index: head/net/ntopng/files/patch-configure.seed =================================================================== --- head/net/ntopng/files/patch-configure.seed (revision 471571) +++ head/net/ntopng/files/patch-configure.seed (revision 471572) @@ -1,77 +1,65 @@ ---- configure.seed.orig 2018-01-12 09:48:20 UTC +--- configure.seed.orig 2018-06-04 09:56:33 UTC +++ configure.seed -@@ -29,26 +29,8 @@ fi +@@ -27,33 +27,8 @@ fi # 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 - -if test -d /opt/local/include; then : - CFLAGS="${CFLAGS} -I/opt/local/include" - CPPFLAGS="${CPPFLAGS} -I/opt/local/include" -fi - -if test -d /opt/local/lib; then : - LDFLAGS="${LDFLAGS} -L/opt/local/lib" -fi - - if [ test -f /usr/bin/lsb_release ]; then - CODENAME=`/usr/bin/lsb_release -c|cut -f 2` - if [[ $CODENAME == "wheezy" ]]; then : -@@ -64,26 +46,7 @@ GIT_BRANCH="@GIT_BRANCH@" - PRO_GIT_RELEASE="@PRO_GIT_RELEASE@" - PRO_GIT_DATE="@PRO_GIT_DATE@" - --AC_MSG_CHECKING(for nDPI) --NDPI_HOME=./nDPI --if test -d "$NDPI_HOME" ; then : -- AC_MSG_RESULT(found in $NDPI_HOME) --else -- NDPI_HOME=../nDPI -- if test -d "$NDPI_HOME"; then : -- AC_MSG_RESULT(found in $NDPI_HOME) -- else -- NDPI_HOME=$HOME/nDPI -- if test -d "$NDPI_HOME"; then : -- AC_MSG_RESULT(found in $NDPI_HOME) -- else -- AC_MSG_RESULT(not found) -- echo "Please do cd ..; git clone https://github.com/ntop/nDPI.git; cd nDPI; ./autogen.sh; make; cd ../ntopng" -- echo " and try again" -- exit -- fi +-if [ test -f /usr/bin/lsb_release ]; then +- CODENAME=`/usr/bin/lsb_release -c|cut -f 2` +- if [[ $CODENAME == "wheezy" ]]; then : +- CPPFLAGS="${CPPFLAGS} -DOLD_NETFILTER_INTERFACE=1" - fi -fi -+NDPI_HOME=%%LOCALBASE%% +- + SHORT_MACHINE=`uname -m | cut -b1-3` - if test -d "/usr/include/openssl"; then : - AC_DEFINE_UNQUOTED(NO_SSL_DL, 1, [has openssl]) -@@ -438,18 +401,6 @@ GMAKE=`which gmake` + GIT_RELEASE="@GIT_RELEASE@" +@@ -94,7 +69,7 @@ AC_ARG_WITH(ndpi-includes, + 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) +@@ -505,18 +480,6 @@ GMAKE=`which gmake` if test x$GMAKE = x then GMAKE="make" -fi - -GIT=`which git` -if test x$GIT = x -then - AC_MSG_RESULT(FATAL ERROR: git is not installed on your host) -fi - -WGET=`which wget` -if test x$WGET = x -then - AC_MSG_RESULT(ERROR. wget is not installed on your host: you cannot download GeoIP data) fi umask 002 Index: head/net/ntopng/pkg-plist =================================================================== --- head/net/ntopng/pkg-plist (revision 471571) +++ head/net/ntopng/pkg-plist (revision 471572) @@ -1,432 +1,448 @@ bin/ntopng %%GEOIP%%bin/ntopng-geoipupdate.sh man/man8/ntopng.8.gz %%DATADIR%%/httpdocs/bootstrap/css/bootstrap-theme.css %%DATADIR%%/httpdocs/bootstrap/css/bootstrap-theme.css.map %%DATADIR%%/httpdocs/bootstrap/css/bootstrap.css %%DATADIR%%/httpdocs/bootstrap/css/bootstrap.css.map %%DATADIR%%/httpdocs/bootstrap/fonts/glyphicons-halflings-regular.eot %%DATADIR%%/httpdocs/bootstrap/fonts/glyphicons-halflings-regular.svg %%DATADIR%%/httpdocs/bootstrap/fonts/glyphicons-halflings-regular.ttf %%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/css/Rickshaw/detail.css %%DATADIR%%/httpdocs/css/Rickshaw/graph.css %%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/cal-heatmap.css %%DATADIR%%/httpdocs/css/cubism.css +%%DATADIR%%/httpdocs/css/custom_theme.css %%DATADIR%%/httpdocs/css/datepicker.css %%DATADIR%%/httpdocs/css/dc.css %%DATADIR%%/httpdocs/css/flags.css %%DATADIR%%/httpdocs/css/images/ui-bg_diagonals-thick_18_b81900_40x40.png %%DATADIR%%/httpdocs/css/images/ui-bg_diagonals-thick_20_666666_40x40.png %%DATADIR%%/httpdocs/css/images/ui-bg_flat_10_000000_40x100.png %%DATADIR%%/httpdocs/css/images/ui-bg_glass_100_f6f6f6_1x400.png %%DATADIR%%/httpdocs/css/images/ui-bg_glass_100_fdf5ce_1x400.png %%DATADIR%%/httpdocs/css/images/ui-bg_glass_65_ffffff_1x400.png %%DATADIR%%/httpdocs/css/images/ui-bg_gloss-wave_35_f6a828_500x100.png %%DATADIR%%/httpdocs/css/images/ui-bg_highlight-soft_100_eeeeee_1x100.png %%DATADIR%%/httpdocs/css/images/ui-bg_highlight-soft_75_ffe45c_1x100.png %%DATADIR%%/httpdocs/css/images/ui-icons_222222_256x240.png %%DATADIR%%/httpdocs/css/images/ui-icons_228ef1_256x240.png %%DATADIR%%/httpdocs/css/images/ui-icons_ef8c08_256x240.png %%DATADIR%%/httpdocs/css/images/ui-icons_ffd27a_256x240.png %%DATADIR%%/httpdocs/css/images/ui-icons_ffffff_256x240.png %%DATADIR%%/httpdocs/css/jquery-ui.css %%DATADIR%%/httpdocs/css/ntopng.css %%DATADIR%%/httpdocs/css/nv.d3.css %%DATADIR%%/httpdocs/css/pagingbar.css %%DATADIR%%/httpdocs/css/pie-chart.css %%DATADIR%%/httpdocs/css/rickshaw.css %%DATADIR%%/httpdocs/css/sequence_sunburst.css %%DATADIR%%/httpdocs/css/tablesorted.css %%DATADIR%%/httpdocs/css/timeline.css %%DATADIR%%/httpdocs/css/timepicker.css %%DATADIR%%/httpdocs/favicon.ico %%DATADIR%%/httpdocs/font-awesome/HELP-US-OUT.txt %%DATADIR%%/httpdocs/font-awesome/css/font-awesome.css %%DATADIR%%/httpdocs/font-awesome/css/font-awesome.min.css %%DATADIR%%/httpdocs/font-awesome/fonts/FontAwesome.otf %%DATADIR%%/httpdocs/font-awesome/fonts/fontawesome-webfont.eot %%DATADIR%%/httpdocs/font-awesome/fonts/fontawesome-webfont.svg %%DATADIR%%/httpdocs/font-awesome/fonts/fontawesome-webfont.ttf %%DATADIR%%/httpdocs/font-awesome/fonts/fontawesome-webfont.woff %%DATADIR%%/httpdocs/font-awesome/fonts/fontawesome-webfont.woff2 %%DATADIR%%/httpdocs/font-awesome/less/animated.less %%DATADIR%%/httpdocs/font-awesome/less/bordered-pulled.less %%DATADIR%%/httpdocs/font-awesome/less/core.less %%DATADIR%%/httpdocs/font-awesome/less/fixed-width.less %%DATADIR%%/httpdocs/font-awesome/less/font-awesome.less %%DATADIR%%/httpdocs/font-awesome/less/icons.less %%DATADIR%%/httpdocs/font-awesome/less/larger.less %%DATADIR%%/httpdocs/font-awesome/less/list.less %%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 %%DATADIR%%/httpdocs/font-awesome/scss/_bordered-pulled.scss %%DATADIR%%/httpdocs/font-awesome/scss/_core.scss %%DATADIR%%/httpdocs/font-awesome/scss/_fixed-width.scss %%DATADIR%%/httpdocs/font-awesome/scss/_icons.scss %%DATADIR%%/httpdocs/font-awesome/scss/_larger.scss %%DATADIR%%/httpdocs/font-awesome/scss/_list.scss %%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 %%DATADIR%%/httpdocs/geoip/README %%DATADIR%%/httpdocs/img/asc.gif %%DATADIR%%/httpdocs/img/blank.gif %%DATADIR%%/httpdocs/img/block-end.png %%DATADIR%%/httpdocs/img/block-start.png %%DATADIR%%/httpdocs/img/cpu_icon.png %%DATADIR%%/httpdocs/img/desc.gif %%DATADIR%%/httpdocs/img/flags.png %%DATADIR%%/httpdocs/img/glyphicons-halflings-white.png %%DATADIR%%/httpdocs/img/glyphicons-halflings.png %%DATADIR%%/httpdocs/img/graph.gif %%DATADIR%%/httpdocs/img/info.png %%DATADIR%%/httpdocs/img/info_icon.png %%DATADIR%%/httpdocs/img/interaction-graph-icons/apache2.png %%DATADIR%%/httpdocs/img/interaction-graph-icons/firefox.png %%DATADIR%%/httpdocs/img/interaction-graph-icons/java.png %%DATADIR%%/httpdocs/img/interaction-graph-icons/nprobe.png %%DATADIR%%/httpdocs/img/interaction-graph-icons/ntopng.png %%DATADIR%%/httpdocs/img/interaction-graph-icons/redis-server.png %%DATADIR%%/httpdocs/img/interaction-graph-icons/remote_hosts.png %%DATADIR%%/httpdocs/img/interaction-graph-icons/sprobe.png %%DATADIR%%/httpdocs/img/loading.gif %%DATADIR%%/httpdocs/img/logo.png %%DATADIR%%/httpdocs/img/logo.svg %%DATADIR%%/httpdocs/img/maps/conv30.png %%DATADIR%%/httpdocs/img/maps/conv40.png %%DATADIR%%/httpdocs/img/maps/conv50.png %%DATADIR%%/httpdocs/img/maps/heart30.png %%DATADIR%%/httpdocs/img/maps/heart40.png %%DATADIR%%/httpdocs/img/maps/heart50.png %%DATADIR%%/httpdocs/img/maps/m1.png %%DATADIR%%/httpdocs/img/maps/m2.png %%DATADIR%%/httpdocs/img/maps/m3.png %%DATADIR%%/httpdocs/img/maps/m4.png %%DATADIR%%/httpdocs/img/maps/m5.png %%DATADIR%%/httpdocs/img/maps/people35.png %%DATADIR%%/httpdocs/img/maps/people45.png %%DATADIR%%/httpdocs/img/maps/people55.png %%DATADIR%%/httpdocs/img/network_icon.png %%DATADIR%%/httpdocs/img/os_icon.png %%DATADIR%%/httpdocs/img/throbber.gif %%DATADIR%%/httpdocs/img/warning.png %%DATADIR%%/httpdocs/inc/as_stats_id.inc %%DATADIR%%/httpdocs/inc/country_stats_id.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_id.inc %%DATADIR%%/httpdocs/inc/http_servers_stats_id.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_id.inc %%DATADIR%%/httpdocs/inc/network_stats_id.inc %%DATADIR%%/httpdocs/inc/os_stats_id.inc %%DATADIR%%/httpdocs/inc/pool_stats_id.inc %%DATADIR%%/httpdocs/inc/processes_stats_id.inc %%DATADIR%%/httpdocs/inc/sprobe_process.inc %%DATADIR%%/httpdocs/inc/sprobe_process_header.inc %%DATADIR%%/httpdocs/inc/vlan_stats_id.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.js %%DATADIR%%/httpdocs/js/bootstrap3-typeahead.js %%DATADIR%%/httpdocs/js/bubble-chart.js %%DATADIR%%/httpdocs/js/cal-heatmap.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/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.js %%DATADIR%%/httpdocs/js/jquery.peity.js %%DATADIR%%/httpdocs/js/jquery.tablesorter.js %%DATADIR%%/httpdocs/js/jquery_bootstrap.min.js %%DATADIR%%/httpdocs/js/jquery_bootstrap.min.js.map %%DATADIR%%/httpdocs/js/markerclusterer.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/ntopng_validators.js %%DATADIR%%/httpdocs/js/nv.d3.js %%DATADIR%%/httpdocs/js/pdfmake.js %%DATADIR%%/httpdocs/js/pie-chart.js +%%DATADIR%%/httpdocs/js/quotas_utils.js %%DATADIR%%/httpdocs/js/rickshaw.js %%DATADIR%%/httpdocs/js/ripe_widget_api.js %%DATADIR%%/httpdocs/js/sankey.js %%DATADIR%%/httpdocs/js/sequence_sunburst.js %%DATADIR%%/httpdocs/js/springy-ntop.js %%DATADIR%%/httpdocs/js/springyui-ntop.js %%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/other/TimeZones.txt %%DATADIR%%/httpdocs/other/trackers.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/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/pinger.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 %%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 %%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_details.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 %%DATADIR%%/scripts/lua/examples/interface.lua %%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_category.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 %%DATADIR%%/scripts/lua/get_flows_data.lua %%DATADIR%%/scripts/lua/get_geo_hosts.lua %%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_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_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_realtime.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_details.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 %%DATADIR%%/scripts/lua/host_l4_stats.lua %%DATADIR%%/scripts/lua/host_pkt_distro.lua %%DATADIR%%/scripts/lua/host_sflow_distro.lua %%DATADIR%%/scripts/lua/host_stats.lua %%DATADIR%%/scripts/lua/host_top_peers_protocols.lua %%DATADIR%%/scripts/lua/hosts_comparison.lua %%DATADIR%%/scripts/lua/hosts_comparison_bubble.lua %%DATADIR%%/scripts/lua/hosts_comparison_sankey.lua %%DATADIR%%/scripts/lua/hosts_geomap.lua %%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_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 %%DATADIR%%/scripts/lua/iface_local_stats.lua %%DATADIR%%/scripts/lua/iface_ndpi_stats.lua %%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/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_pkt_distro.lua %%DATADIR%%/scripts/lua/mac_stats.lua %%DATADIR%%/scripts/lua/macs_stats.lua -%%DATADIR%%/scripts/lua/modules/alert_api.lua +%%DATADIR%%/scripts/lua/metrics.lua +%%DATADIR%%/scripts/lua/modules/alert_consts.lua +%%DATADIR%%/scripts/lua/modules/alert_endpoints/email.lua +%%DATADIR%%/scripts/lua/modules/alert_endpoints/nagios.lua +%%DATADIR%%/scripts/lua/modules/alert_endpoints/slack.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/base64.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/discover_utils.lua %%DATADIR%%/scripts/lua/modules/dkjson.lua +%%DATADIR%%/scripts/lua/modules/doa_ox.lua %%DATADIR%%/scripts/lua/modules/flow_aggregation_utils.lua %%DATADIR%%/scripts/lua/modules/flow_utils.lua +%%DATADIR%%/scripts/lua/modules/format_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_talkers_utils.lua +%%DATADIR%%/scripts/lua/modules/tz_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 +%%DATADIR%%/scripts/lua/nindex.lua %%DATADIR%%/scripts/lua/os_stats.lua %%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/reset_stats.lua %%DATADIR%%/scripts/lua/resolve_address.lua %%DATADIR%%/scripts/lua/runtime.lua %%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 %%DATADIR%%/scripts/lua/sprobe_host_process.lua %%DATADIR%%/scripts/lua/sprobe_host_process_data.lua %%DATADIR%%/scripts/lua/sprobe_hosts.lua %%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/test_locales.lua %%DATADIR%%/scripts/lua/test_snmp.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