Skip site navigation (1)Skip section navigation (2)
Date:      Mon, 2 Dec 2013 08:00:56 +0000 (UTC)
From:      Sunpoet Po-Chuan Hsieh <sunpoet@FreeBSD.org>
To:        ports-committers@freebsd.org, svn-ports-all@freebsd.org, svn-ports-head@freebsd.org
Subject:   svn commit: r335455 - in head/net: . ntopng ntopng/files
Message-ID:  <201312020800.rB280ufY015956@svn.freebsd.org>

next in thread | raw e-mail | index | archive | help
Author: sunpoet
Date: Mon Dec  2 08:00:56 2013
New Revision: 335455
URL: http://svnweb.freebsd.org/changeset/ports/335455

Log:
  - Add ntopng 1.1
  
  ntopng is a new generation flexible and feature-rich tool for monitoring and
  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/
  
  PR:		ports/184197
  Submitted by:	Muhammad Moinur Rahman <5u623l20@gmail.com>

Added:
  head/net/ntopng/
  head/net/ntopng/Makefile   (contents, props changed)
  head/net/ntopng/distinfo   (contents, props changed)
  head/net/ntopng/files/
  head/net/ntopng/files/ntopng.in   (contents, props changed)
  head/net/ntopng/files/patch-Makefile.in   (contents, props changed)
  head/net/ntopng/files/patch-Ntop.cpp   (contents, props changed)
  head/net/ntopng/files/patch-configure   (contents, props changed)
  head/net/ntopng/files/patch-credis.c   (contents, props changed)
  head/net/ntopng/pkg-descr   (contents, props changed)
  head/net/ntopng/pkg-message   (contents, props changed)
  head/net/ntopng/pkg-plist   (contents, props changed)
Modified:
  head/net/Makefile

Modified: head/net/Makefile
==============================================================================
--- head/net/Makefile	Mon Dec  2 07:58:39 2013	(r335454)
+++ head/net/Makefile	Mon Dec  2 08:00:56 2013	(r335455)
@@ -442,6 +442,7 @@
     SUBDIR += nstxd
     SUBDIR += ntlmaps
     SUBDIR += ntop
+    SUBDIR += ntopng
     SUBDIR += ntp
     SUBDIR += ntp-devel
     SUBDIR += ntp-rc

