From nobody Sun Aug 11 11:09:22 2024 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 4WhZfW61pZz5SW2l; Sun, 11 Aug 2024 11:09:23 +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 "R11" (verified OK)) by mx1.freebsd.org (Postfix) with ESMTPS id 4WhZfW30dvz4lPx; Sun, 11 Aug 2024 11:09:23 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1723374563; 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=ZuTJG6ZsgbOUHVx0YHvizKIamOIl8RWkrup3DkxybiU=; b=YDixfvHOI/2u0LssCZPg3ohVXuqFvWtSnGHQA9xz64qm6vu+0SC//vVFJvabPnQYGTMf+X LVETahCtWHYiAjNRCKMC1E1QS2+FF2mYdHS4Q0EpQJl2xZG3ezRqyuxAsCf7hap9euK+LY uI/zG7ErMMM6j6VhJtGb6ezsBDagnwFeRKYPr4J2HDSseVA2gRFJ3/NIYBbcZNvS7EdHKd Qn7Bog8nvStQEU4iKcgstwKtKj4x2Ds8gRn8iK9mBhGmS+jDx/534U9+GXClZ7Wydb5EIH npEmvgBi0NhdJ7PufxYsUXLNUHN4fv5zsp7XEFW+421cgWYProdfsBLdH/XPRQ== ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1723374563; a=rsa-sha256; cv=none; b=tXwCT2LOsmd8tb1O9xp7jfksom5tlqcmB5e/OLqWIqIDWmFi60wowyGYrBcBif5v5L8XWQ dvsBcg+1R6/p/EU6UxOdv2RT0zPe5pUKH32ZGgmibEPAhM5QzlIEQ7wHIpBlJxoP5E54Ar +oMyysnpHryf+vAvsfZ0J9FBUAMgcqUUUsXm6b5K5FN2DD6cetUt17fHofgmEu87UOLL+F Es5x0nwPWzj93/Bzgq8J4O08HZrT01UhrvIAFhPOBletGVQ0DTuzIQ1KWyZBV9NII2nGLh ppTTeOPNDgar3t2tgdVAVoPdoSXss4u5w13iwbZNk0RXVS9zvU624oxskDmCqA== ARC-Authentication-Results: i=1; mx1.freebsd.org; none ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1723374563; 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=ZuTJG6ZsgbOUHVx0YHvizKIamOIl8RWkrup3DkxybiU=; b=IqxrJX07mvg6giyiRdcczp6ItQR6OvjwgdGiMcMdIQgDieb4W/cQVW/7S3fA8NMrUMCR58 GEsTwX9z57/zPt8ExcqXLzjO7Ul3khwxBpYXUIRmQ3cIuohqmQAO1EjJtlANbCbYYeDoMA ThvqYVD6rM6shmt2xTJQ/YLVqhXwjzCvrJTntKS4p/0zA2Ny5UYe8X1IGlMlrxyofIq/l2 1PEluA98J9KSwYXegJgopBrG6rWnj028b44S4PXEw0cE1BBJu/GEBuLPaLRJVsyEFmXOOf Ma5o9+Vq9MNZ0W5fGhTYLcVs06QfgyVCxvyURRgRqaXYXoY3alZcoO6dGgHsEg== 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 4WhZfW1Jr9zhgV; Sun, 11 Aug 2024 11:09:23 +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 47BB9MtL017541; Sun, 11 Aug 2024 11:09:22 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.18.1/8.18.1/Submit) id 47BB9M9B017538; Sun, 11 Aug 2024 11:09:22 GMT (envelope-from git) Date: Sun, 11 Aug 2024 11:09:22 GMT Message-Id: <202408111109.47BB9M9B017538@gitrepo.freebsd.org> To: ports-committers@FreeBSD.org, dev-commits-ports-all@FreeBSD.org, dev-commits-ports-main@FreeBSD.org From: Babak Farrokhi Subject: git: 90fc03b99996 - main - net-mgmt/fastnetmon: Update to 1.2.7 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: X-BeenThere: dev-commits-ports-main@freebsd.org Sender: owner-dev-commits-ports-main@FreeBSD.org MIME-Version: 1.0 Content-Type: text/plain; charset=utf-8 Content-Transfer-Encoding: 8bit X-Git-Committer: farrokhi X-Git-Repository: ports X-Git-Refname: refs/heads/main X-Git-Reftype: branch X-Git-Commit: 90fc03b99996ebb9f040ac305794fe627a8856d3 Auto-Submitted: auto-generated The branch main has been updated by farrokhi: URL: https://cgit.FreeBSD.org/ports/commit/?id=90fc03b99996ebb9f040ac305794fe627a8856d3 commit 90fc03b99996ebb9f040ac305794fe627a8856d3 Author: Babak Farrokhi AuthorDate: 2024-08-11 11:06:19 +0000 Commit: Babak Farrokhi CommitDate: 2024-08-11 11:06:19 +0000 net-mgmt/fastnetmon: Update to 1.2.7 Release Notes: https://github.com/pavel-odintsov/fastnetmon/releases/tag/v1.2.7 PR: 280367 Reported by: Marek Zarychta Sponsored by: PANS Jarosław --- net-mgmt/fastnetmon/Makefile | 27 ++++++++----------- net-mgmt/fastnetmon/distinfo | 8 +++--- net-mgmt/fastnetmon/files/patch-CMakeLists.txt | 30 ---------------------- net-mgmt/fastnetmon/files/patch-src_fastnetmon.cpp | 29 --------------------- .../fastnetmon/files/patch-src_man_fastnetmon.8 | 11 -------- .../patch-src_netmap__plugin_netmap__collector.cpp | 10 -------- net-mgmt/fastnetmon/pkg-plist | 1 + 7 files changed, 14 insertions(+), 102 deletions(-) diff --git a/net-mgmt/fastnetmon/Makefile b/net-mgmt/fastnetmon/Makefile index 4e0e66cad815..57e6501f518a 100644 --- a/net-mgmt/fastnetmon/Makefile +++ b/net-mgmt/fastnetmon/Makefile @@ -1,15 +1,11 @@ -PORTNAME= fastnetmon +PORTNAME= fastnetmon DISTVERSIONPREFIX= v -DISTVERSION= 1.2.6 -PORTREVISION= 2 -CATEGORIES= net-mgmt security +DISTVERSION= 1.2.7 +CATEGORIES= net-mgmt security -PATCH_SITES= https://github.com/pavel-odintsov/${PORTNAME}/commit/ -PATCHFILES= fad8757b8986226024d549a6dfb40abbab01643e.patch:-p2 - -MAINTAINER= farrokhi@FreeBSD.org -COMMENT= Very fast DDoS analyzer with sflow/netflow/mirror support -WWW= https://fastnetmon.com +MAINTAINER= farrokhi@FreeBSD.org +COMMENT= Very fast DDoS analyzer with sflow/netflow/mirror support +WWW= https://fastnetmon.com LICENSE= GPLv2 LICENSE_FILE= ${WRKSRC}/../LICENSE @@ -49,18 +45,15 @@ CMAKE_ON= ENABLE_NETMAP_SUPPORT \ OPTIONS_DEFINE= DOCS post-patch: - @${REINPLACE_CMD} -e 's|/usr/local|${PREFIX}|; \ - s|/var/run|&/fastnetmon|g; s|/var/log|&/fastnetmon|g; \ - s|"/etc/|"${PREFIX}/etc/|g; s|/root/fastnetmon|${DATADIR}|g' \ - ${WRKSRC}/fastnetmon.conf ${WRKSRC}/fastnetmon.cpp - @${REINPLACE_CMD} -e 's|%%PREFIX%%|${PREFIX}|g' \ - ${WRKSRC}/man/fastnetmon.8 + @${REINPLACE_CMD} -e 's|/etc/networks|${PREFIX}/etc/networks|g' \ + -e 's|/var/run|/var/run/${PORTNAME}|g' ${WRKSRC}/fastnetmon.conf + @${REINPLACE_CMD} -e 's|/etc/|${PREFIX}/etc/|g' ${WRKSRC}/man/fastnetmon.8 post-install: ${INSTALL_DATA} ${WRKSRC}/fastnetmon.conf ${STAGEDIR}${PREFIX}/etc/fastnetmon.conf.sample ${INSTALL_DATA} ${WRKSRC}/networks_list ${STAGEDIR}${PREFIX}/etc/networks_list.sample ${INSTALL_DATA} ${WRKSRC}/networks_whitelist ${STAGEDIR}${PREFIX}/etc/networks_whitelist.sample - ${MKDIR} ${STAGEDIR}/var/run/fastnetmon ${STAGEDIR}/var/log/fastnetmon_attacks + ${MKDIR} ${STAGEDIR}/var/run/fastnetmon ${STAGEDIR}/var/log/fastnetmon ${STAGEDIR}/var/log/fastnetmon_attacks ${INSTALL_SCRIPT} ${WRKSRC}/notify_about_attack.sh ${STAGEDIR}${PREFIX}/bin/notify_about_attack.sh.sample post-install-DOCS-on: diff --git a/net-mgmt/fastnetmon/distinfo b/net-mgmt/fastnetmon/distinfo index f8d70d4ffad9..b1e024e750c0 100644 --- a/net-mgmt/fastnetmon/distinfo +++ b/net-mgmt/fastnetmon/distinfo @@ -1,5 +1,3 @@ -TIMESTAMP = 1706176431 -SHA256 (pavel-odintsov-fastnetmon-v1.2.6_GH0.tar.gz) = b6a7d1e9ba98c1c042d774bff82ea3e8bbf03085e0be43a2676e41d590f668cf -SIZE (pavel-odintsov-fastnetmon-v1.2.6_GH0.tar.gz) = 1421719 -SHA256 (fad8757b8986226024d549a6dfb40abbab01643e.patch) = 22e739071959c4e2b88cca4ad8278c07be998505c152952d6f18b69227cc8844 -SIZE (fad8757b8986226024d549a6dfb40abbab01643e.patch) = 2694 +TIMESTAMP = 1721758522 +SHA256 (pavel-odintsov-fastnetmon-v1.2.7_GH0.tar.gz) = c21fcbf970214dd48ee8aa11e6294e16bea86495085315e7b370a84b316d0af9 +SIZE (pavel-odintsov-fastnetmon-v1.2.7_GH0.tar.gz) = 1443577 diff --git a/net-mgmt/fastnetmon/files/patch-CMakeLists.txt b/net-mgmt/fastnetmon/files/patch-CMakeLists.txt deleted file mode 100644 index d833ac56fc9d..000000000000 --- a/net-mgmt/fastnetmon/files/patch-CMakeLists.txt +++ /dev/null @@ -1,30 +0,0 @@ ---- CMakeLists.txt.orig 2023-10-14 15:48:26 UTC -+++ CMakeLists.txt -@@ -47,7 +47,8 @@ set(GTEST_INSTALL_PATH "${FASTNETMON_LIBRARIES_GLOBAL_ - # In order to get a warning about an unused function parameter, you must either specify -Wextra -Wunused (note that -Wall implies -Wunused), or separately specify -Wunused-parameter. - # TODO: return -Wunused-parameter and address all warning later, I started it but did not finish as we have too many of them - # catch-value is documented here: https://patchwork.ozlabs.org/project/gcc/patch/tkrat.8c7b4260a533be2f@netcologne.de/#1680619 --add_definitions("-Wreorder -Wunused -Wparentheses -Wimplicit-fallthrough -Wreturn-type -Wuninitialized -Winit-self -Wmaybe-uninitialized -Wcatch-value=3 -Wclass-memaccess") -+# add_definitions("-Wreorder -Wunused -Wparentheses -Wimplicit-fallthrough -Wreturn-type -Wuninitialized -Winit-self -Wmaybe-uninitialized -Wcatch-value=3 -Wclass-memaccess") -+add_definitions("-Wreorder -Wunused -Wparentheses -Wimplicit-fallthrough -Wreturn-type -Wuninitialized -Winit-self") - - # On Windows we need to build libgcc and libstdc++ statically to avoid need to carry dlls with us - if (${CMAKE_SYSTEM_NAME} STREQUAL "Windows") -@@ -81,7 +82,7 @@ option(KAFKA_SUPPORT "Enables Kafka support" OFF) - option(KAFKA_SUPPORT "Enables Kafka support" OFF) - - # We need to add it into include path as gRPC uses it include path --include_directories("${ABSL_INSTALL_PATH}/include") -+# include_directories("${ABSL_INSTALL_PATH}/include") - - option(DO_NOT_USE_SYSTEM_LIBRARIES_FOR_BUILD "Disables use of libraries from system path" OFF) - -@@ -848,7 +849,7 @@ if (ENABLE_CAPNP_SUPPORT) - message(FATAL_ERROR "Could not find capnp libraries") - endif() - -- include_directories("${CAPNP_CUSTOM_INSTALL_PATH}/include") -+ # include_directories("${CAPNP_CUSTOM_INSTALL_PATH}/include") - - target_link_libraries(simple_packet_capnp ${CAPNP_LIBRARY_PATH} ${CAPNP_KJ_LIBRARY_PATH}) - diff --git a/net-mgmt/fastnetmon/files/patch-src_fastnetmon.cpp b/net-mgmt/fastnetmon/files/patch-src_fastnetmon.cpp deleted file mode 100644 index 74155be61ca9..000000000000 --- a/net-mgmt/fastnetmon/files/patch-src_fastnetmon.cpp +++ /dev/null @@ -1,29 +0,0 @@ ---- fastnetmon.cpp.orig 2023-05-23 06:20:59 UTC -+++ fastnetmon.cpp -@@ -156,7 +156,7 @@ unsigned int stats_thread_initial_call_delay = 30; - std::string reporting_server = "community-stats.fastnetmon.com"; - - // Path to temporarily store backtrace when fatal failure happened --std::string backtrace_path = "/var/log/fastnetmon_backtrace.dump"; -+std::string backtrace_path = "/var/log/fastnetmon/fastnetmon_backtrace.dump"; - - // Each this seconds we will check about available data in bucket - unsigned int check_for_availible_for_processing_packets_buckets = 1; -@@ -430,7 +430,7 @@ std::string exabgp_community_subnet = ""; - std::string exabgp_community_host = ""; - - --std::string exabgp_command_pipe = "/var/run/exabgp.cmd"; -+std::string exabgp_command_pipe = "/var/run/fastnetmon/exabgp.cmd"; - std::string exabgp_next_hop = ""; - - // Graphite monitoring -@@ -514,7 +514,7 @@ void sigpipe_handler_for_popen(int signo) { - #ifdef GEOIP - bool geoip_init() { - // load GeoIP ASN database to memory -- geo_ip = GeoIP_open("/root/fastnetmon/GeoIPASNum.dat", GEOIP_MEMORY_CACHE); -+ geo_ip = GeoIP_open("/usr/local/share/fastnetmon/GeoIPASNum.dat", GEOIP_MEMORY_CACHE); - - if (geo_ip == NULL) { - return false; diff --git a/net-mgmt/fastnetmon/files/patch-src_man_fastnetmon.8 b/net-mgmt/fastnetmon/files/patch-src_man_fastnetmon.8 deleted file mode 100644 index 75d8a25831a5..000000000000 --- a/net-mgmt/fastnetmon/files/patch-src_man_fastnetmon.8 +++ /dev/null @@ -1,11 +0,0 @@ ---- man/fastnetmon.8.orig 2023-03-03 16:20:18 UTC -+++ man/fastnetmon.8 -@@ -8,7 +8,7 @@ fastnetmon [--daemonize] - .SH DESCRIPTION - FastNetMon - a high performance DoS/DDoS load analyzer built on top of multiple packet capture engines (NetFlow, IPFIX, sFlow, port mirror). - --For more information about configuration, please look at the comments in /etc/fastnetmon.conf and check the project GitHub page: https://github.com/pavel-odintsov/fastnetmon. -+For more information about configuration, please look at the comments in %%PREFIX%%/etc/fastnetmon.conf and check the project GitHub page: https://github.com/pavel-odintsov/fastnetmon. - .SH OPTIONS - fastnetmon has only a single command line option --daemonize which is used for forking and detaching it from the terminal. - .SH SEE ALSO diff --git a/net-mgmt/fastnetmon/files/patch-src_netmap__plugin_netmap__collector.cpp b/net-mgmt/fastnetmon/files/patch-src_netmap__plugin_netmap__collector.cpp deleted file mode 100644 index 1bc5cd90e69f..000000000000 --- a/net-mgmt/fastnetmon/files/patch-src_netmap__plugin_netmap__collector.cpp +++ /dev/null @@ -1,10 +0,0 @@ ---- netmap_plugin/netmap_collector.cpp.orig 2023-03-01 14:23:34 UTC -+++ netmap_plugin/netmap_collector.cpp -@@ -19,6 +19,7 @@ - - // Disable debug messages from Netmap - #define NETMAP_NO_DEBUG -+typedef bool _Bool; - #include - #include - diff --git a/net-mgmt/fastnetmon/pkg-plist b/net-mgmt/fastnetmon/pkg-plist index 2912f9ef0846..624483fe7ab0 100644 --- a/net-mgmt/fastnetmon/pkg-plist +++ b/net-mgmt/fastnetmon/pkg-plist @@ -8,4 +8,5 @@ share/man/man1/fastnetmon_client.1.gz @sample etc/networks_whitelist.sample @sample etc/fastnetmon.conf.sample @dir(fastnetmon,fastnetmon) /var/run/fastnetmon +@dir(fastnetmon,fastnetmon) /var/log/fastnetmon @dir(fastnetmon,fastnetmon) /var/log/fastnetmon_attacks