diff --git a/net/ndpi/Makefile b/net/ndpi/Makefile index 213660b3c66f..8b36d3ee8763 100644 --- a/net/ndpi/Makefile +++ b/net/ndpi/Makefile @@ -1,53 +1,55 @@ PORTNAME= ndpi -PORTVERSION= 5.0.d20260502 -PORTREVISION= 1 +PORTVERSION= 6.0.d20260828 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 \ +LIB_DEPENDS= libgcrypt.so:security/libgcrypt \ + libgpg-error.so:security/libgpg-error \ libjson-c.so:devel/json-c \ - libgcrypt.so:security/libgcrypt \ - libgpg-error.so:security/libgpg-error + librrd.so:databases/rrdtool -USES= autoreconf compiler:c++11-lang cpe libtool localbase:ldflags pathfix \ - pkgconfig +USES= autoreconf compiler:c++11-lang cpe gmake libtool \ + localbase:ldflags pathfix pkgconfig CPE_VENDOR= ntop +USE_GITHUB= yes +GH_ACCOUNT= ntop +GH_PROJECT= nDPI +GH_TAGNAME= a9f34d0 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 +CONFIGURE_ARGS= --disable-dependency-tracking \ + --with-local-libgcrypt \ + --with-pic +MAKE_ENV= EXAMPLESDIR="${EXAMPLESDIR_REL}" INSTALL_TARGET= install-strip -USE_GITHUB= yes -GH_ACCOUNT= ntop -GH_PROJECT= nDPI -GH_TAGNAME= 70ca5b8 +CPPFLAGS+= -I${LOCALBASE}/include/json-c +LIBS+= -ljson-c -PLIST_SUB= MAJOR_VER=${PORTVERSION:R:R} VER=${PORTVERSION:R} +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 a5b5e9f32b1e..206251b83186 100644 --- a/net/ndpi/distinfo +++ b/net/ndpi/distinfo @@ -1,3 +1,3 @@ -TIMESTAMP = 1781178518 -SHA256 (ntop-nDPI-5.0.d20260502-70ca5b8_GH0.tar.gz) = 3782a37ed6cd68f0e23004b92e63d7aaedd061ca067a01f3e121cd2a711dbdef -SIZE (ntop-nDPI-5.0.d20260502-70ca5b8_GH0.tar.gz) = 42135581 +TIMESTAMP = 1787990635 +SHA256 (ntop-nDPI-6.0.d20260828-a9f34d0_GH0.tar.gz) = 50a5900a66561834c56b8a3b5f2cc839ea661d3b8423a39b83c24ec4c0667be6 +SIZE (ntop-nDPI-6.0.d20260828-a9f34d0_GH0.tar.gz) = 48649976 diff --git a/net/ndpi/files/patch-example_Makefile.in b/net/ndpi/files/patch-example_Makefile.in deleted file mode 100644 index 1f0b3c26232e..000000000000 --- a/net/ndpi/files/patch-example_Makefile.in +++ /dev/null @@ -1,77 +0,0 @@ ---- example/Makefile.in.orig 2025-11-17 08:11:53 UTC -+++ example/Makefile.in -@@ -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=$(top_srcdir)/src --ifneq ($(OS),Windows_NT) --CFLAGS+=-fPIC -DPIC --endif --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=$(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),$(notdir $(wildcard $(srcdir)/*.c))) -+COMMON_SOURCES = reader_util.c - - libndpiReader.a: $(COMMON_SOURCES:%.c=%.o) $(LIBNDPI) - $(AR) rsv libndpiReader.a $(COMMON_SOURCES:%.c=%.o) -@@ -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 $(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 deleted file mode 100644 index ee9472c1f60d..000000000000 --- a/net/ndpi/files/patch-src_lib_Makefile.in +++ /dev/null @@ -1,53 +0,0 @@ ---- src/lib/Makefile.in.orig 2025-11-17 08:11:53 UTC -+++ src/lib/Makefile.in -@@ -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$(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_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 $(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 -@@ -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 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 deleted file mode 100644 index 89f110776020..000000000000 --- a/net/ndpi/files/patch-tests_dga_Makefile.in +++ /dev/null @@ -1,23 +0,0 @@ ---- tests/dga/Makefile.in.orig 2025-11-17 08:11:53 UTC -+++ tests/dga/Makefile.in -@@ -10,10 +10,7 @@ SRCHOME=$(top_srcdir)/src - - SRCHOME=$(top_srcdir)/src - --ifneq ($(OS),Windows_NT) --CFLAGS+=-fPIC -DPIC --endif --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@ -@@ -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 deleted file mode 100644 index 8527ec04cc67..000000000000 --- a/net/ndpi/files/patch-tests_unit_Makefile.in +++ /dev/null @@ -1,43 +0,0 @@ ---- tests/unit/Makefile.in.orig 2025-11-17 08:11:53 UTC -+++ tests/unit/Makefile.in -@@ -11,10 +11,7 @@ SRCHOME=$(top_srcdir)/src - - SRCHOME=$(top_srcdir)/src - --ifneq ($(OS),Windows_NT) --CFLAGS+=-fPIC -DPIC --endif --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@ -@@ -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) - diff --git a/net/ndpi/pkg-plist b/net/ndpi/pkg-plist index 9ab6015bf616..0d9d7b4fe82c 100644 --- a/net/ndpi/pkg-plist +++ b/net/ndpi/pkg-plist @@ -1,22 +1,23 @@ bin/ndpiReader +bin/ndpiSimpleIntegration include/ndpi/ndpi_api.h include/ndpi/ndpi_classify.h include/ndpi/ndpi_config.h include/ndpi/ndpi_define.h include/ndpi/ndpi_encryption.h include/ndpi/ndpi_includes.h -include/ndpi/ndpi_includes_OpenBSD.h include/ndpi/ndpi_main.h include/ndpi/ndpi_patricia_typedefs.h include/ndpi/ndpi_protocol_ids.h include/ndpi/ndpi_replace_printf.h include/ndpi/ndpi_typedefs.h include/ndpi/ndpi_unix.h +include/ndpi/ndpi_usdt.h include/ndpi/ndpi_win32.h lib/libndpi.a lib/libndpi.so lib/libndpi.so.%%MAJOR_VER%% lib/libndpi.so.%%VER%%.0 libdata/pkgconfig/libndpi.pc -%%EXAMPLESDIR%%/ndpiCustomCategory.txt -%%EXAMPLESDIR%%/ndpiProtos.txt +%%DATADIR%%/ndpiCustomCategory.txt +%%DATADIR%%/ndpiProtos.txt