Fri Jul 12 09:30:34 2019 UTC ()
ndpi: updated to 2.8
2.8 Stable
New Supported Protocols and Services
* Added Modbus over TCP dissector
Improvements
* Wireshark Lua plugin compatibility with Wireshark 3
* Improved MDNS dissection
* Improved HTTP response code handling
* Full dissection of HTTP responses
Fixes
* Fixed false positive mining detection
* Fixed invalid TCP DNS dissection
* Releasing buffers upon realloc failures
* ndpiReader: Prevents references after free
* Endianness fixes
* Fixed IPv6 HTTP traffic dissection
* Fixed H.323 detection
Other
* Disabled ookla statistics which need to be improved
* Support for custom protocol files of arbitrary length
* Update radius.c to RFC2865
(adam)
diff -r1.5 -r1.6 pkgsrc/net/ndpi/Makefile
diff -r1.2 -r1.3 pkgsrc/net/ndpi/PLIST
diff -r1.1 -r1.2 pkgsrc/net/ndpi/buildlink3.mk
diff -r1.4 -r1.5 pkgsrc/net/ndpi/distinfo
diff -r0 -r1.1 pkgsrc/net/ndpi/patches/patch-Makefile.am
diff -r1.1 -r0 pkgsrc/net/ndpi/patches/patch-autogen.sh
diff -r1.1 -r0 pkgsrc/net/ndpi/patches/patch-src_lib_ndpi__main.c
diff -r1.1 -r0 pkgsrc/net/ndpi/patches/patch-src_lib_third__party_include_hash.h
diff -r1.1 -r1.2 pkgsrc/net/ndpi/patches/patch-configure.seed
diff -r1.1 -r1.2 pkgsrc/net/ndpi/patches/patch-src_lib_Makefile.in
--- pkgsrc/net/ndpi/Makefile 2018/10/18 16:24:29 1.5
+++ pkgsrc/net/ndpi/Makefile 2019/07/12 09:30:34 1.6
@@ -1,6 +1,6 @@
-# $NetBSD: Makefile,v 1.5 2018/10/18 16:24:29 adam Exp $
+# $NetBSD: Makefile,v 1.6 2019/07/12 09:30:34 adam Exp $
-DISTNAME= nDPI-2.4
+DISTNAME= nDPI-2.8
PKGNAME= ${DISTNAME:tl}
CATEGORIES= net
MASTER_SITES= ${MASTER_SITE_GITHUB:=ntop/}
--- pkgsrc/net/ndpi/PLIST 2018/10/18 16:24:29 1.2
+++ pkgsrc/net/ndpi/PLIST 2019/07/12 09:30:34 1.3
@@ -1,4 +1,4 @@
-@comment $NetBSD: PLIST,v 1.2 2018/10/18 16:24:29 adam Exp $
+@comment $NetBSD: PLIST,v 1.3 2019/07/12 09:30:34 adam Exp $
bin/ndpiReader
include/ndpi/ndpi_api.h
include/ndpi/ndpi_config.h
@@ -13,4 +13,5 @@
lib/libndpi.a
lib/libndpi.so
lib/libndpi.so.${PKGVERSION}.0
+lib/libndpi.so.2
lib/pkgconfig/libndpi.pc
--- pkgsrc/net/ndpi/buildlink3.mk 2016/04/08 16:51:23 1.1
+++ pkgsrc/net/ndpi/buildlink3.mk 2019/07/12 09:30:34 1.2
@@ -1,11 +1,11 @@
-# $NetBSD: buildlink3.mk,v 1.1 2016/04/08 16:51:23 adam Exp $
+# $NetBSD: buildlink3.mk,v 1.2 2019/07/12 09:30:34 adam Exp $
BUILDLINK_TREE+= ndpi
.if !defined(NDPI_BUILDLINK3_MK)
NDPI_BUILDLINK3_MK:=
-BUILDLINK_API_DEPENDS.ndpi+= ndpi>=1.7
+BUILDLINK_API_DEPENDS.ndpi+= ndpi>=2.8
BUILDLINK_PKGSRCDIR.ndpi?= ../../net/ndpi
.include "../../textproc/json-c/buildlink3.mk"
--- pkgsrc/net/ndpi/distinfo 2018/10/18 16:24:29 1.4
+++ pkgsrc/net/ndpi/distinfo 2019/07/12 09:30:34 1.5
@@ -1,12 +1,10 @@
-$NetBSD: distinfo,v 1.4 2018/10/18 16:24:29 adam Exp $
+$NetBSD: distinfo,v 1.5 2019/07/12 09:30:34 adam Exp $
-SHA1 (nDPI-2.4.tar.gz) = 6ff0d034a2badade2e1deb835594a42fc297646a
-RMD160 (nDPI-2.4.tar.gz) = 5f022327354c55a773d17e83f76d50cc68fa3c78
-SHA512 (nDPI-2.4.tar.gz) = 7c746c167ab3ebafbe8646f752c95e32d66237a0a86adeec9ded1ec7e20f62170a9b1c4e5d25594f6459f5c0f616c27c5b393151d936471590f16df3fa3fa884
-Size (nDPI-2.4.tar.gz) = 19308586 bytes
-SHA1 (patch-autogen.sh) = 61dbff4cce826994726da317667de9534030c5c1
-SHA1 (patch-configure.seed) = 885956b856b37d3f77e2c05630eee60af8ba5759
+SHA1 (nDPI-2.8.tar.gz) = 5b5f613cf55deeb040483f7c04ede7a2ed415c26
+RMD160 (nDPI-2.8.tar.gz) = c26bfadeee1db4abbf86a06fdfa338cbfaf42d9b
+SHA512 (nDPI-2.8.tar.gz) = aae757047810bbc32700ecf7ac2e5df4b93528021a50da4a0b83865a5248dfca8b1643c75aa7eeb6eac4f155638d45666db487318b2be9adb2f3412cb8ec8497
+Size (nDPI-2.8.tar.gz) = 19754226 bytes
+SHA1 (patch-Makefile.am) = 3f4649a55e519a21e1c5b645669f1febcef82d4e
+SHA1 (patch-configure.seed) = 154f2d6a690bd6e7e01862769bcf0fa4b1a86ad6
SHA1 (patch-src_include_ndpi__includes.h) = db5da9ca24ecf32fd8c264e193af280814dc74c6
-SHA1 (patch-src_lib_Makefile.in) = 60b03e8e6daaa9d882732c6fcf9897f5d843c3de
+SHA1 (patch-src_lib_Makefile.in) = 458e095e55a3b6f24166813a249350a32a1e0589
-SHA1 (patch-src_lib_ndpi__main.c) = 6a10a5318a033ce686b7fef37b0f2bf597b4eb06
-SHA1 (patch-src_lib_third__party_include_hash.h) = af82b9a7b418a5cba0c678c40d331dc5bffc0f0b
$NetBSD: patch-Makefile.am,v 1.1 2019/07/12 09:30:34 adam Exp $
Use standard pkgconfigdir.
--- Makefile.am.orig 2019-07-11 10:20:02.000000000 +0000
+++ Makefile.am
@@ -1,7 +1,7 @@
ACLOCAL_AMFLAGS = -I m4
SUBDIRS = src/lib example tests
-pkgconfigdir = $(prefix)/libdata/pkgconfig
+pkgconfigdir = $(prefix)/lib/pkgconfig
pkgconfig_DATA = libndpi.pc
EXTRA_DIST = autogen.sh
--- pkgsrc/net/ndpi/patches/Attic/patch-configure.seed 2018/10/18 16:24:29 1.1
+++ pkgsrc/net/ndpi/patches/Attic/patch-configure.seed 2019/07/12 09:30:34 1.2
--- pkgsrc/net/ndpi/patches/patch-src_lib_Makefile.in 2018/10/18 16:24:29 1.1
+++ pkgsrc/net/ndpi/patches/patch-src_lib_Makefile.in 2019/07/12 09:30:34 1.2
@@ -1,61 +1,49 @@
-$NetBSD: patch-src_lib_Makefile.in,v 1.1 2018/10/18 16:24:29 adam Exp $
+$NetBSD: patch-src_lib_Makefile.in,v 1.2 2019/07/12 09:30:34 adam Exp $
-Add missing src/lib/Makefile.in
+Fix building on Darwin.
---- /dev/null 2018-10-18 13:00:10.000000000 +0000
+--- src/lib/Makefile.in.orig 2019-03-01 17:04:18.000000000 +0000
+++ src/lib/Makefile.in
-@@ -0,0 +1,54 @@
-+#
-+# Simple non-autotools dependent makefile
-+#
-+# ./autogen.sh
-+# cd src/lib
-+# make Makefile
-+#
-+
-+
-+#
-+# Installation directories
-+#
-+libdir = ${PREFIX}/lib
-+includedir = ${PREFIX}/include/ndpi
-+CFLAGS += -fPIC -DPIC -I../include -Ithird_party/include -DNDPI_LIB_COMPILATION
-+RANLIB = ranlib
-+
-+OBJECTS = $(patsubst protocols/%.c, protocols/%.o, $(wildcard protocols/*.c)) $(patsubst third_party/src/%.c, third_party/src/%.o, $(wildcard third_party/src/*.c)) ndpi_main.o
-+HEADERS = $(wildcard ../include/*.h)
-+NDPI_LIB_STATIC = libndpi.a
+@@ -21,8 +21,15 @@ OBJECTS = $(patsubst protocols/%.c, pr
+ HEADERS = $(wildcard ../include/*.h)
+ NDPI_VERSION_MAJOR = @NDPI_MAJOR@
+ NDPI_LIB_STATIC = libndpi.a
+ifeq ($(OS),Darwin)
+NDPI_LIB_SHARED_BASE = libndpi.dylib
+NDPI_LIB_SHARED = libndpi.@NDPI_VERSION_SHORT@.dylib
-+LDFLAGS += -install_name ${PREFIX}/lib/${NDPI_LIB_SHARED}
++NDPI_LIB_SHARED_SHORT= libndpi.@NDPI_MAJOR@.dylib
+else
-+NDPI_LIB_SHARED_BASE = libndpi.so
-+NDPI_LIB_SHARED = $(NDPI_LIB_SHARED_BASE).@NDPI_VERSION_SHORT@
+ NDPI_LIB_SHARED_BASE = libndpi.so
+ 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)
+ NDPI_LIBS = $(NDPI_LIB_STATIC) $(NDPI_LIB_SHARED)
-+
+
-+all: $(NDPI_LIBS)
+ ifneq ($(OS),Windows_NT)
-+
+@@ -30,8 +37,7 @@ OS := $(shell uname)
-+ndpi_main.c: ndpi_content_match.c.inc
+ endif
-+
+
-+$(NDPI_LIB_STATIC): $(OBJECTS)
+ ifeq ($(OS),Darwin)
-+ ar rc $@ $(OBJECTS)
+-CC=clang
-+ $(RANLIB) $@
+-SONAME_FLAG=
-+
++SONAME_FLAG=-install_name $(libdir)/${NDPI_LIB_SHARED}
-+$(NDPI_LIB_SHARED): $(OBJECTS)
+ else
-+ $(CC) -shared -fPIC ${LDFLAGS} -o $@ $(OBJECTS)
+ SONAME_FLAG=-Wl,-soname,$(NDPI_LIB_SHARED_BASE).$(NDPI_VERSION_MAJOR)
-+ ln -Fs $(NDPI_LIB_SHARED) $(NDPI_LIB_SHARED_BASE)
+ endif
-+
+@@ -47,7 +53,7 @@ $(NDPI_LIB_STATIC): $(OBJECTS)
-+%.o: %.c $(HEADERS) Makefile
+ $(NDPI_LIB_SHARED): $(OBJECTS)
-+ $(CC) $(CFLAGS) -c $< -o $@
+ $(CC) -shared -fPIC $(SONAME_FLAG) -o $@ $(OBJECTS)
-+
+ ln -Ffs $(NDPI_LIB_SHARED) $(NDPI_LIB_SHARED_BASE)
-+clean:
+- ln -Ffs $(NDPI_LIB_SHARED) $(NDPI_LIB_SHARED_BASE).$(NDPI_VERSION_MAJOR)
-+ /bin/rm -f $(NDPI_LIB_STATIC) $(OBJECTS) *.o *.so *.lo
++ ln -Ffs $(NDPI_LIB_SHARED) $(NDPI_LIB_SHARED_SHORT)
-+
+
-+install: $(NDPI_LIBS)
+ %.o: %.c $(HEADERS) Makefile
-+ mkdir -p $(DESTDIR)$(libdir)
+ $(CC) $(CFLAGS) -c $< -o $@
-+ cp $(NDPI_LIBS) $(DESTDIR)$(libdir)/
+@@ -62,6 +68,6 @@ install: $(NDPI_LIBS)
-+ ln -Fs $(DESTDIR)$(libdir)/$(NDPI_LIB_SHARED) $(DESTDIR)$(libdir)/$(NDPI_LIB_SHARED_BASE)
+ mkdir -p $(DESTDIR)$(libdir)
-+ mkdir -p $(DESTDIR)$(includedir)
+ cp $(NDPI_LIBS) $(DESTDIR)$(libdir)/
-+ cp ../include/*.h $(DESTDIR)$(includedir)
+ ln -Ffs $(DESTDIR)$(libdir)/$(NDPI_LIB_SHARED) $(DESTDIR)$(libdir)/$(NDPI_LIB_SHARED_BASE)
+- ln -Ffs $(DESTDIR)$(libdir)/$(NDPI_LIB_SHARED) $(DESTDIR)$(libdir)/$(NDPI_LIB_SHARED_BASE).$(NDPI_VERSION_MAJOR)
++ ln -Ffs $(DESTDIR)$(libdir)/$(NDPI_LIB_SHARED) $(DESTDIR)$(libdir)/$(NDPI_LIB_SHARED_SHORT)
+ mkdir -p $(DESTDIR)$(includedir)
+ cp ../include/*.h $(DESTDIR)$(includedir)