net/ndpi: Update to 4.6 latest upstream stable snapshot

6 files changed, 27 insertions, 41 deletions

diff --git a/net/ndpi/Makefile b/net/ndpi/Makefile
index 24c7e8a0c5ef..d2bb15ab453e 100644
--- a/net/ndpi/Makefile
+++ b/net/ndpi/Makefile
@@ -1,5 +1,5 @@
 PORTNAME=	ndpi
-PORTVERSION=	4.4.d20221026
+PORTVERSION=	4.6.d20230201
 PORTEPOCH=	1
 CATEGORIES=	net
 
@@ -30,7 +30,7 @@ INSTALL_TARGET=	install-strip
 USE_GITHUB=	yes
 GH_ACCOUNT=	ntop
 GH_PROJECT=	nDPI
-GH_TAGNAME=	299fc4d
+GH_TAGNAME=	56aade0
 
 PLIST_SUB=	MAJOR_VER=${PORTVERSION:R:R} VER=${PORTVERSION:R}
 
diff --git a/net/ndpi/distinfo b/net/ndpi/distinfo
index 178f0cc9cdfc..cf22417b86f9 100644
--- a/net/ndpi/distinfo
+++ b/net/ndpi/distinfo
@@ -1,3 +1,3 @@
-TIMESTAMP = 1671612061
-SHA256 (ntop-nDPI-4.4.d20221026-299fc4d_GH0.tar.gz) = 75e107ceca36dd7c7541a03cb2967dbc006d24e9d3254199e4b9ad217f771083
-SIZE (ntop-nDPI-4.4.d20221026-299fc4d_GH0.tar.gz) = 151062882
+TIMESTAMP = 1676626529
+SHA256 (ntop-nDPI-4.6.d20230201-56aade0_GH0.tar.gz) = cbde34191cd8bb6d0aa51775f4ed07c2919a5668dde94fabff8ee38eb23ec684
+SIZE (ntop-nDPI-4.6.d20230201-56aade0_GH0.tar.gz) = 29706674
diff --git a/net/ndpi/files/patch-example_Makefile.in b/net/ndpi/files/patch-example_Makefile.in
index 87d9a194fc93..afac677a898a 100644
--- a/net/ndpi/files/patch-example_Makefile.in
+++ b/net/ndpi/files/patch-example_Makefile.in
@@ -1,4 +1,4 @@
---- example/Makefile.in.orig	2022-07-14 16:13:42 UTC
+--- example/Makefile.in.orig	2023-02-01 17:29:59 UTC
 +++ example/Makefile.in
 @@ -6,46 +6,23 @@ SRCHOME=../src
  DISABLE_NPCAP=@DISABLE_NPCAP@
@@ -7,9 +7,9 @@
 -ifneq ($(OS),Windows_NT)
 -CFLAGS+=-fPIC -DPIC
 -endif
--CFLAGS+=-I$(SRCHOME)/include @PCAP_INC@ @CFLAGS@ @GPROF_CFLAGS@
-+CFLAGS+=-fPIC -DPIC -I$(SRCHOME)/include @PCAP_INC@ @CFLAGS@ @GPROF_CFLAGS@
- LDFLAGS=@LDFLAGS@
+-CFLAGS+=-I$(SRCHOME)/include @NDPI_CFLAGS@ @PCAP_INC@ @GPROF_CFLAGS@
++CFLAGS+=-fPIC -DPIC -I$(SRCHOME)/include @NDPI_CFLAGS@ @PCAP_INC@ @CFLAGS@ @GPROF_CFLAGS@
+ LDFLAGS+=@NDPI_LDFLAGS@
  LIBNDPI=$(SRCHOME)/lib/libndpi.a
  LIBS=$(LIBNDPI) @PCAP_LIB@ @ADDITIONAL_LIBS@ @LIBS@ @GPROF_LIBS@
  HEADERS=reader_util.h $(SRCHOME)/include/ndpi_api.h \
