pkgsrc-Changes archive

[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index][Old Index]

CVS commit: pkgsrc/net/ndpi



Module Name:    pkgsrc
Committed By:   adam
Date:           Fri Nov 20 13:10:38 UTC 2026

Modified Files:
        pkgsrc/net/ndpi: Makefile PLIST distinfo
        pkgsrc/net/ndpi/patches: patch-src_lib_Makefile.in
Added Files:
        pkgsrc/net/ndpi/patches: patch-src_lib_plugins_Makefile.in
Removed Files:
        pkgsrc/net/ndpi/patches: patch-configure.ac

Log Message:
ndpi: updated to 6.0

6.0

Major Changes

Update nDPI Licensing Terms and Component Usage: for-profit vs not-for-profit applications. See: https://www.ntop.org/announcing-ndpi-dual-license-change/
Add detection of Slow Dos, SlowDoS 3WH and Slowloris attacks. See: https://www.ntop.org/slow-dos-detection-and-prevention/
More flexible and useful (nDPI-) fingerprints. See: https://www.ntop.org/is-ja4-now-obsolete/
Add USDT static tracing probes for zero-overhead runtime observability. See: https://www.ntop.org/observing-ndpi-from-the-inside-introducing-usdt-tracepoints/
Add ability to define protocol dissectors in shared libraries and load them at runtime


To generate a diff of this commit:
cvs rdiff -u -r1.16 -r1.17 pkgsrc/net/ndpi/Makefile pkgsrc/net/ndpi/distinfo
cvs rdiff -u -r1.8 -r1.9 pkgsrc/net/ndpi/PLIST
cvs rdiff -u -r1.4 -r0 pkgsrc/net/ndpi/patches/patch-configure.ac
cvs rdiff -u -r1.9 -r1.10 pkgsrc/net/ndpi/patches/patch-src_lib_Makefile.in
cvs rdiff -u -r0 -r1.1 \
    pkgsrc/net/ndpi/patches/patch-src_lib_plugins_Makefile.in

Please note that diffs are not public domain; they are subject to the
copyright notices on the relevant files.

Modified files:

Index: pkgsrc/net/ndpi/Makefile
diff -u pkgsrc/net/ndpi/Makefile:1.16 pkgsrc/net/ndpi/Makefile:1.17
--- pkgsrc/net/ndpi/Makefile:1.16       Wed Jun 10 13:17:30 2026
+++ pkgsrc/net/ndpi/Makefile    Fri Nov 20 13:10:38 2026
@@ -1,6 +1,6 @@
-# $NetBSD: Makefile,v 1.16 2026/06/10 13:17:30 adam Exp $
+# $NetBSD: Makefile,v 1.17 2026/11/20 13:10:38 adam Exp $
 
-DISTNAME=      nDPI-5.0
+DISTNAME=      nDPI-6.0
 PKGNAME=       ${DISTNAME:tl}
 CATEGORIES=    net
 MASTER_SITES=  ${MASTER_SITE_GITHUB:=ntop/}
Index: pkgsrc/net/ndpi/distinfo
diff -u pkgsrc/net/ndpi/distinfo:1.16 pkgsrc/net/ndpi/distinfo:1.17
--- pkgsrc/net/ndpi/distinfo:1.16       Wed Jun 10 13:17:30 2026
+++ pkgsrc/net/ndpi/distinfo    Fri Nov 20 13:10:38 2026
@@ -1,9 +1,9 @@
-$NetBSD: distinfo,v 1.16 2026/06/10 13:17:30 adam Exp $
+$NetBSD: distinfo,v 1.17 2026/11/20 13:10:38 adam Exp $
 
-BLAKE2s (nDPI-5.0.tar.gz) = 8feb37e245c7ebc745a18983ee5b947ddb7950a2bf86f08702cec7d00bc05ac2
-SHA512 (nDPI-5.0.tar.gz) = 9857aa654051d5b91089e6410a8a7faddf9dbd502bad21add9de035c59152031f6d130a4225fadb9738f7ef7ff37a4655300b582f6582658266b58b88c48eae3
-Size (nDPI-5.0.tar.gz) = 42133112 bytes
-SHA1 (patch-configure.ac) = d5646a3fae8df49fbb3502b4bcc28b6fb42f9409
+BLAKE2s (nDPI-6.0.tar.gz) = 64fe4297ebc17c9b16bb0deb85c5978c73537f5662512cb8d602149493519960
+SHA512 (nDPI-6.0.tar.gz) = a404930ecafecd1990f07b01c3b66f7fd5d61df7c7b4e0b5d20fd0ed6ccfeec216438b66a1d3a58df6b16bbad1038a1162023a0e92c30d3b441950e75eb1447a
+Size (nDPI-6.0.tar.gz) = 48649618 bytes
 SHA1 (patch-src_include_ndpi__includes.h) = a457e8edd5795178239739d07969624638ec9474
