From nobody Sun Dec 22 16:16:38 2024 X-Original-To: dev-commits-ports-all@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 4YGR9f2l0Pz5Yx1d; Sun, 22 Dec 2024 16:16:38 +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 "R10" (verified OK)) by mx1.freebsd.org (Postfix) with ESMTPS id 4YGR9f1RzSz4bRk; Sun, 22 Dec 2024 16:16:38 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1734884198; 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=cWkDDhpdid/OuPSPvRZI09CPXEw1OLdLo+/3VdwA688=; b=S8WDbKHDOpysg1YlIHewb6wKn5QdvAuiYRdpZkajnTkVejbkGpqkpdgG7w63Vw4mwemv/Q 8QX3q4L1KOeGXbvRkAMHAmRyA2uer9Dtbib8NOyK1ufGG3jyponJ4w+ZSzQxHR7GcwsSZS 0jeMIcYr42dZrLxe92rfDKYHVKbfe5xMpuIZXM2/F8rvPl16dvQE5AFuhgxy5qZrX2sgqh dSsgr3JvP7Mh/Ng/HOwNpspDMGEsMeAndeqMG2WpKUY1Z8xs7TWvRUIGIPkk2zu4XTo+lQ yPQUlBEPV8QEmm5fMzX+nYJitD9hEoWGeXhI+svum9z1LK2P9InpHuXSviWSOg== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1734884198; 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=cWkDDhpdid/OuPSPvRZI09CPXEw1OLdLo+/3VdwA688=; b=DEHxiO51uRzUDqaE2n92FGjg97gbuacInCPu5q/VAOuunqemIUdnpXrZxWg0ZG3daZfw30 6O6FBUSzYQguwCe+xfC2lmD3Fi42jWfKD0ya7A538OOi21ZqHP2lm51Y1TeIZi2aKBqQNc j8Ldd+d3MhMvozoUm4GkhHQ8ToafQCrH7v/XrxDlxiKZx/qP5dHK9TEMPKTLb4zvQVMiTE WfB+kx9NDR9SJ0ScCLbfpvMDDa+cWyySQ81ef5zRLBzo5dMXs7BrZhvLh2JwfmH5ojCrID d6JGWEZMO+gxeifr4gooTeZxZg6uBSAwmWx4hjqW48+NPeIgZMT6J2lbbIJrow== ARC-Authentication-Results: i=1; mx1.freebsd.org; none ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1734884198; a=rsa-sha256; cv=none; b=lKmWTAJguqHsPRdG+ewuT3+ewAplnSt4KpmBQUqlcftvOsqgqkW1DyaRDcjVpxToK9d1c+ 0bOgF53QVx5XflkMDWhV3y5sCrqzosha3IQ5DD9wvWyslN5O3ZUcmbLPexqX4Oy0Sk5EZA 6/Y4tjVAibr9HjMRdENdzUzVTKGpLTeaNaI58/ip2I/MAkbi0PTObJVz9jstaoJEMiyUsT 5zVfLkp8UhbFPeSNxjZwqOySwzh8xvD0yRV0fsNPqvHMWbAzhiG/fzoytbGC3NBAmk/Qm+ DgN4xAury3kIhcJVG9GBCJfAyh6v4UUbL2RjDDvUi7AQTIPL4XRmA4q1HhX0wA== 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 4YGR9f13WmzFwS; Sun, 22 Dec 2024 16:16:38 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from gitrepo.freebsd.org ([127.0.1.44]) by gitrepo.freebsd.org (8.18.1/8.18.1) with ESMTP id 4BMGGc6S076770; Sun, 22 Dec 2024 16:16:38 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.18.1/8.18.1/Submit) id 4BMGGc7O076767; Sun, 22 Dec 2024 16:16:38 GMT (envelope-from git) Date: Sun, 22 Dec 2024 16:16:38 GMT Message-Id: <202412221616.4BMGGc7O076767@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: bd4c7b6fbf36 - main - net/ndpi: Update to new stable branch List-Id: Commit messages for all branches of the ports repository List-Archive: https://lists.freebsd.org/archives/dev-commits-ports-all List-Help: List-Post: List-Subscribe: List-Unsubscribe: X-BeenThere: dev-commits-ports-all@freebsd.org Sender: owner-dev-commits-ports-all@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: bd4c7b6fbf364dd8451439486b3f977a32ae8fc6 Auto-Submitted: auto-generated The branch main has been updated by madpilot: URL: https://cgit.FreeBSD.org/ports/commit/?id=bd4c7b6fbf364dd8451439486b3f977a32ae8fc6 commit bd4c7b6fbf364dd8451439486b3f977a32ae8fc6 Author: Guido Falsi AuthorDate: 2024-12-22 16:15:31 +0000 Commit: Guido Falsi CommitDate: 2024-12-22 16:16:34 +0000 net/ndpi: Update to new stable branch --- net/ndpi/Makefile | 4 ++-- net/ndpi/distinfo | 6 +++--- net/ndpi/files/patch-example_Makefile.in | 13 +++++++------ 3 files changed, 12 insertions(+), 11 deletions(-) diff --git a/net/ndpi/Makefile b/net/ndpi/Makefile index b7e66d6a7c41..315130aa477e 100644 --- a/net/ndpi/Makefile +++ b/net/ndpi/Makefile @@ -1,5 +1,5 @@ PORTNAME= ndpi -PORTVERSION= 4.10.d20240807 +PORTVERSION= 4.12.d20241217 PORTEPOCH= 1 CATEGORIES= net @@ -30,7 +30,7 @@ INSTALL_TARGET= install-strip USE_GITHUB= yes GH_ACCOUNT= ntop GH_PROJECT= nDPI -GH_TAGNAME= b07d0ae +GH_TAGNAME= b4455a0 PLIST_SUB= MAJOR_VER=${PORTVERSION:R:R} VER=${PORTVERSION:R} diff --git a/net/ndpi/distinfo b/net/ndpi/distinfo index bba61143de7e..25ffac8d3b27 100644 --- a/net/ndpi/distinfo +++ b/net/ndpi/distinfo @@ -1,3 +1,3 @@ -TIMESTAMP = 1723128522 -SHA256 (ntop-nDPI-4.10.d20240807-b07d0ae_GH0.tar.gz) = 5810013650d53505c39a8f0ef695b681d8cfbf65198511397f7cff52a31df8a1 -SIZE (ntop-nDPI-4.10.d20240807-b07d0ae_GH0.tar.gz) = 38579260 +TIMESTAMP = 1734879291 +SHA256 (ntop-nDPI-4.12.d20241217-b4455a0_GH0.tar.gz) = c8384e2c2972f54d35bca4757ebc98f8090b3a878cd745a56f57f93d1ab0ffb1 +SIZE (ntop-nDPI-4.12.d20241217-b4455a0_GH0.tar.gz) = 47562576 diff --git a/net/ndpi/files/patch-example_Makefile.in b/net/ndpi/files/patch-example_Makefile.in index d0051b797c65..9236fd15c5c5 100644 --- a/net/ndpi/files/patch-example_Makefile.in +++ b/net/ndpi/files/patch-example_Makefile.in @@ -1,4 +1,4 @@ ---- example/Makefile.in.orig 2024-08-07 09:36:14 UTC +--- example/Makefile.in.orig 2024-12-17 13:59:14 UTC +++ example/Makefile.in @@ -1,57 +1,28 @@ CXX=@CXX@ AR=@AR@ @@ -18,8 +18,8 @@ -ifneq ($(OS),Windows_NT) -CFLAGS+=-fPIC -DPIC -endif --CFLAGS+=-I$(SRCHOME)/include @NDPI_CFLAGS@ @PCAP_INC@ @GPROF_CFLAGS@ -+CFLAGS+=-fPIC -DPIC -I$(SRCHOME)/include @NDPI_CFLAGS@ @PCAP_INC@ @GPROF_CFLAGS@ +-CFLAGS+=-I$(SRCHOME)/include @NDPI_CFLAGS@ @PCAP_INC@ @GPROF_CFLAGS@ @CUSTOM_NDPI@ ++CFLAGS+=-fPIC -DPIC -I$(SRCHOME)/include @NDPI_CFLAGS@ @PCAP_INC@ @GPROF_CFLAGS@ @CUSTOM_NDPI@ LDFLAGS+=@NDPI_LDFLAGS@ LIBNDPI=$(SRCHOME)/lib/libndpi.a LIBS=$(LIBNDPI) @PCAP_LIB@ @ADDITIONAL_LIBS@ @LIBS@ @GPROF_LIBS@ @@ -61,7 +61,7 @@ libndpiReader.a: $(COMMON_SOURCES:%.c=%.o) $(LIBNDPI) $(AR) rsv libndpiReader.a $(COMMON_SOURCES:%.c=%.o) -@@ -67,10 +38,10 @@ install: ndpiReader$(EXE_SUFFIX) +@@ -67,10 +38,11 @@ install: ndpiReader$(EXE_SUFFIX) install: ndpiReader$(EXE_SUFFIX) mkdir -p $(DESTDIR)$(PREFIX)/bin/ @@ -70,8 +70,9 @@ cp ndpiReader$(EXE_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 ++ cp protos.txt $(DESTDIR)$(PREFIX)/$(EXAMPLESDIR)/ndpiProtos.txt ++ cp mining_hosts.txt $(DESTDIR)$(PREFIX)/$(EXAMPLESDIR)/ndpiCustomCategory.txt ++ [ -f ndpiSimpleIntegration$(EXE_SUFFIX) ] && cp ndpiSimpleIntegration$(EXE_SUFFIX) $(DESTDIR)$(PREFIX)/bin/ndpiSimpleIntegration$(EXE_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