From nobody Wed Feb 09 14:17:15 2022 X-Original-To: dev-commits-ports-main@mlmmj.nyi.freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2610:1c1:1:606c::19:1]) by mlmmj.nyi.freebsd.org (Postfix) with ESMTP id AE33019B33D7; Wed, 9 Feb 2022 14:17:15 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from mxrelay.nyi.freebsd.org (mxrelay.nyi.freebsd.org [IPv6:2610:1c1:1:606c::19:3]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256 client-signature RSA-PSS (4096 bits) client-digest SHA256) (Client CN "mxrelay.nyi.freebsd.org", Issuer "R3" (verified OK)) by mx1.freebsd.org (Postfix) with ESMTPS id 4Jv2574K5sz4tSt; Wed, 9 Feb 2022 14:17:15 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1644416235; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=VrguAYHYmHqj21lgq9P8vvFDwlyPSTueKXfqUE6C4BU=; b=G9TmCSn9DknPO1H6z2qKguD2uyIQv9QXPVUqRq2Pj/05bld73fTvik3QXaepyLltbp1t2b azYvnvc8LWibY/6KGu+cx4CakA4EnIjHJGBXHqxM+AKRGTpBtfJyl5UpO/QQurf0v+t4s8 tmDc7nQ9YmsxqnpMqrvfR/+PLTEBCZBNQoqq6/7W4uuMGUtZlNuHgNaF76HuQorichDGd/ kblLFfvdc1RR4iLAvP+O1yUCkF5FHQyB+dniXow8YbWhT5kga/mI3NGLttqZyY68iJiFMk PzekuCGv8FQyc5UN6lg2WqWZq58eMLmJpfydKXVGoT1bXqBWi4bjNYDjWuA4Fg== Received: from gitrepo.freebsd.org (gitrepo.freebsd.org [IPv6:2610:1c1:1:6068::e6a:5]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256) (Client did not present a certificate) by mxrelay.nyi.freebsd.org (Postfix) with ESMTPS id 72996695C; Wed, 9 Feb 2022 14:17:15 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from gitrepo.freebsd.org ([127.0.1.44]) by gitrepo.freebsd.org (8.16.1/8.16.1) with ESMTP id 219EHFbi065342; Wed, 9 Feb 2022 14:17:15 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.16.1/8.16.1/Submit) id 219EHFfq065341; Wed, 9 Feb 2022 14:17:15 GMT (envelope-from git) Date: Wed, 9 Feb 2022 14:17:15 GMT Message-Id: <202202091417.219EHFfq065341@gitrepo.freebsd.org> To: ports-committers@FreeBSD.org, dev-commits-ports-all@FreeBSD.org, dev-commits-ports-main@FreeBSD.org From: Guido Falsi Subject: git: ff4654ccfb7f - main - net/ndpi: Update to 4.2 List-Id: Commits to the main branch of the FreeBSD ports repository List-Archive: https://lists.freebsd.org/archives/dev-commits-ports-main List-Help: List-Post: List-Subscribe: List-Unsubscribe: Sender: owner-dev-commits-ports-main@freebsd.org X-BeenThere: dev-commits-ports-main@freebsd.org MIME-Version: 1.0 Content-Type: text/plain; charset=utf-8 Content-Transfer-Encoding: 8bit X-Git-Committer: madpilot X-Git-Repository: ports X-Git-Refname: refs/heads/main X-Git-Reftype: branch X-Git-Commit: ff4654ccfb7fe0361058fe1d90e9444e824c3b26 Auto-Submitted: auto-generated ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1644416235; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=VrguAYHYmHqj21lgq9P8vvFDwlyPSTueKXfqUE6C4BU=; b=dVQH/1Gp7f1zvSOJCY9eIfedB2UN7M/ZTjfiUzsaek5+/QinHTAn1Pjy0JnigkJ+htgCqL Ohcvw0nL/+BE5AJ+i/z/nNVr3PZIA+6wUfv0bhVmgwGhVNEQ7IdoOfuvU9mF+JnqgQ7gft fRh7HkLn08603/30jbDzfgdvK5Ggu6RFjP2XWpk1j9uU9TIAUfYTZnvx8fGBJe6b89kh1Y yUKno9a6KLK71ecFKJpSXcevYnMCqIG+Ya+48vxtAip2S/PPVZa+ZFjGmRjoHvHh9X3Y9d La21YByR35o1cj5zvSyorbKjGc5Krr3Sr79BGcICeoKKylfNDMeF5gLLemlh8w== ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1644416235; a=rsa-sha256; cv=none; b=tT7wmh4ETqXKgVsXtX3y53qT7y/wpNzon9VMM61ez3RE5BdgjVKpPoNKnmqxiKxZ04Uu67 UIPucR2XXMgOtW73Lp3kBBANxmI8yuHbdYEl03RV4/15sT2YYpbfMyKEgD1tLO4wkfvWVU FFej4YPgOFUXcH3ekTL5A4Rd+KM2duRbZPwuB7LC0lkBT0HFbNCjgNKg9BcMrWCDPQJiUM p1NXlxorHDZmybLnzOWIuX5Zj6iVUj9K0JF6QWH7oweQwRCQj7JD6hkxa6paaOt5SGN77d g7+l1HArpkfVUZVVwCuupZ8TCeLrBzkEsaIYhtbStBPYgG2tXkQYy0rSCwt1nw== ARC-Authentication-Results: i=1; mx1.freebsd.org; none X-ThisMailContainsUnwantedMimeParts: N The branch main has been updated by madpilot: URL: https://cgit.FreeBSD.org/ports/commit/?id=ff4654ccfb7fe0361058fe1d90e9444e824c3b26 commit ff4654ccfb7fe0361058fe1d90e9444e824c3b26 Author: Guido Falsi AuthorDate: 2022-02-09 14:16:30 +0000 Commit: Guido Falsi CommitDate: 2022-02-09 14:16:30 +0000 net/ndpi: Update to 4.2 --- net/ndpi/Makefile | 7 +--- net/ndpi/distinfo | 6 +-- net/ndpi/files/patch-autogen.sh | 62 ----------------------------- net/ndpi/files/patch-example_Makefile.in | 39 ++++++++++-------- net/ndpi/files/patch-tests_dga_Makefile.in | 26 ++++++++++++ net/ndpi/files/patch-tests_unit_Makefile.in | 26 ++++++++++++ 6 files changed, 79 insertions(+), 87 deletions(-) diff --git a/net/ndpi/Makefile b/net/ndpi/Makefile index 95590b85af8a..0575f1a3abc1 100644 --- a/net/ndpi/Makefile +++ b/net/ndpi/Makefile @@ -1,7 +1,7 @@ # Created by: Muhammad Moinur Rahman <5u623l20@gmail.com> PORTNAME= ndpi -PORTVERSION= 4.0.d20211111 +PORTVERSION= 4.2.d20220201 PORTEPOCH= 1 CATEGORIES= net @@ -30,13 +30,10 @@ INSTALL_TARGET= install-strip USE_GITHUB= yes GH_ACCOUNT= ntop GH_PROJECT= nDPI -GH_TAGNAME= 92a1be2 +GH_TAGNAME= 8b5c6af PLIST_SUB= MAJOR_VER=${PORTVERSION:R:R} VER=${PORTVERSION:R} -post-patch: - (cd ${WRKSRC} && ${SH} autogen.sh) - post-configure: @${REINPLACE_CMD} -e 's/#define PACKAGE/#define NDPI_PACKAGE/g' \ -e 's/#define VERSION/#define NDPI_VERSION/g' \ diff --git a/net/ndpi/distinfo b/net/ndpi/distinfo index 503b7ff3e2cb..3880cbbcc29a 100644 --- a/net/ndpi/distinfo +++ b/net/ndpi/distinfo @@ -1,3 +1,3 @@ -TIMESTAMP = 1640249838 -SHA256 (ntop-nDPI-4.0.d20211111-92a1be2_GH0.tar.gz) = d2ea9cbf9fa23ffe87db2081d5cb7fcd30f567477a80c6124316aaf9d63ef9c4 -SIZE (ntop-nDPI-4.0.d20211111-92a1be2_GH0.tar.gz) = 120052622 +TIMESTAMP = 1644343060 +SHA256 (ntop-nDPI-4.2.d20220201-8b5c6af_GH0.tar.gz) = 1c45ba61f0a7ce0d14178c80b4a6aeb4624e9df26afd2bfccacebe420a920aef +SIZE (ntop-nDPI-4.2.d20220201-8b5c6af_GH0.tar.gz) = 126561030 diff --git a/net/ndpi/files/patch-autogen.sh b/net/ndpi/files/patch-autogen.sh deleted file mode 100644 index 4cc3f7b8b68e..000000000000 --- a/net/ndpi/files/patch-autogen.sh +++ /dev/null @@ -1,62 +0,0 @@ ---- autogen.sh.orig 2021-07-26 07:42:48 UTC -+++ autogen.sh -@@ -5,46 +5,6 @@ NDPI_MINOR="0" - NDPI_PATCH="0" - NDPI_VERSION_SHORT="$NDPI_MAJOR.$NDPI_MINOR.$NDPI_PATCH" - --rm -f configure config.h config.h.in -- --AUTOCONF=$(command -v autoconf) --AUTOMAKE=$(command -v automake) --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 -- echo "automake is missing: please install it and try again" -- exit --fi -- --if test -z $LIBTOOL && test -z $LIBTOOLIZE ; then -- echo "libtool and libtoolize is missing: please install it and try again" -- exit --fi -- --if test -z $AUTORECONF; then -- 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" \ -@@ -52,12 +12,3 @@ cat configure.seed | sed \ - -e "s/@NDPI_VERSION_SHORT@/$NDPI_VERSION_SHORT/g" \ - -e "s/@FUZZY@/$FUZZY/g" \ - > configure.ac -- --autoreconf -ivf --cat configure | sed "s/#define PACKAGE/#define NDPI_PACKAGE/g" | sed "s/#define VERSION/#define NDPI_VERSION/g" > configure.tmp --cat configure.tmp > configure -- --echo "./configure $@" --chmod +x configure --./configure $@ -- diff --git a/net/ndpi/files/patch-example_Makefile.in b/net/ndpi/files/patch-example_Makefile.in index 39c3aeddb298..343167ead9ef 100644 --- a/net/ndpi/files/patch-example_Makefile.in +++ b/net/ndpi/files/patch-example_Makefile.in @@ -1,42 +1,47 @@ ---- example/Makefile.in.orig 2020-10-19 14:18:25 UTC +--- example/Makefile.in.orig 2022-02-01 08:14:05 UTC +++ example/Makefile.in -@@ -9,17 +9,12 @@ HEADERS=intrusion_detection.h reader_util.h $(SRCHOME) +@@ -12,28 +12,14 @@ 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.' +-SUFFIX:=.exe +-CFLAGS+=-I@srcdir@/../windows/WpdPack/Include -I@srcdir@/../windows/WpdPack/Include/pcap +-LIBS+=-Wl,-Bstatic -lpthread -Wl,-Bdynamic +- +-ifneq ($(BUILD_MINGW_X64),) +-LIBS+=@srcdir@/../windows/WpdPack/Lib/x64/wpcap.lib +-else +-LIBS+=@srcdir@/../windows/WpdPack/Lib/wpcap.lib +-endif - -else - - all: ndpiReader @DPDK_TARGET@ + LIBS+=-lpthread + +-endif +- + all: ndpiReader$(SUFFIX) @DPDK_TARGET@ EXECUTABLE_SOURCES := ndpiReader.c ndpiSimpleIntegration.c -COMMON_SOURCES := $(filter-out $(EXECUTABLE_SOURCES),$(wildcard *.c )) -+COMMON_SOURCES=intrusion_detection.c reader_util.c ++COMMON_SOURCES := reader_util.c libndpiReader.a: $(COMMON_SOURCES:%.c=%.o) $(LIBNDPI) - ar rsv libndpiReader.a $(COMMON_SOURCES:%.c=%.o) -@@ -35,10 +30,10 @@ ndpiSimpleIntegration: ndpiSimpleIntegration.o + $(AR) rsv libndpiReader.a $(COMMON_SOURCES:%.c=%.o) +@@ -49,10 +35,10 @@ ndpiSimpleIntegration$(SUFFIX): ndpiSimpleIntegration. - install: ndpiReader + install: ndpiReader$(SUFFIX) mkdir -p $(DESTDIR)$(PREFIX)/bin/ - mkdir -p $(DESTDIR)$(PREFIX)/share/ndpi + mkdir -p $(DESTDIR)$(PREFIX)/$(EXAMPLESDIR)/ - cp ndpiReader $(DESTDIR)$(PREFIX)/bin/ + cp ndpiReader$(SUFFIX) $(DESTDIR)$(PREFIX)/bin/ - cp protos.txt $(DESTDIR)$(PREFIX)/share/ndpi/ndpiProtos.txt - cp mining_hosts.txt $(DESTDIR)$(PREFIX)/share/ndpi/ndpiCustomCategory.txt + cp protos.txt $(DESTDIR)$(PREFIX)/$(EXAMPLESDIR)/ndpiProtos.txt + cp mining_hosts.txt $(DESTDIR)$(PREFIX)/$(EXAMPLESDIR)/ndpiCustomCategory.txt + [ -f ndpiSimpleIntegration$(SUFFIX) ] && cp ndpiSimpleIntegration$(SUFFIX) $(DESTDIR)$(PREFIX)/bin/ndpiSimpleIntegration$(SUFFIX) || true [ -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 diff --git a/net/ndpi/files/patch-tests_dga_Makefile.in b/net/ndpi/files/patch-tests_dga_Makefile.in new file mode 100644 index 000000000000..c7e09995d8c5 --- /dev/null +++ b/net/ndpi/files/patch-tests_dga_Makefile.in @@ -0,0 +1,26 @@ +--- tests/dga/Makefile.in.orig 2022-02-01 08:14:05 UTC ++++ tests/dga/Makefile.in +@@ -12,16 +12,13 @@ HEADERS=$(SRCHOME)/include/ndpi_api.h $(SRCHOME)/inclu + OBJS=dga_evaluate + PREFIX?=@prefix@ + +-ifneq ($(BUILD_MINGW),) + all: + @echo 'DGA test disabled due to mingw build.' + +-else +- + all: dga_evaluate + + EXECUTABLE_SOURCES := dga_evaluate.c +-COMMON_SOURCES := $(filter-out $(EXECUTABLE_SOURCES),$(wildcard *.c )) ++COMMON_SOURCES= + + dga_evaluate: $(LIBNDPI) dga_evaluate.o + $(CC) $(CFLAGS) $(CPPFLAGS) $(LDFLAGS) dga_evaluate.o $(LIBS) -o $@ +@@ -42,5 +39,3 @@ distdir: + + distclean: clean + /bin/rm -f Makefile +- +-endif diff --git a/net/ndpi/files/patch-tests_unit_Makefile.in b/net/ndpi/files/patch-tests_unit_Makefile.in new file mode 100644 index 000000000000..d56c22da2529 --- /dev/null +++ b/net/ndpi/files/patch-tests_unit_Makefile.in @@ -0,0 +1,26 @@ +--- tests/unit/Makefile.in.orig 2022-02-01 08:14:05 UTC ++++ tests/unit/Makefile.in +@@ -12,16 +12,10 @@ HEADERS=$(SRCHOME)/include/ndpi_api.h $(SRCHOME)/inclu + OBJS=unit + PREFIX?=@prefix@ + +-ifneq ($(BUILD_MINGW),) +-all: +- @echo 'Unit tests disabled due to mingw build.' +- +-else +- + all: unit + + EXECUTABLE_SOURCES := unit.c +-COMMON_SOURCES := $(filter-out $(EXECUTABLE_SOURCES),$(wildcard *.c )) ++COMMON_SOURCES= + + unit: $(LIBNDPI) unit.o + $(CC) $(CFLAGS) $(CPPFLAGS) $(LDFLAGS) unit.o $(LIBS) -o $@ +@@ -42,5 +36,3 @@ distdir: + + distclean: clean + /bin/rm -f Makefile +- +-endif