Added: head/net/ntopng/Makefile
==============================================================================
--- /dev/null	00:00:00 1970	(empty, because file is newly added)
+++ head/net/ntopng/Makefile	Mon Dec  2 08:00:56 2013	(r335455)
@@ -0,0 +1,88 @@
+# Created by: Muhammad Moinur Rahman <5u623l20@gmail.com>
+# $FreeBSD$
+
+PORTNAME=	ntopng
+PORTVERSION=	1.1
+CATEGORIES=	net
+MASTER_SITES=	SF/ntop/${PORTNAME}:source1 \
+		http://geolite.maxmind.com/download/geoip/database/:source2 \
+		http://geolite.maxmind.com/download/geoip/database/GeoLiteCityv6-beta/:source3 \
+		http://download.maxmind.com/download/geoip/database/asnum/:source4
+DISTFILES=	${DISTNAME}_6932.tgz:source1 \
+		GeoLiteCity.dat.gz:source2 \
+		GeoLiteCityv6.dat.gz:source3 \
+		GeoIPASNum.dat.gz:source4 \
+		GeoIPASNumv6.dat.gz:source4
+EXTRACT_ONLY=	${DISTNAME}_6932.tgz
+
+MAINTAINER=	5u623l20@gmail.com
+COMMENT=	Network monitoring tool with command line and web interfaces
+
+LICENSE=	GPLv3
+
+BUILD_DEPENDS=	bash:${PORTSDIR}/shells/bash \
+		geoiplookup:${PORTSDIR}/net/GeoIP
+LIB_DEPENDS=	libcairo.so:${PORTSDIR}/graphics/cairo \
+		libluajit-5.1.so:${PORTSDIR}/lang/luajit \
+		libzmq.so:${PORTSDIR}/devel/ntopng-zmq
+
+CPPFLAGS+=	-I${LOCALBASE}/include/luajit-2.0
+GNU_CONFIGURE=	yes
+MAKE_JOBS_UNSAFE=	yes
+USE_GCC=	any
+USE_GNOME=	intltool
+USE_LDCONFIG=	yes
+USES=	 	gmake pathfix pkgconfig
+WRKSRC=		${WRKDIR}/${DISTNAME}_6932
+
+USE_RC_SUBR=	ntopng
+
+post-extract:
+	@${CP} ${DISTDIR}/GeoLiteCity.dat.gz ${WRKDIR}
+	@${CP} ${DISTDIR}/GeoLiteCityv6.dat.gz ${WRKDIR}
+	@${CP} ${DISTDIR}/GeoIPASNum.dat.gz ${WRKDIR}
+	@${CP} ${DISTDIR}/GeoIPASNumv6.dat.gz ${WRKDIR}
+	@${RM} ${WRKSRC}/scripts/lua/modules/redis.lua
+	@${CP} ${WRKSRC}/third-party/redis-lua/src/redis.lua ${WRKSRC}/scripts/lua/modules/redis.lua
+	@${FIND} ${WRKSRC} -name "*~" -delete
+	@cd ${WRKDIR} && ${GUNZIP_CMD} GeoLiteCity.dat.gz GeoLiteCityv6.dat.gz GeoIPASNum.dat.gz GeoIPASNumv6.dat.gz
+
+post-patch:
+	@${REINPLACE_CMD} -e "s#/bin/bash#/usr/local/bin/bash#" ${WRKSRC}/third-party/rrdtool-1.4.7/Makefile \
+		${WRKSRC}/third-party/rrdtool-1.4.7/config.status ${WRKSRC}/third-party/rrdtool-1.4.7/src/Makefile \
+		${WRKSRC}/third-party/rrdtool-1.4.7/bindings/Makefile ${WRKSRC}/third-party/rrdtool-1.4.7/doc/Makefile \
+		${WRKSRC}/third-party/rrdtool-1.4.7/examples/Makefile \
+	       	${WRKSRC}/third-party/rrdtool-1.4.7/examples/rrdcached/Makefile
+	@${REINPLACE_CMD} -e "s#%%LUAJIT_LIB%%#LUAJIT_LIB=${LOCALBASE}/lib/libluajit-5.1.a#" ${WRKSRC}/Makefile.in
+	@${REINPLACE_CMD} -e "s#%%ZEROMQ_LIB%%#ZEROMQ_LIB=${LOCALBASE}/lib/libzmq.a#" ${WRKSRC}/Makefile.in
+	@${REINPLACE_CMD} -e "s#%%STAGEDIR%%%%DATADIR%%#${STAGEDIR}${DATADIR}#" ${WRKSRC}/Makefile.in
+	@${REINPLACE_CMD} -e "s#%%STAGEDIR%%%%PREFIX%%#${STAGEDIR}${PREFIX}#" ${WRKSRC}/Makefile.in
+	@${REINPLACE_CMD} -e "s#%%WRKSRC%%#${WRKSRC}#" ${WRKSRC}/Makefile.in
+	@${REINPLACE_CMD} -e "s#%%WRKDIR%%#${WRKDIR}#" ${WRKSRC}/Makefile.in
+	@${REINPLACE_CMD} -e "s#%%PORTNAME%%#${PORTNAME}#" ${WRKSRC}/Makefile.in
+	@${REINPLACE_CMD} -e "s#%%LOCALBASE%%#${LOCALBASE}#" ${WRKSRC}/Makefile.in
+	@${REINPLACE_CMD} -e "s#%%INSTALL_PROGRAM%%#${INSTALL_PROGRAM}#" ${WRKSRC}/Makefile.in
+	@${REINPLACE_CMD} -e "s#%%INSTALL_MAN%%#${INSTALL_MAN}#" ${WRKSRC}/Makefile.in
+	@${REINPLACE_CMD} -e "s#%%INSTALL_SCRIPT%%#${INSTALL_SCRIPT}#" ${WRKSRC}/Makefile.in
+	@${REINPLACE_CMD} -e "s#%%INSTALL_DATA%%#${INSTALL_DATA}#" ${WRKSRC}/Makefile.in
+	@${REINPLACE_CMD} -e "s#%%G++%%#${CXX}#" ${WRKSRC}/Makefile.in
+
+pre-build:
+	cd ${WRKSRC}/third-party/json-c && ${MAKE} clean && ./configure && ${MAKE}
+	cd ${WRKSRC}/third-party/rrdtool-1.4.7 && ${MAKE} clean \
+	&& ./configure --disable-rrd_graph \
+	--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 && \
+	cd src && ${GMAKE} librrd_th.la
+	cd ${WRKSRC}/third-party/credis-0.2.3 && ${GMAKE} clean && ${GMAKE}
+
+post-install:
+	${MKDIR} ${STAGEDIR}${DATADIR}
+	${MKDIR} ${STAGEDIR}${DATADIR}/httpdocs
+	${MKDIR} ${STAGEDIR}${DATADIR}/httpdocs/geoip
+	${MKDIR} ${STAGEDIR}${DATADIR}/scripts
+	cd ${WRKSRC}/httpdocs && ${COPYTREE_SHARE} . ${STAGEDIR}${DATADIR}/httpdocs
+	cd ${WRKSRC}/scripts && ${COPYTREE_SHARE} . ${STAGEDIR}${DATADIR}/scripts
+
+.include <bsd.port.mk>

Added: head/net/ntopng/distinfo
==============================================================================
--- /dev/null	00:00:00 1970	(empty, because file is newly added)
+++ head/net/ntopng/distinfo	Mon Dec  2 08:00:56 2013	(r335455)
@@ -0,0 +1,10 @@
+SHA256 (ntopng-1.1_6932.tgz) = f9dbc621efa7354fa65d93d043dceabcfb55a7b56e83c87e3f6b8d2b75aeab31
+SIZE (ntopng-1.1_6932.tgz) = 45064737
+SHA256 (GeoLiteCity.dat.gz) = b92dad48943b388e73e542b5f895850d4de4d78d8f3ecaaa85214bd46ded6930
+SIZE (GeoLiteCity.dat.gz) = 26285561
+SHA256 (GeoLiteCityv6.dat.gz) = 54745e189726fd79761b2fe22197221cdf5d501b81214343b990405a726a852d
+SIZE (GeoLiteCityv6.dat.gz) = 10630112
+SHA256 (GeoIPASNum.dat.gz) = a4bb84c319bf3d9643e2a2c72c7bcded2aa7db5b76f07652c2fd653e751a59c8
+SIZE (GeoIPASNum.dat.gz) = 1913167
+SHA256 (GeoIPASNumv6.dat.gz) = b42f01f01bc8c21ba5f09b898981ce1358d0cbed2bab304708b293a4fa1226bf
+SIZE (GeoIPASNumv6.dat.gz) = 2006882

