mirror of
https://git.FreeBSD.org/ports.git
synced 2025-01-16 07:58:04 +00:00
- Update ndpi to 3.4 branch
- Update ntopng to latest upstream stable commit
This commit is contained in:
Guido Falsi
parent
ec70d5bc63
commit
e9e5f223fc
Notes:
svn2git
2021-03-31 03:12:20 +00:00
svn path=/head/; revision=553201
@ -2,7 +2,7 @@
|
||||
# $FreeBSD$
|
||||
|
||||
PORTNAME= ndpi
|
||||
PORTVERSION= 3.2.d20200721
|
||||
PORTVERSION= 3.4.d20201019
|
||||
PORTEPOCH= 1
|
||||
CATEGORIES= net
|
||||
|
||||
@ -28,7 +28,7 @@ INSTALL_TARGET= install-strip
|
||||
USE_GITHUB= yes
|
||||
GH_ACCOUNT= ntop
|
||||
GH_PROJECT= nDPI
|
||||
GH_TAGNAME= 6735bb3
|
||||
GH_TAGNAME= 64929a7
|
||||
|
||||
PLIST_SUB= MAJOR_VER=${PORTVERSION:R:R} VER=${PORTVERSION:R}
|
||||
|
||||
|
||||
@ -1,3 +1,3 @@
|
||||
TIMESTAMP = 1596791745
|
||||
SHA256 (ntop-nDPI-3.2.d20200721-6735bb3_GH0.tar.gz) = 72ad5133db2373114559c076776b50b98281065d19f372312b94b6395fb30124
|
||||
SIZE (ntop-nDPI-3.2.d20200721-6735bb3_GH0.tar.gz) = 29585843
|
||||
TIMESTAMP = 1603197678
|
||||
SHA256 (ntop-nDPI-3.4.d20201019-64929a7_GH0.tar.gz) = 5a1d5a010c68c767deee008dabeca943a5b9897a0f936b2a68c30f6e1d9d6810
|
||||
SIZE (ntop-nDPI-3.4.d20201019-64929a7_GH0.tar.gz) = 37976447
|
||||
|
||||
@ -1,6 +1,6 @@
|
||||
--- autogen.sh.orig 2018-12-21 16:33:57 UTC
|
||||
--- autogen.sh.orig 2020-10-19 14:18:25 UTC
|
||||
+++ autogen.sh
|
||||
@@ -5,44 +5,9 @@ NDPI_MINOR="6"
|
||||
@@ -5,46 +5,6 @@ NDPI_MINOR="4"
|
||||
NDPI_PATCH="0"
|
||||
NDPI_VERSION_SHORT="$NDPI_MAJOR.$NDPI_MINOR.$NDPI_PATCH"
|
||||
|
||||
@ -11,10 +11,17 @@
|
||||
-LIBTOOL=$(command -v libtool)
|
||||
-LIBTOOLIZE=$(command -v libtoolize)
|
||||
-AUTORECONF=$(command -v autoreconf)
|
||||
-PKG_CONFIG=$(command -v pkg-config)
|
||||
-FUZZY=
|
||||
-
|
||||
-if test -z $AUTOCONF; then
|
||||
- echo "autoconf is missing: please install it and try again"
|
||||
- exit
|
||||
-else
|
||||
- V=`autoconf --version | head -1 | cut -d ' ' -f 4`
|
||||
- if [ "$V" = '2.63' ]; then
|
||||
- FUZZY="dnl> "
|
||||
- fi
|
||||
-fi
|
||||
-
|
||||
-if test -z $AUTOMAKE; then
|
||||
@ -31,12 +38,18 @@
|
||||
- echo "autoreconf is missing: please install it and try again"
|
||||
- exit
|
||||
-fi
|
||||
-
|
||||
-if test -z $PKG_CONFIG; then
|
||||
- echo "pkg-config is missing: please install it (apt-get install pkg-config) and try again"
|
||||
- exit
|
||||
-fi
|
||||
-
|
||||
cat configure.seed | sed \
|
||||
-e "s/@NDPI_MAJOR@/$NDPI_MAJOR/g" \
|
||||
-e "s/@NDPI_MINOR@/$NDPI_MINOR/g" \
|
||||
-e "s/@NDPI_PATCH@/$NDPI_PATCH/g" \
|
||||
@@ -52,11 +12,3 @@ cat configure.seed | sed \
|
||||
-e "s/@NDPI_VERSION_SHORT@/$NDPI_VERSION_SHORT/g" \
|
||||
-e "s/@FUZZY@/$FUZZY/g" \
|
||||
> configure.ac
|
||||
-
|
||||
-autoreconf -ivf
|
||||
@ -44,4 +57,5 @@
|
||||
-cat configure.tmp > configure
|
||||
-
|
||||
-chmod +x configure
|
||||
-./configure $*
|
||||
-./configure $@
|
||||
-
|
||||
|
||||
@ -1,22 +1,28 @@
|
||||
--- example/Makefile.in.orig 2020-03-24 12:39:12 UTC
|
||||
--- example/Makefile.in.orig 2020-10-19 14:18:25 UTC
|
||||
+++ example/Makefile.in
|
||||
@@ -8,11 +8,12 @@ HEADERS=intrusion_detection.h reader_util.h $(SRCHOME)
|
||||
@@ -9,17 +9,12 @@ HEADERS=intrusion_detection.h reader_util.h $(SRCHOME)
|
||||
$(SRCHOME)/include/ndpi_typedefs.h $(SRCHOME)/include/ndpi_protocol_ids.h
|
||||
OBJS=ndpiReader.o reader_util.o intrusion_detection.o
|
||||
PREFIX?=@prefix@
|
||||
+EXAMPLESDIR?=share/examples/ndpi
|
||||
|
||||
-ifneq ($(BUILD_MINGW),)
|
||||
-all:
|
||||
- @echo 'Examples disabled due to mingw build.'
|
||||
-
|
||||
-else
|
||||
-
|
||||
all: ndpiReader @DPDK_TARGET@
|
||||
|
||||
EXECUTABLE_SOURCES := ndpiReader.c
|
||||
EXECUTABLE_SOURCES := ndpiReader.c ndpiSimpleIntegration.c
|
||||
-COMMON_SOURCES := $(filter-out $(EXECUTABLE_SOURCES),$(wildcard *.c ))
|
||||
+COMMON_SOURCES=intrusion_detection.c reader_util.c
|
||||
|
||||
libndpiReader.a: $(COMMON_SOURCES:%.c=%.o) $(LIBNDPI)
|
||||
ar rsv libndpiReader.a $(COMMON_SOURCES:%.c=%.o)
|
||||
@@ -25,10 +26,10 @@ ndpiReader: libndpiReader.a $(LIBNDPI) $(EXECUTABLE_SO
|
||||
@@ -35,10 +30,10 @@ ndpiSimpleIntegration: ndpiSimpleIntegration.o
|
||||
|
||||
install:
|
||||
install: ndpiReader
|
||||
mkdir -p $(DESTDIR)$(PREFIX)/bin/
|
||||
- mkdir -p $(DESTDIR)$(PREFIX)/share/ndpi
|
||||
+ mkdir -p $(DESTDIR)$(PREFIX)/$(EXAMPLESDIR)/
|
||||
@ -28,3 +34,9 @@
|
||||
[ -f build/app/ndpiReader.dpdk ] && cp build/app/ndpiReader.dpdk $(DESTDIR)$(PREFIX)/bin/ || true
|
||||
[ -f ndpiReader.dpdk ] && cp ndpiReader.dpdk $(DESTDIR)$(PREFIX)/bin/ || true
|
||||
|
||||
@@ -61,5 +56,3 @@ distdir:
|
||||
distclean: clean
|
||||
/bin/rm -f Makefile.dpdk
|
||||
/bin/rm -f Makefile
|
||||
-
|
||||
-endif
|
||||
|
||||
@ -1,9 +1,9 @@
|
||||
- /bin/rm -f libndpi.a $(OBJECTS)
|
||||
new file mode 100644
|
||||
--- src/lib/Makefile.in.orig 2019-10-21 13:36:38 UTC
|
||||
--- src/lib/Makefile.in.orig 2020-10-19 14:18:25 UTC
|
||||
+++ src/lib/Makefile.in
|
||||
@@ -17,24 +17,15 @@ CC = @CC@
|
||||
CFLAGS += -fPIC -DPIC -I../include -Ithird_party/include -DNDPI_LIB_COMPILATION -O2 -g -Wall
|
||||
@@ -18,30 +18,17 @@ CFLAGS += -fPIC -DPIC -I../include -Ithird_party/i
|
||||
LDFLAGS = @LDFLAGS@ @ADDITIONAL_LIBS@ @LIBS@
|
||||
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)) $(patsubst ./%.c, ./%.o, $(wildcard ./*.c))
|
||||
@ -19,12 +19,18 @@ new file mode 100644
|
||||
-ifneq ($(OS),Windows_NT)
|
||||
-OS := $(shell uname)
|
||||
-endif
|
||||
-
|
||||
BUILD_MINGW = @BUILD_MINGW@
|
||||
|
||||
-ifeq ($(OS),Darwin)
|
||||
-CC=clang
|
||||
-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)
|
||||
-endif
|
||||
-endif
|
||||
|
||||
all: $(NDPI_LIBS)
|
||||
|
||||
@ -4,6 +4,7 @@ include/ndpi/ndpi_classify.h
|
||||
include/ndpi/ndpi_config.h
|
||||
include/ndpi/ndpi_define.h
|
||||
include/ndpi/ndpi_includes.h
|
||||
include/ndpi/ndpi_includes_OpenBSD.h
|
||||
include/ndpi/ndpi_main.h
|
||||
include/ndpi/ndpi_protocol_ids.h
|
||||
include/ndpi/ndpi_protocols.h
|
||||
|
||||
@ -2,7 +2,7 @@
|
||||
# $FreeBSD$
|
||||
|
||||
PORTNAME= ntopng
|
||||
PORTVERSION= 4.0.d20200917
|
||||
PORTVERSION= 4.0.d20201019
|
||||
PORTEPOCH= 1
|
||||
CATEGORIES= net
|
||||
|
||||
@ -36,7 +36,7 @@ PLIST_SUB= NTOPNGUSER="${USERS}" NTOPNGROUP="${GROUPS}"
|
||||
|
||||
USE_GITHUB= yes
|
||||
GH_ACCOUNT= ntop
|
||||
GH_TAGNAME= 17bc5c0
|
||||
GH_TAGNAME= 882b255
|
||||
|
||||
CPE_VENDOR= ntop
|
||||
|
||||
|
||||
@ -1,3 +1,3 @@
|
||||
TIMESTAMP = 1601472514
|
||||
SHA256 (ntop-ntopng-4.0.d20200917-17bc5c0_GH0.tar.gz) = f5edb75e6f1b8c09c7531b9684078cf4ceb0d3cbadfbbaae455d476e01dac62e
|
||||
SIZE (ntop-ntopng-4.0.d20200917-17bc5c0_GH0.tar.gz) = 43417733
|
||||
TIMESTAMP = 1603197726
|
||||
SHA256 (ntop-ntopng-4.0.d20201019-882b255_GH0.tar.gz) = 2fdd1eeb3b7cb67be71e4410e8b8ec8062fc873fdf34a53bb8886fb0e3a43b6b
|
||||
SIZE (ntop-ntopng-4.0.d20201019-882b255_GH0.tar.gz) = 43417332
|
||||
|
||||
Loading…
Reference in New Issue
Block a user