Attachment 146992 Details for Bug 193421 – patch for 1.2.1

[patch] patch for 1.2.1

ntopng-1.2.1.patch (text/plain), 40.20 KB, created by Muhammad Moinur Rahman on 2014-09-07 10:45:49 UTC

(hide)

Description:

Filename:

MIME Type:

Creator: Muhammad Moinur Rahman

Created: 2014-09-07 10:45:49 UTC

Size: 40.20 KB

patch

obsolete

>diff -ruN /usr/ports//net/ntopng/Makefile ./Makefile
>--- /usr/ports//net/ntopng/Makefile	2014-08-11 23:05:50.000000000 +0600
>+++ ./Makefile	2014-09-07 16:34:41.248725033 +0600
>@@ -1,92 +1,56 @@
> # Created by: Muhammad Moinur Rahman <5u623l20@gmail.com>
>-# $FreeBSD: head/net/ntopng/Makefile 364628 2014-08-11 17:05:50Z adamw $
>+# $FreeBSD: head/net/ntopng/Makefile 359185 2014-06-25 05:35:31Z bapt $
> 
> PORTNAME=	ntopng
>-PORTVERSION=	1.1
>-PORTREVISION=	2
>+PORTVERSION=	1.2.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
>+MASTER_SITES=	SF/ntop/${PORTNAME}
>+EXTRACT_SUFX=	.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 \
>+LIB_DEPENDS=	librrd.so:${PORTSDIR}/databases/rrdtool \
> 		libluajit-5.1.so:${PORTSDIR}/lang/luajit \
>-		libzmq.so:${PORTSDIR}/devel/ntopng-zmq
>+		libndpi.so:${PORTSDIR}/net/ndpi \
>+		libzmq.so:${PORTSDIR}/net/libzmq4
> 
>-BROKEN=		no distinfo provided for some of the distfiles
>-
>-CPPFLAGS+=	-I${LOCALBASE}/include/luajit-2.0
>-GNU_CONFIGURE=	yes
>+USE_AUTOTOOLS=	autoheader aclocal libtoolize
>+USE_SQLITE=	yes
> MAKE_JOBS_UNSAFE=	yes
>-USE_GCC=	any
>-USE_GNOME=	intltool
> USE_LDCONFIG=	yes
>-USES=	 	gmake pathfix pkgconfig
>-WRKSRC=		${WRKDIR}/${DISTNAME}_6932
>+USES=	 	gmake libtool pathfix pkgconfig
>+SUB_FILES=	ntopng-geoipupdate.sh
>+
>+OPTIONS_DEFINE=	GEOIP NLS
>+OPTIONS_DEFAULT=	GEOIP
>+GEOIP_BUILD_DEPENDS=	geoiplookup:${PORTSDIR}/net/GeoIP
>+NLS_USES=	gettext
> 
> USE_RC_SUBR=	ntopng
> 
>+.include <bsd.port.options.mk>
>+
>+.if ${OSVERSION} < 900000
>+BROKEN=	Does not build on 8.X due to *ENDIAN implementations
>+.endif
>+
> 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
>+	@${RMDIR} ${WRKSRC}/httpdocs/ssl
>+	@${RMDIR} ${WRKSRC}/httpdocs/geoip
> 
>-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
>-	@${REINPLACE_CMD} -e "s#LIBS#LIBRARIES#" ${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 && ${MAKE_CMD} librrd_th.la
>-	cd ${WRKSRC}/third-party/credis-0.2.3 && ${MAKE_CMD} clean && ${MAKE_CMD}
>-
>-post-install:
>-	${MKDIR} ${STAGEDIR}${DATADIR}
>+do-install:
>+	cd ${WRKSRC} && ${INSTALL_PROGRAM} ${PORTNAME} ${STAGEDIR}${PREFIX}/bin
>+	cd ${WRKSRC} && ${INSTALL_MAN} ${PORTNAME}.8 ${STAGEDIR}${PREFIX}/man/man8
> 	${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
> 
>+post-install:
>+	${INSTALL_SCRIPT} ${WRKDIR}/ntopng-geoipupdate.sh ${STAGEDIR}${PREFIX}/bin
>+
> .include <bsd.port.mk>
>diff -ruN /usr/ports//net/ntopng/distinfo ./distinfo
>--- /usr/ports//net/ntopng/distinfo	2013-12-25 21:07:29.000000000 +0600
>+++ ./distinfo	2014-09-06 20:33:12.815695552 +0600
>@@ -1,6 +1,2 @@
>-SHA256 (ntopng-1.1_6932.tgz) = f9dbc621efa7354fa65d93d043dceabcfb55a7b56e83c87e3f6b8d2b75aeab31
>-SIZE (ntopng-1.1_6932.tgz) = 45064737
>-SHA256 (GeoLiteCity.dat.gz) = IGNORE
>-SHA256 (GeoLiteCityv6.dat.gz) = IGNORE
>-SHA256 (GeoIPASNum.dat.gz) = IGNORE
>-SHA256 (GeoIPASNumv6.dat.gz) = IGNORE
>+SHA256 (ntopng-1.2.1.tgz) = 9b98114358d350caad2dcdbacceb895288f958dbbbfddf21a23b921d1a1b68b5
>+SIZE (ntopng-1.2.1.tgz) = 9381092
>diff -ruN /usr/ports//net/ntopng/files/ntopng-geoipupdate.sh.in ./files/ntopng-geoipupdate.sh.in
>--- /usr/ports//net/ntopng/files/ntopng-geoipupdate.sh.in	1970-01-01 06:00:00.000000000 +0600
>+++ ./files/ntopng-geoipupdate.sh.in	2014-09-07 05:16:35.294529935 +0600
>@@ -0,0 +1,39 @@
>+#!/bin/sh
>+
>+set -eu
>+mkdir -p %%DATADIR%%/httpdocs/geoip
>+
>+# arguments:
>+# $1 URL
>+# $2 output file name
>+_fetch() {
>+    url="$1"
>+    out="$2"
>+    TEMPFILE="$(mktemp "%%DATADIR%%"/httpdocs/geoip/GeoIP.dat-XXXXXX)"
>+    trap 'rc=$? ; set +e ; rm -f "'"$TEMPFILE"'" ; exit $rc' 0
>+    if fetch -o - "$url" | gunzip >> "$TEMPFILE" ; then
>+	chmod 444 "$TEMPFILE"
>+	if ! mv -f "$TEMPFILE" "%%DATADIR%%"/"$2" ; then
>+	    echo "Unable to replace %%DATADIR%%/$2"
>+	    return 2
>+	fi
>+    else
>+	echo "$2 download failed"
>+	return 1
>+    fi
>+    rm -f "$TEMPFILE"
>+    trap - 0
>+    return 0
>+}
>+
>+echo Fetching GeoLiteCity.dat...
>+_fetch "http://geolite.maxmind.com/download/geoip/database/GeoLiteCity.dat.gz" GeoLiteCity.dat
>+
>+echo Fetching GeoLiteCityv6.dat...
>+_fetch "http://geolite.maxmind.com/download/geoip/database/GeoLiteCityv6-beta/GeoLiteCityv6.dat.gz" GeoLiteCityv6.dat
>+
>+echo Fetching GeoIPASNum.dat...
>+_fetch "http://download.maxmind.com/download/geoip/database/asnum/GeoIPASNum.dat.gz" GeoIPASNum.dat.gz
>+
>+echo Fetching GeoIPASNumv6.dat...
>+_fetch "http://download.maxmind.com/download/geoip/database/asnum/GeoIPASNumv6.dat.gz" GeoIPASNumv6.dat.gz
>diff -ruN /usr/ports//net/ntopng/files/patch-Makefile.in ./files/patch-Makefile.in
>--- /usr/ports//net/ntopng/files/patch-Makefile.in	2013-12-02 14:00:56.000000000 +0600
>+++ ./files/patch-Makefile.in	2014-09-07 04:26:30.605737733 +0600
>@@ -1,73 +1,120 @@
>---- 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 @@
>+--- Makefile.in.orig	2014-09-07 01:22:11.756545075 +0600
>++++ Makefile.in	2014-09-07 01:45:36.496401797 +0600
>+@@ -6,67 +6,32 @@
>+ INSTALL_DIR=@INSTALL_DIR@
>+ MAN_DIR=@MAN_DIR@
>+ ######
>+-HAS_NDPI=$(shell pkg-config --exists libndpi; echo $$?)
>+-ifeq ($(HAS_NDPI), 0)
>+-    NDPI_INC = $(shell pkg-config --cflags libndpi | sed -e 's/$-I[^ \t]*$/\1\/libndpi/g')
>+-    NDPI_LIB = $(shell pkg-config --libs libndpi)
>+-    NDPI_LIB_DEP =
>+-else
>+-    NDPI_INC=-I./nDPI/src/include
>+-    NDPI_LIB=./nDPI/src/lib/.libs/libndpi.a
>+-    NDPI_LIB_DEP=$(NDPI_LIB)
>+-endif
>++NDPI_INC = $(shell pkg-config --cflags libndpi | sed -e 's/$-I[^ \t]*$/\1\/libndpi/g')
>++NDPI_LIB = $(shell pkg-config --libs libndpi)
>++NDPI_LIB_DEP =
>+ ######
>+ LIBPCAP=-lpcap
>+ ######
>  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%%
>+-HAS_LUAJIT=$(shell pkg-config --exists luajit; echo $$?)
>+-ifeq ($(HAS_LUAJIT), 0)
>+-	LUAJIT_INC = $(shell pkg-config --cflags luajit)
>+-	LUAJIT_LIB = $(shell pkg-config --libs luajit)
>+-else
>+-	LUAJIT_HOME=./third-party/LuaJIT-2.0.3
>+-	LUAJIT_INC=-I$(LUAJIT_HOME)/src
>+-	LUAJIT_LIB=$(LUAJIT_HOME)/src/libluajit.a
>+-endif
>++LUAJIT_INC = $(shell pkg-config --cflags luajit)
>++LUAJIT_LIB = $(shell pkg-config --libs luajit)
>+ ######
>+-LIBRRDTOOL_HOME=third-party/rrdtool-1.4.8
>+-HAS_LIBRRDTOOL=$(shell pkg-config --exists librrd; echo $$?)
>+-ifeq ($(HAS_LIBRRDTOOL), 0)
>+-	LIBRRDTOOL_INC = $(shell pkg-config --cflags librrd)
>+-	LIBRRDTOOL_LIB = $(shell pkg-config --libs librrd)
>+-else
>+-	LIBRRDTOOL_INC=-I$(LIBRRDTOOL_HOME)/src/
>+-	LIBRRDTOOL_LIB=$(LIBRRDTOOL_HOME)/src/.libs/librrd_th.a
>+-endif
>++LIBRRDTOOL_INC = $(shell pkg-config --cflags librrd)
>++LIBRRDTOOL_LIB = $(shell pkg-config --libs librrd)
>+ ######
>+ HTTPCLIENT_INC=third-party/http-client-c/src/
>+ ######
>+-HAS_JSON=$(shell pkg-config --exists json-c; echo $$?)
>+-ifeq ($(HAS_JSON), 0)
>+-	JSON_INC = $(shell pkg-config --cflags json-c)
>+-	JSON_LIB = $(shell pkg-config --libs json-c)
>+-else
>+-	JSON_HOME=third-party/json-c
>+-	JSON_INC=-I$(JSON_HOME)
>+-	JSON_LIB=$(JSON_HOME)/.libs/libjson-c.a
>+-endif
>++JSON_INC = $(shell pkg-config --cflags json-c)
>++JSON_LIB = $(shell pkg-config --libs json-c)
>+ ######
>+-HAS_ZEROMQ=$(shell pkg-config --exists libzmq; echo $$?)
>+-ifeq ($(HAS_ZEROMQ), 0)
>+-	ZEROMQ_INC = $(shell pkg-config --cflags libzmq)
>+-	ZMQ_STATIC=/usr/local/lib/libzmq.a
>+-	ifeq ($(wildcard $(ZMQ_STATIC)),)
>+-		ZEROMQ_LIB = $(shell pkg-config --libs libzmq)
>+-	else
>+-		ZEROMQ_LIB = $(ZMQ_STATIC)
>+-	endif
>++ZEROMQ_INC = $(shell pkg-config --cflags libzmq)
>++ZMQ_STATIC=/usr/local/lib/libzmq.a
>++ifeq ($(wildcard $(ZMQ_STATIC)),)
>++	ZEROMQ_LIB = $(shell pkg-config --libs libzmq)
>+ else
>+-	ZEROMQ_HOME=./third-party/zeromq-3.2.4
>+-	ZEROMQ_INC=-I$(ZEROMQ_HOME)/include
>+-	ZEROMQ_LIB=$(ZEROMQ_HOME)/src/.libs/libzmq.a
>++	ZEROMQ_LIB = $(ZMQ_STATIC)
>+ endif
>  ######
>  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/
>+@@ -91,22 +56,6 @@
>+ 
>+ LIB_TARGETS =
>+ 
>+-ifneq ($(HAS_LUAJIT), 0)
>+-LIB_TARGETS += $(LUAJIT_LIB)
>+- endif
>+-
>+-ifneq ($(HAS_ZEROMQ), 0)
>+-LIB_TARGETS += $(ZEROMQ_LIB)
>+-endif
>+-
>+-ifneq ($(HAS_LIBRRDTOOL), 0)
>+-LIB_TARGETS += $(LIBRRDTOOL_LIB)
>+-endif
>+-
>+-ifneq ($(HAS_JSON), 0)
>+-LIB_TARGETS += $(JSON_LIB)
>+-endif
>+-
>+ .PHONY: default all clean docs test
>+ 
>+ .NOTPARALLEL: default all
>+@@ -129,24 +78,6 @@
>+ $(TARGET): $(OBJECTS) $(LIBRRDTOOL) Makefile
>+ 	$(GPP) $(OBJECTS) -Wall $(LIBS) -o $@
>  
>+-$(NDPI_LIB): nDPI
>+-	cd nDPI; if test ! -f Makefile; then ./autogen.sh ; ./configure; fi; make
>+-
>+-nDPI:
>+-	svn co https://svn.ntop.org/svn/ntop/trunk/nDPI/
>+-
> -$(LUAJIT_LIB):
> -	cd $(LUAJIT_HOME); @GMAKE@
> -
>@@ -78,41 +125,49 @@
> -	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
>+-	cd $(JSON_HOME); ./autogen.sh; ./configure; @GMAKE@
> -
>  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
>+@@ -156,10 +87,6 @@
>+ 	cat privkey.pem cert.pem > httpdocs/ssl/ntopng-cert.pem
>+ 	/bin/rm -f privkey.pem cert.pem
>  
>+-veryclean:
>+-	-rm -rf nDPI
>+-
>+-
>+ geoip: httpdocs/geoip/GeoLiteCity.dat httpdocs/geoip/GeoLiteCityv6.dat httpdocs/geoip/GeoIPASNum.dat httpdocs/geoip/GeoIPASNumv6.dat
>  
>--install: ntopng geoip
>+ httpdocs/geoip/GeoLiteCity.dat:
>+@@ -189,7 +116,6 @@
>+ 	cp -r doc *.cpp *.h configure COPYING README.* *.in ntopng.8 httpdocs scripts packages third-party ntopng-@NTOPNG_VERSION@
>+ 	find ntopng-@NTOPNG_VERSION@ -name ".svn" | xargs /bin/rm -rf
>+ 	-rm ntopng-@NTOPNG_VERSION@/httpdocs/geoip/*
>+-	cd ntopng-@NTOPNG_VERSION@; svn co https://svn.ntop.org/svn/ntop/trunk/nDPI/; cd ..
>+ 	tar cvfz ntopng-@NTOPNG_VERSION@.tgz ntopng-@NTOPNG_VERSION@
>+ 	#
>+ 	rm -f $(HOME)/rpmbuild/RPMS/$(PLATFORM)/$(RPM_PKG)
>+@@ -232,21 +158,8 @@
>+ dist:
>+ 	rm -rf ntopng-@NTOPNG_VERSION@
>+ 	mkdir ntopng-@NTOPNG_VERSION@
>+-	cd ntopng-@NTOPNG_VERSION@; svn co https://svn.ntop.org/svn/ntop/trunk/ntopng/; cd ntopng; svn co https://svn.ntop.org/svn/ntop/trunk/nDPI/; cd ..; find ntopng -name .svn | xargs rm -rf ; mv ntopng ntopng-@NTOPNG_VERSION@; tar cvfz ../ntopng-@NTOPNG_VERSION@.tgz ntopng-@NTOPNG_VERSION@
>+ 
>+ install: ntopng
>+-	@echo "Make sure you have already run 'make geoip' to also install geoip dat files"
> -	@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/
>+-	mkdir -p $(INSTALL_DIR)/share/ntopng $(MAN_DIR)/man/man8 $(INSTALL_DIR)/bin
>+-	cp ntopng $(INSTALL_DIR)/bin
>+-	cp ./ntopng.8 $(MAN_DIR)/man/man8
>+-	cp -r ./httpdocs $(INSTALL_DIR)/share/ntopng
>+-	cp -r ./scripts $(INSTALL_DIR)/share/ntopng
>+-	find $(INSTALL_DIR)/share/ntopng -name "*~"   | xargs /bin/rm -f
>+-	find $(INSTALL_DIR)/share/ntopng -name ".svn" | xargs /bin/rm -rf
>+ 
>+ uninstall:
>+ 	if test -f $(INSTALL_DIR)/bin/ntopng; then rm $(INSTALL_DIR)/bin/ntopng; fi;
>diff -ruN /usr/ports//net/ntopng/files/patch-Ntop.cpp ./files/patch-Ntop.cpp
>--- /usr/ports//net/ntopng/files/patch-Ntop.cpp	2013-12-02 14:00:56.000000000 +0600
>+++ ./files/patch-Ntop.cpp	1970-01-01 06:00:00.000000000 +0600
>@@ -1,20 +0,0 @@
>---- 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;
>- }
>- 
>- /* ******************************************* */
>diff -ruN /usr/ports//net/ntopng/files/patch-configure ./files/patch-configure
>--- /usr/ports//net/ntopng/files/patch-configure	2014-06-11 20:49:59.000000000 +0600
>+++ ./files/patch-configure	1970-01-01 06:00:00.000000000 +0600
>@@ -1,37 +0,0 @@
>---- 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
>-@@ -2955,13 +2954,13 @@
>- CPPFLAGS="${CPPFLAGS} -I/usr/local/include -I/opt/local/include"
>- 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`
>- 
>diff -ruN /usr/ports//net/ntopng/files/patch-configure.ac ./files/patch-configure.ac
>--- /usr/ports//net/ntopng/files/patch-configure.ac	1970-01-01 06:00:00.000000000 +0600
>+++ ./files/patch-configure.ac	2014-09-06 20:37:26.498702833 +0600
>@@ -0,0 +1,40 @@
>+--- configure.ac.orig	2014-08-15 02:03:01.405288503 +0600
>++++ configure.ac	2014-08-15 02:05:37.514273838 +0600
>+@@ -18,8 +18,8 @@
>+ SVN_RELEASE=`svn info . | grep "^Revision"|cut -d " " -f 2`
>+ SVN_DATE=`svn info . | grep "^Last Changed Date"|cut -d " " -f 4-`
>+ else
>+-SVN_RELEASE="${PACKAGE_VERSION}"
>+-SVN_DATE=`date`
>++SVN_RELEASE="8205"
>++SVN_DATE="2014-09-06 19:23:32 +0600 (Sat, 06 Sep 2014)"
>+ fi
>+ 
>+ AC_DEFINE_UNQUOTED(NTOPNG_SVN_RELEASE, "r${SVN_RELEASE}", [SVN Release])
>+@@ -178,18 +178,6 @@
>+ 	GPP="g++"
>+ fi
>+ 
>+-SVN=`which svn`
>+-if test x$SVN = x
>+-then
>+-	AC_MSG_RESULT(FATAL ERROR: svn 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
>+ 
>+ INSTALL_DIR=${prefix}
>+@@ -222,7 +210,6 @@
>+ AC_SUBST(SQLITE_LIB)
>+ AC_SUBST(GMAKE)
>+ AC_SUBST(GPP)
>+-AC_SUBST(SVN)
>+ AC_SUBST(CFLAGS)
>+ AC_SUBST(CXXFLAGS)
>+ AC_SUBST(CPPFLAGS)
>diff -ruN /usr/ports//net/ntopng/files/patch-credis.c ./files/patch-credis.c
>--- /usr/ports//net/ntopng/files/patch-credis.c	2013-12-02 14:00:56.000000000 +0600
>+++ ./files/patch-credis.c	1970-01-01 06:00:00.000000000 +0600
>@@ -1,12 +0,0 @@
>---- 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>
>diff -ruN /usr/ports//net/ntopng/files/patch-ntop__includes.h ./files/patch-ntop__includes.h
>--- /usr/ports//net/ntopng/files/patch-ntop__includes.h	1970-01-01 06:00:00.000000000 +0600
>+++ ./files/patch-ntop__includes.h	2014-09-07 02:16:07.660276174 +0600
>@@ -0,0 +1,22 @@
>+--- ntop_includes.h.orig	2014-09-07 02:11:07.296297465 +0600
>++++ ntop_includes.h	2014-09-07 02:14:50.419281644 +0600
>+@@ -81,6 +81,8 @@
>+ #include <math.h>
>+ #include <sys/stat.h>
>+ #include <zmq.h>
>++#include <sys/param.h>
>++#include <machine/endian.h>
>+ 
>+ #ifdef __APPLE__
>+ #include <uuid/uuid.h>
>+@@ -88,8 +90,8 @@
>+ 
>+ extern "C" {
>+ #include "pcap.h"
>+-#include "ndpi_main.h"
>+-#include "luajit.h"
>++#include <ndpi_main.h>
>++#include <luajit.h>
>+ #include "lauxlib.h"
>+ #include "lualib.h"
>+ #ifdef HAVE_PF_RING
>diff -ruN /usr/ports//net/ntopng/pkg-message ./pkg-message
>--- /usr/ports//net/ntopng/pkg-message	2013-12-02 14:00:56.000000000 +0600
>+++ ./pkg-message	2014-09-07 17:30:23.477496131 +0600
>@@ -8,4 +8,7 @@
> 
> Please install redis server from databases/redis or use -r to specify
> a remote one.
>+
>+Please use ntopng-geoipupdate.sh to update GeoIP database to the
>+latest.
> ----------------------------------------------------------------------------
>diff -ruN /usr/ports//net/ntopng/pkg-plist ./pkg-plist
>--- /usr/ports//net/ntopng/pkg-plist	2013-12-02 14:00:56.000000000 +0600
>+++ ./pkg-plist	2014-09-07 05:17:06.513529425 +0600
>@@ -1,199 +1,278 @@
> bin/ntopng
>+bin/ntopng-geoipupdate.sh
> 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-theme.css
>+%%DATADIR%%/httpdocs/bootstrap/css/bootstrap-theme.css.map
> %%DATADIR%%/httpdocs/bootstrap/css/bootstrap.css
>-%%DATADIR%%/httpdocs/bootstrap/css/bootstrap.min.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/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/bootstrap/js/bootstrap.js
>+%%DATADIR%%/httpdocs/css/bootstrap-datetimepicker.css
>+%%DATADIR%%/httpdocs/css/bubble-chart.css
> %%DATADIR%%/httpdocs/css/cal-heatmap.css
> %%DATADIR%%/httpdocs/css/cubism.css
> %%DATADIR%%/httpdocs/css/datepicker.css
>+%%DATADIR%%/httpdocs/css/dc.css
> %%DATADIR%%/httpdocs/css/flags.css
>+%%DATADIR%%/httpdocs/css/jquery-ui.css
>+%%DATADIR%%/httpdocs/css/ntopng.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/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/font-awesome/css/font-awesome-ie7.css
>-%%DATADIR%%/httpdocs/font-awesome/css/font-awesome-ie7.min.css
>+%%DATADIR%%/httpdocs/css/Rickshaw/detail.css
>+%%DATADIR%%/httpdocs/css/Rickshaw/graph.css
>+%%DATADIR%%/httpdocs/css/Rickshaw/legend.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/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/less/bordered-pulled.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/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/spinning.less
>+%%DATADIR%%/httpdocs/font-awesome/less/stacked.less
> %%DATADIR%%/httpdocs/font-awesome/less/variables.less
>-%%DATADIR%%/httpdocs/font-awesome/scss/_bootstrap.scss
>+%%DATADIR%%/httpdocs/font-awesome/scss/_bordered-pulled.scss
> %%DATADIR%%/httpdocs/font-awesome/scss/_core.scss
>-%%DATADIR%%/httpdocs/font-awesome/scss/_extras.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/_spinning.scss
>+%%DATADIR%%/httpdocs/font-awesome/scss/_stacked.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/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/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/add_user_dialog.inc
> %%DATADIR%%/httpdocs/inc/aggregated_hosts_stats_bottom.inc
>+%%DATADIR%%/httpdocs/inc/aggregated_hosts_stats_id.inc
> %%DATADIR%%/httpdocs/inc/aggregated_hosts_stats_top.inc
>-%%DATADIR%%/httpdocs/inc/delete_user_dialog.inc
> %%DATADIR%%/httpdocs/inc/flows_stats_bottom.inc
>+%%DATADIR%%/httpdocs/inc/flows_stats_id.inc
>+%%DATADIR%%/httpdocs/inc/flows_stats_middle.inc
> %%DATADIR%%/httpdocs/inc/flows_stats_top.inc
> %%DATADIR%%/httpdocs/inc/geolocation_disclaimer.inc
> %%DATADIR%%/httpdocs/inc/header.inc
> %%DATADIR%%/httpdocs/inc/hosts_stats_bottom.inc
>+%%DATADIR%%/httpdocs/inc/hosts_stats_id.inc
> %%DATADIR%%/httpdocs/inc/hosts_stats_top.inc
> %%DATADIR%%/httpdocs/inc/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/inc/index_TopPorts.inc
>+%%DATADIR%%/httpdocs/inc/processes_stats_bottom.inc
>+%%DATADIR%%/httpdocs/inc/processes_stats_id.inc
>+%%DATADIR%%/httpdocs/inc/processes_stats_top.inc
>+%%DATADIR%%/httpdocs/inc/sflows_stats_bottom.inc
>+%%DATADIR%%/httpdocs/inc/sflows_stats_top.inc
>+%%DATADIR%%/httpdocs/inc/sprobe_process.inc
>+%%DATADIR%%/httpdocs/inc/sprobe_process_header.inc
> %%DATADIR%%/httpdocs/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/bootstrap-datetimepicker.js
>+%%DATADIR%%/httpdocs/js/bootstrap.ajaxpager-0.8.js
>+%%DATADIR%%/httpdocs/js/bootstrap3-typeahead.js
>+%%DATADIR%%/httpdocs/js/bubble-chart.js
>+%%DATADIR%%/httpdocs/js/cal-heatmap.js
> %%DATADIR%%/httpdocs/js/cpu_bar.js
>+%%DATADIR%%/httpdocs/js/crossfilter.js
> %%DATADIR%%/httpdocs/js/cubism.v1.js
>-%%DATADIR%%/httpdocs/js/cubism.v1.js.1
>-%%DATADIR%%/httpdocs/js/d3.v2.min.js
>-%%DATADIR%%/httpdocs/js/gauge.min.js
>+%%DATADIR%%/httpdocs/js/d3.v3.js
>+%%DATADIR%%/httpdocs/js/dc.js
>+%%DATADIR%%/httpdocs/js/gauge.js
> %%DATADIR%%/httpdocs/js/googleMapJson.js
> %%DATADIR%%/httpdocs/js/handlebars-1.0.0.0.beta.6.js
>-%%DATADIR%%/httpdocs/js/highlight.min.js
>+%%DATADIR%%/httpdocs/js/highlight.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/jquery.js
>+%%DATADIR%%/httpdocs/js/jquery.peity.js
>+%%DATADIR%%/httpdocs/js/jquery.sparkline.js
>+%%DATADIR%%/httpdocs/js/jquery.tablesorter.js
> %%DATADIR%%/httpdocs/js/line-graph.js
>+%%DATADIR%%/httpdocs/js/markerclusterer.js
>+%%DATADIR%%/httpdocs/js/matrix_volume.js
>+%%DATADIR%%/httpdocs/js/moment.js
> %%DATADIR%%/httpdocs/js/pie-chart.js
> %%DATADIR%%/httpdocs/js/prettify.js
>-%%DATADIR%%/httpdocs/js/rickshaw.min.js
>+%%DATADIR%%/httpdocs/js/rickshaw.js
> %%DATADIR%%/httpdocs/js/sankey.js
>-%%DATADIR%%/httpdocs/js/serializeCFJSON-0.1.min.js
>-%%DATADIR%%/httpdocs/js/typeahead.min.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%%/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/API.lua
> %%DATADIR%%/scripts/lua/about.lua
>+%%DATADIR%%/scripts/lua/admin/prefs.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/config_historical_interface.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_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_alerts_data.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_host_activitymap.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_traffic.lua
>+%%DATADIR%%/scripts/lua/get_host_traffic_matrix.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_process_info.lua
>+%%DATADIR%%/scripts/lua/get_processes_data.lua
>+%%DATADIR%%/scripts/lua/get_system_hosts_interaction.lua
> %%DATADIR%%/scripts/lua/get_treemap.lua
>-%%DATADIR%%/scripts/lua/hello_world.lua
>+%%DATADIR%%/scripts/lua/get_user_info.lua
> %%DATADIR%%/scripts/lua/host_details.lua
>+%%DATADIR%%/scripts/lua/host_dns_breakdown.lua
>+%%DATADIR%%/scripts/lua/host_epp_breakdown.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_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_flows_matrix.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_ndpi.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/iface_ports_list.lua
>+%%DATADIR%%/scripts/lua/inc/add_user_dialog.lua
>+%%DATADIR%%/scripts/lua/inc/delete_user_dialog.lua
>+%%DATADIR%%/scripts/lua/inc/password_dialog.lua
>+%%DATADIR%%/scripts/lua/inc/sprobe.lua
>+%%DATADIR%%/scripts/lua/inc/users.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/modules/alert_utils.lua
>+%%DATADIR%%/scripts/lua/modules/lua_trace.lua
>+%%DATADIR%%/scripts/lua/modules/sqlite_utils.lua
>+%%DATADIR%%/scripts/lua/modules/voip_utils.lua
> %%DATADIR%%/scripts/lua/network_load.lua
> %%DATADIR%%/scripts/lua/page_not_found.lua
>+%%DATADIR%%/scripts/lua/pid_stats.lua
>+%%DATADIR%%/scripts/lua/popKeys.lua
> %%DATADIR%%/scripts/lua/port_details.lua
>-%%DATADIR%%/scripts/lua/prova.lua
>+%%DATADIR%%/scripts/lua/processes_stats.lua
>+%%DATADIR%%/scripts/lua/protocols/dns_aggregations.lua
>+%%DATADIR%%/scripts/lua/protocols/epp_aggregations.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/sflow_tree.lua
>+%%DATADIR%%/scripts/lua/sflows_stats.lua
>+%%DATADIR%%/scripts/lua/show_alerts.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/system_hosts_interaction.lua
> %%DATADIR%%/scripts/lua/top_asn.lua
> %%DATADIR%%/scripts/lua/top_hosts.lua
> %%DATADIR%%/scripts/lua/top_talkers.lua
>+%%DATADIR%%/scripts/lua/user_stats.lua
> %%DATADIR%%/scripts/lua/admin/add_user.lua
> %%DATADIR%%/scripts/lua/admin/delete_user.lua
> %%DATADIR%%/scripts/lua/admin/get_users.lua
>@@ -208,31 +287,31 @@
> %%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/protocols
> @dirrm %%DATADIR%%/scripts/lua/modules
> @dirrm %%DATADIR%%/scripts/lua/inc
>+@dirrm %%DATADIR%%/scripts/lua/examples
> @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/maps
>+@dirrm %%DATADIR%%/httpdocs/img/interaction-graph-icons
> @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/fonts
> @dirrm %%DATADIR%%/httpdocs/font-awesome/css
> @dirrm %%DATADIR%%/httpdocs/font-awesome
>+@dirrm %%DATADIR%%/httpdocs/css/Rickshaw
> @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/fonts
> @dirrm %%DATADIR%%/httpdocs/bootstrap/css
> @dirrm %%DATADIR%%/httpdocs/bootstrap
> @dirrm %%DATADIR%%/httpdocs

Flags:

bofh: maintainer-approval+

Actions: View | Diff

Attachments on bug 193421: 146992