Added: head/net/ntopng/files/ntopng.in
==============================================================================
--- /dev/null	00:00:00 1970	(empty, because file is newly added)
+++ head/net/ntopng/files/ntopng.in	Mon Dec  2 08:00:56 2013	(r335455)
@@ -0,0 +1,35 @@
+#!/bin/sh
+#
+# $FreeBSD$
+#
+# PROVIDE: ntopng
+# REQUIRE: DAEMON
+# KEYWORD: shutdown
+#
+# Add the following lines to /etc/rc.conf to enable ntop:
+#
+# ntopng_enable (bool):		Set it to "YES" to enable ntop
+#				Default is "NO".
+# ntopng_flags (flags):		Set extra flags to ntop
+#				Default is "-d --use-syslog=daemon". see ntop(8).
+#
+
+. /etc/rc.subr
+
+name=ntopng
+rcvar=ntopng_enable
+pid_path=/var/run/${name}.pid
+httpdocs_path=%%DATADIR%%/httpdocs
+scripts_path=%%DATADIR%%/scripts
+callbacks_path=%%DATADIR%%/scripts/callbacks
+user_path=%%PREFIX%%/etc/ntopng-users.conf
+
+load_rc_config $name
+
+: ${ntopng_enable="NO"}
+: ${ntopng_flags="-e -G ${pid_path}"}
+
+command=%%PREFIX%%/bin/ntopng
+command_args="-e -G $pid_path -1 $httpdocs_path -2 $scripts_path -3 $callbacks_path
+
+run_rc_command "$1"