-SHA1 (patch-src_lib_Makefile.in) = 883e0e10421751d684461365ed17660fec026968
+SHA1 (patch-src_lib_Makefile.in) = 83e6274fb5a48d228df26e5afabab87def07667b
+SHA1 (patch-src_lib_plugins_Makefile.in) = 42376427336c4c6f97c6157b4712d1924464e285
 SHA1 (patch-src_lib_third__party_include_gcrypt_common.h) = 257a2c9b08793f8bca564dc7c6229f1d5168b5e1

Index: pkgsrc/net/ndpi/PLIST
diff -u pkgsrc/net/ndpi/PLIST:1.8 pkgsrc/net/ndpi/PLIST:1.9
--- pkgsrc/net/ndpi/PLIST:1.8   Wed Jun 10 13:17:30 2026
+++ pkgsrc/net/ndpi/PLIST       Fri Nov 20 13:10:38 2026
@@ -1,23 +1,24 @@
-@comment $NetBSD: PLIST,v 1.8 2026/06/10 13:17:30 adam Exp $
+@comment $NetBSD: PLIST,v 1.9 2026/11/20 13:10:38 adam Exp $
 bin/ndpiReader
+bin/ndpiSimpleIntegration
 include/ndpi/ndpi_api.h
 include/ndpi/ndpi_classify.h
 include/ndpi/ndpi_config.h
 include/ndpi/ndpi_define.h
 include/ndpi/ndpi_encryption.h
 include/ndpi/ndpi_includes.h
-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_replace_printf.h
 include/ndpi/ndpi_typedefs.h
 include/ndpi/ndpi_unix.h
+include/ndpi/ndpi_usdt.h
 include/ndpi/ndpi_win32.h
 lib/libndpi.a
 lib/libndpi.so
 lib/libndpi.so.${PKGVERSION}.0
-lib/libndpi.so.5
+lib/libndpi.so.6
 lib/pkgconfig/libndpi.pc
 share/ndpi/ndpiCustomCategory.txt
 share/ndpi/ndpiProtos.txt

Index: pkgsrc/net/ndpi/patches/patch-src_lib_Makefile.in
diff -u pkgsrc/net/ndpi/patches/patch-src_lib_Makefile.in:1.9 pkgsrc/net/ndpi/patches/patch-src_lib_Makefile.in:1.10
--- pkgsrc/net/ndpi/patches/patch-src_lib_Makefile.in:1.9       Wed Jun 10 13:17:31 2026
+++ pkgsrc/net/ndpi/patches/patch-src_lib_Makefile.in   Fri Nov 20 13:10:38 2026
@@ -1,11 +1,11 @@
-$NetBSD: patch-src_lib_Makefile.in,v 1.9 2026/06/10 13:17:31 adam Exp $
+$NetBSD: patch-src_lib_Makefile.in,v 1.10 2026/11/20 13:10:38 adam Exp $
 
 Fix building on Darwin.
 
---- src/lib/Makefile.in.orig   2025-11-17 08:11:53.000000000 +0000
+--- src/lib/Makefile.in.orig   2026-08-28 09:57:03.000000000 +0000
 +++ src/lib/Makefile.in
