net/ntopng: Update to latest upstream snapshot

While here, regenerate patches.

6 files changed, 26 insertions, 51 deletions

diff --git a/net/ntopng/Makefile b/net/ntopng/Makefile
index a5bd4f43c90e..64e825b29976 100644
--- a/net/ntopng/Makefile
+++ b/net/ntopng/Makefile
@@ -1,5 +1,5 @@
 PORTNAME=	ntopng
-PORTVERSION=	5.6.d20230216
+PORTVERSION=	5.6.d20230531
 PORTEPOCH=	1
 CATEGORIES=	net
 
@@ -38,9 +38,9 @@ GROUPS=		ntopng
 PLIST_SUB=	NTOPNGUSER="${USERS}" NTOPNGROUP="${GROUPS}"
 
 USE_GITHUB=	yes
-GH_TUPLE=	ntop:ntopng-dist:6f66796:dist/httpdocs/dist
+GH_TUPLE=	ntop:ntopng-dist:535c490:dist/httpdocs/dist
 GH_ACCOUNT=	ntop
-GH_TAGNAME=	39ce2fd
+GH_TAGNAME=	a4917fa
 
 CPE_VENDOR=	ntop
 
diff --git a/net/ntopng/distinfo b/net/ntopng/distinfo
index 4e1bcd99e266..6a7f8a3e6e0c 100644
--- a/net/ntopng/distinfo
+++ b/net/ntopng/distinfo
@@ -1,5 +1,5 @@
-TIMESTAMP = 1676626872
-SHA256 (ntop-ntopng-5.6.d20230216-39ce2fd_GH0.tar.gz) = 3d0f50dfc52ab5404318fa86d3fbdc5260ef1324f850bcdd79d4556e534af27c
-SIZE (ntop-ntopng-5.6.d20230216-39ce2fd_GH0.tar.gz) = 46322951
-SHA256 (ntop-ntopng-dist-6f66796_GH0.tar.gz) = d75d0e5c8afd81aa4615e4cbd5701ff623106e1ef1f9a17cb50f16da99b32044
-SIZE (ntop-ntopng-dist-6f66796_GH0.tar.gz) = 2480369
+TIMESTAMP = 1686152508
+SHA256 (ntop-ntopng-5.6.d20230531-a4917fa_GH0.tar.gz) = be8afe2b30daec1c18a07045d02306b732670405ff0cc4737dbd4d386ee5302b
+SIZE (ntop-ntopng-5.6.d20230531-a4917fa_GH0.tar.gz) = 46454949
+SHA256 (ntop-ntopng-dist-535c490_GH0.tar.gz) = 27fc7f0abab6e52c57125d3c1c45d391c42c1da57b69438295add8b161162ade
+SIZE (ntop-ntopng-dist-535c490_GH0.tar.gz) = 2527921
diff --git a/net/ntopng/files/patch-configure.ac.in b/net/ntopng/files/patch-configure.ac.in
index 72c8dad69b2f..0eb772b211f8 100644
--- a/net/ntopng/files/patch-configure.ac.in
+++ b/net/ntopng/files/patch-configure.ac.in
@@ -1,6 +1,6 @@
---- configure.ac.in.orig	2023-02-16 14:08:39 UTC
+--- configure.ac.in.orig	2023-05-31 14:54:04 UTC
 +++ configure.ac.in
-@@ -91,56 +91,8 @@ LIBPCAP=-lpcap
+@@ -90,40 +90,8 @@ LIBPCAP=-lpcap
  MAKE=make
  BIN_PATH=/usr/bin
  LIBPCAP=-lpcap
@@ -26,7 +26,7 @@
 -   dnl> CXX=clang++ -fsanitize=address -fsanitize-address-use-after-scope
 -   OSXV=`sw_vers -productVersion`
 -   if test $SYSTEM = "Darwin"; then
--     OS="MacOSX $OSXV"
+-     OS="macOS $OSXV"
 -   else
 -     OS=`uname -or | cut -d '-' -f 1`
 -   fi
@@ -37,28 +37,12 @@
 -            CFLAGS="-fno-color-diagnostics $CFLAGS"
 -      fi
 -   fi
--dnl> else
--dnl>   if test $SYSTEM = "Linux"; then
--dnl>     if [ test -f /usr/bin/clang++ ]; then
--dnl>       CC=clang
--dnl>       CXX="clang++ -fpie -fno-color-diagnostics $CLANG_STDLIB"
--dnl>       AC_MSG_RESULT(Using clang++ compiler)
--dnl>     fi
--dnl> 
--dnl>     if [ test -f /etc/redhat-release ]; then
--dnl>       OS=`cat /etc/redhat-release`
--dnl>     else
--dnl>       if [ test -f /usr/bin/lsb_release ]; then
--dnl>         OS=`/usr/bin/lsb_release -d|cut -d ':' -f 2`
--dnl>       fi
--dnl>     fi
--dnl>   fi
 -fi
 -
  dnl> Remove spaces
  OS="${OS#"${OS%%[![:space:]]*}"}"
  
