Date: Sat, 22 Dec 2018 20:06:53 +0000 (UTC) From: Guido Falsi <madpilot@FreeBSD.org> To: ports-committers@freebsd.org, svn-ports-all@freebsd.org, svn-ports-head@freebsd.org Subject: svn commit: r488125 - in head: . net/ndpi net/ndpi/files net/ntopng net/ntopng/files Message-ID: <201812222006.wBMK6rIA061906@repo.freebsd.org>
next in thread | raw e-mail | index | archive | help
Author: madpilot Date: Sat Dec 22 20:06:52 2018 New Revision: 488125 URL: https://svnweb.freebsd.org/changeset/ports/488125 Log: - Update ndpi to 2.6.d20181221 - Update ntopng to 3.8.d20181221 - Add USES=localbase to ndpi - Silence portlint warnings - Update WWW links - Add UPDATING note about data directory change nDPI changelog: https://github.com/ntop/nDPI/blob/dev/CHANGELOG.md ntopng changelog: https://github.com/ntop/ntopng/blob/dev/CHANGELOG.md Added: head/net/ndpi/files/patch-src_lib_Makefile.in - copied, changed from r488124, head/net/ndpi/files/patch-dynlibfix Deleted: head/net/ndpi/files/patch-dynlibfix head/net/ndpi/files/patch-libndpi.pc.in head/net/ndpi/files/patch-src_lib_ndpi__main.c head/net/ntopng/files/patch-third-party_LuaJIT-2.1.0-git_src_Makefile Modified: head/UPDATING head/net/ndpi/Makefile head/net/ndpi/distinfo head/net/ndpi/files/patch-autogen.sh head/net/ndpi/pkg-descr head/net/ndpi/pkg-plist 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/files/patch-src_NetworkInterface.cpp head/net/ntopng/pkg-descr head/net/ntopng/pkg-plist Modified: head/UPDATING ============================================================================== --- head/UPDATING Sat Dec 22 19:29:44 2018 (r488124) +++ head/UPDATING Sat Dec 22 20:06:52 2018 (r488125) @@ -5,6 +5,29 @@ they are unavoidable. You should get into the habit of checking this file for changes each time you update your ports collection, before attempting any port upgrades. +20181222: + AFFECTS: users of net/ntopng + AUTHOR: madpilot@FreeBSD.org + + Since ntopng 3.7, for security reasons, the default setting for + the data directory has been changed to "/var/lib/ntopng", and the + default user has been changed to "ntopng". This new directory is + created automatically by the port/package with correct permissions. + + In order to maintain backward compatibility, if you are already + using "/var/tmp/ntopng" as data directory, ntopng keeps using that + folder, owned by "nobody". This said, using the old defaults is not + recommended and a manual action is required in order to migrate to + the new settings, unless you are already using a custom directory: + + # service ntopng stop + # mv /var/tmp/ntopng/* /var/lib/ntopng/ + # chown -R ntopng:ntopng /var/lib/ntopng + # service ntopng start + + Please check hte upstream FAQ for reference: + https://www.ntop.org/support/faq/migrate-the-data-directory-in-ntopng/ + 20181218: AFFECTS: users of misc/openhab2 AUTHOR: netchild@FreeBSD.org Modified: head/net/ndpi/Makefile ============================================================================== --- head/net/ndpi/Makefile Sat Dec 22 19:29:44 2018 (r488124) +++ head/net/ndpi/Makefile Sat Dec 22 20:06:52 2018 (r488125) @@ -2,8 +2,7 @@ # $FreeBSD$ PORTNAME= ndpi -PORTVERSION= 2.4.d20180830 -PORTREVISION= 2 +PORTVERSION= 2.6.d20181221 PORTEPOCH= 1 CATEGORIES= net @@ -15,21 +14,22 @@ LICENSE_FILE= ${WRKSRC}/COPYING LIB_DEPENDS= libjson-c.so:devel/json-c -USES= autoreconf compiler:c++11-lang libtool pathfix pkgconfig +USES= autoreconf compiler:c++11-lang libtool localbase:ldflags pathfix \ + pkgconfig +USE_LDCONFIG= yes + 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= 33c35f5 +GH_TAGNAME= 7759f12 -PLIST_SUB= MAJOR_VER=${PORTVERSION:R} +PLIST_SUB= MAJOR_VER=${PORTVERSION:R:R} VER=${PORTVERSION:R} post-patch: (cd ${WRKSRC} && ${SH} autogen.sh) @@ -41,8 +41,12 @@ post-configure: post-install: ${STRIP_CMD} ${STAGEDIR}${PREFIX}/lib/libndpi.so.${PORTVERSION:R}.0 - ${RM} ${STAGEDIR}${PREFIX}/lib/libndpi.so + ${STRIP_CMD} ${STAGEDIR}${PREFIX}/bin/ndpiReader + ${RM} ${STAGEDIR}${PREFIX}/lib/libndpi.so \ + ${STAGEDIR}${PREFIX}/lib/libndpi.so.${PORTVERSION:R:R} ${RLN} ${STAGEDIR}${PREFIX}/lib/libndpi.so.${PORTVERSION:R}.0 \ ${STAGEDIR}${PREFIX}/lib/libndpi.so + ${RLN} ${STAGEDIR}${PREFIX}/lib/libndpi.so.${PORTVERSION:R}.0 \ + ${STAGEDIR}${PREFIX}/lib/libndpi.so.${PORTVERSION:R:R} .include <bsd.port.mk> Modified: head/net/ndpi/distinfo ============================================================================== --- head/net/ndpi/distinfo Sat Dec 22 19:29:44 2018 (r488124) +++ head/net/ndpi/distinfo Sat Dec 22 20:06:52 2018 (r488125) @@ -1,3 +1,3 @@ -TIMESTAMP = 1535621920 -SHA256 (ntop-nDPI-2.4.d20180830-33c35f5_GH0.tar.gz) = 9481007a601cb5140d0269305b76abba79055a8d74363a7678d7a8db7c227781 -SIZE (ntop-nDPI-2.4.d20180830-33c35f5_GH0.tar.gz) = 19308026 +TIMESTAMP = 1545486152 +SHA256 (ntop-nDPI-2.6.d20181221-7759f12_GH0.tar.gz) = fbbdf6ed3b1fbe8fcda271f683e3a53cca09c75a84ff43bd081aae530320f201 +SIZE (ntop-nDPI-2.6.d20181221-7759f12_GH0.tar.gz) = 19754891 Modified: head/net/ndpi/files/patch-autogen.sh ============================================================================== --- head/net/ndpi/files/patch-autogen.sh Sat Dec 22 19:29:44 2018 (r488124) +++ head/net/ndpi/files/patch-autogen.sh Sat Dec 22 20:06:52 2018 (r488125) @@ -1,10 +1,10 @@ ---- autogen.sh.orig 2018-04-06 15:23:12 UTC +--- autogen.sh.orig 2018-12-21 16:33:57 UTC +++ autogen.sh -@@ -5,44 +5,9 @@ NDPI_MINOR="2" - NDPI_PATCH="2" +@@ -5,44 +5,9 @@ NDPI_MINOR="6" + NDPI_PATCH="0" NDPI_VERSION_SHORT="$NDPI_MAJOR.$NDPI_MINOR.$NDPI_PATCH" --rm -f configure config.h config.h.in src/lib/Makefile.in +-rm -f configure config.h config.h.in - -AUTOCONF=$(command -v autoconf) -AUTOMAKE=$(command -v automake) Copied and modified: head/net/ndpi/files/patch-src_lib_Makefile.in (from r488124, head/net/ndpi/files/patch-dynlibfix) ============================================================================== --- head/net/ndpi/files/patch-dynlibfix Sat Dec 22 19:29:44 2018 (r488124, copy source) +++ head/net/ndpi/files/patch-src_lib_Makefile.in Sat Dec 22 20:06:52 2018 (r488125) @@ -1,218 +1,31 @@ -diff --git a/Makefile.am b/Makefile.am -index 17c67481..0642aec9 100644 ---- Makefile.am -+++ Makefile.am -@@ -1,8 +1,7 @@ - ACLOCAL_AMFLAGS = -I m4 -- - SUBDIRS = src/lib example tests - - pkgconfigdir = $(prefix)/libdata/pkgconfig - pkgconfig_DATA = libndpi.pc - --EXTRA_DIST = libndpi.sym autogen.sh -+EXTRA_DIST = autogen.sh -diff --git a/autogen.sh b/autogen.sh -index ea5ed669..20bf400a 100755 ---- configure.seed -+++ configure.seed -@@ -10,6 +10,7 @@ AC_PROG_CC - AM_PROG_CC_C_O - AX_PTHREAD - -+NDPI_VERSION_SHORT="@NDPI_VERSION_SHORT@" - NDPI_MAJOR="@NDPI_MAJOR@" - NDPI_MINOR="@NDPI_MINOR@" - NDPI_PATCH="@NDPI_PATCH@" -@@ -127,12 +128,13 @@ AC_ARG_ENABLE([debug-messages], - - AC_CHECK_LIB(pthread, pthread_setaffinity_np, AC_DEFINE_UNQUOTED(HAVE_PTHREAD_SETAFFINITY_NP, 1, [libc has pthread_setaffinity_np])) - --AC_CONFIG_FILES([Makefile example/Makefile tests/Makefile libndpi.pc src/include/ndpi_define.h]) -+AC_CONFIG_FILES([Makefile example/Makefile tests/Makefile libndpi.pc src/include/ndpi_define.h src/lib/Makefile]) - AC_CONFIG_HEADERS(src/include/ndpi_config.h) - AC_SUBST(GIT_RELEASE) - AC_SUBST(NDPI_MAJOR) - AC_SUBST(NDPI_MINOR) - AC_SUBST(NDPI_PATCH) -+AC_SUBST(NDPI_VERSION_SHORT) - AC_SUBST(SVN_DATE) - AC_SUBST(JSON_C_LIB) - AC_SUBST(PCAP_INC) -diff --git a/libndpi.sym b/libndpi.sym -deleted file mode 100644 -index 66cffbb1..00000000 ---- libndpi.sym -+++ /dev/null -@@ -1,75 +0,0 @@ --ndpi_dump_protocols --ndpi_strnstr --ndpi_detection_giveup --ndpi_get_proto_name --ndpi_free --ndpi_flow_free --ndpi_guess_undetected_protocol --ndpi_tfind --ndpi_tsearch --ndpi_set_protocol_detection_bitmask2 --ndpi_detection_get_sizeof_ndpi_id_struct --ndpi_detection_get_sizeof_ndpi_flow_struct --ndpi_load_protocols_file --ndpi_tdestroy --ndpi_exit_detection_module --ndpi_l4_detection_process_packet --ndpi_detection_process_packet --ndpi_process_extra_packet --ndpi_twalk --ndpi_tdelete --ndpi_revision --ndpi_init_detection_module --ndpi_get_num_supported_protocols --ndpi_set_proto_defaults --ndpi_get_protocol_id --ndpi_get_category_id --ndpi_find_port_based_protocol --ndpi_get_http_method --ndpi_get_http_url --ndpi_get_http_content_type --ndpi_free_flow --ndpi_get_proto_breed --ndpi_get_proto_breed_name --ndpi_get_proto_by_id --ndpi_get_proto_by_name --ndpi_get_protocol_id_master_proto --ndpi_guess_protocol_id --ndpi_protocol2name --ndpi_get_lower_proto --ndpi_is_proto --ndpi_malloc --ndpi_calloc --ndpi_set_detected_protocol --ndpi_match_string_subprotocol --ndpi_init_automa --ndpi_free_automa --ndpi_add_string_value_to_automa --ndpi_add_string_to_automa --ndpi_finalize_automa --ndpi_match_string --ndpi_match_string_id --set_ndpi_malloc --set_ndpi_flow_malloc --set_ndpi_free --set_ndpi_flow_free --set_ndpi_debug_function --ndpi_category_str --ndpi_get_proto_category --ndpi_netbios_name_interpret --ndpi_category_set_name --ndpi_category_get_name --ndpi_is_custom_category --ndpi_is_subprotocol_informative --ndpi_set_proto_category --ndpi_get_api_version --ndpi_network_ptree_match --ndpi_check_flow_func --ndpi_fill_protocol_category --ndpi_load_hostname_category --ndpi_enable_loaded_categories --ndpi_set_detection_preferences --ndpi_get_proto_defaults --ndpi_get_ndpi_num_supported_protocols --ndpi_get_ndpi_num_custom_protocols --ndpi_get_ndpi_detection_module_size -diff --git a/src/lib/Makefile b/src/lib/Makefile -deleted file mode 100644 -index 19c6f1cf..00000000 ---- src/lib/Makefile -+++ /dev/null -@@ -1,26 +0,0 @@ --# --# Simple non-autotools dependent makefile --# --# ./autogen.sh --# cd src/lib --# make -f Makefile.simple --# --CFLAGS += -fPIC -DPIC -I../include -Ithird_party/include -DNDPI_LIB_COMPILATION -g --RANLIB = ranlib -- --OBJECTS = $(patsubst protocols/%.c, protocols/%.o, $(wildcard protocols/*.c)) $(patsubst third_party/src/%.c, third_party/src/%.o, $(wildcard third_party/src/*.c)) ndpi_main.o --HEADERS = $(wildcard ../include/*.h) -- --all: libndpi.a -- --ndpi_main.c: ndpi_content_match.c.inc -- --libndpi.a: $(OBJECTS) -- ar rc $@ $(OBJECTS) -- $(RANLIB) $@ -- --%.o: %.c $(HEADERS) Makefile -- $(CC) $(CFLAGS) -c $< -o $@ -- --clean: - /bin/rm -f libndpi.a $(OBJECTS) -diff --git a/src/lib/Makefile.in b/src/lib/Makefile.in new file mode 100644 -index 00000000..1bbc4095 ---- /dev/null +--- src/lib/Makefile.in.orig 2018-12-21 16:33:57 UTC +++ src/lib/Makefile.in -@@ -0,0 +1,49 @@ -+# -+# Simple non-autotools dependent makefile -+# -+# ./autogen.sh -+# cd src/lib -+# make Makefile -+# -+ -+# -+# Installation directories -+# -+prefix = /usr/local -+libdir = ${prefix}/lib -+includedir = ${prefix}/include/ndpi -+ -+CFLAGS += -fPIC -DPIC -I../include -Ithird_party/include -DNDPI_LIB_COMPILATION -g -+RANLIB = ranlib -+ +@@ -17,24 +17,15 @@ CC = @CC@ + CFLAGS += -fPIC -DPIC -I../include -Ithird_party/include -DNDPI_LIB_COMPILATION -O2 -g + RANLIB = ranlib + +-OBJECTS = $(patsubst protocols/%.c, protocols/%.o, $(wildcard protocols/*.c)) $(patsubst third_party/src/%.c, third_party/src/%.o, $(wildcard third_party/src/*.c)) ndpi_main.o +-HEADERS = $(wildcard ../include/*.h) +OBJECTS != ls protocols/*.c | sed 's/\(.*\)\.c$$/\1.o/' && ls third_party/src/*.c | sed 's/\(.*\)\.c$$/\1.o/' && echo ndpi_main.o +HEADERS != ls ../include/*.h -+NDPI_LIB_STATIC = libndpi.a -+NDPI_LIB_SHARED_BASE = libndpi.so -+NDPI_LIB_SHARED = $(NDPI_LIB_SHARED_BASE).@NDPI_VERSION_SHORT@ -+NDPI_LIBS = $(NDPI_LIB_STATIC) $(NDPI_LIB_SHARED) -+ -+all: $(NDPI_LIBS) -+ -+ndpi_main.c: ndpi_content_match.c.inc -+ -+$(NDPI_LIB_STATIC): $(OBJECTS) -+ ar rc $@ $(OBJECTS) -+ $(RANLIB) $@ -+ -+$(NDPI_LIB_SHARED): $(OBJECTS) -+ $(CC) -shared -fPIC -Wl,-soname,$(NDPI_LIB_SHARED) -o $@ $(OBJECTS) -+ ln -Fs $(NDPI_LIB_SHARED) $(NDPI_LIB_SHARED_BASE) -+ -+%.o: %.c $(HEADERS) Makefile -+ $(CC) $(CFLAGS) -c $< -o $@ -+ -+clean: -+ /bin/rm -f $(NDPI_LIB_STATIC) $(OBJECTS) *.o *.so *.lo -+ -+install: $(NDPI_LIBS) -+ mkdir -p $(DESTDIR)$(libdir) -+ cp $(NDPI_LIBS) $(DESTDIR)$(libdir)/ -+ ln -Fs $(DESTDIR)$(libdir)/$(NDPI_LIB_SHARED) $(DESTDIR)$(libdir)/$(NDPI_LIB_SHARED_BASE) -+ mkdir -p $(DESTDIR)$(includedir) -+ cp ../include/*.h $(DESTDIR)$(includedir) -diff --git a/tests/result/ssdp-m-search.pcap.out b/tests/result/ssdp-m-search.pcap.out -new file mode 100644 -index 00000000..e975bfeb ---- /dev/null -+++ tests/result/ssdp-m-search.pcap.out -@@ -0,0 +1,3 @@ -+SSDP 19 1197 1 -+ -+ 1 UDP 192.168.242.8:42253 -> 192.168.242.255:32412 [proto: 12/SSDP][cat: System/18][19 pkts/1197 bytes -> 0 pkts/0 bytes] + NDPI_VERSION_MAJOR = @NDPI_MAJOR@ + NDPI_LIB_STATIC = libndpi.a + NDPI_LIB_SHARED_BASE = libndpi.so + NDPI_LIB_SHARED = $(NDPI_LIB_SHARED_BASE).@NDPI_VERSION_SHORT@ + NDPI_LIBS = $(NDPI_LIB_STATIC) $(NDPI_LIB_SHARED) + +-ifneq ($(OS),Windows_NT) +-OS := $(shell uname) +-endif +- +-ifeq ($(OS),Darwin) +-CC=clang +-SONAME_FLAG= +-else + SONAME_FLAG=-Wl,-soname,$(NDPI_LIB_SHARED_BASE).$(NDPI_VERSION_MAJOR) +-endif + + all: $(NDPI_LIBS) + Modified: head/net/ndpi/pkg-descr ============================================================================== --- head/net/ndpi/pkg-descr Sat Dec 22 19:29:44 2018 (r488124) +++ head/net/ndpi/pkg-descr Sat Dec 22 20:06:52 2018 (r488125) @@ -5,4 +5,4 @@ nDPI do be more suitable for traffic monitoring applic specific features that slow down the DPI engine while being them un-necessary for network traffic monitoring. -WWW: http://www.ntop.org/products/ndpi/ +WWW: https://www.ntop.org/products/deep-packet-inspection/ndpi/ Modified: head/net/ndpi/pkg-plist ============================================================================== --- head/net/ndpi/pkg-plist Sat Dec 22 19:29:44 2018 (r488124) +++ head/net/ndpi/pkg-plist Sat Dec 22 20:06:52 2018 (r488125) @@ -11,5 +11,6 @@ include/ndpi/ndpi_unix.h include/ndpi/ndpi_win32.h lib/libndpi.a lib/libndpi.so -lib/libndpi.so.%%MAJOR_VER%%.0 +lib/libndpi.so.%%MAJOR_VER%% +lib/libndpi.so.%%VER%%.0 libdata/pkgconfig/libndpi.pc Modified: head/net/ntopng/Makefile ============================================================================== --- head/net/ntopng/Makefile Sat Dec 22 19:29:44 2018 (r488124) +++ head/net/ntopng/Makefile Sat Dec 22 20:06:52 2018 (r488125) @@ -2,7 +2,7 @@ # $FreeBSD$ PORTNAME= ntopng -PORTVERSION= 3.6.d201800910 +PORTVERSION= 3.8.d20181221 PORTEPOCH= 1 CATEGORIES= net @@ -23,6 +23,7 @@ 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 \ httpdocs/misc/ntopng-utils-manage-config.in @@ -31,10 +32,11 @@ CONFIGURE_ARGS= --with-ndpi-includes=${LOCALBASE}/incl USERS= ntopng GROUPS= ntopng +PLIST_SUB= NTOPNGUSER="${USERS}" NTOPNGROUP="${GROUPS}" USE_GITHUB= yes GH_ACCOUNT= ntop -GH_TAGNAME= 96a403a +GH_TAGNAME= e7503c7 CPE_VENDOR= ntop @@ -52,12 +54,11 @@ 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-git/Makefile cd ${WRKSRC} && ${SH} autogen.sh post-install: ${STRIP_CMD} ${STAGEDIR}${PREFIX}/bin/ntopng + ${MKDIR} ${STAGEDIR}/var/lib/ntopng post-install-GEOIP-on: ${INSTALL_SCRIPT} ${WRKDIR}/ntopng-geoipupdate.sh ${STAGEDIR}${PREFIX}/bin Modified: head/net/ntopng/distinfo ============================================================================== --- head/net/ntopng/distinfo Sat Dec 22 19:29:44 2018 (r488124) +++ head/net/ntopng/distinfo Sat Dec 22 20:06:52 2018 (r488125) @@ -1,3 +1,3 @@ -TIMESTAMP = 1536591868 -SHA256 (ntop-ntopng-3.6.d201800910-96a403a_GH0.tar.gz) = 2c1c5c05a74d325a12c76dd03d6565e24debe032add807ded28673ddc5895c29 -SIZE (ntop-ntopng-3.6.d201800910-96a403a_GH0.tar.gz) = 30352530 +TIMESTAMP = 1545486562 +SHA256 (ntop-ntopng-3.8.d20181221-e7503c7_GH0.tar.gz) = 24513419f03079f6e1dbe2f8971094f8686443e73a0ae752c88fdbac41673c5d +SIZE (ntop-ntopng-3.8.d20181221-e7503c7_GH0.tar.gz) = 33912235 Modified: head/net/ntopng/files/patch-Makefile.in ============================================================================== --- head/net/ntopng/files/patch-Makefile.in Sat Dec 22 19:29:44 2018 (r488124) +++ head/net/ntopng/files/patch-Makefile.in Sat Dec 22 20:06:52 2018 (r488125) @@ -1,6 +1,6 @@ ---- Makefile.in.orig 2018-08-22 08:00:26 UTC +--- Makefile.in.orig 2018-12-21 18:58:17 UTC +++ Makefile.in -@@ -99,7 +99,7 @@ ifeq (@NEDGE@, 0) +@@ -95,7 +95,7 @@ ifeq (@NEDGE@, 0) HAS_ZEROMQ=$(shell pkg-config --exists libzmq; echo $$?) ifeq ($(HAS_ZEROMQ), 0) ZEROMQ_INC = $(shell pkg-config --cflags libzmq) Modified: head/net/ntopng/files/patch-configure.seed ============================================================================== --- head/net/ntopng/files/patch-configure.seed Sat Dec 22 19:29:44 2018 (r488124) +++ head/net/ntopng/files/patch-configure.seed Sat Dec 22 20:06:52 2018 (r488125) @@ -1,6 +1,6 @@ ---- configure.seed.orig 2018-06-04 09:56:33 UTC +--- configure.seed.orig 2018-12-21 18:58:17 UTC +++ configure.seed -@@ -27,33 +27,8 @@ fi +@@ -53,33 +53,8 @@ fi # On CentOS 6 `git rev-list HEAD --count` does not work # # @@ -35,7 +35,7 @@ SHORT_MACHINE=`uname -m | cut -b1-3` GIT_RELEASE="@GIT_RELEASE@" -@@ -94,7 +69,7 @@ AC_ARG_WITH(ndpi-includes, +@@ -131,7 +106,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 @@ -44,7 +44,7 @@ NDPI_LIB_DEP= ], [ AC_MSG_CHECKING(for nDPI source) -@@ -505,18 +480,6 @@ GMAKE=`which gmake` +@@ -530,18 +505,6 @@ GMAKE=`which gmake` if test x$GMAKE = x then GMAKE="make" Modified: head/net/ntopng/files/patch-src_NetworkInterface.cpp ============================================================================== --- head/net/ntopng/files/patch-src_NetworkInterface.cpp Sat Dec 22 19:29:44 2018 (r488124) +++ head/net/ntopng/files/patch-src_NetworkInterface.cpp Sat Dec 22 20:06:52 2018 (r488125) @@ -1,6 +1,6 @@ ---- src/NetworkInterface.cpp.orig 2018-08-22 08:00:26 UTC +--- src/NetworkInterface.cpp.orig 2018-12-21 18:58:17 UTC +++ src/NetworkInterface.cpp -@@ -6591,7 +6591,11 @@ bool NetworkInterface::matchLiveCapture(struct ntopngL +@@ -6772,7 +6772,11 @@ bool NetworkInterface::matchLiveCapture(struct ntopngL || (luactx->live_capture.matching_host == f->get_srv_host())) { if(luactx->live_capture.bpfFilterSet) { if(!bpf_filter(luactx->live_capture.fcode.bf_insns, Modified: head/net/ntopng/pkg-descr ============================================================================== --- head/net/ntopng/pkg-descr Sat Dec 22 19:29:44 2018 (r488124) +++ head/net/ntopng/pkg-descr Sat Dec 22 20:06:52 2018 (r488125) @@ -2,4 +2,4 @@ ntopng is a new generation flexible and feature-rich t troubleshooting local area networks. It provides command line and web interfaces, the latter via an embedded web server. ntop is based on libpcap. -WWW: http://www.ntop.org/products/ntop/ +WWW: https://www.ntop.org/products/traffic-analysis/ntop/ Modified: head/net/ntopng/pkg-plist ============================================================================== --- head/net/ntopng/pkg-plist Sat Dec 22 19:29:44 2018 (r488124) +++ head/net/ntopng/pkg-plist Sat Dec 22 20:06:52 2018 (r488125) @@ -15,7 +15,6 @@ man/man8/ntopng.8.gz %%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 @@ -42,7 +41,6 @@ man/man8/ntopng.8.gz %%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 @@ -133,8 +131,6 @@ man/man8/ntopng.8.gz %%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 @@ -156,6 +152,7 @@ man/man8/ntopng.8.gz %%DATADIR%%/httpdocs/js/Makefile %%DATADIR%%/httpdocs/js/README.gauge %%DATADIR%%/httpdocs/js/ays_utils.js +%%DATADIR%%/httpdocs/js/binary-indicators.js %%DATADIR%%/httpdocs/js/bootstrap-datatable.js %%DATADIR%%/httpdocs/js/bootstrap-datetimepicker.js %%DATADIR%%/httpdocs/js/bootstrap-slider.js @@ -171,6 +168,7 @@ man/man8/ntopng.8.gz %%DATADIR%%/httpdocs/js/dc.js %%DATADIR%%/httpdocs/js/deps.min.js %%DATADIR%%/httpdocs/js/deps.min.js.map +%%DATADIR%%/httpdocs/js/ebpf_utils.js %%DATADIR%%/httpdocs/js/gauge.js %%DATADIR%%/httpdocs/js/googleMapJson.js %%DATADIR%%/httpdocs/js/graph_utils.js @@ -178,7 +176,6 @@ man/man8/ntopng.8.gz %%DATADIR%%/httpdocs/js/ie_fix.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 @@ -191,18 +188,14 @@ man/man8/ntopng.8.gz %%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-utils-manage-config %%DATADIR%%/httpdocs/misc/ntopng-utils-manage-config.in @@ -212,10 +205,12 @@ man/man8/ntopng.8.gz %%DATADIR%%/httpdocs/other/TimeZones.txt %%DATADIR%%/httpdocs/other/lists/malware.txt %%DATADIR%%/httpdocs/other/lists/web_mining.txt +%%DATADIR%%/httpdocs/other/radcli_dictionary.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_extraction_dialog.html %%DATADIR%%/httpdocs/templates/traffic_report.html %%DATADIR%%/httpdocs/templates/typeahead_input.html %%DATADIR%%/httpdocs/templates/wizard_dialog.html @@ -228,6 +223,7 @@ man/man8/ntopng.8.gz %%DATADIR%%/scripts/callbacks/system/boot.lua %%DATADIR%%/scripts/callbacks/system/daily.lua %%DATADIR%%/scripts/callbacks/system/discover.lua +%%DATADIR%%/scripts/callbacks/system/hourly.lua %%DATADIR%%/scripts/callbacks/system/housekeeping.lua %%DATADIR%%/scripts/callbacks/system/minute.lua %%DATADIR%%/scripts/callbacks/system/pinger.lua @@ -235,16 +231,17 @@ man/man8/ntopng.8.gz %%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/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/edit_categories.lua +%%DATADIR%%/scripts/lua/admin/edit_device_protocols.lua +%%DATADIR%%/scripts/lua/admin/edit_profiles.lua +%%DATADIR%%/scripts/lua/admin/get_custom_categories_hosts.lua +%%DATADIR%%/scripts/lua/admin/get_device_protocols.lua %%DATADIR%%/scripts/lua/admin/get_ndpi_applications.lua %%DATADIR%%/scripts/lua/admin/get_user_info.lua %%DATADIR%%/scripts/lua/admin/get_users.lua @@ -252,13 +249,16 @@ man/man8/ntopng.8.gz %%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/remote_assistance.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/assistant_test.lua %%DATADIR%%/scripts/lua/authorize_captive.lua %%DATADIR%%/scripts/lua/captive_portal.lua %%DATADIR%%/scripts/lua/change_password.lua +%%DATADIR%%/scripts/lua/check_recording_data.lua %%DATADIR%%/scripts/lua/check_update.lua %%DATADIR%%/scripts/lua/country_details.lua %%DATADIR%%/scripts/lua/country_stats.lua @@ -287,8 +287,10 @@ man/man8/ntopng.8.gz %%DATADIR%%/scripts/lua/get_db_flows.lua %%DATADIR%%/scripts/lua/get_discover_data.lua %%DATADIR%%/scripts/lua/get_discover_progress.lua +%%DATADIR%%/scripts/lua/get_extracted_traffic.lua %%DATADIR%%/scripts/lua/get_flow_data.lua %%DATADIR%%/scripts/lua/get_flow_db_data.lua +%%DATADIR%%/scripts/lua/get_flow_process_tree.lua %%DATADIR%%/scripts/lua/get_flows_data.lua %%DATADIR%%/scripts/lua/get_geo_hosts.lua %%DATADIR%%/scripts/lua/get_grouped_hosts_data.lua @@ -302,12 +304,14 @@ man/man8/ntopng.8.gz %%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_influxdb_info.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_data.lua %%DATADIR%%/scripts/lua/get_process_info.lua %%DATADIR%%/scripts/lua/get_processes_data.lua +%%DATADIR%%/scripts/lua/get_processes_graph_data.lua %%DATADIR%%/scripts/lua/get_system_hosts_interaction.lua %%DATADIR%%/scripts/lua/get_top_realtime.lua %%DATADIR%%/scripts/lua/get_top_talkers.lua @@ -315,8 +319,10 @@ man/man8/ntopng.8.gz %%DATADIR%%/scripts/lua/get_ts.lua %%DATADIR%%/scripts/lua/get_unknown_devices_data.lua %%DATADIR%%/scripts/lua/get_user_info.lua +%%DATADIR%%/scripts/lua/get_username_data.lua %%DATADIR%%/scripts/lua/get_vlan_data.lua %%DATADIR%%/scripts/lua/get_vlans_data.lua +%%DATADIR%%/scripts/lua/google_assistant_utils.lua %%DATADIR%%/scripts/lua/host_details.lua %%DATADIR%%/scripts/lua/host_details_ndpi.lua %%DATADIR%%/scripts/lua/host_details_ndpi_categories.lua @@ -329,7 +335,6 @@ man/man8/ntopng.8.gz %%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 @@ -349,14 +354,19 @@ 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/edit_categories.lua +%%DATADIR%%/scripts/lua/inc/edit_ndpi_applications.lua +%%DATADIR%%/scripts/lua/inc/edit_presets.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/traffic_recording_config.lua +%%DATADIR%%/scripts/lua/inc/traffic_recording_jobs.lua +%%DATADIR%%/scripts/lua/inc/traffic_recording_status.lua %%DATADIR%%/scripts/lua/inc/users.lua %%DATADIR%%/scripts/lua/index.lua %%DATADIR%%/scripts/lua/info_portal.lua @@ -364,6 +374,7 @@ man/man8/ntopng.8.gz %%DATADIR%%/scripts/lua/live_capture_data.lua %%DATADIR%%/scripts/lua/live_capture_stats.lua %%DATADIR%%/scripts/lua/live_traffic.lua +%%DATADIR%%/scripts/lua/live_traffic_extraction.lua %%DATADIR%%/scripts/lua/local_hosts_stats.lua %%DATADIR%%/scripts/lua/login.lua %%DATADIR%%/scripts/lua/logout.lua @@ -378,23 +389,28 @@ man/man8/ntopng.8.gz %%DATADIR%%/scripts/lua/modules/alert_endpoints/nagios.lua %%DATADIR%%/scripts/lua/modules/alert_endpoints/sample.lua %%DATADIR%%/scripts/lua/modules/alert_endpoints/slack.lua +%%DATADIR%%/scripts/lua/modules/alert_endpoints/syslog.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/categories_utils.lua %%DATADIR%%/scripts/lua/modules/db_utils.lua %%DATADIR%%/scripts/lua/modules/delete_data_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/ebpf_utils.lua %%DATADIR%%/scripts/lua/modules/flow_aggregation_utils.lua %%DATADIR%%/scripts/lua/modules/flow_dbms/drivers/mysql.lua %%DATADIR%%/scripts/lua/modules/flow_dbms/drivers/nindex.lua %%DATADIR%%/scripts/lua/modules/flow_dbms/flow_dbms.lua +%%DATADIR%%/scripts/lua/modules/flow_field_value_maps.lua +%%DATADIR%%/scripts/lua/modules/flow_field_value_maps/sonicwall_app_id.lua %%DATADIR%%/scripts/lua/modules/flow_utils.lua %%DATADIR%%/scripts/lua/modules/format_utils.lua +%%DATADIR%%/scripts/lua/modules/google_assistant_utils.lua %%DATADIR%%/scripts/lua/modules/grafana/index.lua %%DATADIR%%/scripts/lua/modules/grafana/query.lua %%DATADIR%%/scripts/lua/modules/grafana/search.lua @@ -419,11 +435,15 @@ man/man8/ntopng.8.gz %%DATADIR%%/scripts/lua/modules/mac_utils.lua %%DATADIR%%/scripts/lua/modules/ntop_utils.lua %%DATADIR%%/scripts/lua/modules/os_utils.lua +%%DATADIR%%/scripts/lua/modules/page_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/presets_utils.lua +%%DATADIR%%/scripts/lua/modules/recording_utils.lua %%DATADIR%%/scripts/lua/modules/recovery_utils.lua +%%DATADIR%%/scripts/lua/modules/remote_assistance.lua %%DATADIR%%/scripts/lua/modules/resty/template.lua %%DATADIR%%/scripts/lua/modules/resty/template/html.lua %%DATADIR%%/scripts/lua/modules/resty/template/microbenchmark.lua @@ -432,32 +452,38 @@ man/man8/ntopng.8.gz %%DATADIR%%/scripts/lua/modules/rrd_paths.lua %%DATADIR%%/scripts/lua/modules/rrd_utils.lua %%DATADIR%%/scripts/lua/modules/sqlite_utils.lua +%%DATADIR%%/scripts/lua/modules/storage_utils.lua %%DATADIR%%/scripts/lua/modules/telegram.lua %%DATADIR%%/scripts/lua/modules/template.lua %%DATADIR%%/scripts/lua/modules/template_utils.lua %%DATADIR%%/scripts/lua/modules/timeseries/drivers/influxdb.lua +%%DATADIR%%/scripts/lua/modules/timeseries/drivers/nindex.lua %%DATADIR%%/scripts/lua/modules/timeseries/drivers/rrd.lua %%DATADIR%%/scripts/lua/modules/timeseries/drivers/sample.lua %%DATADIR%%/scripts/lua/modules/timeseries/schemas/ts_5min.lua +%%DATADIR%%/scripts/lua/modules/timeseries/schemas/ts_custom.lua +%%DATADIR%%/scripts/lua/modules/timeseries/schemas/ts_hour.lua %%DATADIR%%/scripts/lua/modules/timeseries/schemas/ts_minute.lua %%DATADIR%%/scripts/lua/modules/timeseries/schemas/ts_second.lua -%%DATADIR%%/scripts/lua/modules/timeseries/tests/influxdb_test.lua +%%DATADIR%%/scripts/lua/modules/timeseries/tests/influxdb2series.lua +%%DATADIR%%/scripts/lua/modules/timeseries/tests/influxdb_queries.lua %%DATADIR%%/scripts/lua/modules/timeseries/tests/run.lua +%%DATADIR%%/scripts/lua/modules/timeseries/tests/test_utils.lua %%DATADIR%%/scripts/lua/modules/timeseries/tests/utils_test.lua %%DATADIR%%/scripts/lua/modules/timeseries/ts_common.lua %%DATADIR%%/scripts/lua/modules/timeseries/ts_schema.lua %%DATADIR%%/scripts/lua/modules/timeseries/ts_utils.lua %%DATADIR%%/scripts/lua/modules/timeseries/ts_utils_core.lua %%DATADIR%%/scripts/lua/modules/top_talkers_utils.lua +%%DATADIR%%/scripts/lua/modules/tracker.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_state.lua %%DATADIR%%/scripts/lua/network_stats.lua -%%DATADIR%%/scripts/lua/nindex.lua -%%DATADIR%%/scripts/lua/nindex_topk.lua %%DATADIR%%/scripts/lua/os_stats.lua %%DATADIR%%/scripts/lua/page_not_found.lua %%DATADIR%%/scripts/lua/pid_stats.lua @@ -465,28 +491,28 @@ man/man8/ntopng.8.gz %%DATADIR%%/scripts/lua/pool_details.lua %%DATADIR%%/scripts/lua/pool_stats.lua %%DATADIR%%/scripts/lua/port_details.lua +%%DATADIR%%/scripts/lua/process_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/stop_live_capture.lua %%DATADIR%%/scripts/lua/test_locales.lua %%DATADIR%%/scripts/lua/test_snmp.lua %%DATADIR%%/scripts/lua/top_hosts.lua +%%DATADIR%%/scripts/lua/traffic_extraction.lua +%%DATADIR%%/scripts/lua/traffic_extraction_data.lua %%DATADIR%%/scripts/lua/unknown_devices.lua %%DATADIR%%/scripts/lua/user_stats.lua +%%DATADIR%%/scripts/lua/username_details.lua %%DATADIR%%/scripts/lua/vlan_details.lua %%DATADIR%%/scripts/lua/vlan_stats.lua +@dir(%%NTOPNGUSER%%,%%NTOPNGGROUP%%,750) /var/lib/ntopng +@dir /var/lib
Want to link to this message? Use this URL: <https://mail-archive.FreeBSD.org/cgi/mid.cgi?201812222006.wBMK6rIA061906>