diff --git a/net/ndpi/Makefile b/net/ndpi/Makefile index b7e66d6a7c41..315130aa477e 100644 --- a/net/ndpi/Makefile +++ b/net/ndpi/Makefile @@ -1,52 +1,52 @@ PORTNAME= ndpi -PORTVERSION= 4.10.d20240807 +PORTVERSION= 4.12.d20241217 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= b07d0ae +GH_TAGNAME= b4455a0 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 bba61143de7e..25ffac8d3b27 100644 --- a/net/ndpi/distinfo +++ b/net/ndpi/distinfo @@ -1,3 +1,3 @@ -TIMESTAMP = 1723128522 -SHA256 (ntop-nDPI-4.10.d20240807-b07d0ae_GH0.tar.gz) = 5810013650d53505c39a8f0ef695b681d8cfbf65198511397f7cff52a31df8a1 -SIZE (ntop-nDPI-4.10.d20240807-b07d0ae_GH0.tar.gz) = 38579260 +TIMESTAMP = 1734879291 +SHA256 (ntop-nDPI-4.12.d20241217-b4455a0_GH0.tar.gz) = c8384e2c2972f54d35bca4757ebc98f8090b3a878cd745a56f57f93d1ab0ffb1 +SIZE (ntop-nDPI-4.12.d20241217-b4455a0_GH0.tar.gz) = 47562576 diff --git a/net/ndpi/files/patch-example_Makefile.in b/net/ndpi/files/patch-example_Makefile.in index d0051b797c65..9236fd15c5c5 100644 --- a/net/ndpi/files/patch-example_Makefile.in +++ b/net/ndpi/files/patch-example_Makefile.in @@ -1,77 +1,78 @@ ---- example/Makefile.in.orig 2024-08-07 09:36:14 UTC +--- example/Makefile.in.orig 2024-12-17 13:59:14 UTC +++ example/Makefile.in @@ -1,57 +1,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 -ifneq ($(OS),Windows_NT) -CFLAGS+=-fPIC -DPIC -endif --CFLAGS+=-I$(SRCHOME)/include @NDPI_CFLAGS@ @PCAP_INC@ @GPROF_CFLAGS@ -+CFLAGS+=-fPIC -DPIC -I$(SRCHOME)/include @NDPI_CFLAGS@ @PCAP_INC@ @GPROF_CFLAGS@ +-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@ 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 \ $(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 = reader_util.c libndpiReader.a: $(COMMON_SOURCES:%.c=%.o) $(LIBNDPI) $(AR) rsv libndpiReader.a $(COMMON_SOURCES:%.c=%.o) -@@ -67,10 +38,10 @@ install: ndpiReader$(EXE_SUFFIX) +@@ -67,10 +38,11 @@ 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 protos.txt $(DESTDIR)$(PREFIX)/$(EXAMPLESDIR)//ndpiProtos.txt -+ cp mining_hosts.txt $(DESTDIR)$(PREFIX)/$(EXAMPLESDIR)//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