-@@ -182,15 +134,6 @@ fi
+@@ -165,15 +133,6 @@ fi
    LIBS="${LIBS} -lnetfilter_queue -lnfnetlink -lnetfilter_conntrack"
  fi
  
@@ -74,7 +58,7 @@
  if test -d /opt/local/include; then :
    CFLAGS="${CFLAGS} -I/opt/local/include"
    CPPFLAGS="${CPPFLAGS} -I/opt/local/include"
-@@ -244,15 +187,12 @@ AC_ARG_WITH(ndpi-includes,
+@@ -227,15 +186,12 @@ AC_ARG_WITH(ndpi-includes,
        NDPI_CUST_INC="-I$withval -I$withval/../lib/third_party/include"
     ])
  
@@ -96,7 +80,7 @@
        if test -d "./nDPI" ; then :
           NDPI_HOME=./nDPI
        elif test -d "../nDPI" ; then :
-@@ -277,8 +217,8 @@ AC_MSG_CHECKING(for nDPI source)
+@@ -260,8 +216,8 @@ AC_MSG_CHECKING(for nDPI source)
        else
           AC_MSG_RESULT(not found)
        fi
@@ -106,7 +90,7 @@
  if test ! -z "$NDPI_CUST_INC" ; then :
    NDPI_INC=$NDPI_CUST_INC
  fi
-@@ -295,18 +235,14 @@ dnl finish: nDPI handling
+@@ -278,18 +234,14 @@ dnl finish: nDPI handling
  fi
  dnl finish: nDPI handling
  
@@ -132,7 +116,7 @@
  fi
  
  pkg-config --exists libssl
-@@ -461,11 +397,7 @@ if test "$?" -ne 1; then
+@@ -447,11 +399,7 @@ if test "$?" -ne 1; then
  pkg-config --exists hiredis
  if test "$?" -ne 1; then
    HIREDIS_INC="`pkg-config --cflags hiredis` -I/usr/include/hiredis"
@@ -145,7 +129,7 @@
  else
    echo "Please install hiredis package prerequisite"
    exit -1
-@@ -483,14 +415,14 @@ if test "${with_nedge+set}" != set; then
+@@ -469,14 +417,14 @@ if test "${with_nedge+set}" != set; then
    fi
  
    if test $SYSTEM = "FreeBSD"; then
@@ -162,7 +146,7 @@
    AC_DEFINE_UNQUOTED(HAVE_PF_RING, 1, [Native PF_RING support])
    if test -f "${PF_RING_HOME}/userland/lib/libpfring.a"; then
       echo "${PF_RING_HOME}/userland/libpcap/libpcap.a"
-@@ -510,18 +442,18 @@ if test "${with_nedge+set}" != set; then
+@@ -496,18 +444,18 @@ if test "${with_nedge+set}" != set; then
           CPPFLAGS="${CPPFLAGS} -I/opt/pfring/include"
           echo "Using PF_RING installed in /opt/pfring"
        else
@@ -187,7 +171,7 @@
  	  echo "Please make sure you have installed your PF_RING libraries and try again"
  	  exit 1
          fi
-@@ -670,9 +602,9 @@ dnl> FreeBSD
+@@ -656,9 +604,9 @@ dnl> FreeBSD
  fi
  
  dnl> FreeBSD
diff --git a/net/ntopng/files/patch-httpdocs_misc_ntopng-utils-manage-config.in b/net/ntopng/files/patch-httpdocs_misc_ntopng-utils-manage-config.in
index 634c45414efd..9c080e985518 100644
--- a/net/ntopng/files/patch-httpdocs_misc_ntopng-utils-manage-config.in
+++ b/net/ntopng/files/patch-httpdocs_misc_ntopng-utils-manage-config.in
@@ -1,8 +1,8 @@
---- httpdocs/misc/ntopng-utils-manage-config.in.orig	2018-12-21 18:58:17 UTC
+--- httpdocs/misc/ntopng-utils-manage-config.in.orig	2023-05-31 14:54:04 UTC
 +++ httpdocs/misc/ntopng-utils-manage-config.in
-@@ -2,7 +2,7 @@
+@@ -14,7 +14,7 @@ DEFAULT_CONF_FILE="${NTOPNG_CONFIG_PATH}/ntopng.conf"
  
- DEFAULT_CONF_FILE="/etc/ntopng/ntopng.conf"
+ DEFAULT_CONF_FILE="${NTOPNG_CONFIG_PATH}/ntopng.conf"
  
 -DEFAULT_DATADIR="/var/lib/ntopng"
 +DEFAULT_DATADIR="/var/db/ntopng"
