From nobody Thu Dec 22 20:15:14 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 4NdM4M0bMfz1HTkC; Thu, 22 Dec 2022 20:15: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 4NdM4M08Qzz3Bw6; Thu, 22 Dec 2022 20:15:15 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1671740115; 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=FfvxX+hBcmRQFf/Nuh5ELG+Brm/nR/hbY7VkRnPG9nM=; b=f+iW67YAcj7CLVEOiuamwd4oeMCjc4FGTsQd0R7pkvB7DFMu3B8rtn2ITeXLlqUFRE9D1b a2MZ1ecrto7mzFo2Gx+uXzBLkazTREyxwzsMA+NSAV5mguyKpzyIXO4gIw5Ulcc/tE6+n8 lpbgfZ/PffJPN//LF6CXb+hysc26So8WBzUWJ+SRsZW6kxk5Iy+37P49hMn0bTnyegA2S1 y/EGD1fKc8b/xyatmKaBpm9Zr7ke87jONiqe4a35adUmATqxfckn6pgV7zIaznHKZ2ZbCO HYGf64UGySvwOPWSM+qfQtfMFWDkAUdq8uln8OLA5YjcYzMvQYQ0i642mKBCwA== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1671740115; 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=FfvxX+hBcmRQFf/Nuh5ELG+Brm/nR/hbY7VkRnPG9nM=; b=LLe8ow7J9m9wbRluKlD/X38X2VjNMSfiIL2NjrpdgZQ1bRoDOaH6d/Hg2Y87RuX0puUwLi oRDwQ0HIcSiRT7FsC5KaniXp6o7yrJjK/ZJRVwxL1eLeE/zLLkylADDk7NK7Ct7zG91pVp zynzAfsMqdNBXcQ7r4kdJUJtyRjrWT4wL6h+JAxA2B9F17VJ0RL3LfNqEOKGHdVaH2855t g26sTh7ytEtYCGRkAlsYTQRQ0RrPyBdE2I02GRc0C1QworjsmCv29rxguzh8qOsisDZyrm bUmzhdqYLsFRC8bVbWve0qAf8i5WEgF8iJSPzXZOXEEFbYlEfNVkNkQC90k/JQ== ARC-Authentication-Results: i=1; mx1.freebsd.org; none ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1671740115; a=rsa-sha256; cv=none; b=eru7aLoDurq24g29IMuG8viw0Bd1f3dCQGw/uvoAk3QcTU7Tal3wgAy9xn14lwksOz4yaV ebjWgolpNgAvyw5/JwNVIKPWA7Dg7/z8GQfSMpYRTZX0Al3YS1gHatKkGeg0mxeO8FP8WF vLxZSp6emcyfjFxUOKORnqhdjrWL9tqF9UXZV2RexTSTc6Jr6EiKGraYbC9oA/BSESevod lwJWsdyz5MYwlYyGK4tpYgwU3RzVmjncQPXvgceRBkZ35zoVrFodYWIpgn9y1P0oZstHV3 quAI8A9Z9ANhTjX3aNMhvQe9/GrZwdgYDtStdoHBPkOuX5xMUEmz+S9uvu7FKQ== 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 4NdM4L6Mvwz173k; Thu, 22 Dec 2022 20:15:14 +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 2BMKFEAD069346; Thu, 22 Dec 2022 20:15:14 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.16.1/8.16.1/Submit) id 2BMKFEFq069345; Thu, 22 Dec 2022 20:15:14 GMT (envelope-from git) Date: Thu, 22 Dec 2022 20:15:14 GMT Message-Id: <202212222015.2BMKFEFq069345@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: 587f13705ee5 - main - net/ntopng: Update to latest upstream satable snapshot 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: 587f13705ee5cd3e9a298dd8dbea92fe03420724 Auto-Submitted: auto-generated X-ThisMailContainsUnwantedMimeParts: N The branch main has been updated by madpilot: URL: https://cgit.FreeBSD.org/ports/commit/?id=587f13705ee5cd3e9a298dd8dbea92fe03420724 commit 587f13705ee5cd3e9a298dd8dbea92fe03420724 Author: Guido Falsi AuthorDate: 2022-12-22 20:11:44 +0000 Commit: Guido Falsi CommitDate: 2022-12-22 20:11:44 +0000 net/ntopng: Update to latest upstream satable snapshot - Import one patch from upstream head fixing a bug in stable branch [1] Obtained from: https://github.com/ntop/ntopng/commit/9d7bdc36a0d9cf7f06fd66f1ee26d7bb79c7c109 [1] --- net/ntopng/Makefile | 6 ++--- net/ntopng/distinfo | 10 ++++----- net/ntopng/files/patch-FlowDevicesFix | 41 +++++++++++++++++++++++++++++++++++ 3 files changed, 49 insertions(+), 8 deletions(-) diff --git a/net/ntopng/Makefile b/net/ntopng/Makefile index 2879d75de5c1..961f42ec6192 100644 --- a/net/ntopng/Makefile +++ b/net/ntopng/Makefile @@ -1,5 +1,5 @@ PORTNAME= ntopng -PORTVERSION= 5.4.d20220812 +PORTVERSION= 5.4.d20221219 PORTEPOCH= 1 CATEGORIES= net @@ -39,9 +39,9 @@ GROUPS= ntopng PLIST_SUB= NTOPNGUSER="${USERS}" NTOPNGROUP="${GROUPS}" USE_GITHUB= yes -GH_TUPLE= ntop:ntopng-dist:604aa39:dist/httpdocs/dist +GH_TUPLE= ntop:ntopng-dist:9579bab:dist/httpdocs/dist GH_ACCOUNT= ntop -GH_TAGNAME= 8ade112 +GH_TAGNAME= 05f68a1 CPE_VENDOR= ntop diff --git a/net/ntopng/distinfo b/net/ntopng/distinfo index cf4dff247765..a75d33fd591f 100644 --- a/net/ntopng/distinfo +++ b/net/ntopng/distinfo @@ -1,5 +1,5 @@ -TIMESTAMP = 1660757495 -SHA256 (ntop-ntopng-5.4.d20220812-8ade112_GH0.tar.gz) = a6e37f51dc1406322beb4c9998215422bc69b653c054340fd9d6e307648bf138 -SIZE (ntop-ntopng-5.4.d20220812-8ade112_GH0.tar.gz) = 42662190 -SHA256 (ntop-ntopng-dist-604aa39_GH0.tar.gz) = 0187ee0514ec63e4421e8386f521cf241d6b72da9683ef2bd164851deb6e2d87 -SIZE (ntop-ntopng-dist-604aa39_GH0.tar.gz) = 1712437 +TIMESTAMP = 1671612269 +SHA256 (ntop-ntopng-5.4.d20221219-05f68a1_GH0.tar.gz) = 762eed49add7c8125357a1c0e0304355abbb306854442ade71d93ed9ec129ee1 +SIZE (ntop-ntopng-5.4.d20221219-05f68a1_GH0.tar.gz) = 42663355 +SHA256 (ntop-ntopng-dist-9579bab_GH0.tar.gz) = 5108087df5ad60512d646909db5f63aceedd99c24ba0f8c594c4c88dba1a04dd +SIZE (ntop-ntopng-dist-9579bab_GH0.tar.gz) = 1712425 diff --git a/net/ntopng/files/patch-FlowDevicesFix b/net/ntopng/files/patch-FlowDevicesFix new file mode 100644 index 000000000000..55a058a54355 --- /dev/null +++ b/net/ntopng/files/patch-FlowDevicesFix @@ -0,0 +1,41 @@ +From 9d7bdc36a0d9cf7f06fd66f1ee26d7bb79c7c109 Mon Sep 17 00:00:00 2001 +From: Luca Deri +Date: Mon, 12 Dec 2022 10:37:13 +0100 +Subject: [PATCH] Fixes #7029 + +--- + scripts/lua/inc/menu.lua | 2 +- + src/LuaEngineInterface.cpp | 4 +++- + 2 files changed, 4 insertions(+), 2 deletions(-) + +diff --git a/scripts/lua/inc/menu.lua b/scripts/lua/inc/menu.lua +index 24bfbabd3b3..081c7729171 100644 +--- scripts/lua/inc/menu.lua ++++ scripts/lua/inc/menu.lua +@@ -305,7 +305,7 @@ else + + -- Exporters + +- local has_exporters = (ifs.type == "zmq") or (ifs.type == "custom") or (table.len(interface.getFlowDevices()) > 0) ++ local has_exporters = (ifs.type == "zmq") or (ifs.type == "custom") or (ntop.isPro() and (table.len(interface.getFlowDevices()) > 0)) + + page_utils.add_menubar_section( + { +diff --git a/src/LuaEngineInterface.cpp b/src/LuaEngineInterface.cpp +index fa1cc582fa1..9dfc147effd 100644 +--- src/LuaEngineInterface.cpp ++++ src/LuaEngineInterface.cpp +@@ -4657,10 +4657,12 @@ static luaL_Reg _ntop_interface_reg[] = { + /* SNMP */ + { "getSNMPStats", ntop_interface_get_snmp_stats }, + ++#ifdef NTOPNG_PRO + /* Flow Devices */ + { "getFlowDevices", ntop_get_flow_devices }, + { "getFlowDeviceInfo", ntop_get_flow_device_info }, +- ++#endif ++ + #ifdef HAVE_NEDGE + /* L7 */ + { "reloadL7Rules", ntop_reload_l7_rules },