Index: head/net/ntopng/Makefile
===================================================================
--- head/net/ntopng/Makefile	(revision 459370)
+++ head/net/ntopng/Makefile	(revision 459371)
@@ -1,63 +1,62 @@
 # Created by: Muhammad Moinur Rahman <5u623l20@gmail.com>
 # $FreeBSD$
 
 PORTNAME=	ntopng
-PORTVERSION=	3.2.2017.12.27
-PORTREVISION=	1
+PORTVERSION=	3.2.2018.01.12
 CATEGORIES=	net
 
 MAINTAINER=	madpilot@FreeBSD.org
 COMMENT=	Network monitoring tool with command line and web interfaces
 
 LICENSE=	GPLv3
 LICENSE_FILE=	${WRKSRC}/COPYING
 
 LIB_DEPENDS=	librrd.so:databases/rrdtool \
 		libzmq.so:net/libzmq4 \
 		libcurl.so:ftp/curl \
 		libndpi.so:net/ndpi \
 		libjson-c.so:devel/json-c \
 		libsodium.so:security/libsodium
 BUILD_DEPENDS=  bash:shells/bash
 
 USES=		autoreconf cpe gmake libtool localbase mysql pathfix pkgconfig \
 		shebangfix sqlite ssl
 SUB_FILES=	ntopng-geoipupdate.sh pkg-deinstall
 SHEBANG_FILES=	httpdocs/misc/ntopng-add-user.sh
 GNU_CONFIGURE=	yes
 USE_LDCONFIG=	yes
 
 USERS=		ntopng
 GROUPS=		ntopng
 
 USE_GITHUB=	yes
 GH_ACCOUNT=	ntop
-GH_TAGNAME=	ecd5336
+GH_TAGNAME=	b16f3e2
 
 CPE_VENDOR=	ntop
 
 OPTIONS_DEFINE=		GEOIP NLS
 OPTIONS_DEFAULT=	GEOIP
 
 OPTIONS_SUB=	yes
 
 GEOIP_LIB_DEPENDS=	libGeoIP.so:net/GeoIP
 
 NLS_USES=	gettext
 
 USE_RC_SUBR=	ntopng
 
 post-patch:
 	@${REINPLACE_CMD} -e 's|%%LOCALBASE%%|${LOCALBASE}|' \
 		${WRKSRC}/configure.seed
 	@${REINPLACE_CMD} -e 's|^\(export PREFIX=\).*|\1 ${PREFIX}|' \
 		${WRKSRC}/third-party/LuaJIT-2.1.0-beta3/Makefile
 	cd ${WRKSRC} && ${SH} autogen.sh
 
 post-install:
 	${STRIP_CMD} ${STAGEDIR}${PREFIX}/bin/ntopng
 
 post-install-GEOIP-on:
 	${INSTALL_SCRIPT} ${WRKDIR}/ntopng-geoipupdate.sh ${STAGEDIR}${PREFIX}/bin
 
 .include <bsd.port.mk>
Index: head/net/ntopng/distinfo
===================================================================
--- head/net/ntopng/distinfo	(revision 459370)
+++ head/net/ntopng/distinfo	(revision 459371)
@@ -1,3 +1,3 @@
-TIMESTAMP = 1514728301
-SHA256 (ntop-ntopng-3.2.2017.12.27-ecd5336_GH0.tar.gz) = e7b8660c4a6aff1c13d1d85aa64b486588d9977cdcb48ffce4e15757129d2fc6
-SIZE (ntop-ntopng-3.2.2017.12.27-ecd5336_GH0.tar.gz) = 24195373
+TIMESTAMP = 1516263485
+SHA256 (ntop-ntopng-3.2.2018.01.12-b16f3e2_GH0.tar.gz) = b72672c91d4805c3388774cd7e412f643e0c4cd0379be702f3b01bb450a76a26
+SIZE (ntop-ntopng-3.2.2018.01.12-b16f3e2_GH0.tar.gz) = 24195410
Index: head/net/ntopng/files/patch-Makefile.in
===================================================================
--- head/net/ntopng/files/patch-Makefile.in	(revision 459370)
+++ head/net/ntopng/files/patch-Makefile.in	(revision 459371)
@@ -1,21 +1,21 @@
---- Makefile.in.orig	2017-12-06 11:11:19 UTC
+--- Makefile.in.orig	2018-01-12 09:48:20 UTC
 +++ Makefile.in
 @@ -34,7 +34,8 @@ LIBPCAP=-lpcap
  MONGOOSE_HOME=${PWD}/third-party/mongoose
  MONGOOSE_INC=-I$(MONGOOSE_HOME)
  ######
--HAS_LUAJIT=$(shell pkg-config --exists luajit; echo $$?)
+-HAS_LUAJIT=$(shell pkg-config --atleast-version=2.1.0 luajit; echo $$?)
 +# Force using embedded luajit
 +HAS_LUAJIT=1
  ifeq ($(HAS_LUAJIT), 0)
  	LUAJIT_INC = $(shell pkg-config --cflags luajit)
  	LUAJIT_LIB = $(shell pkg-config --libs luajit)
 @@ -91,7 +92,7 @@ ifeq (@NEDGE@, 0)
   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
 +	ZMQ_STATIC=/nonexistent
  	ifeq ($(wildcard $(ZMQ_STATIC)),)
  		ZEROMQ_LIB = $(shell pkg-config --libs libzmq)
  	else
