mirror/freebsd-ports
1
0
Fork 0
mirror of https://git.FreeBSD.org/ports.git synced 2024-11-18 00:10:04 +00:00
Code Issues Releases Activity

net/ndpi: Update to new 4.10 version latest commit

Browse Source
This commit is contained in:
Guido Falsi 2024-08-08 22:12:27 +02:00
parent 8245731e0e
commit 6023975617
5 changed files with 27 additions and 22 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

5
net/ndpi/Makefile
View File

@ -1,6 +1,5 @@
PORTNAME= ndpi
PORTVERSION= 4.8.d20240223
PORTREVISION= 1
PORTVERSION= 4.10.d20240807
PORTEPOCH= 1
CATEGORIES= net
@ -31,7 +30,7 @@ INSTALL_TARGET= install-strip
USE_GITHUB= yes
GH_ACCOUNT= ntop
GH_PROJECT= nDPI
GH_TAGNAME= 467c27c
GH_TAGNAME= b07d0ae
PLIST_SUB= MAJOR_VER=${PORTVERSION:R:R} VER=${PORTVERSION:R}

6
net/ndpi/distinfo
View File

@ -1,3 +1,3 @@
TIMESTAMP = 1709883780
SHA256 (ntop-nDPI-4.8.d20240223-467c27c_GH0.tar.gz) = 367fb5ed5484f98eeb713856acd1142aab14441576d7581ad0fd9db1dd184cec
SIZE (ntop-nDPI-4.8.d20240223-467c27c_GH0.tar.gz) = 39479466
TIMESTAMP = 1723128522
SHA256 (ntop-nDPI-4.10.d20240807-b07d0ae_GH0.tar.gz) = 5810013650d53505c39a8f0ef695b681d8cfbf65198511397f7cff52a31df8a1
SIZE (ntop-nDPI-4.10.d20240807-b07d0ae_GH0.tar.gz) = 38579260

15
net/ndpi/files/patch-example_Makefile.in
View File

@ -1,9 +1,12 @@
--- example/Makefile.in.orig 2023-10-23 09:45:30 UTC
--- example/Makefile.in.orig 2024-08-07 09:36:14 UTC
+++ example/Makefile.in
@@ -1,54 +1,28 @@ CXX=@CXX@
@@ -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
@ -16,7 +19,7 @@
-CFLAGS+=-fPIC -DPIC
-endif
-CFLAGS+=-I$(SRCHOME)/include @NDPI_CFLAGS@ @PCAP_INC@ @GPROF_CFLAGS@
+CFLAGS+=-fPIC -DPIC -I$(SRCHOME)/include @NDPI_CFLAGS@ @PCAP_INC@ @CFLAGS@ @GPROF_CFLAGS@
+CFLAGS+=-fPIC -DPIC -I$(SRCHOME)/include @NDPI_CFLAGS@ @PCAP_INC@ @GPROF_CFLAGS@
LDFLAGS+=@NDPI_LDFLAGS@
LIBNDPI=$(SRCHOME)/lib/libndpi.a
LIBS=$(LIBNDPI) @PCAP_LIB@ @ADDITIONAL_LIBS@ @LIBS@ @GPROF_LIBS@
@ -58,7 +61,7 @@
libndpiReader.a: $(COMMON_SOURCES:%.c=%.o) $(LIBNDPI)
$(AR) rsv libndpiReader.a $(COMMON_SOURCES:%.c=%.o)
@@ -64,10 +38,10 @@ install: ndpiReader$(EXE_SUFFIX)
@@ -67,10 +38,10 @@ install: ndpiReader$(EXE_SUFFIX)
install: ndpiReader$(EXE_SUFFIX)
mkdir -p $(DESTDIR)$(PREFIX)/bin/
@ -67,8 +70,8 @@
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

20
net/ndpi/files/patch-src_lib_Makefile.in
View File

@ -1,25 +1,32 @@
--- src/lib/Makefile.in.orig 2023-11-02 19:51:08 UTC
--- src/lib/Makefile.in.orig 2024-08-07 09:36:14 UTC
+++ src/lib/Makefile.in
@@ -14,15 +14,12 @@ includedir = @includedir@/ndpi
@@ -14,13 +14,7 @@ includedir = @includedir@/ndpi
PREFIX = @prefix@
libdir = @libdir@
includedir = @includedir@/ndpi
-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../include -Ithird_party/include -DNDPI_LIB_COMPILATION @NDPI_CFLAGS@ @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_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@
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 ../include/*.h)
-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
NDPI_VERSION_MAJOR = @NDPI_MAJOR@
NDPI_LIB_STATIC = libndpi.a
NDPI_LIB_SHARED_BASE = libndpi.so
@@ -30,27 +27,7 @@ USE_HOST_LIBGCRYPT = @USE_HOST_LIBGCRYPT@
@@ -38,24 +32,7 @@ USE_HOST_LIBGCRYPT = @USE_HOST_LIBGCRYPT@
NDPI_LIBS = $(NDPI_LIB_STATIC) $(NDPI_LIB_SHARED)
USE_HOST_LIBGCRYPT = @USE_HOST_LIBGCRYPT@
@ -28,9 +35,6 @@
-OBJECTS = $(filter-out third_party/src/gcrypt_light.o,$(TMP_OBJS))
-endif
-
-ifneq ($(OS),Windows_NT)
-OS := $(shell uname)
-endif
-BUILD_MINGW = @BUILD_MINGW@
-
-ifeq ($(OS),Darwin)

3
net/ndpi/pkg-plist
View File

@ -9,10 +9,9 @@ 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_protocols.h
include/ndpi/ndpi_replace_printf.h
include/ndpi/ndpi_typedefs.h
include/ndpi/ndpi_unix.h
include/ndpi/ndpi_utils.h
include/ndpi/ndpi_win32.h
lib/libndpi.a
lib/libndpi.so