git: 00ddd77ed36c - main - net/ndpi: Update to new 4.8 branch
- Go to: [ bottom of page ] [ top of archives ] [ this month ]
Date: Wed, 25 Oct 2023 08:15:40 UTC
The branch main has been updated by madpilot:
URL: https://cgit.FreeBSD.org/ports/commit/?id=00ddd77ed36ccce9eec5d5ccabab23d8295a3056
commit 00ddd77ed36ccce9eec5d5ccabab23d8295a3056
Author: Guido Falsi <madpilot@FreeBSD.org>
AuthorDate: 2023-10-25 08:14:34 +0000
Commit: Guido Falsi <madpilot@FreeBSD.org>
CommitDate: 2023-10-25 08:14:34 +0000
net/ndpi: Update to new 4.8 branch
---
net/ndpi/Makefile | 10 +++++-----
net/ndpi/distinfo | 6 +++---
net/ndpi/files/patch-example_Makefile.in | 14 +++++++++++---
net/ndpi/files/patch-src_lib_Makefile.in | 22 ++++++++++------------
4 files changed, 29 insertions(+), 23 deletions(-)
diff --git a/net/ndpi/Makefile b/net/ndpi/Makefile
index ca920d17c387..d4c5ace782c0 100644
--- a/net/ndpi/Makefile
+++ b/net/ndpi/Makefile
@@ -1,5 +1,5 @@
PORTNAME= ndpi
-PORTVERSION= 4.6.d20230510
+PORTVERSION= 4.8.d20231023
PORTEPOCH= 1
CATEGORIES= net
@@ -21,16 +21,16 @@ 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}"
+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= 4432e5b
+GH_TAGNAME= b328916
PLIST_SUB= MAJOR_VER=${PORTVERSION:R:R} VER=${PORTVERSION:R}
diff --git a/net/ndpi/distinfo b/net/ndpi/distinfo
index 6f4ce70f53c5..48e9aa3557e8 100644
--- a/net/ndpi/distinfo
+++ b/net/ndpi/distinfo
@@ -1,3 +1,3 @@
-TIMESTAMP = 1686152228
-SHA256 (ntop-nDPI-4.6.d20230510-4432e5b_GH0.tar.gz) = 683bffed1ac54b54340ea4babd00171efcbcea6b81ebc2e3ad005e3ee6a8da7d
-SIZE (ntop-nDPI-4.6.d20230510-4432e5b_GH0.tar.gz) = 29720730
+TIMESTAMP = 1698154698
+SHA256 (ntop-nDPI-4.8.d20231023-b328916_GH0.tar.gz) = 0ef6805c72ca6f87ec6d2c43e5289e014eeb7cfb48828243202193455fd06522
+SIZE (ntop-nDPI-4.8.d20231023-b328916_GH0.tar.gz) = 39479352
diff --git a/net/ndpi/files/patch-example_Makefile.in b/net/ndpi/files/patch-example_Makefile.in
index afac677a898a..64aa6fdc0624 100644
--- a/net/ndpi/files/patch-example_Makefile.in
+++ b/net/ndpi/files/patch-example_Makefile.in
@@ -1,6 +1,14 @@
---- example/Makefile.in.orig 2023-02-01 17:29:59 UTC
+--- example/Makefile.in.orig 2023-10-23 09:45:30 UTC
+++ example/Makefile.in
-@@ -6,46 +6,23 @@ SRCHOME=../src
+@@ -1,54 +1,28 @@ CXX=@CXX@
+ AR=@AR@
+ CC=@CC@
+ CXX=@CXX@
+-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
@@ -50,7 +58,7 @@
libndpiReader.a: $(COMMON_SOURCES:%.c=%.o) $(LIBNDPI)
$(AR) rsv libndpiReader.a $(COMMON_SOURCES:%.c=%.o)
-@@ -61,10 +38,10 @@ install: ndpiReader$(EXE_SUFFIX)
+@@ -64,10 +38,10 @@ install: ndpiReader$(EXE_SUFFIX)
install: ndpiReader$(EXE_SUFFIX)
mkdir -p $(DESTDIR)$(PREFIX)/bin/
diff --git a/net/ndpi/files/patch-src_lib_Makefile.in b/net/ndpi/files/patch-src_lib_Makefile.in
index e27fd4ca157b..698cb08beee8 100644
--- a/net/ndpi/files/patch-src_lib_Makefile.in
+++ b/net/ndpi/files/patch-src_lib_Makefile.in
@@ -1,6 +1,4 @@
-- /bin/rm -f libndpi.a $(OBJECTS)
-new file mode 100644
---- src/lib/Makefile.in.orig 2023-02-01 17:29:59 UTC
+--- src/lib/Makefile.in.orig 2023-10-23 09:45:30 UTC
+++ src/lib/Makefile.in
@@ -14,15 +14,12 @@ includedir = @includedir@/ndpi
PREFIX = @prefix@
@@ -9,19 +7,19 @@ new file mode 100644
-ifneq ($(OS),Windows_NT)
-CFLAGS += -fPIC -DPIC
-endif
--CFLAGS += -I../include -Ithird_party/include -DNDPI_LIB_COMPILATION @NDPI_CFLAGS@ @GPROF_CFLAGS@ @CUSTOM_NDPI@ @ADDITIONAL_INCS@
+-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@
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 ./%.c, ./%.o, $(wildcard ./*.c))
--HEADERS = $(wildcard ../include/*.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 ./*.c | sed 's/\(.*\)\.c$$/\1.o/'
-+HEADERS != ls ../include/*.h
+-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)
++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,9 @@ USE_HOST_LIBGCRYPT = @USE_HOST_LIBGCRYPT@
+@@ -30,27 +27,7 @@ USE_HOST_LIBGCRYPT = @USE_HOST_LIBGCRYPT@
NDPI_LIBS = $(NDPI_LIB_STATIC) $(NDPI_LIB_SHARED)
USE_HOST_LIBGCRYPT = @USE_HOST_LIBGCRYPT@
@@ -34,16 +32,16 @@ new file mode 100644
-OS := $(shell uname)
-endif
BUILD_MINGW = @BUILD_MINGW@
-
+-
-ifeq ($(OS),Darwin)
--CC=clang
+-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)
+-SONAME_FLAG=-Wl,-soname,$(NDPI_LIB_SHARED_BASE).$(NDPI_VERSION_MAJOR)
-endif
-endif