net/ndpi: Update to new stable branch

This commit is contained in:
Guido Falsi 2024-12-22 17:15:31 +01:00
parent a943fad293
commit bd4c7b6fbf
3 changed files with 12 additions and 11 deletions

View file

@ -1,5 +1,5 @@
PORTNAME= ndpi
PORTVERSION= 4.10.d20240807
PORTVERSION= 4.12.d20241217
PORTEPOCH= 1
CATEGORIES= net
@ -30,7 +30,7 @@ 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}

View file

@ -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

View file

@ -1,4 +1,4 @@
--- 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@
@ -18,8 +18,8 @@
-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@
@ -61,7 +61,7 @@
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/
@ -70,8 +70,9 @@
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