Attachment #146992 for bug #193421

View | Details | Raw Unified | Return to bug 193421
Collapse All | Expand All




# Created by: Muhammad Moinur Rahman <5u623l20@gmail.com>
# $FreeBSD: head/net/ntopng/Makefile 359185 2014-06-25 05:35:31Z bapt $

PORTNAME=	ntopng
PORTVERSION=	1.2.1
PORTREVISION=	2
CATEGORIES=	net
MASTER_SITES=	SF/ntop/${PORTNAME}
EXTRACT_SUFX=	.tgz
		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

LIB_DEPENDS=	librrd.so:${PORTSDIR}/databases/rrdtool \
		geoiplookup:${PORTSDIR}/net/GeoIP
LIB_DEPENDS=	libcairo.so:${PORTSDIR}/graphics/cairo \
		libluajit-5.1.so:${PORTSDIR}/lang/luajit \
		libndpi.so:${PORTSDIR}/net/ndpi \
		libzmq.so:${PORTSDIR}/net/libzmq4

USE_AUTOTOOLS=	autoheader aclocal libtoolize
USE_SQLITE=	yes
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 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
	@${RMDIR} ${WRKSRC}/httpdocs/ssl
	@${RMDIR} ${WRKSRC}/httpdocs/geoip

do-install:
	cd ${WRKSRC} && ${INSTALL_PROGRAM} ${PORTNAME} ${STAGEDIR}${PREFIX}/bin
	cd ${WRKSRC} && ${INSTALL_MAN} ${PORTNAME}.8 ${STAGEDIR}${PREFIX}/man/man8
		${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}
	${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>

Lines 1-6 Link Here

(-)./distinfo (-6 / +2 lines)
1	SHA256 (ntopng-1.1_6932.tgz) = f9dbc621efa7354fa65d93d043dceabcfb55a7b56e83c87e3f6b8d2b75aeab31	1	SHA256 (ntopng-1.2.1.tgz) = 9b98114358d350caad2dcdbacceb895288f958dbbbfddf21a23b921d1a1b68b5
2	SIZE (ntopng-1.1_6932.tgz) = 45064737	2	SIZE (ntopng-1.2.1.tgz) = 9381092
3	SHA256 (GeoLiteCity.dat.gz) = IGNORE
4	SHA256 (GeoLiteCityv6.dat.gz) = IGNORE
5	SHA256 (GeoIPASNum.dat.gz) = IGNORE
6	SHA256 (GeoIPASNumv6.dat.gz) = IGNORE




#!/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




--- 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)
 ######
-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
@@ -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 $@
-	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/
 
