kpriv/freebsd-ports
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity

net/ndpi: Update to 4.6 latest upstream stable snapshot

Browse source
This commit is contained in:
Guido Falsi 2023-02-20 12:36:17 +01:00
parent 720ca48281
commit d8bbe19fc6
6 changed files with 27 additions and 41 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

4
net/ndpi/Makefile
View file

@ -1,5 +1,5 @@
PORTNAME= ndpi PORTNAME= ndpi
PORTVERSION= 4.4.d20221026 PORTVERSION= 4.6.d20230201
PORTEPOCH= 1 PORTEPOCH= 1
CATEGORIES= net CATEGORIES= net
@ -30,7 +30,7 @@ INSTALL_TARGET= install-strip
USE_GITHUB= yes USE_GITHUB= yes
GH_ACCOUNT= ntop GH_ACCOUNT= ntop
GH_PROJECT= nDPI GH_PROJECT= nDPI
GH_TAGNAME= 299fc4d GH_TAGNAME= 56aade0
PLIST_SUB= MAJOR_VER=${PORTVERSION:R:R} VER=${PORTVERSION:R} PLIST_SUB= MAJOR_VER=${PORTVERSION:R:R} VER=${PORTVERSION:R}

6
net/ndpi/distinfo
View file

@ -1,3 +1,3 @@
TIMESTAMP = 1671612061 TIMESTAMP = 1676626529
SHA256 (ntop-nDPI-4.4.d20221026-299fc4d_GH0.tar.gz) = 75e107ceca36dd7c7541a03cb2967dbc006d24e9d3254199e4b9ad217f771083 SHA256 (ntop-nDPI-4.6.d20230201-56aade0_GH0.tar.gz) = cbde34191cd8bb6d0aa51775f4ed07c2919a5668dde94fabff8ee38eb23ec684
SIZE (ntop-nDPI-4.4.d20221026-299fc4d_GH0.tar.gz) = 151062882 SIZE (ntop-nDPI-4.6.d20230201-56aade0_GH0.tar.gz) = 29706674

8
net/ndpi/files/patch-example_Makefile.in
View file

@ -1,4 +1,4 @@
--- example/Makefile.in.orig 2022-07-14 16:13:42 UTC --- example/Makefile.in.orig 2023-02-01 17:29:59 UTC
+++ example/Makefile.in +++ example/Makefile.in
@@ -6,46 +6,23 @@ SRCHOME=../src @@ -6,46 +6,23 @@ SRCHOME=../src
DISABLE_NPCAP=@DISABLE_NPCAP@ DISABLE_NPCAP=@DISABLE_NPCAP@
@ -7,9 +7,9 @@
-ifneq ($(OS),Windows_NT) -ifneq ($(OS),Windows_NT)
-CFLAGS+=-fPIC -DPIC -CFLAGS+=-fPIC -DPIC
-endif -endif
-CFLAGS+=-I$(SRCHOME)/include @PCAP_INC@ @CFLAGS@ @GPROF_CFLAGS@ -CFLAGS+=-I$(SRCHOME)/include @NDPI_CFLAGS@ @PCAP_INC@ @GPROF_CFLAGS@
+CFLAGS+=-fPIC -DPIC -I$(SRCHOME)/include @PCAP_INC@ @CFLAGS@ @GPROF_CFLAGS@ +CFLAGS+=-fPIC -DPIC -I$(SRCHOME)/include @NDPI_CFLAGS@ @PCAP_INC@ @CFLAGS@ @GPROF_CFLAGS@
LDFLAGS=@LDFLAGS@ LDFLAGS+=@NDPI_LDFLAGS@
LIBNDPI=$(SRCHOME)/lib/libndpi.a LIBNDPI=$(SRCHOME)/lib/libndpi.a
LIBS=$(LIBNDPI) @PCAP_LIB@ @ADDITIONAL_LIBS@ @LIBS@ @GPROF_LIBS@ LIBS=$(LIBNDPI) @PCAP_LIB@ @ADDITIONAL_LIBS@ @LIBS@ @GPROF_LIBS@
HEADERS=reader_util.h $(SRCHOME)/include/ndpi_api.h \ HEADERS=reader_util.h $(SRCHOME)/include/ndpi_api.h \

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