Added: head/net/ntopng/files/patch-Makefile.in
==============================================================================
--- /dev/null	00:00:00 1970	(empty, because file is newly added)
+++ head/net/ntopng/files/patch-Makefile.in	Mon Dec  2 08:00:56 2013	(r335455)
@@ -0,0 +1,118 @@
+--- Makefile.in.orig	2013-11-04 06:15:16.000000000 +0600
++++ Makefile.in	2013-11-18 21:50:52.000000000 +0600
+@@ -1,5 +1,4 @@
+-SHELL=/bin/bash
+-OS := $(shell uname -s)
++OS=FreeBSD
+ ######
+ CREDIS_HOME=third-party/credis-0.2.3
+ CREDIS=$(CREDIS_HOME)/credis.o
+@@ -13,9 +12,7 @@
+ MONGOOSE_HOME=./third-party/mongoose
+ MONGOOSE_INC=-I$(MONGOOSE_HOME)
+ ######
+-LUAJIT_HOME=./third-party/LuaJIT-2.0.2
+-LUAJIT_INC=-I$(LUAJIT_HOME)/src
+-LUAJIT_LIB=$(LUAJIT_HOME)/src/libluajit.a
++%%LUAJIT_LIB%%
+ ######
+ LIBRRDTOOL_HOME=third-party/rrdtool-1.4.7
+ LIBRRDTOOL_INC=-I$(LIBRRDTOOL_HOME)/src/
+@@ -29,14 +26,14 @@
+ ######
+ ZEROMQ_HOME=./third-party/zeromq-3.2.3
+ ZEROMQ_INC=-I$(ZEROMQ_HOME)/include
+-ZEROMQ_LIB=$(ZEROMQ_HOME)/src/.libs/libzmq.a 
++%%ZEROMQ_LIB%%
+ ######
+ EWH_HOME=third-party/EWAHBoolArray
+ EWH_INC=$(EWH_HOME)/headers
+ ######
+ TARGET = ntopng
+-LIBS = @LDFLAGS@ $(NDPI_LIB) $(LIBPCAP) $(LUAJIT_LIB) $(LIBRRDTOOL_LIB) $(ZEROMQ_LIB) $(JSON_LIB) -lxml2 @SQLITE_LIB@ @LINK_OPTS@ @LIBGNUTLS@ @GEOIP_LIB@ @Z_LIB@ -lm -ldl -lpthread
+-CPPFLAGS = -g @CFLAGS@ $(CREDIS_INC) $(MONGOOSE_INC) -I$(JSON_INC) $(NDPI_INC) $(LUAJIT_INC) $(LIBRRDTOOL_INC) $(ZEROMQ_INC) @CPPFLAGS@ -I$(HTTPCLIENT_INC) -I$(EWH_INC) # -D_GLIBCXX_DEBUG
++LIBS = @LDFLAGS@ $(NDPI_LIB) $(LIBPCAP) $(LUAJIT_LIB) $(ZEROMQ_LIB) $(LIBRRDTOOL_LIB) $(JSON_LIB) -lxml2 @SQLITE_LIB@ @LINK_OPTS@ @LIBGNUTLS@ @GEOIP_LIB@ @Z_LIB@ -lm -lpthread
++CPPFLAGS = -g @CFLAGS@ $(CREDIS_INC) $(MONGOOSE_INC) -I$(JSON_INC) $(NDPI_INC) $(LIBRRDTOOL_INC) @CPPFLAGS@ -I$(HTTPCLIENT_INC) -I$(EWH_INC) # -D_GLIBCXX_DEBUG
+ ######
+ # ntopng-1.0_1234.x86_64.rpm 
+ PLATFORM = `uname -p`
+@@ -53,22 +50,22 @@
+ 
+ .PHONY: default all clean
+ 
+-default: $(NDPI_LIB) $(LUAJIT_LIB) $(LIBRRDTOOL_LIB) $(ZEROMQ_LIB) $(JSON_LIB) $(TARGET)
++default: $(NDPI_LIB) $(TARGET)
+ all: default
+ 
+ OBJECTS = $(patsubst %.cpp, %.o, $(wildcard *.cpp)) $(CREDIS)
+ HEADERS = $(wildcard *.h)
+ 
+ %.o: %.c $(HEADERS) Makefile
+-	g++ $(CPPFLAGS) -c $< -o $@
++	%%G++%% $(CPPFLAGS) -c $< -o $@
+ 
+ %.o: %.cpp $(HEADERS) Makefile
+-	g++ $(CPPFLAGS) -c $< -o $@
++	%%G++%% $(CPPFLAGS) -c $< -o $@
+ 
+ .PRECIOUS: $(TARGET) $(OBJECTS)
+ 
+-$(TARGET): $(OBJECTS) $(LIBRRDTOOL) Makefile
+-	g++ $(OBJECTS) -Wall $(LIBS) -o $@
++$(TARGET): $(OBJECTS) Makefile
++	%%G++%% $(OBJECTS) -Wall $(LIBS) -o $@
+ 
+ $(NDPI_LIB): nDPI
+ 	cd nDPI; ./configure; @GMAKE@
+@@ -76,18 +73,6 @@
+ nDPI:
+ 	svn co https://svn.ntop.org/svn/ntop/trunk/nDPI/
+ 
+-$(LUAJIT_LIB):
+-	cd $(LUAJIT_HOME); @GMAKE@
+-
+-$(ZEROMQ_LIB):
+-	cd $(ZEROMQ_HOME); ./configure --without-documentation; @GMAKE@
+-
+-$(LIBRRDTOOL_LIB):
+-	cd $(LIBRRDTOOL_HOME); ./configure --disable-rrd_graph --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; cd src; @GMAKE@ librrd_th.la
+-
+-$(JSON_LIB):
+-	cd $(JSON_HOME); ./autogen.sh; ./configure; make
+-
+ clean:
+ 	-rm -f *.o *~ svn-commit.* #config.h
+ 	-rm -f $(TARGET)
+@@ -156,21 +141,14 @@
+ 	-rm -rf ntopng-data-@PACKAGE_VERSION@ ntopng-data_@PACKAGE_VERSION@_@SVN_RELEASE@.tgz
+ 
+ 
+-install: ntopng geoip
+-	@echo "While we provide you an install make target, we encourage you"
+-	@echo "to create a package and install that"
+-	@echo "rpm - do 'make build-rpm'"
+-	@echo "deb - do 'cd packages/ubuntu;./configure;make"
+-	mkdir -p /usr/local/share/ntopng /usr/local/man/man8 /usr/local/bin
+-	cp ntopng /usr/local/bin
+-	cp ./ntopng.8 /usr/local/man/man8
+-	cp -r ./httpdocs /usr/local/share/ntopng
+-	cp -r ./scripts /usr/local/share/ntopng
+-	find /usr/local/share/ntopng -name "*~"   | xargs /bin/rm -f
+-	find /usr/local/share/ntopng -name ".svn" | xargs /bin/rm -rf
+-
+-Makefile: @SVN_WC_DB@
+-	@echo ""
+-	@echo "Re-running configure as the SVN release has changed"
+-	@echo ""
+-	./configure
++install:
++	/bin/mkdir -p %%STAGEDIR%%%%DATADIR%%
++	/bin/mkdir -p %%STAGEDIR%%%%DATADIR%%/httpdocs
++	/bin/mkdir -p %%STAGEDIR%%%%DATADIR%%/httpdocs/geoip
++	/bin/mkdir -p %%STAGEDIR%%%%DATADIR%%/scripts
++	cd %%WRKSRC%% && %%INSTALL_PROGRAM%% %%PORTNAME%% %%STAGEDIR%%%%PREFIX%%/bin/
++	cd %%WRKSRC%% && %%INSTALL_MAN%% ntopng.8 %%STAGEDIR%%%%PREFIX%%/man/man8
++	cd %%WRKDIR%% && %%INSTALL_DATA%% GeoIPASNum.dat %%STAGEDIR%%%%DATADIR%%/httpdocs/geoip/
++	cd %%WRKDIR%% && %%INSTALL_DATA%% GeoIPASNumv6.dat %%STAGEDIR%%%%DATADIR%%/httpdocs/geoip/
++	cd %%WRKDIR%% && %%INSTALL_DATA%% GeoLiteCity.dat %%STAGEDIR%%%%DATADIR%%/httpdocs/geoip/
++	cd %%WRKDIR%% && %%INSTALL_DATA%% GeoLiteCityv6.dat %%STAGEDIR%%%%DATADIR%%/httpdocs/geoip/