Index: head/net/ntopng/files/patch-configure.seed
===================================================================
--- head/net/ntopng/files/patch-configure.seed	(revision 459370)
+++ head/net/ntopng/files/patch-configure.seed	(revision 459371)
@@ -1,77 +1,77 @@
---- configure.seed.orig	2017-06-01 07:18:57 UTC
+--- configure.seed.orig	2018-01-12 09:48:20 UTC
 +++ configure.seed
-@@ -19,26 +19,8 @@ SYSTEM=`uname -s`
+@@ -29,26 +29,8 @@ fi
  # On CentOS 6 `git rev-list HEAD --count` does not work
  #
  #
 -REVISION=`git log --pretty=oneline | wc -l`
 +#REVISION=`git log --pretty=oneline | wc -l`
  
 -if test -d "/usr/local/include"; then
 -CFLAGS="${CFLAGS} -I/usr/local/include"
 -CPPFLAGS="${CPPFLAGS} -I/usr/local/include"
 -fi
 -
 -if test -d "/usr/local/lib"; then
 -LDFLAGS="${LDFLAGS} -L/usr/local/lib"
 -fi
 -
 -if test -d /opt/local/include; then :
 -   CFLAGS="${CFLAGS} -I/opt/local/include"
 -   CPPFLAGS="${CPPFLAGS} -I/opt/local/include"
 -fi
 -
 -if test -d /opt/local/lib; then :
 -  LDFLAGS="${LDFLAGS} -L/opt/local/lib"
 -fi
 -
  if [ test -f /usr/bin/lsb_release ]; then
     CODENAME=`/usr/bin/lsb_release -c|cut -f 2`
     if [[ $CODENAME == "wheezy" ]]; then :
-@@ -54,26 +36,7 @@ GIT_BRANCH="@GIT_BRANCH@"
+@@ -64,26 +46,7 @@ GIT_BRANCH="@GIT_BRANCH@"
  PRO_GIT_RELEASE="@PRO_GIT_RELEASE@"
  PRO_GIT_DATE="@PRO_GIT_DATE@"
  
 -AC_MSG_CHECKING(for nDPI)
 -NDPI_HOME=./nDPI
 -if test -d "$NDPI_HOME" ; then :
 -   AC_MSG_RESULT(found in $NDPI_HOME)
 -else
 -   NDPI_HOME=../nDPI
 -   if test -d "$NDPI_HOME"; then :
 -      AC_MSG_RESULT(found in $NDPI_HOME)
 -   else
 -      NDPI_HOME=$HOME/nDPI
 -      if test -d "$NDPI_HOME"; then :
 -        AC_MSG_RESULT(found in $NDPI_HOME)
 -      else
 -        AC_MSG_RESULT(not found)
 -        echo "Please do cd ..; git clone https://github.com/ntop/nDPI.git; cd nDPI; ./autogen.sh; make; cd ../ntopng"
 -        echo " and try again"
 -        exit
 -      fi
 -   fi
 -fi
 +NDPI_HOME=%%LOCALBASE%%
  
  if test -d "/usr/include/openssl"; then :
   AC_DEFINE_UNQUOTED(NO_SSL_DL, 1, [has openssl])
-@@ -378,18 +341,6 @@ GMAKE=`which gmake`
+@@ -438,18 +401,6 @@ GMAKE=`which gmake`
  if test x$GMAKE = x
  then
  	GMAKE="make"
 -fi
 -
 -GIT=`which git`
 -if test x$GIT = x
 -then
 -	AC_MSG_RESULT(FATAL ERROR: git is not installed on your host)
 -fi
 -
 -WGET=`which wget`
 -if test x$WGET = x
 -then
 -	AC_MSG_RESULT(ERROR. wget is not installed on your host: you cannot download GeoIP data)
  fi
  
  umask 002
