diff --git a/net/ndpi/Makefile b/net/ndpi/Makefile index 35a0225fc137..db97776be840 100644 --- a/net/ndpi/Makefile +++ b/net/ndpi/Makefile @@ -1,52 +1,52 @@ PORTNAME= ndpi -PORTVERSION= 4.14.d20250609 +PORTVERSION= 5.0.d20251224 PORTEPOCH= 1 CATEGORIES= net MAINTAINER= madpilot@FreeBSD.org COMMENT= NTOP-maintained superset of the popular OpenDPI library WWW= https://www.ntop.org/products/deep-packet-inspection/ndpi/ LICENSE= LGPL3+ LICENSE_FILE= ${WRKSRC}/COPYING LIB_DEPENDS= librrd.so:databases/rrdtool \ libjson-c.so:devel/json-c \ libgcrypt.so:security/libgcrypt \ libgpg-error.so:security/libgpg-error USES= autoreconf compiler:c++11-lang cpe libtool localbase:ldflags pathfix \ pkgconfig CPE_VENDOR= ntop USE_LDCONFIG= yes CONFIGURE_ARGS= --with-pic --with-local-libgcrypt CPPFLAGS= -I${LOCALBASE}/include/json-c LIBS= -ljson-c MAKE_ENV= EXAMPLESDIR="${EXAMPLESDIR_REL}" GNU_CONFIGURE= yes INSTALL_TARGET= install-strip USE_GITHUB= yes GH_ACCOUNT= ntop GH_PROJECT= nDPI -GH_TAGNAME= f2a9087 +GH_TAGNAME= 6ddf2ea PLIST_SUB= MAJOR_VER=${PORTVERSION:R:R} VER=${PORTVERSION:R} post-configure: @${REINPLACE_CMD} -e 's/#define PACKAGE/#define NDPI_PACKAGE/g' \ -e 's/#define VERSION/#define NDPI_VERSION/g' \ ${WRKSRC}/configure post-install: ${STRIP_CMD} ${STAGEDIR}${PREFIX}/lib/libndpi.so.${PORTVERSION:R}.0 ${STRIP_CMD} ${STAGEDIR}${PREFIX}/bin/ndpiReader ${RM} ${STAGEDIR}${PREFIX}/lib/libndpi.so \ ${STAGEDIR}${PREFIX}/lib/libndpi.so.${PORTVERSION:R:R} ${RLN} ${STAGEDIR}${PREFIX}/lib/libndpi.so.${PORTVERSION:R}.0 \ ${STAGEDIR}${PREFIX}/lib/libndpi.so ${RLN} ${STAGEDIR}${PREFIX}/lib/libndpi.so.${PORTVERSION:R}.0 \ ${STAGEDIR}${PREFIX}/lib/libndpi.so.${PORTVERSION:R:R} .include diff --git a/net/ndpi/distinfo b/net/ndpi/distinfo index c29985c2a31a..a7ca5d5bdd42 100644 --- a/net/ndpi/distinfo +++ b/net/ndpi/distinfo @@ -1,3 +1,3 @@ -TIMESTAMP = 1759129522 -SHA256 (ntop-nDPI-4.14.d20250609-f2a9087_GH0.tar.gz) = 97ed7925c44ce3994da73666900c416e4b81360310a5f72d34ba17eab1abe691 -SIZE (ntop-nDPI-4.14.d20250609-f2a9087_GH0.tar.gz) = 48476632 +TIMESTAMP = 1766955507 +SHA256 (ntop-nDPI-5.0.d20251224-6ddf2ea_GH0.tar.gz) = b463a560cd78de2f48d4688a0ba1a70063ec4779678a4e7a360ffa36ba2e8409 +SIZE (ntop-nDPI-5.0.d20251224-6ddf2ea_GH0.tar.gz) = 42136226 diff --git a/net/ndpi/files/patch-example_Makefile.in b/net/ndpi/files/patch-example_Makefile.in index 9236fd15c5c5..1f0b3c26232e 100644 --- a/net/ndpi/files/patch-example_Makefile.in +++ b/net/ndpi/files/patch-example_Makefile.in @@ -1,78 +1,77 @@ ---- example/Makefile.in.orig 2024-12-17 13:59:14 UTC +--- example/Makefile.in.orig 2025-11-17 08:11:53 UTC +++ example/Makefile.in -@@ -1,57 +1,28 @@ CXX=@CXX@ +@@ -7,57 +7,28 @@ CXX=@CXX@ AR=@AR@ CC=@CC@ CXX=@CXX@ -ifneq ($(OS),Windows_NT) -OS := $(shell uname) -endif -ifeq ($(OS),Darwin) -CC=clang -fno-color-diagnostics -endif BUILD_MINGW=@BUILD_MINGW@ BUILD_MINGW_X64=@BUILD_MINGW_X64@ DISABLE_NPCAP=@DISABLE_NPCAP@ EXE_SUFFIX=@EXE_SUFFIX@ - SRCHOME=../src + SRCHOME=$(top_srcdir)/src -ifneq ($(OS),Windows_NT) -CFLAGS+=-fPIC -DPIC -endif --CFLAGS+=-I$(SRCHOME)/include @NDPI_CFLAGS@ @PCAP_INC@ @GPROF_CFLAGS@ @CUSTOM_NDPI@ -+CFLAGS+=-fPIC -DPIC -I$(SRCHOME)/include @NDPI_CFLAGS@ @PCAP_INC@ @GPROF_CFLAGS@ @CUSTOM_NDPI@ +-CFLAGS+=-I$(SRCHOME)/include -I$(top_builddir)/src/include @NDPI_CFLAGS@ @PCAP_INC@ @GPROF_CFLAGS@ @CUSTOM_NDPI@ ++CFLAGS+=-fPIC -DPIC -I$(SRCHOME)/include -I$(top_builddir)/src/include @NDPI_CFLAGS@ @PCAP_INC@ @GPROF_CFLAGS@ @CUSTOM_NDPI@ LDFLAGS+=@NDPI_LDFLAGS@ - LIBNDPI=$(SRCHOME)/lib/libndpi.a + LIBNDPI=$(top_builddir)/src/lib/libndpi.a LIBS=$(LIBNDPI) @PCAP_LIB@ @ADDITIONAL_LIBS@ @LIBS@ @GPROF_LIBS@ HEADERS=reader_util.h $(SRCHOME)/include/ndpi_api.h \ $(SRCHOME)/include/ndpi_typedefs.h $(SRCHOME)/include/ndpi_protocol_ids.h PREFIX?=@prefix@ +EXAMPLESDIR?=share/examples/ndpi -ifneq ($(BUILD_MINGW),) - -ifeq ($(DISABLE_NPCAP),0) -CFLAGS+=-I@srcdir@/../windows/WpdPack/Include -I@srcdir@/../windows/WpdPack/Include/pcap -else -CFLAGS+=-DDISABLE_NPCAP -endif - -ifeq ($(DISABLE_NPCAP),0) - -ifneq ($(BUILD_MINGW_X64),) -LIBS+=@srcdir@/../windows/WpdPack/Lib/x64/wpcap.lib -else -LIBS+=@srcdir@/../windows/WpdPack/Lib/wpcap.lib -endif - -endif - -LIBS+=-Wl,-Bstatic -lpthread -Wl,-Bdynamic -else LIBS+=-pthread -endif CFLAGS+=-pthread all: ndpiReader$(EXE_SUFFIX) @DPDK_TARGET@ EXECUTABLE_SOURCES := ndpiReader.c ndpiSimpleIntegration.c --COMMON_SOURCES := $(filter-out $(EXECUTABLE_SOURCES),$(wildcard *.c )) +-COMMON_SOURCES := $(filter-out $(EXECUTABLE_SOURCES),$(notdir $(wildcard $(srcdir)/*.c))) +COMMON_SOURCES = reader_util.c libndpiReader.a: $(COMMON_SOURCES:%.c=%.o) $(LIBNDPI) $(AR) rsv libndpiReader.a $(COMMON_SOURCES:%.c=%.o) -@@ -67,10 +38,11 @@ install: ndpiReader$(EXE_SUFFIX) +@@ -73,10 +44,10 @@ install: ndpiReader$(EXE_SUFFIX) install: ndpiReader$(EXE_SUFFIX) mkdir -p $(DESTDIR)$(PREFIX)/bin/ - mkdir -p $(DESTDIR)$(PREFIX)/share/ndpi + mkdir -p $(DESTDIR)$(PREFIX)/$(EXAMPLESDIR)/ cp ndpiReader$(EXE_SUFFIX) $(DESTDIR)$(PREFIX)/bin/ -- cp protos.txt $(DESTDIR)$(PREFIX)/share/ndpi/ndpiProtos.txt -- cp mining_hosts.txt $(DESTDIR)$(PREFIX)/share/ndpi/ndpiCustomCategory.txt +- cp $(srcdir)/protos.txt $(DESTDIR)$(PREFIX)/share/ndpi/ndpiProtos.txt +- cp $(srcdir)/mining_hosts.txt $(DESTDIR)$(PREFIX)/share/ndpi/ndpiCustomCategory.txt + cp protos.txt $(DESTDIR)$(PREFIX)/$(EXAMPLESDIR)/ndpiProtos.txt + cp mining_hosts.txt $(DESTDIR)$(PREFIX)/$(EXAMPLESDIR)/ndpiCustomCategory.txt -+ [ -f ndpiSimpleIntegration$(EXE_SUFFIX) ] && cp ndpiSimpleIntegration$(EXE_SUFFIX) $(DESTDIR)$(PREFIX)/bin/ndpiSimpleIntegration$(EXE_SUFFIX) || true [ -f build/app/ndpiReader.dpdk ] && cp build/app/ndpiReader.dpdk $(DESTDIR)$(PREFIX)/bin/ || true [ -f ndpiReader.dpdk ] && cp ndpiReader.dpdk $(DESTDIR)$(PREFIX)/bin/ || true diff --git a/net/ndpi/files/patch-src_lib_Makefile.in b/net/ndpi/files/patch-src_lib_Makefile.in index df5ce3968804..ee9472c1f60d 100644 --- a/net/ndpi/files/patch-src_lib_Makefile.in +++ b/net/ndpi/files/patch-src_lib_Makefile.in @@ -1,53 +1,53 @@ ---- src/lib/Makefile.in.orig 2024-08-07 09:36:14 UTC +--- src/lib/Makefile.in.orig 2025-11-17 08:11:53 UTC +++ src/lib/Makefile.in -@@ -14,13 +14,7 @@ includedir = @includedir@/ndpi - PREFIX = @prefix@ - libdir = @libdir@ +@@ -23,13 +23,7 @@ PREFIX = $(prefix) includedir = @includedir@/ndpi + # For backwards compatibility + PREFIX = $(prefix) -ifneq ($(OS),Windows_NT) -OS := $(shell uname) -endif -ifneq ($(OS),Windows_NT) -CFLAGS += -fPIC -DPIC -endif --CFLAGS += -I. -I../include -Ithird_party/include -DNDPI_LIB_COMPILATION @NDPI_CFLAGS@ @GPROF_CFLAGS@ @CUSTOM_NDPI@ @ADDITIONAL_INCS@ -+CFLAGS += -fPIC -DPIC -I. -I../include -Ithird_party/include -DNDPI_LIB_COMPILATION @NDPI_CFLAGS@ @GPROF_CFLAGS@ @CUSTOM_NDPI@ @ADDITIONAL_INCS@ +-CFLAGS += -I$(srcdir) -I$(top_srcdir)/src/include -I$(top_builddir)/src/include -I$(srcdir)/third_party/include -DNDPI_LIB_COMPILATION @NDPI_CFLAGS@ @GPROF_CFLAGS@ @CUSTOM_NDPI@ @ADDITIONAL_INCS@ ++CFLAGS += -fPIC -DPIC -I$(srcdir) -I$(top_srcdir)/src/include -I$(top_builddir)/src/include -I$(srcdir)/third_party/include -DNDPI_LIB_COMPILATION @NDPI_CFLAGS@ @GPROF_CFLAGS@ @CUSTOM_NDPI@ @ADDITIONAL_INCS@ CFLAGS_ndpi_bitmap.c := -Wno-unused-function CFLAGS_ndpi_bitmap64_fuse.c := -Wno-unused-function - CFLAGS_third_party/src/gcrypt_light.c := -Wno-unused-function -Wno-unused-parameter -@@ -29,8 +23,8 @@ LIBS = @ADDITIONAL_LIBS@ @LIBS@ @GPROF_LIBS@ + CFLAGS_gcrypt_light.c := -Wno-unused-function -Wno-unused-parameter +@@ -38,8 +32,8 @@ LIBS = @ADDITIONAL_LIBS@ @LIBS@ @GPROF_LIBS@ 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 third_party/src/hll/%.c, third_party/src/hll/%.o, $(wildcard third_party/src/hll/*.c)) $(patsubst ./%.c, ./%.o, $(wildcard ./*.c)) --HEADERS = $(wildcard ../include/*.h) $(wildcard *.h) -+OBJECTS != ls protocols/*.c | sed 's/\(.*\)\.c$$/\1.o/' && ls third_party/src/*.c | sed -e 's/\(.*\)\.c$$/\1.o/' -e '/gcrypt_light/d' && ls third_party/src/hll/*.c | sed -e 's/\(.*\)\.c$$/\1.o/' && ls ./*.c | sed 's/\(.*\)\.c$$/\1.o/' -+HEADERS != ls ../include/*.h +-OBJECTS = $(patsubst $(srcdir)/protocols/%.c, %.o, $(wildcard $(srcdir)/protocols/*.c)) $(patsubst $(srcdir)/third_party/src/%.c, %.o, $(wildcard $(srcdir)/third_party/src/*.c)) $(patsubst $(srcdir)/third_party/src/hll/%.c, %.o, $(wildcard $(srcdir)/third_party/src/hll/*.c)) $(patsubst $(srcdir)/%.c, %.o, $(wildcard $(srcdir)/*.c)) +-HEADERS = $(wildcard $(top_srcdir)/src/include/*.h) $(wildcard $(top_builddir)/src/include/*.h) $(wildcard $(srcdir)/*.h) ++OBJECTS != ls $(srcdir)/protocols/*.c | sed 's/\(.*\)\.c$$/\1.o/' && ls $(srcdir)/third_party/src/*.c | sed -e 's/\(.*\)\.c$$/\1.o/' -e '/gcrypt_light/d' && ls $(srcdir)/third_party/src/hll/*.c | sed -e 's/\(.*\)\.c$$/\1.o/' && ls $(srcdir)/*.c | sed 's/\(.*\)\.c$$/\1.o/' ++HEADERS != ls $(top_srcdir)/src/include/*.h && ls $(top_builddir)/src/include/*.h && ls $(srcdir)/include/*.h NDPI_VERSION_MAJOR = @NDPI_MAJOR@ NDPI_LIB_STATIC = libndpi.a NDPI_LIB_SHARED_BASE = libndpi.so -@@ -38,24 +32,7 @@ USE_HOST_LIBGCRYPT = @USE_HOST_LIBGCRYPT@ +@@ -47,24 +41,7 @@ USE_HOST_LIBGCRYPT = @USE_HOST_LIBGCRYPT@ NDPI_LIBS = $(NDPI_LIB_STATIC) $(NDPI_LIB_SHARED) USE_HOST_LIBGCRYPT = @USE_HOST_LIBGCRYPT@ -ifneq ($(USE_HOST_LIBGCRYPT),0) -TMP_OBJS := $(OBJECTS) --OBJECTS = $(filter-out third_party/src/gcrypt_light.o,$(TMP_OBJS)) +-OBJECTS = $(filter-out gcrypt_light.o,$(TMP_OBJS)) -endif - -BUILD_MINGW = @BUILD_MINGW@ - -ifeq ($(OS),Darwin) -CC=clang -fno-color-diagnostics -SONAME_FLAG= -else -ifneq ($(BUILD_MINGW),) -NDPI_LIB_SHARED_BASE = libndpi -NDPI_LIB_SHARED = $(NDPI_LIB_SHARED_BASE)-@NDPI_VERSION_SHORT@.dll -else SONAME_FLAG=-Wl,-soname,$(NDPI_LIB_SHARED_BASE).$(NDPI_VERSION_MAJOR) -endif -endif all: $(NDPI_LIBS) diff --git a/net/ndpi/files/patch-tests_dga_Makefile.in b/net/ndpi/files/patch-tests_dga_Makefile.in index 0bd7c19df5a1..89f110776020 100644 --- a/net/ndpi/files/patch-tests_dga_Makefile.in +++ b/net/ndpi/files/patch-tests_dga_Makefile.in @@ -1,23 +1,23 @@ ---- tests/dga/Makefile.in.orig 2023-02-01 17:29:59 UTC +--- tests/dga/Makefile.in.orig 2025-11-17 08:11:53 UTC +++ tests/dga/Makefile.in -@@ -4,10 +4,7 @@ SRCHOME=../../src +@@ -10,10 +10,7 @@ SRCHOME=$(top_srcdir)/src - SRCHOME=../../src + SRCHOME=$(top_srcdir)/src -ifneq ($(OS),Windows_NT) -CFLAGS+=-fPIC -DPIC -endif --CFLAGS+=-g -I$(SRCHOME)/include @NDPI_CFLAGS@ -+CFLAGS+=-fPIC -DPIC -g -I$(SRCHOME)/include @CFLAGS@ @NDPI_CFLAGS@ - LIBNDPI=$(SRCHOME)/lib/libndpi.a +-CFLAGS+=-g -I$(SRCHOME)/include -I$(top_builddir)/src/include @NDPI_CFLAGS@ ++CFLAGS+=-fPIC -DPIC -g -I$(SRCHOME)/include -I$(top_builddir)/src/include @NDPI_CFLAGS@ + LIBNDPI=$(top_builddir)/src/lib/libndpi.a LIBS=$(LIBNDPI) @ADDITIONAL_LIBS@ -lpthread @LIBS@ LDFLAGS+=@NDPI_LDFLAGS@ -@@ -18,7 +15,7 @@ EXECUTABLE_SOURCES := dga_evaluate.c +@@ -24,7 +21,7 @@ EXECUTABLE_SOURCES := dga_evaluate.c all: dga_evaluate$(EXE_SUFFIX) EXECUTABLE_SOURCES := dga_evaluate.c -COMMON_SOURCES := $(filter-out $(EXECUTABLE_SOURCES),$(wildcard *.c )) +COMMON_SOURCES = dga_evaluate$(EXE_SUFFIX): $(LIBNDPI) dga_evaluate.o $(CC) $(CFLAGS) $(CPPFLAGS) $(LDFLAGS) dga_evaluate.o $(LIBS) -o $@ diff --git a/net/ndpi/files/patch-tests_unit_Makefile.in b/net/ndpi/files/patch-tests_unit_Makefile.in index 5ab8bbb1122e..8527ec04cc67 100644 --- a/net/ndpi/files/patch-tests_unit_Makefile.in +++ b/net/ndpi/files/patch-tests_unit_Makefile.in @@ -1,43 +1,43 @@ ---- tests/unit/Makefile.in.orig 2023-02-01 17:29:59 UTC +--- tests/unit/Makefile.in.orig 2025-11-17 08:11:53 UTC +++ tests/unit/Makefile.in -@@ -5,10 +5,7 @@ SRCHOME=../../src +@@ -11,10 +11,7 @@ SRCHOME=$(top_srcdir)/src - SRCHOME=../../src + SRCHOME=$(top_srcdir)/src -ifneq ($(OS),Windows_NT) -CFLAGS+=-fPIC -DPIC -endif --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 +-CFLAGS+=-g -I$(SRCHOME)/include -I$(top_builddir)/src/include @NDPI_CFLAGS@ @JSONC_CFLAGS@ @PCAP_INC@ @ADDITIONAL_INCS@ ++CFLAGS+=-fPIC -DPIC -g -I$(SRCHOME)/include -I$(top_builddir)/src/include @NDPI_CFLAGS@ @JSONC_CFLAGS@ @PCAP_INC@ @ADDITIONAL_INCS@ + LIBNDPI=$(top_builddir)/src/lib/libndpi.a LIBS=$(LIBNDPI) @PCAP_LIB@ @ADDITIONAL_LIBS@ @JSONC_LIBS@ @LIBS@ LDFLAGS+=@NDPI_LDFLAGS@ -@@ -16,28 +13,7 @@ PREFIX?=@prefix@ +@@ -22,28 +19,7 @@ PREFIX?=@prefix@ OBJS=unit PREFIX?=@prefix@ -ifneq ($(BUILD_MINGW),) - -ifeq ($(DISABLE_NPCAP),0) -CFLAGS+=-I@srcdir@/../windows/WpdPack/Include -I@srcdir@/../windows/WpdPack/Include/pcap -else -CFLAGS+=-DDISABLE_NPCAP -endif - -ifeq ($(DISABLE_NPCAP),0) - -ifneq ($(BUILD_MINGW_X64),) -LIBS+=@srcdir@/../windows/WpdPack/Lib/x64/wpcap.lib -else -LIBS+=@srcdir@/../windows/WpdPack/Lib/wpcap.lib -endif - -endif - -LIBS+=-Wl,-Bstatic -lpthread -Wl,-Bdynamic -else LIBS+=-pthread -endif all: unit$(EXE_SUFFIX)