diff --git a/net/ntopng/files/patch-include_ntop__defines.h b/net/ntopng/files/patch-include_ntop__defines.h
index 9080ef13c76b..fffd6b4ca95e 100644
--- a/net/ntopng/files/patch-include_ntop__defines.h
+++ b/net/ntopng/files/patch-include_ntop__defines.h
@@ -1,6 +1,6 @@
---- include/ntop_defines.h.orig	2021-08-20 09:38:15 UTC
+--- include/ntop_defines.h.orig	2023-05-31 14:54:04 UTC
 +++ include/ntop_defines.h
-@@ -523,7 +523,7 @@
+@@ -542,7 +542,7 @@
  #define CONST_SHARE_DIR              "/usr/share"
  #define CONST_SHARE_DIR_2            "/usr/local/share"
  #define CONST_ETC_DIR                "/etc"
diff --git a/net/ntopng/pkg-plist b/net/ntopng/pkg-plist
index a95917586837..44aa6d49e04f 100644
--- a/net/ntopng/pkg-plist
+++ b/net/ntopng/pkg-plist
@@ -5,19 +5,16 @@ man/man8/ntopng.8.gz
 %%DATADIR%%/httpdocs/css/select2.min.css
 %%DATADIR%%/httpdocs/dist/0a1b701f5563c2288281.ttf
 %%DATADIR%%/httpdocs/dist/15d98c18221c8bcb2334.ttf
-%%DATADIR%%/httpdocs/dist/1a6e7eaefbde2f91f471.png
 %%DATADIR%%/httpdocs/dist/2bd53024cba1f2355d53.png
+%%DATADIR%%/httpdocs/dist/3d503f89ccaf1b224aa5.woff2
 %%DATADIR%%/httpdocs/dist/4896d4b04430cc3dfb06.woff2
-%%DATADIR%%/httpdocs/dist/4e48546121b5478aa6cd.png
-%%DATADIR%%/httpdocs/dist/518b8c59f15bff8fad43.png
-%%DATADIR%%/httpdocs/dist/6a2400dc21b9371537a6.png
+%%DATADIR%%/httpdocs/dist/52eba2c567c521b8d58a.ttf
 %%DATADIR%%/httpdocs/dist/73879eafee8fd84e7c13.png
 %%DATADIR%%/httpdocs/dist/79da213423ac0def2058.ttf
 %%DATADIR%%/httpdocs/dist/8dbb811c120eea1560c8.png
 %%DATADIR%%/httpdocs/dist/95ce97b96124cddcc6ff.png
 %%DATADIR%%/httpdocs/dist/a0d12b5793f7a819cf4a.png
 %%DATADIR%%/httpdocs/dist/b18a220ea3ed601ec968.png
-%%DATADIR%%/httpdocs/dist/b2160eb121c76bb72cb1.png
 %%DATADIR%%/httpdocs/dist/bdacea417c235e289149.png
 %%DATADIR%%/httpdocs/dist/custom-theme.css
 %%DATADIR%%/httpdocs/dist/custom-theme.js
@@ -37,11 +34,6 @@ man/man8/ntopng.8.gz
 %%DATADIR%%/httpdocs/dist/images/marker-icon-red.png
 %%DATADIR%%/httpdocs/dist/images/marker-icon.png
 %%DATADIR%%/httpdocs/dist/images/marker-shadow.png
-%%DATADIR%%/httpdocs/dist/images/sort_asc.png
-%%DATADIR%%/httpdocs/dist/images/sort_asc_disabled.png
-%%DATADIR%%/httpdocs/dist/images/sort_both.png
-%%DATADIR%%/httpdocs/dist/images/sort_desc.png
-%%DATADIR%%/httpdocs/dist/images/sort_desc_disabled.png
 %%DATADIR%%/httpdocs/dist/images/ui-icons_444444_256x240.png
 %%DATADIR%%/httpdocs/dist/images/ui-icons_555555_256x240.png
 %%DATADIR%%/httpdocs/dist/images/ui-icons_777620_256x240.png
@@ -272,7 +264,6 @@ man/man8/ntopng.8.gz
 %%DATADIR%%/scripts/callbacks/checks/flows/custom_flow_end_script.lua.sample
 %%DATADIR%%/scripts/callbacks/checks/flows/custom_flow_periodic_script.lua.sample
 %%DATADIR%%/scripts/callbacks/checks/flows/custom_flow_protocol_detected_script.lua.sample
-%%DATADIR%%/scripts/callbacks/checks/hosts/custom_host_lua_script.lua
 %%DATADIR%%/scripts/callbacks/checks/hosts/custom_host_lua_script.lua.sample
 %%DATADIR%%/scripts/callbacks/daily-delayed/interface/interface_checks.lua
 %%DATADIR%%/scripts/callbacks/daily-delayed/interface/local_network_checks.lua