Index: head/net/ntopng/files/patch-src_DivertInterface.cpp
===================================================================
--- head/net/ntopng/files/patch-src_DivertInterface.cpp	(nonexistent)
+++ head/net/ntopng/files/patch-src_DivertInterface.cpp	(revision 459371)
@@ -0,0 +1,11 @@
+--- src/DivertInterface.cpp.orig	2018-01-18 14:31:32 UTC
++++ src/DivertInterface.cpp
+@@ -101,7 +101,7 @@ DivertInterface::DivertInterface(const char *name) : N
+   sin.sin_family = AF_INET, sin.sin_port = htons(port);
+   sin_len = sizeof(struct sockaddr_in);
+ 
+-  if(bind(sock, (struct sockaddr *) &sin, sin_len) == -1) {
++  if(::bind(sock, (struct sockaddr *) &sin, sin_len) == -1) {
+     ntop->getTrace()->traceEvent(TRACE_ERROR, "Unable to bind divert socket to port %d", port);
+     throw 1;
+   }

Property changes on: head/net/ntopng/files/patch-src_DivertInterface.cpp
___________________________________________________________________
Added: fbsd:nokeywords
## -0,0 +1 ##
+yes
\ No newline at end of property
Added: svn:eol-style
## -0,0 +1 ##
+native
\ No newline at end of property
Added: svn:mime-type
## -0,0 +1 ##
+text/plain
\ No newline at end of property
Index: head/net/ntopng/files/patch-src_Utils.cpp
===================================================================
--- head/net/ntopng/files/patch-src_Utils.cpp	(nonexistent)
+++ head/net/ntopng/files/patch-src_Utils.cpp	(revision 459371)
@@ -0,0 +1,11 @@
+--- src/Utils.cpp.orig	2018-01-12 09:48:20 UTC
++++ src/Utils.cpp
+@@ -2370,7 +2370,7 @@ int Utils::bindSockToDevice(int sock, int family, cons
+ 
+   if(pAdapterFound != NULL) {
+     int addrsize = (family == AF_INET6) ? sizeof(sockaddr_in6) : sizeof(sockaddr_in);
+-    bindresult = bind(sock, pAdapterFound->ifa_addr, addrsize);
++    bindresult = ::bind(sock, pAdapterFound->ifa_addr, addrsize);
+   }
+ 
+   freeifaddrs(pList);

Property changes on: head/net/ntopng/files/patch-src_Utils.cpp
___________________________________________________________________
Added: fbsd:nokeywords
## -0,0 +1 ##
+yes
\ No newline at end of property
Added: svn:eol-style
## -0,0 +1 ##
+native
\ No newline at end of property
Added: svn:mime-type
## -0,0 +1 ##
+text/plain
\ No newline at end of property
Index: head/net/ntopng/files/patch-third-party_mongoose_mongoose.c
===================================================================
--- head/net/ntopng/files/patch-third-party_mongoose_mongoose.c	(nonexistent)
+++ head/net/ntopng/files/patch-third-party_mongoose_mongoose.c	(revision 459371)
@@ -0,0 +1,29 @@
+--- third-party/mongoose/mongoose.c.orig	2018-01-12 09:48:20 UTC
++++ third-party/mongoose/mongoose.c
+@@ -730,7 +730,7 @@ struct mg_request_info *mg_get_request_info(struct mg_
+   return &conn->request_info;
+ }
+ 
+-static void mg_strlcpy(register char *dst, register const char *src, size_t n) {
++static void mg_strlcpy(char *dst, const char *src, size_t n) {
+   for (; *src != '\0' && n > 1; n--) {
+     *dst++ = *src++;
+   }
+@@ -2139,7 +2139,7 @@ static void MD5Init(MD5_CTX *ctx) {
+ }
+ 
+ static void MD5Transform(uint32_t buf[4], uint32_t const in[16]) {
+-  register uint32_t a, b, c, d;
++  uint32_t a, b, c, d;
+ 
+   a = buf[0];
+   b = buf[1];
+@@ -4511,7 +4511,7 @@ static int set_ports_option(struct mg_context *ctx) {
+ 					   (void *)
+ #endif
+ 					   &on, sizeof(on))) != 0 ||
+-	       (rc_bind = bind(so.sock,
++	       (rc_bind = ::bind(so.sock,
+ 			       &sa->sa,
+ 			       (sa->sa.sa_family == AF_INET) ? sizeof(sa->sin) : sizeof(sa->sin6))
+ 		) != 0 ||

Property changes on: head/net/ntopng/files/patch-third-party_mongoose_mongoose.c
___________________________________________________________________
Added: fbsd:nokeywords
## -0,0 +1 ##
+yes
\ No newline at end of property
Added: svn:eol-style
## -0,0 +1 ##
+native
\ No newline at end of property
Added: svn:mime-type
## -0,0 +1 ##
+text/plain
\ No newline at end of property
Index: head/net/ntopng/files/patch-third-party_snmp_net.c
===================================================================
--- head/net/ntopng/files/patch-third-party_snmp_net.c	(nonexistent)
+++ head/net/ntopng/files/patch-third-party_snmp_net.c	(revision 459371)
@@ -0,0 +1,11 @@
+--- third-party/snmp/net.c.orig	2018-01-12 09:48:20 UTC
++++ third-party/snmp/net.c
+@@ -64,7 +64,7 @@ int open_udp_socket(int port)
+   si_me.sin_family = AF_INET;
+   si_me.sin_port = htons(port);
+   si_me.sin_addr.s_addr = htonl(INADDR_ANY);
+-  if (bind(s, (struct sockaddr *) &si_me, sizeof(si_me)) != 0)
++  if (::bind(s, (struct sockaddr *) &si_me, sizeof(si_me)) != 0)
+     return(-1); //diep("bind");
+     
+   return s;

Property changes on: head/net/ntopng/files/patch-third-party_snmp_net.c
___________________________________________________________________
Added: fbsd:nokeywords
## -0,0 +1 ##
+yes
\ No newline at end of property
Added: svn:eol-style
## -0,0 +1 ##
+native
\ No newline at end of property
Added: svn:mime-type
## -0,0 +1 ##
+text/plain
\ No newline at end of property