diff --git a/net/ndpi/files/patch-src_lib_Makefile.in b/net/ndpi/files/patch-src_lib_Makefile.in
index 01fb958f91cc..e27fd4ca157b 100644
--- a/net/ndpi/files/patch-src_lib_Makefile.in
+++ b/net/ndpi/files/patch-src_lib_Makefile.in
@@ -1,17 +1,17 @@
 -	/bin/rm -f libndpi.a $(OBJECTS)
 new file mode 100644
---- src/lib/Makefile.in.orig	2022-07-14 16:13:42 UTC
+--- src/lib/Makefile.in.orig	2023-02-01 17:29:59 UTC
 +++ src/lib/Makefile.in
-@@ -14,15 +14,12 @@ includedir = ${prefix}/include/ndpi
- prefix     = @prefix@
- libdir     = ${prefix}/lib
- includedir = ${prefix}/include/ndpi
+@@ -14,15 +14,12 @@ includedir = @includedir@/ndpi
+ PREFIX     = @prefix@
+ libdir     = @libdir@
+ includedir = @includedir@/ndpi
 -ifneq ($(OS),Windows_NT)
 -CFLAGS     += -fPIC -DPIC
 -endif
--CFLAGS     += -I../include -Ithird_party/include -DNDPI_LIB_COMPILATION @CFLAGS@ @GPROF_CFLAGS@ @CUSTOM_NDPI@
-+CFLAGS     += -fPIC -DPIC -I../include -Ithird_party/include -DNDPI_LIB_COMPILATION @CFLAGS@ @GPROF_CFLAGS@ @CUSTOM_NDPI@
- LDFLAGS    = @LDFLAGS@
+-CFLAGS     += -I../include -Ithird_party/include -DNDPI_LIB_COMPILATION @NDPI_CFLAGS@ @GPROF_CFLAGS@ @CUSTOM_NDPI@ @ADDITIONAL_INCS@
++CFLAGS     += -fPIC -DPIC -I../include -Ithird_party/include -DNDPI_LIB_COMPILATION @NDPI_CFLAGS@ @CFLAGS@ @GPROF_CFLAGS@ @CUSTOM_NDPI@ @ADDITIONAL_INCS@
+ LDFLAGS    += @NDPI_LDFLAGS@
  LIBS       = @ADDITIONAL_LIBS@ @LIBS@ @GPROF_LIBS@
  
 -OBJECTS   = $(patsubst protocols/%.c, protocols/%.o, $(wildcard protocols/*.c)) $(patsubst third_party/src/%.c, third_party/src/%.o, $(wildcard third_party/src/*.c)) $(patsubst ./%.c, ./%.o, $(wildcard ./*.c))
@@ -21,7 +21,7 @@ new file mode 100644
  NDPI_VERSION_MAJOR   = @NDPI_MAJOR@
  NDPI_LIB_STATIC      = libndpi.a
  NDPI_LIB_SHARED_BASE = libndpi.so
-@@ -30,27 +27,8 @@ USE_HOST_LIBGCRYPT   = @USE_HOST_LIBGCRYPT@
+@@ -30,27 +27,9 @@ USE_HOST_LIBGCRYPT   = @USE_HOST_LIBGCRYPT@
  NDPI_LIBS            = $(NDPI_LIB_STATIC) $(NDPI_LIB_SHARED)
  USE_HOST_LIBGCRYPT   = @USE_HOST_LIBGCRYPT@
  
@@ -34,7 +34,7 @@ new file mode 100644
 -OS := $(shell uname)
 -endif
  BUILD_MINGW    		 = @BUILD_MINGW@
--
+ 
 -ifeq ($(OS),Darwin)
 -CC=clang
 -SONAME_FLAG=
diff --git a/net/ndpi/files/patch-tests_dga_Makefile.in b/net/ndpi/files/patch-tests_dga_Makefile.in
index 2e0dbdf6b39a..0bd7c19df5a1 100644
--- a/net/ndpi/files/patch-tests_dga_Makefile.in
+++ b/net/ndpi/files/patch-tests_dga_Makefile.in
@@ -1,4 +1,4 @@
---- tests/dga/Makefile.in.orig	2022-07-14 16:13:42 UTC
+--- tests/dga/Makefile.in.orig	2023-02-01 17:29:59 UTC
 +++ tests/dga/Makefile.in
 @@ -4,10 +4,7 @@ SRCHOME=../../src
  
@@ -7,11 +7,11 @@
 -ifneq ($(OS),Windows_NT)
 -CFLAGS+=-fPIC -DPIC
 -endif
--CFLAGS+=-g -I$(SRCHOME)/include @CFLAGS@
-+CFLAGS+=-fPIC -DPIC -g -I$(SRCHOME)/include @CFLAGS@
+-CFLAGS+=-g -I$(SRCHOME)/include @NDPI_CFLAGS@
++CFLAGS+=-fPIC -DPIC -g -I$(SRCHOME)/include @CFLAGS@ @NDPI_CFLAGS@
  LIBNDPI=$(SRCHOME)/lib/libndpi.a
  LIBS=$(LIBNDPI) @ADDITIONAL_LIBS@ -lpthread @LIBS@
- LDFLAGS=@LDFLAGS@
+ LDFLAGS+=@NDPI_LDFLAGS@
 @@ -18,7 +15,7 @@ EXECUTABLE_SOURCES := dga_evaluate.c
  all: dga_evaluate$(EXE_SUFFIX)
  
@@ -21,10 +21,3 @@
  
  dga_evaluate$(EXE_SUFFIX): $(LIBNDPI) dga_evaluate.o
  	$(CC) $(CFLAGS) $(CPPFLAGS) $(LDFLAGS) dga_evaluate.o $(LIBS) -o $@
-@@ -38,6 +35,4 @@ distclean: clean
- 
- distclean: clean
- 	/bin/rm -f Makefile
--
--check:
- 	true # nothing to do here, done by invoking tests/do-dga.sh
diff --git a/net/ndpi/files/patch-tests_unit_Makefile.in b/net/ndpi/files/patch-tests_unit_Makefile.in
index 96040ac63d7d..5ab8bbb1122e 100644
--- a/net/ndpi/files/patch-tests_unit_Makefile.in
+++ b/net/ndpi/files/patch-tests_unit_Makefile.in
@@ -1,4 +1,4 @@
---- tests/unit/Makefile.in.orig	2022-07-14 16:13:42 UTC
+--- tests/unit/Makefile.in.orig	2023-02-01 17:29:59 UTC
 +++ tests/unit/Makefile.in
 @@ -5,10 +5,7 @@ SRCHOME=../../src
  
@@ -7,11 +7,11 @@
 -ifneq ($(OS),Windows_NT)
 -CFLAGS+=-fPIC -DPIC
 -endif
--CFLAGS+=-g -I$(SRCHOME)/include @JSONC_CFLAGS@ @PCAP_INC@ @CFLAGS@
-+CFLAGS+=-fPIC -DPIC -g -I$(SRCHOME)/include @JSONC_CFLAGS@ @PCAP_INC@ @CFLAGS@
+-CFLAGS+=-g -I$(SRCHOME)/include @NDPI_CFLAGS@ @JSONC_CFLAGS@ @PCAP_INC@
++CFLAGS+=-fPIC -DPIC -g -I$(SRCHOME)/include @NDPI_CFLAGS@ @JSONC_CFLAGS@ @PCAP_INC@ @CFLAGS@
  LIBNDPI=$(SRCHOME)/lib/libndpi.a
  LIBS=$(LIBNDPI) @PCAP_LIB@ @ADDITIONAL_LIBS@ @JSONC_LIBS@ @LIBS@
- LDFLAGS=@LDFLAGS@
+ LDFLAGS+=@NDPI_LDFLAGS@
 @@ -16,28 +13,7 @@ PREFIX?=@prefix@
  OBJS=unit
  PREFIX?=@prefix@
@@ -41,10 +41,3 @@
  
  all: unit$(EXE_SUFFIX)
  
-@@ -62,6 +38,4 @@ distclean: clean
- 
- distclean: clean
- 	/bin/rm -f Makefile
--
--check:
- 	true # nothing to do here, done by invoking tests/do-unit.sh