Update nDPI and ntopng to latest upstream snapshot versions.

svn path=/head/; revision=531757
2020-04-15 11:11:26 +00:00 · 2020-04-15 11:11:26 +00:00 · 5ab98672c1 · 2021-03-31 03:12:20 +00:00
commit 5ab98672c1
parent 1118a9239a
6 changed files with 40 additions and 59 deletions
--- a/net/ndpi/Makefile
+++ b/net/ndpi/Makefile
@ -2,7 +2,7 @@
 # $FreeBSD$

 PORTNAME=	ndpi
-PORTVERSION=	3.2.d20200324
+PORTVERSION=	3.2.d20200403
 PORTEPOCH=	1
 CATEGORIES=	net

@ -28,7 +28,7 @@ INSTALL_TARGET=	install-strip
 USE_GITHUB=	yes
 GH_ACCOUNT=	ntop
 GH_PROJECT=	nDPI
-GH_TAGNAME=	cd4f805
+GH_TAGNAME=	60e3ac6

 PLIST_SUB=	MAJOR_VER=${PORTVERSION:R:R} VER=${PORTVERSION:R}

--- a/net/ndpi/distinfo
+++ b/net/ndpi/distinfo
@ -1,3 +1,3 @@
-TIMESTAMP = 1585258208
-SHA256 (ntop-nDPI-3.2.d20200324-cd4f805_GH0.tar.gz) = 049e30ae3e8ad2be860cf52f1e76ba42852fe156d99b2e7252bd98c903b75d6f
-SIZE (ntop-nDPI-3.2.d20200324-cd4f805_GH0.tar.gz) = 29586575
+TIMESTAMP = 1586891830
+SHA256 (ntop-nDPI-3.2.d20200403-60e3ac6_GH0.tar.gz) = d7a1b6df9b5ddc2a653218a9c9185cf3b3009f7ddfeea0807ad747c020b13359
+SIZE (ntop-nDPI-3.2.d20200403-60e3ac6_GH0.tar.gz) = 29586002
--- a/net/ntopng/Makefile
+++ b/net/ntopng/Makefile
@ -2,8 +2,7 @@
 # $FreeBSD$

 PORTNAME=	ntopng
-PORTVERSION=	4.0.d20200326
-PORTREVISION=	1
+PORTVERSION=	4.0.d20200414
 PORTEPOCH=	1
 CATEGORIES=	net

@ -37,7 +36,7 @@ PLIST_SUB=	NTOPNGUSER="${USERS}" NTOPNGROUP="${GROUPS}"

 USE_GITHUB=	yes
 GH_ACCOUNT=	ntop
-GH_TAGNAME=	6d3ebbc
+GH_TAGNAME=	e7f6b4a

 CPE_VENDOR=	ntop

@ -50,8 +49,6 @@ NLS_USES=	gettext
 USE_RC_SUBR=	ntopng

 post-patch:
-	@${REINPLACE_CMD} -e 's|%%LOCALBASE%%|${LOCALBASE}|' \
-		${WRKSRC}/configure.seed
 	@${REINPLACE_CMD} -e 's/bind(/::bind(/' \
 		${WRKSRC}/src/SyslogCollectorInterface.cpp
 	cd ${WRKSRC} && ${SH} autogen.sh
@ -60,6 +57,7 @@ post-install:
 	${STRIP_CMD} ${STAGEDIR}${PREFIX}/bin/ntopng
 	${MKDIR} ${STAGEDIR}/var/db/ntopng
 	${INSTALL_SCRIPT} ${WRKDIR}/ntopng-geoip2update.sh ${STAGEDIR}${PREFIX}/bin
-	${RM} ${STAGEDIR}${DATADIR}/httpdocs/misc/ntopng-utils-manage-updates
+	${RM} ${STAGEDIR}${DATADIR}/httpdocs/misc/ntopng-utils-manage-updates \
+		${STAGEDIR}${DATADIR}/httpdocs/misc/ntopng-utils-manage-updates.in

 .include <bsd.port.mk>
--- a/net/ntopng/distinfo
+++ b/net/ntopng/distinfo
@ -1,3 +1,3 @@
-TIMESTAMP = 1585258827
-SHA256 (ntop-ntopng-4.0.d20200326-6d3ebbc_GH0.tar.gz) = a3239e08fbbe4493a0c95c05210a7e454d2192a17acfe1f3944c0bb07e2e2d64
-SIZE (ntop-ntopng-4.0.d20200326-6d3ebbc_GH0.tar.gz) = 43233771
+TIMESTAMP = 1586892413
+SHA256 (ntop-ntopng-4.0.d20200414-e7f6b4a_GH0.tar.gz) = 1fa0daf4442fe9ef48fa81267c5d60bff2dec05dc67d3cde59227963d3a53391
+SIZE (ntop-ntopng-4.0.d20200414-e7f6b4a_GH0.tar.gz) = 43234438
--- a/net/ntopng/files/patch-configure.seed
+++ b/net/ntopng/files/patch-configure.seed
@ -1,4 +1,4 @@
--- configure.seed.orig	2020-03-26 13:52:23 UTC
+--- configure.seed.orig	2020-04-14 13:42:12 UTC
 +++ configure.seed
@@ -67,33 +67,8 @@ fi
 # On CentOS 6 `git rev-list HEAD --count` does not work
@ -8,17 +8,17 @@
 +#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"
+-  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"
+-  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"
+-  CFLAGS="${CFLAGS} -I/opt/local/include"
+-  CPPFLAGS="${CPPFLAGS} -I/opt/local/include"
 -fi
 -
 -if test -d /opt/local/lib; then :