-$(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@
-

-	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; @GMAKE@
-
 clean:
 	-rm -f *.o *~ svn-commit.* #config.h
 	-rm -f $(TARGET)
@@ -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
 
 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 $(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;
-	@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/




--- 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;
 }
 
 /* ******************************************* */




--- 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`
 




--- 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)




--- 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>




--- 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

Lines 8-11 Link Here

(-)./pkg-message (+3 lines)
8		8
9	Please install redis server from databases/redis or use -r to specify	9	Please install redis server from databases/redis or use -r to specify
10	a remote one.	10	a remote one.
		11
		12	Please use ntopng-geoipupdate.sh to update GeoIP database to the
		13	latest.
11	----------------------------------------------------------------------------	14	----------------------------------------------------------------------------




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-theme.css
%%DATADIR%%/httpdocs/bootstrap/css/bootstrap-theme.css.map
%%DATADIR%%/httpdocs/bootstrap/css/bootstrap.css
%%DATADIR%%/httpdocs/bootstrap/css/bootstrap.css.map
%%DATADIR%%/httpdocs/bootstrap/fonts/glyphicons-halflings-regular.eot
%%DATADIR%%/httpdocs/bootstrap/fonts/glyphicons-halflings-regular.svg
%%DATADIR%%/httpdocs/bootstrap/fonts/glyphicons-halflings-regular.ttf
%%DATADIR%%/httpdocs/bootstrap/fonts/glyphicons-halflings-regular.woff
%%DATADIR%%/httpdocs/bootstrap/img/glyphicons-halflings-white.png
%%DATADIR%%/httpdocs/bootstrap/img/glyphicons-halflings.png
%%DATADIR%%/httpdocs/bootstrap/js/bootstrap.js
%%DATADIR%%/httpdocs/css/bootstrap-datetimepicker.css
%%DATADIR%%/httpdocs/css/bubble-chart.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/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.css
%%DATADIR%%/httpdocs/css/sequence_sunburst.css
%%DATADIR%%/httpdocs/css/tablesorted.css
%%DATADIR%%/httpdocs/css/timeline.css
%%DATADIR%%/httpdocs/css/timepicker.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/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/fixed-width.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/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/_bordered-pulled.scss
%%DATADIR%%/httpdocs/font-awesome/scss/_core.scss
%%DATADIR%%/httpdocs/font-awesome/scss/_fixed-width.scss
%%DATADIR%%/httpdocs/font-awesome/scss/_icons.scss
%%DATADIR%%/httpdocs/font-awesome/scss/_larger.scss
%%DATADIR%%/httpdocs/font-awesome/scss/_list.scss
%%DATADIR%%/httpdocs/font-awesome/scss/_mixins.scss
%%DATADIR%%/httpdocs/font-awesome/scss/_path.scss
%%DATADIR%%/httpdocs/font-awesome/scss/_rotated-flipped.scss
%%DATADIR%%/httpdocs/font-awesome/scss/_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/img/asc.gif
%%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/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/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-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/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/crossfilter.js
%%DATADIR%%/httpdocs/js/cubism.v1.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.js
%%DATADIR%%/httpdocs/js/html5shiv.js
%%DATADIR%%/httpdocs/js/jquery-ui.js
%%DATADIR%%/httpdocs/js/jquery.form.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.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%%/scripts/callbacks/daily.lua
%%DATADIR%%/scripts/callbacks/hourly.lua
%%DATADIR%%/scripts/callbacks/minute.lua
%%DATADIR%%/scripts/callbacks/second.lua
%%DATADIR%%/scripts/lua/API.lua
%%DATADIR%%/scripts/lua/#get_geo_hosts.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/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/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/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/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

%%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/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

Return to bug 193421

Lines 1-92 Link Here

(-)./Makefile (-66 / +30 lines)
1	# Created by: Muhammad Moinur Rahman <5u623l20@gmail.com>	1	# Created by: Muhammad Moinur Rahman <5u623l20@gmail.com>
2	# $FreeBSD: head/net/ntopng/Makefile 364628 2014-08-11 17:05:50Z adamw $	2	# $FreeBSD: head/net/ntopng/Makefile 359185 2014-06-25 05:35:31Z bapt $
3		3
4	PORTNAME= ntopng	4	PORTNAME= ntopng
5	PORTVERSION= 1.1	5	PORTVERSION= 1.2.1
6	PORTREVISION= 2
7	CATEGORIES= net	6	CATEGORIES= net
8	MASTER_SITES= SF/ntop/${PORTNAME}:source1 \	7	MASTER_SITES= SF/ntop/${PORTNAME}
9	http://geolite.maxmind.com/download/geoip/database/:source2 \	8	EXTRACT_SUFX= .tgz
10	http://geolite.maxmind.com/download/geoip/database/GeoLiteCityv6-beta/:source3 \
11	http://download.maxmind.com/download/geoip/database/asnum/:source4
12	DISTFILES= ${DISTNAME}_6932.tgz:source1 \
13	GeoLiteCity.dat.gz:source2 \
14	GeoLiteCityv6.dat.gz:source3 \
15	GeoIPASNum.dat.gz:source4 \
16	GeoIPASNumv6.dat.gz:source4
17	EXTRACT_ONLY= ${DISTNAME}_6932.tgz
18		9
19	MAINTAINER= 5u623l20@gmail.com	10	MAINTAINER= 5u623l20@gmail.com
20	COMMENT= Network monitoring tool with command line and web interfaces	11	COMMENT= Network monitoring tool with command line and web interfaces
21		12
22	LICENSE= GPLv3	13	LICENSE= GPLv3
23		14
24	BUILD_DEPENDS= bash:${PORTSDIR}/shells/bash \	15	LIB_DEPENDS= librrd.so:${PORTSDIR}/databases/rrdtool \
25	geoiplookup:${PORTSDIR}/net/GeoIP
26	LIB_DEPENDS= libcairo.so:${PORTSDIR}/graphics/cairo \
27	libluajit-5.1.so:${PORTSDIR}/lang/luajit \	16	libluajit-5.1.so:${PORTSDIR}/lang/luajit \
28	libzmq.so:${PORTSDIR}/devel/ntopng-zmq	17	libndpi.so:${PORTSDIR}/net/ndpi \
		18	libzmq.so:${PORTSDIR}/net/libzmq4
29		19
30	BROKEN= no distinfo provided for some of the distfiles	20	USE_AUTOTOOLS= autoheader aclocal libtoolize
31		21	USE_SQLITE= yes
32	CPPFLAGS+= -I${LOCALBASE}/include/luajit-2.0
33	GNU_CONFIGURE= yes
34	MAKE_JOBS_UNSAFE= yes	22	MAKE_JOBS_UNSAFE= yes
35	USE_GCC= any
36	USE_GNOME= intltool
37	USE_LDCONFIG= yes	23	USE_LDCONFIG= yes
38	USES= gmake pathfix pkgconfig	24	USES= gmake libtool pathfix pkgconfig
39	WRKSRC= ${WRKDIR}/${DISTNAME}_6932	25	SUB_FILES= ntopng-geoipupdate.sh
		26
		27	OPTIONS_DEFINE= GEOIP NLS
		28	OPTIONS_DEFAULT= GEOIP
		29	GEOIP_BUILD_DEPENDS= geoiplookup:${PORTSDIR}/net/GeoIP
		30	NLS_USES= gettext
40		31
41	USE_RC_SUBR= ntopng	32	USE_RC_SUBR= ntopng
42		33
		34	.include <bsd.port.options.mk>
		35
		36	.if ${OSVERSION} < 900000
		37	BROKEN= Does not build on 8.X due to *ENDIAN implementations
		38	.endif
		39
43	post-extract:	40	post-extract:
44	@${CP} ${DISTDIR}/GeoLiteCity.dat.gz ${WRKDIR}
45	@${CP} ${DISTDIR}/GeoLiteCityv6.dat.gz ${WRKDIR}
46	@${CP} ${DISTDIR}/GeoIPASNum.dat.gz ${WRKDIR}
47	@${CP} ${DISTDIR}/GeoIPASNumv6.dat.gz ${WRKDIR}
48	@${RM} ${WRKSRC}/scripts/lua/modules/redis.lua
49	@${CP} ${WRKSRC}/third-party/redis-lua/src/redis.lua ${WRKSRC}/scripts/lua/modules/redis.lua
50	@${FIND} ${WRKSRC} -name "*~" -delete	41	@${FIND} ${WRKSRC} -name "*~" -delete
51	@cd ${WRKDIR} && ${GUNZIP_CMD} GeoLiteCity.dat.gz GeoLiteCityv6.dat.gz GeoIPASNum.dat.gz GeoIPASNumv6.dat.gz	42	@${RMDIR} ${WRKSRC}/httpdocs/ssl
		43	@${RMDIR} ${WRKSRC}/httpdocs/geoip
52		44
53	post-patch:	45	do-install:
54	@${REINPLACE_CMD} -e "s#/bin/bash#/usr/local/bin/bash#" ${WRKSRC}/third-party/rrdtool-1.4.7/Makefile \	46	cd ${WRKSRC} && ${INSTALL_PROGRAM} ${PORTNAME} ${STAGEDIR}${PREFIX}/bin
55	${WRKSRC}/third-party/rrdtool-1.4.7/config.status ${WRKSRC}/third-party/rrdtool-1.4.7/src/Makefile \	47	cd ${WRKSRC} && ${INSTALL_MAN} ${PORTNAME}.8 ${STAGEDIR}${PREFIX}/man/man8
56	${WRKSRC}/third-party/rrdtool-1.4.7/bindings/Makefile ${WRKSRC}/third-party/rrdtool-1.4.7/doc/Makefile \
57	${WRKSRC}/third-party/rrdtool-1.4.7/examples/Makefile \
58	${WRKSRC}/third-party/rrdtool-1.4.7/examples/rrdcached/Makefile
59	@${REINPLACE_CMD} -e "s#%%LUAJIT_LIB%%#LUAJIT_LIB=${LOCALBASE}/lib/libluajit-5.1.a#" ${WRKSRC}/Makefile.in
60	@${REINPLACE_CMD} -e "s#%%ZEROMQ_LIB%%#ZEROMQ_LIB=${LOCALBASE}/lib/libzmq.a#" ${WRKSRC}/Makefile.in
61	@${REINPLACE_CMD} -e "s#%%STAGEDIR%%%%DATADIR%%#${STAGEDIR}${DATADIR}#" ${WRKSRC}/Makefile.in
62	@${REINPLACE_CMD} -e "s#%%STAGEDIR%%%%PREFIX%%#${STAGEDIR}${PREFIX}#" ${WRKSRC}/Makefile.in
63	@${REINPLACE_CMD} -e "s#%%WRKSRC%%#${WRKSRC}#" ${WRKSRC}/Makefile.in
64	@${REINPLACE_CMD} -e "s#%%WRKDIR%%#${WRKDIR}#" ${WRKSRC}/Makefile.in
65	@${REINPLACE_CMD} -e "s#%%PORTNAME%%#${PORTNAME}#" ${WRKSRC}/Makefile.in
66	@${REINPLACE_CMD} -e "s#%%LOCALBASE%%#${LOCALBASE}#" ${WRKSRC}/Makefile.in
67	@${REINPLACE_CMD} -e "s#%%INSTALL_PROGRAM%%#${INSTALL_PROGRAM}#" ${WRKSRC}/Makefile.in
68	@${REINPLACE_CMD} -e "s#%%INSTALL_MAN%%#${INSTALL_MAN}#" ${WRKSRC}/Makefile.in
69	@${REINPLACE_CMD} -e "s#%%INSTALL_SCRIPT%%#${INSTALL_SCRIPT}#" ${WRKSRC}/Makefile.in
70	@${REINPLACE_CMD} -e "s#%%INSTALL_DATA%%#${INSTALL_DATA}#" ${WRKSRC}/Makefile.in
71	@${REINPLACE_CMD} -e "s#%%G++%%#${CXX}#" ${WRKSRC}/Makefile.in
72	@${REINPLACE_CMD} -e "s#LIBS#LIBRARIES#" ${WRKSRC}/Makefile.in
73
74	pre-build:
75	cd ${WRKSRC}/third-party/json-c && ${MAKE} clean && ./configure && ${MAKE}
76	cd ${WRKSRC}/third-party/rrdtool-1.4.7 && ${MAKE} clean \
77	&& ./configure --disable-rrd_graph \
78	--disable-libdbi --disable-libwrap --disable-rrdcgi --disable-libtool-lock \
79	--disable-nls --disable-rpath --disable-perl --disable-ruby --disable-lua \
80	--disable-tcl --disable-python --disable-dependency-tracking && \
81	cd src && ${MAKE_CMD} librrd_th.la
82	cd ${WRKSRC}/third-party/credis-0.2.3 && ${MAKE_CMD} clean && ${MAKE_CMD}
83
84	post-install:
85	${MKDIR} ${STAGEDIR}${DATADIR}
86	${MKDIR} ${STAGEDIR}${DATADIR}/httpdocs	48	${MKDIR} ${STAGEDIR}${DATADIR}/httpdocs
87	${MKDIR} ${STAGEDIR}${DATADIR}/httpdocs/geoip
88	${MKDIR} ${STAGEDIR}${DATADIR}/scripts	49	${MKDIR} ${STAGEDIR}${DATADIR}/scripts
89	cd ${WRKSRC}/httpdocs && ${COPYTREE_SHARE} . ${STAGEDIR}${DATADIR}/httpdocs	50	cd ${WRKSRC}/httpdocs && ${COPYTREE_SHARE} . ${STAGEDIR}${DATADIR}/httpdocs
90	cd ${WRKSRC}/scripts && ${COPYTREE_SHARE} . ${STAGEDIR}${DATADIR}/scripts	51	cd ${WRKSRC}/scripts && ${COPYTREE_SHARE} . ${STAGEDIR}${DATADIR}/scripts
91		52
		53	post-install:
		54	${INSTALL_SCRIPT} ${WRKDIR}/ntopng-geoipupdate.sh ${STAGEDIR}${PREFIX}/bin
		55
92	.include <bsd.port.mk>	56	.include <bsd.port.mk>

Line 0 Link Here

(-)./files/ntopng-geoipupdate.sh.in (+39 lines)
	1	#!/bin/sh
	2
	3	set -eu
	4	mkdir -p %%DATADIR%%/httpdocs/geoip
	5
	6	# arguments:
	7	# $1 URL
	8	# $2 output file name
	9	_fetch() {
	10	url="$1"
	11	out="$2"
	12	TEMPFILE="$(mktemp "%%DATADIR%%"/httpdocs/geoip/GeoIP.dat-XXXXXX)"
	13	trap 'rc=$? ; set +e ; rm -f "'"$TEMPFILE"'" ; exit $rc' 0
	14	if fetch -o - "$url" \| gunzip >> "$TEMPFILE" ; then
	15	chmod 444 "$TEMPFILE"
	16	if ! mv -f "$TEMPFILE" "%%DATADIR%%"/"$2" ; then
	17	echo "Unable to replace %%DATADIR%%/$2"
	18	return 2
	19	fi
	20	else
	21	echo "$2 download failed"
	22	return 1
	23	fi
	24	rm -f "$TEMPFILE"
	25	trap - 0
	26	return 0
	27	}
	28
	29	echo Fetching GeoLiteCity.dat...
	30	_fetch "http://geolite.maxmind.com/download/geoip/database/GeoLiteCity.dat.gz" GeoLiteCity.dat
	31
	32	echo Fetching GeoLiteCityv6.dat...
	33	_fetch "http://geolite.maxmind.com/download/geoip/database/GeoLiteCityv6-beta/GeoLiteCityv6.dat.gz" GeoLiteCityv6.dat
	34
	35	echo Fetching GeoIPASNum.dat...
	36	_fetch "http://download.maxmind.com/download/geoip/database/asnum/GeoIPASNum.dat.gz" GeoIPASNum.dat.gz
	37
	38	echo Fetching GeoIPASNumv6.dat...
	39	_fetch "http://download.maxmind.com/download/geoip/database/asnum/GeoIPASNumv6.dat.gz" GeoIPASNumv6.dat.gz

Lines 1-73 Link Here

(-)./files/patch-Makefile.in (-92 / +147 lines)
1	--- Makefile.in.orig 2013-11-04 06:15:16.000000000 +0600	1	--- Makefile.in.orig 2014-09-07 01:22:11.756545075 +0600
2	+++ Makefile.in 2013-11-18 21:50:52.000000000 +0600	2	+++ Makefile.in 2014-09-07 01:45:36.496401797 +0600
3	@@ -1,5 +1,4 @@	3	@@ -6,67 +6,32 @@
4	-SHELL=/bin/bash	4	INSTALL_DIR=@INSTALL_DIR@
5	-OS := $(shell uname -s)	5	MAN_DIR=@MAN_DIR@
6	+OS=FreeBSD	6	######
7	######	7	-HAS_NDPI=$(shell pkg-config --exists libndpi; echo $$?)
8	CREDIS_HOME=third-party/credis-0.2.3	8	-ifeq ($(HAS_NDPI), 0)
9	CREDIS=$(CREDIS_HOME)/credis.o	9	- NDPI_INC = $(shell pkg-config --cflags libndpi \| sed -e 's/\(-I[^ \t]*\)/\1\/libndpi/g')
10	@@ -13,9 +12,7 @@	10	- NDPI_LIB = $(shell pkg-config --libs libndpi)
		11	- NDPI_LIB_DEP =
		12	-else
		13	- NDPI_INC=-I./nDPI/src/include
		14	- NDPI_LIB=./nDPI/src/lib/.libs/libndpi.a
		15	- NDPI_LIB_DEP=$(NDPI_LIB)
		16	-endif
		17	+NDPI_INC = $(shell pkg-config --cflags libndpi \| sed -e 's/\(-I[^ \t]*\)/\1\/libndpi/g')
		18	+NDPI_LIB = $(shell pkg-config --libs libndpi)
		19	+NDPI_LIB_DEP =
		20	######
		21	LIBPCAP=-lpcap
		22	######
11	MONGOOSE_HOME=./third-party/mongoose	23	MONGOOSE_HOME=./third-party/mongoose
12	MONGOOSE_INC=-I$(MONGOOSE_HOME)	24	MONGOOSE_INC=-I$(MONGOOSE_HOME)
13	######	25	######
14	-LUAJIT_HOME=./third-party/LuaJIT-2.0.2	26	-HAS_LUAJIT=$(shell pkg-config --exists luajit; echo $$?)
15	-LUAJIT_INC=-I$(LUAJIT_HOME)/src	27	-ifeq ($(HAS_LUAJIT), 0)
16	-LUAJIT_LIB=$(LUAJIT_HOME)/src/libluajit.a	28	- LUAJIT_INC = $(shell pkg-config --cflags luajit)
17	+%%LUAJIT_LIB%%	29	- LUAJIT_LIB = $(shell pkg-config --libs luajit)
18	######	30	-else
19	LIBRRDTOOL_HOME=third-party/rrdtool-1.4.7	31	- LUAJIT_HOME=./third-party/LuaJIT-2.0.3
20	LIBRRDTOOL_INC=-I$(LIBRRDTOOL_HOME)/src/	32	- LUAJIT_INC=-I$(LUAJIT_HOME)/src
21	@@ -29,14 +26,14 @@	33	- LUAJIT_LIB=$(LUAJIT_HOME)/src/libluajit.a
22	######	34	-endif
23	ZEROMQ_HOME=./third-party/zeromq-3.2.3	35	+LUAJIT_INC = $(shell pkg-config --cflags luajit)
24	ZEROMQ_INC=-I$(ZEROMQ_HOME)/include	36	+LUAJIT_LIB = $(shell pkg-config --libs luajit)
25	-ZEROMQ_LIB=$(ZEROMQ_HOME)/src/.libs/libzmq.a	37	######
26	+%%ZEROMQ_LIB%%	38	-LIBRRDTOOL_HOME=third-party/rrdtool-1.4.8
		39	-HAS_LIBRRDTOOL=$(shell pkg-config --exists librrd; echo $$?)
		40	-ifeq ($(HAS_LIBRRDTOOL), 0)
		41	- LIBRRDTOOL_INC = $(shell pkg-config --cflags librrd)
		42	- LIBRRDTOOL_LIB = $(shell pkg-config --libs librrd)
		43	-else
		44	- LIBRRDTOOL_INC=-I$(LIBRRDTOOL_HOME)/src/
		45	- LIBRRDTOOL_LIB=$(LIBRRDTOOL_HOME)/src/.libs/librrd_th.a
		46	-endif
		47	+LIBRRDTOOL_INC = $(shell pkg-config --cflags librrd)
		48	+LIBRRDTOOL_LIB = $(shell pkg-config --libs librrd)
		49	######
		50	HTTPCLIENT_INC=third-party/http-client-c/src/
		51	######
		52	-HAS_JSON=$(shell pkg-config --exists json-c; echo $$?)
		53	-ifeq ($(HAS_JSON), 0)
		54	- JSON_INC = $(shell pkg-config --cflags json-c)
		55	- JSON_LIB = $(shell pkg-config --libs json-c)
		56	-else
		57	- JSON_HOME=third-party/json-c
		58	- JSON_INC=-I$(JSON_HOME)
		59	- JSON_LIB=$(JSON_HOME)/.libs/libjson-c.a
		60	-endif
		61	+JSON_INC = $(shell pkg-config --cflags json-c)
		62	+JSON_LIB = $(shell pkg-config --libs json-c)
		63	######
		64	-HAS_ZEROMQ=$(shell pkg-config --exists libzmq; echo $$?)
		65	-ifeq ($(HAS_ZEROMQ), 0)
		66	- ZEROMQ_INC = $(shell pkg-config --cflags libzmq)
		67	- ZMQ_STATIC=/usr/local/lib/libzmq.a
		68	- ifeq ($(wildcard $(ZMQ_STATIC)),)
		69	- ZEROMQ_LIB = $(shell pkg-config --libs libzmq)
		70	- else
		71	- ZEROMQ_LIB = $(ZMQ_STATIC)
		72	- endif
		73	+ZEROMQ_INC = $(shell pkg-config --cflags libzmq)
		74	+ZMQ_STATIC=/usr/local/lib/libzmq.a
		75	+ifeq ($(wildcard $(ZMQ_STATIC)),)
		76	+ ZEROMQ_LIB = $(shell pkg-config --libs libzmq)
		77	else
		78	- ZEROMQ_HOME=./third-party/zeromq-3.2.4
		79	- ZEROMQ_INC=-I$(ZEROMQ_HOME)/include
		80	- ZEROMQ_LIB=$(ZEROMQ_HOME)/src/.libs/libzmq.a
		81	+ ZEROMQ_LIB = $(ZMQ_STATIC)
		82	endif
27	######	83	######
28	EWH_HOME=third-party/EWAHBoolArray	84	EWH_HOME=third-party/EWAHBoolArray
29	EWH_INC=$(EWH_HOME)/headers	85	@@ -91,22 +56,6 @@
30	######	86
31	TARGET = ntopng	87	LIB_TARGETS =
32	-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	88
33	-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	89	-ifneq ($(HAS_LUAJIT), 0)
34	+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	90	-LIB_TARGETS += $(LUAJIT_LIB)
35	+CPPFLAGS = -g @CFLAGS@ $(CREDIS_INC) $(MONGOOSE_INC) -I$(JSON_INC) $(NDPI_INC) $(LIBRRDTOOL_INC) @CPPFLAGS@ -I$(HTTPCLIENT_INC) -I$(EWH_INC) # -D_GLIBCXX_DEBUG	91	- endif
36	######	92	-
37	# ntopng-1.0_1234.x86_64.rpm	93	-ifneq ($(HAS_ZEROMQ), 0)
38	PLATFORM = `uname -p`	94	-LIB_TARGETS += $(ZEROMQ_LIB)
39	@@ -53,22 +50,22 @@	95	-endif
40		96	-
41	.PHONY: default all clean	97	-ifneq ($(HAS_LIBRRDTOOL), 0)
42		98	-LIB_TARGETS += $(LIBRRDTOOL_LIB)
43	-default: $(NDPI_LIB) $(LUAJIT_LIB) $(LIBRRDTOOL_LIB) $(ZEROMQ_LIB) $(JSON_LIB) $(TARGET)	99	-endif
44	+default: $(NDPI_LIB) $(TARGET)	100	-
45	all: default	101	-ifneq ($(HAS_JSON), 0)
46		102	-LIB_TARGETS += $(JSON_LIB)
47	OBJECTS = $(patsubst %.cpp, %.o, $(wildcard *.cpp)) $(CREDIS)	103	-endif
48	HEADERS = $(wildcard *.h)	104	-
49		105	.PHONY: default all clean docs test
50	%.o: %.c $(HEADERS) Makefile	106
51	- g++ $(CPPFLAGS) -c $< -o $@	107	.NOTPARALLEL: default all
52	+ %%G++%% $(CPPFLAGS) -c $< -o $@	108	@@ -129,24 +78,6 @@
53		109	$(TARGET): $(OBJECTS) $(LIBRRDTOOL) Makefile
54	%.o: %.cpp $(HEADERS) Makefile	110	$(GPP) $(OBJECTS) -Wall $(LIBS) -o $@
55	- g++ $(CPPFLAGS) -c $< -o $@
56	+ %%G++%% $(CPPFLAGS) -c $< -o $@
57
58	.PRECIOUS: $(TARGET) $(OBJECTS)
59
60	-$(TARGET): $(OBJECTS) $(LIBRRDTOOL) Makefile
61	- g++ $(OBJECTS) -Wall $(LIBS) -o $@
62	+$(TARGET): $(OBJECTS) Makefile
63	+ %%G++%% $(OBJECTS) -Wall $(LIBS) -o $@
64
65	$(NDPI_LIB): nDPI
66	cd nDPI; ./configure; @GMAKE@
67	@@ -76,18 +73,6 @@
68	nDPI:
69	svn co https://svn.ntop.org/svn/ntop/trunk/nDPI/
70		111
		112	-$(NDPI_LIB): nDPI
		113	- cd nDPI; if test ! -f Makefile; then ./autogen.sh ; ./configure; fi; make
		114	-
		115	-nDPI:
		116	- svn co https://svn.ntop.org/svn/ntop/trunk/nDPI/
		117	-
71	-$(LUAJIT_LIB):	118	-$(LUAJIT_LIB):
72	- cd $(LUAJIT_HOME); @GMAKE@	119	- cd $(LUAJIT_HOME); @GMAKE@
73	-	120	-
Lines 78-118 Link Here
78	- 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	125	- 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
79	-	126	-
80	-$(JSON_LIB):	127	-$(JSON_LIB):
81	- cd $(JSON_HOME); ./autogen.sh; ./configure; make	128	- cd $(JSON_HOME); ./autogen.sh; ./configure; @GMAKE@
82	-	129	-
83	clean:	130	clean:
84	-rm -f .o ~ svn-commit.* #config.h	131	-rm -f .o ~ svn-commit.* #config.h
85	-rm -f $(TARGET)	132	-rm -f $(TARGET)
86	@@ -156,21 +141,14 @@	133	@@ -156,10 +87,6 @@
87	-rm -rf ntopng-data-@PACKAGE_VERSION@ ntopng-data_@PACKAGE_VERSION@_@SVN_RELEASE@.tgz	134	cat privkey.pem cert.pem > httpdocs/ssl/ntopng-cert.pem
		135	/bin/rm -f privkey.pem cert.pem
88		136
		137	-veryclean:
		138	- -rm -rf nDPI
		139	-
		140	-
		141	geoip: httpdocs/geoip/GeoLiteCity.dat httpdocs/geoip/GeoLiteCityv6.dat httpdocs/geoip/GeoIPASNum.dat httpdocs/geoip/GeoIPASNumv6.dat
89		142
90	-install: ntopng geoip	143	httpdocs/geoip/GeoLiteCity.dat:
		144	@@ -189,7 +116,6 @@
		145	cp -r doc .cpp .h configure COPYING README.* *.in ntopng.8 httpdocs scripts packages third-party ntopng-@NTOPNG_VERSION@
		146	find ntopng-@NTOPNG_VERSION@ -name ".svn" \| xargs /bin/rm -rf
		147	-rm ntopng-@NTOPNG_VERSION@/httpdocs/geoip/*
		148	- cd ntopng-@NTOPNG_VERSION@; svn co https://svn.ntop.org/svn/ntop/trunk/nDPI/; cd ..
		149	tar cvfz ntopng-@NTOPNG_VERSION@.tgz ntopng-@NTOPNG_VERSION@
		150	#
		151	rm -f $(HOME)/rpmbuild/RPMS/$(PLATFORM)/$(RPM_PKG)
		152	@@ -232,21 +158,8 @@
		153	dist:
		154	rm -rf ntopng-@NTOPNG_VERSION@
		155	mkdir ntopng-@NTOPNG_VERSION@
		156	- 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@
		157
		158	install: ntopng
		159	- @echo "Make sure you have already run 'make geoip' to also install geoip dat files"
91	- @echo "While we provide you an install make target, we encourage you"	160	- @echo "While we provide you an install make target, we encourage you"
92	- @echo "to create a package and install that"	161	- @echo "to create a package and install that"
93	- @echo "rpm - do 'make build-rpm'"	162	- @echo "rpm - do 'make build-rpm'"
94	- @echo "deb - do 'cd packages/ubuntu;./configure;make"	163	- @echo "deb - do 'cd packages/ubuntu;./configure;make"
95	- mkdir -p /usr/local/share/ntopng /usr/local/man/man8 /usr/local/bin	164	- mkdir -p $(INSTALL_DIR)/share/ntopng $(MAN_DIR)/man/man8 $(INSTALL_DIR)/bin
96	- cp ntopng /usr/local/bin	165	- cp ntopng $(INSTALL_DIR)/bin
97	- cp ./ntopng.8 /usr/local/man/man8	166	- cp ./ntopng.8 $(MAN_DIR)/man/man8
98	- cp -r ./httpdocs /usr/local/share/ntopng	167	- cp -r ./httpdocs $(INSTALL_DIR)/share/ntopng
99	- cp -r ./scripts /usr/local/share/ntopng	168	- cp -r ./scripts $(INSTALL_DIR)/share/ntopng
100	- find /usr/local/share/ntopng -name "*~" \| xargs /bin/rm -f	169	- find $(INSTALL_DIR)/share/ntopng -name "*~" \| xargs /bin/rm -f
101	- find /usr/local/share/ntopng -name ".svn" \| xargs /bin/rm -rf	170	- find $(INSTALL_DIR)/share/ntopng -name ".svn" \| xargs /bin/rm -rf
102	-	171
103	-Makefile: @SVN_WC_DB@	172	uninstall:
104	- @echo ""	173	if test -f $(INSTALL_DIR)/bin/ntopng; then rm $(INSTALL_DIR)/bin/ntopng; fi;
105	- @echo "Re-running configure as the SVN release has changed"
106	- @echo ""
107	- ./configure
108	+install:
109	+ /bin/mkdir -p %%STAGEDIR%%%%DATADIR%%
110	+ /bin/mkdir -p %%STAGEDIR%%%%DATADIR%%/httpdocs
111	+ /bin/mkdir -p %%STAGEDIR%%%%DATADIR%%/httpdocs/geoip
112	+ /bin/mkdir -p %%STAGEDIR%%%%DATADIR%%/scripts
113	+ cd %%WRKSRC%% && %%INSTALL_PROGRAM%% %%PORTNAME%% %%STAGEDIR%%%%PREFIX%%/bin/
114	+ cd %%WRKSRC%% && %%INSTALL_MAN%% ntopng.8 %%STAGEDIR%%%%PREFIX%%/man/man8
115	+ cd %%WRKDIR%% && %%INSTALL_DATA%% GeoIPASNum.dat %%STAGEDIR%%%%DATADIR%%/httpdocs/geoip/
116	+ cd %%WRKDIR%% && %%INSTALL_DATA%% GeoIPASNumv6.dat %%STAGEDIR%%%%DATADIR%%/httpdocs/geoip/
117	+ cd %%WRKDIR%% && %%INSTALL_DATA%% GeoLiteCity.dat %%STAGEDIR%%%%DATADIR%%/httpdocs/geoip/
118	+ cd %%WRKDIR%% && %%INSTALL_DATA%% GeoLiteCityv6.dat %%STAGEDIR%%%%DATADIR%%/httpdocs/geoip/

Lines 1-20 Link Here

(-)./files/patch-Ntop.cpp (-20 lines)
1	--- Ntop.cpp.orig 2013-11-18 16:49:30.000000000 +0600
2	+++ Ntop.cpp 2013-11-18 16:50:51.000000000 +0600
3	@@ -89,12 +89,12 @@
4	void Ntop::initTimezone() {
5	/*
6	Setup timezone differences
7	-
8	- We call it all the time as daylight can change
9	- during the night and thus we need to have it "fresh"
10	*/
11	- tzset();
12	- time_offset = timezone - (daylight * 3600);
13	+ time_t curtime;
14	+ struct tm *loctime;
15	+ curtime = time (NULL);
16	+ loctime = localtime (&curtime);
17	+ time_offset = loctime->tm_gmtoff;
18	}
19
20	/* ******************************************* */

Lines 1-37 Link Here

(-)./files/patch-configure (-37 lines)
1	--- configure.orig 2013-11-18 11:08:04.000000000 +0600
2	+++ configure 2013-11-18 11:09:19.000000000 +0600
3	@@ -620,7 +620,6 @@
4
5	ac_subst_vars='LTLIBOBJS
6	LIBOBJS
7	-SVN_WC_DB
8	SVN_DATE
9	GMAKE
10	SQLITE_LIB
11	@@ -2955,13 +2954,13 @@
12	CPPFLAGS="${CPPFLAGS} -I/usr/local/include -I/opt/local/include"
13	LDFLAGS="${LDFLAGS} -L/usr/local/lib -L/opt/local/lib"
14
15	-SVN_RELEASE=`svn info . \| grep "^Revision"\|cut -d " " -f 2`
16	+SVN_RELEASE="6939"
17
18	cat >>confdefs.h <<_ACEOF
19	#define NTOPNG_SVN_RELEASE "r${SVN_RELEASE}"
20	_ACEOF
21
22	-SVN_DATE=`svn info . \| grep "^Last Changed Date"\|cut -d " " -f 4-`
23	+SVN_DATE="2013-11-05 03:54:00 +0600 (Tue, 05 Nov 2013)"
24
25	cat >>confdefs.h <<_ACEOF
26	#define NTOPNG_SVN_DATE "${SVN_DATE}"
27	@@ -2969,10 +2968,6 @@
28
29	PACKAGE_VERSION="${NTOPNG_VERS}_${SVN_RELEASE}"
30
31	-if test -f ".svn/wc.db"; then
32	- SVN_WC_DB=".svn/wc.db"
33	-fi
34	-
35	MACHINE=`uname -m`
36	SYSTEM=`uname -s`
37

Line 0 Link Here

(-)./files/patch-configure.ac (+40 lines)
	1	--- configure.ac.orig 2014-08-15 02:03:01.405288503 +0600
	2	+++ configure.ac 2014-08-15 02:05:37.514273838 +0600
	3	@@ -18,8 +18,8 @@
	4	SVN_RELEASE=`svn info . \| grep "^Revision"\|cut -d " " -f 2`
	5	SVN_DATE=`svn info . \| grep "^Last Changed Date"\|cut -d " " -f 4-`
	6	else
	7	-SVN_RELEASE="${PACKAGE_VERSION}"
	8	-SVN_DATE=`date`
	9	+SVN_RELEASE="8205"
	10	+SVN_DATE="2014-09-06 19:23:32 +0600 (Sat, 06 Sep 2014)"
	11	fi
	12
	13	AC_DEFINE_UNQUOTED(NTOPNG_SVN_RELEASE, "r${SVN_RELEASE}", [SVN Release])
	14	@@ -178,18 +178,6 @@
	15	GPP="g++"
	16	fi
	17
	18	-SVN=`which svn`
	19	-if test x$SVN = x
	20	-then
	21	- AC_MSG_RESULT(FATAL ERROR: svn is not installed on your host)
	22	-fi
	23	-
	24	-WGET=`which wget`
	25	-if test x$WGET = x
	26	-then
	27	- AC_MSG_RESULT(ERROR. wget is not installed on your host: you cannot download GeoIP data)
	28	-fi
	29	-
	30	umask 002
	31
	32	INSTALL_DIR=${prefix}
	33	@@ -222,7 +210,6 @@
	34	AC_SUBST(SQLITE_LIB)
	35	AC_SUBST(GMAKE)
	36	AC_SUBST(GPP)
	37	-AC_SUBST(SVN)
	38	AC_SUBST(CFLAGS)
	39	AC_SUBST(CXXFLAGS)
	40	AC_SUBST(CPPFLAGS)

Lines 1-12 Link Here

(-)./files/patch-credis.c (-12 lines)
1	--- third-party/credis-0.2.3/credis.c.orig 2013-11-18 21:41:06.000000000 +0600
2	+++ third-party/credis-0.2.3/credis.c 2013-11-18 21:41:54.000000000 +0600
3	@@ -39,6 +39,9 @@
4	#include <winsock2.h>
5	#include "ntop_win32.h"
6	#else
7	+#ifdef __FreeBSD__
8	+#include <sys/types.h>
9	+#endif
10	#include <arpa/inet.h>
11	#include <errno.h>
12	#include <fcntl.h>

Line 0 Link Here

(-)./files/patch-ntop__includes.h (+22 lines)
	1	--- ntop_includes.h.orig 2014-09-07 02:11:07.296297465 +0600
	2	+++ ntop_includes.h 2014-09-07 02:14:50.419281644 +0600
	3	@@ -81,6 +81,8 @@
	4	#include <math.h>
	5	#include <sys/stat.h>
	6	#include <zmq.h>
	7	+#include <sys/param.h>
	8	+#include <machine/endian.h>
	9
	10	#ifdef __APPLE__
	11	#include <uuid/uuid.h>
	12	@@ -88,8 +90,8 @@
	13
	14	extern "C" {
	15	#include "pcap.h"
	16	-#include "ndpi_main.h"
	17	-#include "luajit.h"
	18	+#include <ndpi_main.h>
	19	+#include <luajit.h>
	20	#include "lauxlib.h"
	21	#include "lualib.h"
	22	#ifdef HAVE_PF_RING