Added: head/net/ntopng/files/patch-Ntop.cpp
==============================================================================
--- /dev/null	00:00:00 1970	(empty, because file is newly added)
+++ head/net/ntopng/files/patch-Ntop.cpp	Mon Dec  2 08:00:56 2013	(r335455)
@@ -0,0 +1,20 @@
+--- Ntop.cpp.orig	2013-11-18 16:49:30.000000000 +0600
++++ Ntop.cpp	2013-11-18 16:50:51.000000000 +0600
+@@ -89,12 +89,12 @@
+ void Ntop::initTimezone() {
+   /*
+      Setup timezone differences
+-
+-     We call it all the time as daylight can change
+-     during the night and thus we need to have it "fresh"
+   */
+-  tzset();
+-  time_offset = timezone - (daylight * 3600);
++  time_t curtime;
++  struct tm *loctime;
++  curtime = time (NULL);
++  loctime = localtime (&curtime);
++  time_offset = loctime->tm_gmtoff;
+ }
+ 
+ /* ******************************************* */

Added: head/net/ntopng/files/patch-configure
==============================================================================
--- /dev/null	00:00:00 1970	(empty, because file is newly added)
+++ head/net/ntopng/files/patch-configure	Mon Dec  2 08:00:56 2013	(r335455)
@@ -0,0 +1,40 @@
+--- configure.orig	2013-11-18 11:08:04.000000000 +0600
++++ configure	2013-11-18 11:09:19.000000000 +0600
+@@ -620,7 +620,6 @@
+ 
+ ac_subst_vars='LTLIBOBJS
+ LIBOBJS
+-SVN_WC_DB
+ SVN_DATE
+ GMAKE
+ SQLITE_LIB
+@@ -2953,15 +2952,15 @@
+ NTOPNG_VERS=`cat ./configure.in | head -1 | grep '_INIT' | cut -d " " -f 2|cut -d ')' -f 1`
+ CFLAGS="${CFLAGS} -I/usr/local/include -I/opt/local/include"
+ CPPFLAGS="${CPPFLAGS} -I/usr/local/include -I/opt/local/include"
+-LDFLAGS="${LDFLAGS} -L/usr/local/lib -L/opt/local/lib"
++LDFLAGS="${LDFLAGS}-L/usr/local/lib -L/opt/local/lib"
+ 
+-SVN_RELEASE=`svn info . | grep "^Revision"|cut -d " " -f 2`
++SVN_RELEASE="6939"
+ 
+ cat >>confdefs.h <<_ACEOF
+ #define NTOPNG_SVN_RELEASE "r${SVN_RELEASE}"
+ _ACEOF
+ 
+-SVN_DATE=`svn info . | grep "^Last Changed Date"|cut -d " " -f 4-`
++SVN_DATE="2013-11-05 03:54:00 +0600 (Tue, 05 Nov 2013)"
+ 
+ cat >>confdefs.h <<_ACEOF
+ #define NTOPNG_SVN_DATE "${SVN_DATE}"
+@@ -2969,10 +2968,6 @@
+ 
+ PACKAGE_VERSION="${NTOPNG_VERS}_${SVN_RELEASE}"
+ 
+-if test -f ".svn/wc.db"; then
+-   SVN_WC_DB=".svn/wc.db"
+-fi
+-
+ MACHINE=`uname -m`
+ SYSTEM=`uname -s`
+ 

Added: head/net/ntopng/files/patch-credis.c
==============================================================================
--- /dev/null	00:00:00 1970	(empty, because file is newly added)
+++ head/net/ntopng/files/patch-credis.c	Mon Dec  2 08:00:56 2013	(r335455)
@@ -0,0 +1,12 @@
+--- third-party/credis-0.2.3/credis.c.orig	2013-11-18 21:41:06.000000000 +0600
++++ third-party/credis-0.2.3/credis.c	2013-11-18 21:41:54.000000000 +0600
+@@ -39,6 +39,9 @@
+ #include <winsock2.h>
+ #include "ntop_win32.h"
+ #else 
++#ifdef __FreeBSD__
++#include <sys/types.h>
++#endif
+ #include <arpa/inet.h>
+ #include <errno.h>
+ #include <fcntl.h>

Added: head/net/ntopng/pkg-descr
==============================================================================
--- /dev/null	00:00:00 1970	(empty, because file is newly added)
+++ head/net/ntopng/pkg-descr	Mon Dec  2 08:00:56 2013	(r335455)
@@ -0,0 +1,5 @@
+ntopng is a new generation flexible and feature-rich tool for monitoring and 
+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/

Added: head/net/ntopng/pkg-message
==============================================================================
--- /dev/null	00:00:00 1970	(empty, because file is newly added)
+++ head/net/ntopng/pkg-message	Mon Dec  2 08:00:56 2013	(r335455)
@@ -0,0 +1,11 @@
+----------------------------------------------------------------------------
+WARNING:
+
+In the past, ntop has been the subject of repeated security vulner-
+abilities, particularly relating to its web interface.  It is strongly
+suggested that you protect your ntop web interface via packet filters
+or TCP wrappers.
+
+Please install redis server from databases/redis or use -r to specify
+a remote one.
+----------------------------------------------------------------------------