@ -26,58 +26,41 @@
 -fi
 -
 -if [ test -f /usr/bin/lsb_release ]; then
-   CODENAME=`/usr/bin/lsb_release -c|cut -f 2`
-   if [[ $CODENAME == "wheezy" ]]; then :
-     CPPFLAGS="${CPPFLAGS} -DOLD_NETFILTER_INTERFACE=1"
-   fi
+-  CODENAME=`/usr/bin/lsb_release -c|cut -f 2`
+-  if [[ $CODENAME == "wheezy" ]]; then :
+-    CPPFLAGS="${CPPFLAGS} -DOLD_NETFILTER_INTERFACE=1"
+-  fi
 -fi
 -
 SHORT_MACHINE=`uname -m | cut -b1-3`
 
 GIT_RELEASE="@GIT_RELEASE@"
-@@ -134,7 +109,7 @@ AC_ARG_WITH(ndpi-includes,
- PKG_CHECK_MODULES([NDPI], [libndpi >= 2.0], [
-    NDPI_INC=`echo $NDPI_CFLAGS | sed -e "s/[ ]*$//"`
-    # Use static libndpi library as building against the dynamic library fails
-   NDPI_LIB="-Wl,-Bstatic $NDPI_LIBS -Wl,-Bdynamic"
-+   NDPI_LIB="$NDPI_LIBS"
-    NDPI_LIB_DEP=
-    ], [
-       AC_MSG_CHECKING(for nDPI source)
-@@ -202,8 +177,15 @@ else
-    SSL_INC="-I/usr/local/opt/openssl/include"
-    SSL_LIB="-L/usr/local/opt/openssl/lib -lssl"
-  else
-   echo "Please install openssl-dev(el) package prerequisite"
-   exit -1
+@@ -201,6 +176,11 @@ else
+     AC_DEFINE_UNQUOTED(NO_SSL_DL, 1, [has openssl])
+     SSL_INC="-I/usr/local/opt/openssl/include"
+     SSL_LIB="-L/usr/local/opt/openssl/lib -lssl"
 +  dnl Workaround for FreeBSD
-+  if test -f "/usr/lib/libssl.so"; then
+  elif test -f "/usr/lib/libssl.so"; then
 +    AC_DEFINE_UNQUOTED(NO_SSL_DL, 1, [has openssl])
 +    SSL_INC="-I/usr/include"
 +    SSL_LIB="-L/usr/lib -lssl"
-+  else
-+    echo "Please install openssl-dev(el) package prerequisite"
-+    exit -1
-+  fi
-  fi
- fi
- 
-@@ -607,18 +589,6 @@ GMAKE=`which gmake`
- if test x$GMAKE = x
- then
- 	GMAKE="make"
+   else
+     echo "Please install openssl-dev(el) package prerequisite"
+     exit -1
+@@ -602,16 +582,6 @@ AC_DEFINE_UNQUOTED(_CRT_SECURE_NO_WARNINGS, 1, [Disabl
+ 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)
+-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)
+-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
--- a/net/ntopng/pkg-plist
+++ b/net/ntopng/pkg-plist
@ -1962,6 +1962,7 @@ man/man8/ntopng.8.gz
 %%DATADIR%%/scripts/lua/captive_portal.lua
 %%DATADIR%%/scripts/lua/change_password.lua
 %%DATADIR%%/scripts/lua/check_recording_data.lua
+%%DATADIR%%/scripts/lua/check_major_release.lua
 %%DATADIR%%/scripts/lua/check_update.lua
 %%DATADIR%%/scripts/lua/code_viewer.lua
 %%DATADIR%%/scripts/lua/container_details.lua
@ -2029,7 +2030,6 @@ man/man8/ntopng.8.gz
 %%DATADIR%%/scripts/lua/get_macs_data.lua
 %%DATADIR%%/scripts/lua/get_network_data.lua
 %%DATADIR%%/scripts/lua/get_networks_data.lua
-%%DATADIR%%/scripts/lua/get_new_blog_posts.lua
 %%DATADIR%%/scripts/lua/get_num_alerts.lua
 %%DATADIR%%/scripts/lua/get_pods_data.lua
 %%DATADIR%%/scripts/lua/get_pool_data.lua
@ -2060,7 +2060,6 @@ man/man8/ntopng.8.gz
 %%DATADIR%%/scripts/lua/hosts_comparison_sankey.lua
 %%DATADIR%%/scripts/lua/hosts_geomap.lua
 %%DATADIR%%/scripts/lua/hosts_stats.lua
-%%DATADIR%%/scripts/lua/hosts_treemap.lua
 %%DATADIR%%/scripts/lua/hotspot-detect.lua
 %%DATADIR%%/scripts/lua/http_servers_stats.lua
 %%DATADIR%%/scripts/lua/if_pkt_distro.lua
@ -2275,6 +2274,7 @@ man/man8/ntopng.8.gz
 %%DATADIR%%/scripts/lua/traffic_extraction_data.lua
 %%DATADIR%%/scripts/lua/traffic_recording_config.lua
 %%DATADIR%%/scripts/lua/unknown_devices.lua
+%%DATADIR%%/scripts/lua/update_blog_posts.lua
 %%DATADIR%%/scripts/lua/update_prefs.lua
 %%DATADIR%%/scripts/lua/user_script_details.lua
 %%DATADIR%%/scripts/lua/user_scripts_overview.lua