-@@ -42,8 +42,15 @@ OBJECTS   = $(patsubst $(srcdir)/protoco
- HEADERS   = $(wildcard $(top_srcdir)/src/include/*.h) $(wildcard $(top_builddir)/src/include/*.h) $(wildcard $(srcdir)/*.h)
+@@ -47,8 +47,15 @@ HEADERS   = $(wildcard $(top_srcdir)/src
+ HEADERS  += $(top_builddir)/src/include/ndpi_config.h $(top_builddir)/src/include/ndpi_define.h
  NDPI_VERSION_MAJOR   = @NDPI_MAJOR@
  NDPI_LIB_STATIC      = libndpi.a
 +ifeq ($(OS),Darwin)
@@ -17,34 +17,33 @@ Fix building on Darwin.
  NDPI_LIB_SHARED      = $(NDPI_LIB_SHARED_BASE).@NDPI_VERSION_SHORT@
 +NDPI_LIB_SHARED_SHORT= $(NDPI_LIB_SHARED_BASE).@NDPI_MAJOR@
 +endif
- NDPI_LIBS            = $(NDPI_LIB_STATIC) $(NDPI_LIB_SHARED)
+ ENABLE_SHARED        = @enable_shared@
+ ENABLE_STATIC        = @enable_static@
  USE_HOST_LIBGCRYPT   = @USE_HOST_LIBGCRYPT@
+@@ -62,7 +69,7 @@ BUILD_MINGW                   = @BUILD_MINGW@
  
-@@ -55,8 +62,7 @@ endif
- BUILD_MINGW                    = @BUILD_MINGW@
- 
- ifeq ($(OS),Darwin)
--CC=clang -fno-color-diagnostics
+ # Platform-specific settings
+ ifeq ($(OS_TYPE),Darwin)
 -SONAME_FLAG=
 +SONAME_FLAG=-install_name $(libdir)/${NDPI_LIB_SHARED}
  else
  ifneq ($(BUILD_MINGW),)
  NDPI_LIB_SHARED_BASE = libndpi
-@@ -77,7 +83,7 @@ $(NDPI_LIB_STATIC): $(OBJECTS)
+@@ -103,7 +110,7 @@ $(NDPI_LIB_STATIC): $(OBJECTS)
  $(NDPI_LIB_SHARED): $(OBJECTS)
-       $(CC) -shared -fPIC $(CFLAGS) $(SONAME_FLAG) -o $@ $(LDFLAGS) $(OBJECTS) $(LIBS)
+       $(CC) -shared -fPIC $(AM_CFLAGS) $(CFLAGS) $(SONAME_FLAG) -o $@ $(AM_LDFLAGS) $(LDFLAGS) $(OBJECTS) $(LIBS)
        ln -fs $(NDPI_LIB_SHARED) $(NDPI_LIB_SHARED_BASE)
 -      ln -fs $(NDPI_LIB_SHARED) $(NDPI_LIB_SHARED_BASE).$(NDPI_VERSION_MAJOR)
 +      ln -fs $(NDPI_LIB_SHARED) $(NDPI_LIB_SHARED_SHORT)
  
  %.o: %.c $(HEADERS) Makefile
-       $(CC) $(CPPFLAGS) $(CFLAGS) $(CFLAGS_$(notdir $<)) -c $< -o $@
-@@ -108,7 +114,7 @@ install: $(NDPI_LIBS)
-       mkdir -p $(DESTDIR)@libdir@
+       $(CC) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) $(CFLAGS_$(notdir $<)) -c $< -o $@
+@@ -137,7 +144,7 @@ install: $(NDPI_LIBS)
        cp $(NDPI_LIBS) $(DESTDIR)@libdir@/
+ ifeq ($(ENABLE_SHARED),yes)
        cp -P $(NDPI_LIB_SHARED_BASE) $(DESTDIR)@libdir@/
 -      cp -P $(NDPI_LIB_SHARED_BASE).$(NDPI_VERSION_MAJOR) $(DESTDIR)@libdir@/
 +      cp -P $(NDPI_LIB_SHARED_SHORT) $(DESTDIR)@libdir@/
-       mkdir -p $(DESTDIR)@includedir@/ndpi
+ endif
+       @MKDIR_P@ $(DESTDIR)@includedir@/ndpi
        #Avoid installing private header
-       # Installing header files to $(DESTDIR)@includedir@/ndpi

Added files:

Index: pkgsrc/net/ndpi/patches/patch-src_lib_plugins_Makefile.in
diff -u /dev/null pkgsrc/net/ndpi/patches/patch-src_lib_plugins_Makefile.in:1.1
--- /dev/null   Fri Nov 20 13:10:38 2026
+++ pkgsrc/net/ndpi/patches/patch-src_lib_plugins_Makefile.in   Fri Nov 20 13:10:38 2026
@@ -0,0 +1,18 @@
+$NetBSD: patch-src_lib_plugins_Makefile.in,v 1.1 2026/11/20 13:10:38 adam Exp $
+
+Use correct library on Darwin.
+
+--- src/lib/plugins/Makefile.in.orig   2026-11-20 11:12:29.727709294 +0000
++++ src/lib/plugins/Makefile.in
+@@ -14,7 +14,11 @@ LDFLAGS=@LDFLAGS@
+ #  * Linux or Mac
+ AM_CFLAGS+=-fPIC -DPIC -DNDPI_LIB_COMPILATION -I$(top_srcdir)/src/include -I$(top_builddir)/src/include @NDPI_CFLAGS@ @CUSTOM_NDPI@
+ AM_LDFLAGS=-L$(top_builddir)/src/lib @NDPI_LDFLAGS@
++ifeq ($(OS),Darwin)
++LIBNDPI_DEP=$(top_builddir)/src/lib/libndpi.dylib
++else
+ LIBNDPI_DEP=$(top_builddir)/src/lib/libndpi.so
++endif
+ LIBS=-lndpi @ADDITIONAL_LIBS@ @LIBS@
+ HEADERS=$(wildcard $(top_srcdir)/src/include/*.h)
+ HEADERS+=$(top_builddir)/src/include/ndpi_config.h $(top_builddir)/src/include/ndpi_define.h



Home | Main Index | Thread Index | Old Index