Added: head/net/ntopng/pkg-plist
==============================================================================
--- /dev/null	00:00:00 1970	(empty, because file is newly added)
+++ head/net/ntopng/pkg-plist	Mon Dec  2 08:00:56 2013	(r335455)
@@ -0,0 +1,239 @@
+bin/ntopng
+man/man8/ntopng.8.gz
+%%DATADIR%%/httpdocs/data.json
+%%DATADIR%%/httpdocs/favicon.ico
+%%DATADIR%%/httpdocs/login.html
+%%DATADIR%%/httpdocs/luca.json
+%%DATADIR%%/httpdocs/test.lp
+%%DATADIR%%/httpdocs/bootstrap/css/bootstrap-responsive.min.css
+%%DATADIR%%/httpdocs/bootstrap/css/bootstrap.css
+%%DATADIR%%/httpdocs/bootstrap/css/bootstrap.min.css
+%%DATADIR%%/httpdocs/bootstrap/img/glyphicons-halflings-white.png
+%%DATADIR%%/httpdocs/bootstrap/img/glyphicons-halflings.png
+%%DATADIR%%/httpdocs/bootstrap/js/bootstrap.min.js
+%%DATADIR%%/httpdocs/bootstrap_3/css/bootstrap-theme.css
+%%DATADIR%%/httpdocs/bootstrap_3/css/bootstrap-theme.min.css
+%%DATADIR%%/httpdocs/bootstrap_3/css/bootstrap.css
+%%DATADIR%%/httpdocs/bootstrap_3/css/bootstrap.min.css
+%%DATADIR%%/httpdocs/bootstrap_3/fonts/glyphicons-halflings-regular.eot
+%%DATADIR%%/httpdocs/bootstrap_3/fonts/glyphicons-halflings-regular.svg
+%%DATADIR%%/httpdocs/bootstrap_3/fonts/glyphicons-halflings-regular.ttf
+%%DATADIR%%/httpdocs/bootstrap_3/fonts/glyphicons-halflings-regular.woff
+%%DATADIR%%/httpdocs/bootstrap_3/js/bootstrap.js
+%%DATADIR%%/httpdocs/bootstrap_3/js/bootstrap.min.js
+%%DATADIR%%/httpdocs/css/bootstrap-responsive.css
+%%DATADIR%%/httpdocs/css/bootstrap.min.css
+%%DATADIR%%/httpdocs/css/cal-heatmap.css
+%%DATADIR%%/httpdocs/css/cubism.css
+%%DATADIR%%/httpdocs/css/datepicker.css
+%%DATADIR%%/httpdocs/css/flags.css
+%%DATADIR%%/httpdocs/css/pagingbar.css
+%%DATADIR%%/httpdocs/css/pie-chart.css
+%%DATADIR%%/httpdocs/css/prettify.css
+%%DATADIR%%/httpdocs/css/rickshaw.min.css
+%%DATADIR%%/httpdocs/css/timepicker.css
+%%DATADIR%%/httpdocs/font-awesome/css/font-awesome-ie7.css
+%%DATADIR%%/httpdocs/font-awesome/css/font-awesome-ie7.min.css
+%%DATADIR%%/httpdocs/font-awesome/css/font-awesome.css
+%%DATADIR%%/httpdocs/font-awesome/css/font-awesome.min.css
+%%DATADIR%%/httpdocs/font-awesome/font/FontAwesome.otf
+%%DATADIR%%/httpdocs/font-awesome/font/fontawesome-webfont.eot
+%%DATADIR%%/httpdocs/font-awesome/font/fontawesome-webfont.svg
+%%DATADIR%%/httpdocs/font-awesome/font/fontawesome-webfont.ttf
+%%DATADIR%%/httpdocs/font-awesome/font/fontawesome-webfont.woff
+%%DATADIR%%/httpdocs/font-awesome/less/bootstrap.less
+%%DATADIR%%/httpdocs/font-awesome/less/core.less
+%%DATADIR%%/httpdocs/font-awesome/less/extras.less
+%%DATADIR%%/httpdocs/font-awesome/less/font-awesome-ie7.less
+%%DATADIR%%/httpdocs/font-awesome/less/font-awesome.less
+%%DATADIR%%/httpdocs/font-awesome/less/icons.less
+%%DATADIR%%/httpdocs/font-awesome/less/mixins.less
+%%DATADIR%%/httpdocs/font-awesome/less/path.less
+%%DATADIR%%/httpdocs/font-awesome/less/variables.less
+%%DATADIR%%/httpdocs/font-awesome/scss/_bootstrap.scss
+%%DATADIR%%/httpdocs/font-awesome/scss/_core.scss
+%%DATADIR%%/httpdocs/font-awesome/scss/_extras.scss
+%%DATADIR%%/httpdocs/font-awesome/scss/_icons.scss
+%%DATADIR%%/httpdocs/font-awesome/scss/_mixins.scss
+%%DATADIR%%/httpdocs/font-awesome/scss/_path.scss
+%%DATADIR%%/httpdocs/font-awesome/scss/_variables.scss
+%%DATADIR%%/httpdocs/font-awesome/scss/font-awesome-ie7.scss
+%%DATADIR%%/httpdocs/font-awesome/scss/font-awesome.scss
+%%DATADIR%%/httpdocs/geoip/GeoIPASNum.dat
+%%DATADIR%%/httpdocs/geoip/GeoIPASNumv6.dat
+%%DATADIR%%/httpdocs/geoip/GeoLiteCity.dat
+%%DATADIR%%/httpdocs/geoip/GeoLiteCityv6.dat
+%%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/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/loading.gif
+%%DATADIR%%/httpdocs/img/logo.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/add_user_dialog.inc
+%%DATADIR%%/httpdocs/inc/aggregated_hosts_stats_bottom.inc
+%%DATADIR%%/httpdocs/inc/aggregated_hosts_stats_top.inc
+%%DATADIR%%/httpdocs/inc/delete_user_dialog.inc
+%%DATADIR%%/httpdocs/inc/flows_stats_bottom.inc
+%%DATADIR%%/httpdocs/inc/flows_stats_top.inc
+%%DATADIR%%/httpdocs/inc/geolocation_disclaimer.inc
+%%DATADIR%%/httpdocs/inc/header.inc
+%%DATADIR%%/httpdocs/inc/hosts_stats_bottom.inc
+%%DATADIR%%/httpdocs/inc/hosts_stats_top.inc
+%%DATADIR%%/httpdocs/inc/index_TopASNs.inc
+%%DATADIR%%/httpdocs/inc/index_TopApplications.inc
+%%DATADIR%%/httpdocs/inc/index_TopFlowSenders.inc
+%%DATADIR%%/httpdocs/inc/index_TopHosts.inc
+%%DATADIR%%/httpdocs/inc/password_dialog.inc
+%%DATADIR%%/httpdocs/inc/users.inc
+%%DATADIR%%/httpdocs/js/README.gauge
+%%DATADIR%%/httpdocs/js/bootstrap-alert.js
+%%DATADIR%%/httpdocs/js/bootstrap-button.js
+%%DATADIR%%/httpdocs/js/bootstrap-carousel.js
+%%DATADIR%%/httpdocs/js/bootstrap-collapse.js
+%%DATADIR%%/httpdocs/js/bootstrap-datatable.js
+%%DATADIR%%/httpdocs/js/bootstrap-datepicker.js
+%%DATADIR%%/httpdocs/js/bootstrap-dropdown.js
+%%DATADIR%%/httpdocs/js/bootstrap-modal.js
+%%DATADIR%%/httpdocs/js/bootstrap-popover.js
+%%DATADIR%%/httpdocs/js/bootstrap-scrollspy.js
+%%DATADIR%%/httpdocs/js/bootstrap-tab.js
+%%DATADIR%%/httpdocs/js/bootstrap-timepicker.js
+%%DATADIR%%/httpdocs/js/bootstrap-tooltip.js
+%%DATADIR%%/httpdocs/js/bootstrap-transition.js
+%%DATADIR%%/httpdocs/js/bootstrap-typeahead.js
+%%DATADIR%%/httpdocs/js/bootstrap.ajaxpager-0.8.min.js
+%%DATADIR%%/httpdocs/js/bootstrap.js
+%%DATADIR%%/httpdocs/js/bootstrap.min.js
+%%DATADIR%%/httpdocs/js/cal-heatmap.min.js
+%%DATADIR%%/httpdocs/js/cal-heatmap.source-map.js
+%%DATADIR%%/httpdocs/js/cpu_bar.js
+%%DATADIR%%/httpdocs/js/cubism.v1.js
+%%DATADIR%%/httpdocs/js/cubism.v1.js.1
+%%DATADIR%%/httpdocs/js/d3.v2.min.js
+%%DATADIR%%/httpdocs/js/gauge.min.js
+%%DATADIR%%/httpdocs/js/googleMapJson.js
+%%DATADIR%%/httpdocs/js/handlebars-1.0.0.0.beta.6.js
+%%DATADIR%%/httpdocs/js/highlight.min.js
+%%DATADIR%%/httpdocs/js/html5shiv.js
+%%DATADIR%%/httpdocs/js/jquery-ui.js
+%%DATADIR%%/httpdocs/js/jquery.form.js
+%%DATADIR%%/httpdocs/js/jquery.min.js
+%%DATADIR%%/httpdocs/js/jquery.peity.min.js
+%%DATADIR%%/httpdocs/js/jquery.sparkline.min.js
+%%DATADIR%%/httpdocs/js/line-graph.js
+%%DATADIR%%/httpdocs/js/pie-chart.js
+%%DATADIR%%/httpdocs/js/prettify.js
+%%DATADIR%%/httpdocs/js/rickshaw.min.js
+%%DATADIR%%/httpdocs/js/sankey.js
+%%DATADIR%%/httpdocs/js/serializeCFJSON-0.1.min.js
+%%DATADIR%%/httpdocs/js/typeahead.min.js
+%%DATADIR%%/scripts/callbacks/daily.lua
+%%DATADIR%%/scripts/callbacks/hourly.lua
+%%DATADIR%%/scripts/callbacks/minute.lua
+%%DATADIR%%/scripts/callbacks/second.lua
+%%DATADIR%%/scripts/lua/#d3nodefocustagsite.html#
+%%DATADIR%%/scripts/lua/#get_geo_hosts.lua#
+%%DATADIR%%/scripts/lua/about.lua
+%%DATADIR%%/scripts/lua/aggregated_host_details.lua
+%%DATADIR%%/scripts/lua/aggregated_host_stats.lua
+%%DATADIR%%/scripts/lua/aggregated_hosts_stats.lua
+%%DATADIR%%/scripts/lua/d3nodefocustagsite.html
+%%DATADIR%%/scripts/lua/do_export_data.lua
+%%DATADIR%%/scripts/lua/export_data.lua
+%%DATADIR%%/scripts/lua/find_host.lua
+%%DATADIR%%/scripts/lua/flow_details.lua
+%%DATADIR%%/scripts/lua/flow_stats.lua
+%%DATADIR%%/scripts/lua/flows_stats.lua
+%%DATADIR%%/scripts/lua/get_aggregated_host_info.lua
+%%DATADIR%%/scripts/lua/get_flows_data.lua
+%%DATADIR%%/scripts/lua/get_geo_hosts.lua
+%%DATADIR%%/scripts/lua/get_host_activitymap.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_top_talkers.lua
+%%DATADIR%%/scripts/lua/get_treemap.lua
+%%DATADIR%%/scripts/lua/hello_world.lua
+%%DATADIR%%/scripts/lua/host_details.lua
+%%DATADIR%%/scripts/lua/host_get_json.lua
+%%DATADIR%%/scripts/lua/host_l4_stats.lua
+%%DATADIR%%/scripts/lua/host_pkt_distro.lua
+%%DATADIR%%/scripts/lua/host_stats.lua
+%%DATADIR%%/scripts/lua/hosts_geomap.lua
+%%DATADIR%%/scripts/lua/hosts_interaction.lua
+%%DATADIR%%/scripts/lua/hosts_matrix.lua
+%%DATADIR%%/scripts/lua/hosts_stats.lua
+%%DATADIR%%/scripts/lua/hosts_treemap.lua
+%%DATADIR%%/scripts/lua/if_pkt_distro.lua
+%%DATADIR%%/scripts/lua/if_stats.lua
+%%DATADIR%%/scripts/lua/iface_flows_sankey.lua
+%%DATADIR%%/scripts/lua/iface_hosts_list.lua
+%%DATADIR%%/scripts/lua/iface_ndpi_stats.lua
+%%DATADIR%%/scripts/lua/index.lua
+%%DATADIR%%/scripts/lua/interface_stats.lua
+%%DATADIR%%/scripts/lua/logout.lua
+%%DATADIR%%/scripts/lua/minute.lua
+%%DATADIR%%/scripts/lua/network_load.lua
+%%DATADIR%%/scripts/lua/page_not_found.lua
+%%DATADIR%%/scripts/lua/port_details.lua
+%%DATADIR%%/scripts/lua/prova.lua
+%%DATADIR%%/scripts/lua/resolve_address.lua
+%%DATADIR%%/scripts/lua/second.lua
+%%DATADIR%%/scripts/lua/set_active_interface.lua
+%%DATADIR%%/scripts/lua/set_if_prefs.lua
+%%DATADIR%%/scripts/lua/top_asn.lua
+%%DATADIR%%/scripts/lua/top_hosts.lua
+%%DATADIR%%/scripts/lua/top_talkers.lua
+%%DATADIR%%/scripts/lua/admin/add_user.lua
+%%DATADIR%%/scripts/lua/admin/delete_user.lua
+%%DATADIR%%/scripts/lua/admin/get_users.lua
+%%DATADIR%%/scripts/lua/admin/password_reset.lua
+%%DATADIR%%/scripts/lua/admin/users.lua
+%%DATADIR%%/scripts/lua/inc/footer.lua
+%%DATADIR%%/scripts/lua/inc/menu.lua
+%%DATADIR%%/scripts/lua/inc/sankey.lua
+%%DATADIR%%/scripts/lua/inc/search_host_box.lua
+%%DATADIR%%/scripts/lua/modules/dkjson.lua
+%%DATADIR%%/scripts/lua/modules/flow_utils.lua
+%%DATADIR%%/scripts/lua/modules/graph_utils.lua
+%%DATADIR%%/scripts/lua/modules/lua_utils.lua
+%%DATADIR%%/scripts/lua/modules/persistence.lua
+%%DATADIR%%/scripts/lua/modules/redis.lua
+%%DATADIR%%/scripts/lua/modules/template.lua
+%%DATADIR%%/scripts/lua/modules/top_talkers.lua
+@dirrm %%DATADIR%%/scripts/lua/modules
+@dirrm %%DATADIR%%/scripts/lua/inc
+@dirrm %%DATADIR%%/scripts/lua/admin
+@dirrm %%DATADIR%%/scripts/lua
+@dirrm %%DATADIR%%/scripts/callbacks
+@dirrm %%DATADIR%%/scripts
+@dirrm %%DATADIR%%/httpdocs/js
+@dirrm %%DATADIR%%/httpdocs/inc
+@dirrm %%DATADIR%%/httpdocs/img
+@dirrm %%DATADIR%%/httpdocs/geoip
+@dirrm %%DATADIR%%/httpdocs/font-awesome/scss
+@dirrm %%DATADIR%%/httpdocs/font-awesome/less
+@dirrm %%DATADIR%%/httpdocs/font-awesome/font
+@dirrm %%DATADIR%%/httpdocs/font-awesome/css
+@dirrm %%DATADIR%%/httpdocs/font-awesome
+@dirrm %%DATADIR%%/httpdocs/css
+@dirrm %%DATADIR%%/httpdocs/bootstrap_3/js
+@dirrm %%DATADIR%%/httpdocs/bootstrap_3/fonts
+@dirrm %%DATADIR%%/httpdocs/bootstrap_3/css
+@dirrm %%DATADIR%%/httpdocs/bootstrap_3
+@dirrm %%DATADIR%%/httpdocs/bootstrap/js
+@dirrm %%DATADIR%%/httpdocs/bootstrap/img
+@dirrm %%DATADIR%%/httpdocs/bootstrap/css
+@dirrm %%DATADIR%%/httpdocs/bootstrap
+@dirrm %%DATADIR%%/httpdocs
+@dirrm %%DATADIR%%



Want to link to this message? Use this URL: <https://mail-archive.FreeBSD.org/cgi/mid.cgi?201312020800.rB280ufY015956>