@ -1,17 +1,17 @@
- /bin/rm -f libndpi.a $(OBJECTS) - /bin/rm -f libndpi.a $(OBJECTS)
new file mode 100644 new file mode 100644
--- src/lib/Makefile.in.orig 2022-07-14 16:13:42 UTC --- src/lib/Makefile.in.orig 2023-02-01 17:29:59 UTC
+++ src/lib/Makefile.in +++ src/lib/Makefile.in
@@ -14,15 +14,12 @@ includedir = ${prefix}/include/ndpi @@ -14,15 +14,12 @@ includedir = @includedir@/ndpi
prefix = @prefix@ PREFIX = @prefix@
libdir = ${prefix}/lib libdir = @libdir@
includedir = ${prefix}/include/ndpi includedir = @includedir@/ndpi
-ifneq ($(OS),Windows_NT) -ifneq ($(OS),Windows_NT)
-CFLAGS += -fPIC -DPIC -CFLAGS += -fPIC -DPIC
-endif -endif
-CFLAGS += -I../include -Ithird_party/include -DNDPI_LIB_COMPILATION @CFLAGS@ @GPROF_CFLAGS@ @CUSTOM_NDPI@ -CFLAGS += -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 @CFLAGS@ @GPROF_CFLAGS@ @CUSTOM_NDPI@ +CFLAGS += -fPIC -DPIC -I../include -Ithird_party/include -DNDPI_LIB_COMPILATION @NDPI_CFLAGS@ @CFLAGS@ @GPROF_CFLAGS@ @CUSTOM_NDPI@ @ADDITIONAL_INCS@
LDFLAGS = @LDFLAGS@ LDFLAGS += @NDPI_LDFLAGS@
LIBS = @ADDITIONAL_LIBS@ @LIBS@ @GPROF_LIBS@ 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 ./%.c, ./%.o, $(wildcard ./*.c)) -OBJECTS = $(patsubst protocols/%.c, protocols/%.o, $(wildcard protocols/*.c)) $(patsubst third_party/src/%.c, third_party/src/%.o, $(wildcard third_party/src/*.c)) $(patsubst ./%.c, ./%.o, $(wildcard ./*.c))
@ -21,7 +21,7 @@ new file mode 100644
NDPI_VERSION_MAJOR = @NDPI_MAJOR@ NDPI_VERSION_MAJOR = @NDPI_MAJOR@
NDPI_LIB_STATIC = libndpi.a NDPI_LIB_STATIC = libndpi.a
NDPI_LIB_SHARED_BASE = libndpi.so NDPI_LIB_SHARED_BASE = libndpi.so
@@ -30,27 +27,8 @@ USE_HOST_LIBGCRYPT = @USE_HOST_LIBGCRYPT@ @@ -30,27 +27,9 @@ USE_HOST_LIBGCRYPT = @USE_HOST_LIBGCRYPT@
NDPI_LIBS = $(NDPI_LIB_STATIC) $(NDPI_LIB_SHARED) NDPI_LIBS = $(NDPI_LIB_STATIC) $(NDPI_LIB_SHARED)
USE_HOST_LIBGCRYPT = @USE_HOST_LIBGCRYPT@ USE_HOST_LIBGCRYPT = @USE_HOST_LIBGCRYPT@
@ -34,7 +34,7 @@ new file mode 100644
-OS := $(shell uname) -OS := $(shell uname)
-endif -endif
BUILD_MINGW = @BUILD_MINGW@ BUILD_MINGW = @BUILD_MINGW@
-
-ifeq ($(OS),Darwin) -ifeq ($(OS),Darwin)
-CC=clang -CC=clang
-SONAME_FLAG= -SONAME_FLAG=

15
net/ndpi/files/patch-tests_dga_Makefile.in
View file

@ -1,4 +1,4 @@
--- tests/dga/Makefile.in.orig 2022-07-14 16:13:42 UTC --- tests/dga/Makefile.in.orig 2023-02-01 17:29:59 UTC
+++ tests/dga/Makefile.in +++ tests/dga/Makefile.in
@@ -4,10 +4,7 @@ SRCHOME=../../src @@ -4,10 +4,7 @@ SRCHOME=../../src
@ -7,11 +7,11 @@
-ifneq ($(OS),Windows_NT) -ifneq ($(OS),Windows_NT)
-CFLAGS+=-fPIC -DPIC -CFLAGS+=-fPIC -DPIC
-endif -endif
-CFLAGS+=-g -I$(SRCHOME)/include @CFLAGS@ -CFLAGS+=-g -I$(SRCHOME)/include @NDPI_CFLAGS@
+CFLAGS+=-fPIC -DPIC -g -I$(SRCHOME)/include @CFLAGS@ +CFLAGS+=-fPIC -DPIC -g -I$(SRCHOME)/include @CFLAGS@ @NDPI_CFLAGS@
LIBNDPI=$(SRCHOME)/lib/libndpi.a LIBNDPI=$(SRCHOME)/lib/libndpi.a
LIBS=$(LIBNDPI) @ADDITIONAL_LIBS@ -lpthread @LIBS@ LIBS=$(LIBNDPI) @ADDITIONAL_LIBS@ -lpthread @LIBS@
LDFLAGS=@LDFLAGS@ LDFLAGS+=@NDPI_LDFLAGS@
@@ -18,7 +15,7 @@ EXECUTABLE_SOURCES := dga_evaluate.c @@ -18,7 +15,7 @@ EXECUTABLE_SOURCES := dga_evaluate.c
all: dga_evaluate$(EXE_SUFFIX) all: dga_evaluate$(EXE_SUFFIX)
@ -21,10 +21,3 @@
dga_evaluate$(EXE_SUFFIX): $(LIBNDPI) dga_evaluate.o dga_evaluate$(EXE_SUFFIX): $(LIBNDPI) dga_evaluate.o
$(CC) $(CFLAGS) $(CPPFLAGS) $(LDFLAGS) dga_evaluate.o $(LIBS) -o $@ $(CC) $(CFLAGS) $(CPPFLAGS) $(LDFLAGS) dga_evaluate.o $(LIBS) -o $@
@@ -38,6 +35,4 @@ distclean: clean
distclean: clean
/bin/rm -f Makefile
-
-check:
true # nothing to do here, done by invoking tests/do-dga.sh

15
net/ndpi/files/patch-tests_unit_Makefile.in
View file

@ -1,4 +1,4 @@
--- tests/unit/Makefile.in.orig 2022-07-14 16:13:42 UTC --- tests/unit/Makefile.in.orig 2023-02-01 17:29:59 UTC
+++ tests/unit/Makefile.in +++ tests/unit/Makefile.in
@@ -5,10 +5,7 @@ SRCHOME=../../src @@ -5,10 +5,7 @@ SRCHOME=../../src
@ -7,11 +7,11 @@
-ifneq ($(OS),Windows_NT) -ifneq ($(OS),Windows_NT)
-CFLAGS+=-fPIC -DPIC -CFLAGS+=-fPIC -DPIC
-endif -endif
-CFLAGS+=-g -I$(SRCHOME)/include @JSONC_CFLAGS@ @PCAP_INC@ @CFLAGS@ -CFLAGS+=-g -I$(SRCHOME)/include @NDPI_CFLAGS@ @JSONC_CFLAGS@ @PCAP_INC@
+CFLAGS+=-fPIC -DPIC -g -I$(SRCHOME)/include @JSONC_CFLAGS@ @PCAP_INC@ @CFLAGS@ +CFLAGS+=-fPIC -DPIC -g -I$(SRCHOME)/include @NDPI_CFLAGS@ @JSONC_CFLAGS@ @PCAP_INC@ @CFLAGS@
LIBNDPI=$(SRCHOME)/lib/libndpi.a LIBNDPI=$(SRCHOME)/lib/libndpi.a
LIBS=$(LIBNDPI) @PCAP_LIB@ @ADDITIONAL_LIBS@ @JSONC_LIBS@ @LIBS@ LIBS=$(LIBNDPI) @PCAP_LIB@ @ADDITIONAL_LIBS@ @JSONC_LIBS@ @LIBS@
LDFLAGS=@LDFLAGS@ LDFLAGS+=@NDPI_LDFLAGS@
@@ -16,28 +13,7 @@ PREFIX?=@prefix@ @@ -16,28 +13,7 @@ PREFIX?=@prefix@
OBJS=unit OBJS=unit
PREFIX?=@prefix@ PREFIX?=@prefix@
@ -41,10 +41,3 @@
all: unit$(EXE_SUFFIX) all: unit$(EXE_SUFFIX)
@@ -62,6 +38,4 @@ distclean: clean
distclean: clean
/bin/rm -f Makefile
-
-check:
true # nothing to do here, done by invoking tests/do-unit.sh