From a1b4f359a98e3e6d9a6c651d2fbad860e7aba43e Mon Sep 17 00:00:00 2001 From: Guido Falsi Date: Sat, 22 Dec 2018 20:06:52 +0000 Subject: - Update ndpi to 2.6.d20181221 - Update ntopng to 3.8.d20181221 - Add USES=localbase to ndpi - Silence portlint warnings - Update WWW links - Add UPDATING note about data directory change nDPI changelog: https://github.com/ntop/nDPI/blob/dev/CHANGELOG.md ntopng changelog: https://github.com/ntop/ntopng/blob/dev/CHANGELOG.md --- net/ndpi/files/patch-src_lib_Makefile.in | 31 +++++++++++++++++++++++++++++++ 1 file changed, 31 insertions(+) create mode 100644 net/ndpi/files/patch-src_lib_Makefile.in (limited to 'net/ndpi/files/patch-src_lib_Makefile.in') diff --git a/net/ndpi/files/patch-src_lib_Makefile.in b/net/ndpi/files/patch-src_lib_Makefile.in new file mode 100644 index 000000000000..46cc8c79158d --- /dev/null +++ b/net/ndpi/files/patch-src_lib_Makefile.in @@ -0,0 +1,31 @@ +- /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 +@@ -17,24 +17,15 @@ CC = @CC@ + CFLAGS += -fPIC -DPIC -I../include -Ithird_party/include -DNDPI_LIB_COMPILATION -O2 -g + 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) ++OBJECTS != ls protocols/*.c | sed 's/\(.*\)\.c$$/\1.o/' && ls third_party/src/*.c | sed 's/\(.*\)\.c$$/\1.o/' && echo ndpi_main.o ++HEADERS != ls ../include/*.h + NDPI_VERSION_MAJOR = @NDPI_MAJOR@ + NDPI_LIB_STATIC = libndpi.a + NDPI_LIB_SHARED_BASE = libndpi.so + NDPI_LIB_SHARED = $(NDPI_LIB_SHARED_BASE).@NDPI_VERSION_SHORT@ + NDPI_LIBS = $(NDPI_LIB_STATIC) $(NDPI_LIB_SHARED) + +-ifneq ($(OS),Windows_NT) +-OS := $(shell uname) +-endif +- +-ifeq ($(OS),Darwin) +-CC=clang +-SONAME_FLAG= +-else + SONAME_FLAG=-Wl,-soname,$(NDPI_LIB_SHARED_BASE).$(NDPI_VERSION_MAJOR) +-endif + + all: $(NDPI_LIBS) + -- cgit v1.2.3