svn commit: r519231 - in head/net/ndpi: . files
Guido Falsi
madpilot at FreeBSD.org
Sat Dec 7 18:52:41 UTC 2019
Author: madpilot
Date: Sat Dec 7 18:52:39 2019
New Revision: 519231
URL: https://svnweb.freebsd.org/changeset/ports/519231
Log:
Update nDPI to 3.0.d20191021
Reported by: Александр Стерин <tuor.rauchris at gmail.com> (via email)
Added:
head/net/ndpi/files/patch-example_Makefile.in (contents, props changed)
Deleted:
head/net/ndpi/files/patch-src_lib_ndpi__main.c
head/net/ndpi/files/patch-src_lib_protocols_quic.c
Modified:
head/net/ndpi/Makefile
head/net/ndpi/distinfo
head/net/ndpi/files/patch-src_lib_Makefile.in
head/net/ndpi/pkg-plist
Modified: head/net/ndpi/Makefile
==============================================================================
--- head/net/ndpi/Makefile Sat Dec 7 18:48:56 2019 (r519230)
+++ head/net/ndpi/Makefile Sat Dec 7 18:52:39 2019 (r519231)
@@ -2,7 +2,7 @@
# $FreeBSD$
PORTNAME= ndpi
-PORTVERSION= 2.8.d20190903
+PORTVERSION= 3.0.d20191021
PORTEPOCH= 1
CATEGORIES= net
@@ -21,13 +21,14 @@ USE_LDCONFIG= yes
CONFIGURE_ARGS= --with-pic
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= e5b1df6
+GH_TAGNAME= 2ce4223
PLIST_SUB= MAJOR_VER=${PORTVERSION:R:R} VER=${PORTVERSION:R}
Modified: head/net/ndpi/distinfo
==============================================================================
--- head/net/ndpi/distinfo Sat Dec 7 18:48:56 2019 (r519230)
+++ head/net/ndpi/distinfo Sat Dec 7 18:52:39 2019 (r519231)
@@ -1,3 +1,3 @@
-TIMESTAMP = 1569143684
-SHA256 (ntop-nDPI-2.8.d20190903-e5b1df6_GH0.tar.gz) = dbbe70560e1d207d5680e84eb3795613ca49485e1878b1f5b02a6d5d616ae2a7
-SIZE (ntop-nDPI-2.8.d20190903-e5b1df6_GH0.tar.gz) = 19754207
+TIMESTAMP = 1575659254
+SHA256 (ntop-nDPI-3.0.d20191021-2ce4223_GH0.tar.gz) = 7732ed792457a4f8b7e48649e2e43e13daa10670a389053729e71fd559a0fe33
+SIZE (ntop-nDPI-3.0.d20191021-2ce4223_GH0.tar.gz) = 26902394
Added: head/net/ndpi/files/patch-example_Makefile.in
==============================================================================
--- /dev/null 00:00:00 1970 (empty, because file is newly added)
+++ head/net/ndpi/files/patch-example_Makefile.in Sat Dec 7 18:52:39 2019 (r519231)
@@ -0,0 +1,24 @@
+--- example/Makefile.in.orig 2019-10-21 13:36:38 UTC
++++ example/Makefile.in
+@@ -5,6 +5,7 @@ LIBNDPI=../src/lib/libndpi.a
+ LDFLAGS=$(LIBNDPI) @PCAP_LIB@ -lpthread -lm @LDFLAGS@
+ OBJS=ndpiReader.o reader_util.o
+ PREFIX?=@prefix@
++EXAMPLESDIR?=share/examples/ndpi
+
+ all: ndpiReader @DPDK_TARGET@
+
+@@ -16,10 +17,10 @@ ndpiReader: $(OBJS) $(LIBNDPI)
+
+ install:
+ mkdir -p $(DESTDIR)$(PREFIX)/bin/
+- mkdir -p $(DESTDIR)$(PREFIX)/sbin/ndpi
++ mkdir -p $(DESTDIR)$(PREFIX)/$(EXAMPLESDIR)/
+ cp ndpiReader $(DESTDIR)$(PREFIX)/bin/
+- cp protos.txt $(DESTDIR)$(PREFIX)/sbin/ndpi/ndpiProtos.txt
+- cp mining_hosts.txt $(DESTDIR)$(PREFIX)/sbin/ndpi/ndpiCustomCategory.txt
++ cp protos.txt $(DESTDIR)$(PREFIX)/$(EXAMPLESDIR)/ndpiProtos.txt
++ cp mining_hosts.txt $(DESTDIR)$(PREFIX)/$(EXAMPLESDIR)/ndpiCustomCategory.txt
+ [ -f build/app/ndpiReader.dpdk ] && cp build/app/ndpiReader.dpdk $(DESTDIR)$(PREFIX)/bin/ || true
+ [ -f ndpiReader.dpdk ] && cp ndpiReader.dpdk $(DESTDIR)$(PREFIX)/bin/ || true
+
Modified: head/net/ndpi/files/patch-src_lib_Makefile.in
==============================================================================
--- head/net/ndpi/files/patch-src_lib_Makefile.in Sat Dec 7 18:48:56 2019 (r519230)
+++ head/net/ndpi/files/patch-src_lib_Makefile.in Sat Dec 7 18:52:39 2019 (r519231)
@@ -1,14 +1,14 @@
- /bin/rm -f libndpi.a $(OBJECTS)
new file mode 100644
---- src/lib/Makefile.in.orig 2018-12-21 16:33:57 UTC
+--- src/lib/Makefile.in.orig 2019-10-21 13:36:38 UTC
+++ src/lib/Makefile.in
@@ -17,24 +17,15 @@ CC = @CC@
- CFLAGS += -fPIC -DPIC -I../include -Ithird_party/include -DNDPI_LIB_COMPILATION -O2 -g
+ CFLAGS += -fPIC -DPIC -I../include -Ithird_party/include -DNDPI_LIB_COMPILATION -O2 -g -Wall
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
+-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 's/\(.*\)\.c$$/\1.o/' && echo ndpi_main.o
++OBJECTS != ls protocols/*.c | sed 's/\(.*\)\.c$$/\1.o/' && ls third_party/src/*.c | sed '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
Modified: head/net/ndpi/pkg-plist
==============================================================================
--- head/net/ndpi/pkg-plist Sat Dec 7 18:48:56 2019 (r519230)
+++ head/net/ndpi/pkg-plist Sat Dec 7 18:52:39 2019 (r519231)
@@ -1,5 +1,6 @@
bin/ndpiReader
include/ndpi/ndpi_api.h
+include/ndpi/ndpi_classify.h
include/ndpi/ndpi_config.h
include/ndpi/ndpi_define.h
include/ndpi/ndpi_includes.h
@@ -14,3 +15,5 @@ lib/libndpi.so
lib/libndpi.so.%%MAJOR_VER%%
lib/libndpi.so.%%VER%%.0
libdata/pkgconfig/libndpi.pc
+%%EXAMPLESDIR%%/ndpiCustomCategory.txt
+%%EXAMPLESDIR%%/ndpiProtos.txt
More information about the svn-ports-all
mailing list