From nobody Mon Jun 19 14:12:06 2023 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 4QlBXk3nDNz4fLF6; Mon, 19 Jun 2023 14:12:06 +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 4QlBXk3MbRz3K9d; Mon, 19 Jun 2023 14:12:06 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1687183926; 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=p0wyjtjTPwS3MjTlXHi0VruAzwNS5O8y98IEYyo4yxY=; b=suVB2B3uw3aPL0P2eLeqJwq98FR7sd0K2FfwxxVrkaUC7zfH3/5VOb8fDWqMeMMg0HxNpz k+gYfYtepJhjggWuTPQGvJiU7CHLqyQNKSKc3pEfXOj9Z8nrcHAq5DjtAvAaptQqvKvwp/ xxjyRhQgXYiK37jQMdQM3KtdhqIunfAImgHwKAfVJvKTA8GXACOlqD+QdFVyxM62H8gU6B Uj3RgeDNm5j/cY/W/lw+rGDrianNXrc/Jldhhp7Xsa2z8Bg+nhLGLZMFdKLHXd0M0e5ohd /jLNGysJ8Whe9ZYnIgpWW/szZqFogTKjk1tglIB0d6bBQA0YhRwOiycgNRu4ZA== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1687183926; 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=p0wyjtjTPwS3MjTlXHi0VruAzwNS5O8y98IEYyo4yxY=; b=s0knjUC1miNvPvyEdYtgRqenqyeUW6kohci+Azn/t3jRrLHbTNVMNWhG4x00EmiPsdU2fq g58C4jpC4eBO0M5yUdMZrZ6JblKckRolzaI8QNez/MpD0tscNtZAoaduZmfPC1G6f1faQc OoiIMZh36GcAtkqCL/8o9RE36LnzzlbqgaJ61CxTa+5oPGRIceDLSwFOvXx+jaAcfJEdrH SLM9+lLsuc5U1pea/IT1Fif82P76CLM2G1+fm5DrkUUlVHaN97YgpDlNkWoNWWekn7537j JYJbUQKakipGj4gkWMQFFLtu/UH45aMsjdmhXuPZXOG9J/RuuAiAwhyakxOEkw== ARC-Authentication-Results: i=1; mx1.freebsd.org; none ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1687183926; a=rsa-sha256; cv=none; b=NjO4UwjRblY5j+wtN0CAn3/Tc6Gu7H/aixU0JVY0RG16wdGJi3Fr99xRpWi5Wg9ybMyRMq q+LFlrYHmJcMCLLG/khMv5VEAOigxeAzrKt1WcZmscSqr4gk3qPJZulQjMIeBmGPCJXLTY 6ogioA8NGOg9rkHq+/zBbOvN1pmhNOtH5xy79qWDmAZn3EYJp9BMcearXb3M598H4DjV18 QI8cXbNf95QmUVMBFX2rC54BbPBcZzuD+grdhdAKvn7aPiNr9E1maE5ExYV5kNYmpVwiGG VBTnmTqrM1UjB8Af6Rzgmup/xvtEB/X0Bd60VIwPGfa6tb/D77wg3AMjTDeF+g== 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 4QlBXk2SZdzKqP; Mon, 19 Jun 2023 14:12:06 +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 35JEC62X050632; Mon, 19 Jun 2023 14:12:06 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.16.1/8.16.1/Submit) id 35JEC6nG050631; Mon, 19 Jun 2023 14:12:06 GMT (envelope-from git) Date: Mon, 19 Jun 2023 14:12:06 GMT Message-Id: <202306191412.35JEC6nG050631@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: d79923ed556a - main - net-mgmt/fastnetmon: Update to 1.2.5 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: farrokhi X-Git-Repository: ports X-Git-Refname: refs/heads/main X-Git-Reftype: branch X-Git-Commit: d79923ed556a97cd6e0c45706c599d72b31201f6 Auto-Submitted: auto-generated X-ThisMailContainsUnwantedMimeParts: N The branch main has been updated by farrokhi: URL: https://cgit.FreeBSD.org/ports/commit/?id=d79923ed556a97cd6e0c45706c599d72b31201f6 commit d79923ed556a97cd6e0c45706c599d72b31201f6 Author: Babak Farrokhi AuthorDate: 2023-06-19 14:11:44 +0000 Commit: Babak Farrokhi CommitDate: 2023-06-19 14:11:44 +0000 net-mgmt/fastnetmon: Update to 1.2.5 --- net-mgmt/fastnetmon/Makefile | 5 ++--- net-mgmt/fastnetmon/distinfo | 6 ++--- .../files/patch-src_fast__endianless.hpp | 10 --------- .../fastnetmon/files/patch-src_fast__library.cpp | 15 ------------- .../files/patch-src_fast__platform.h.template | 26 ---------------------- net-mgmt/fastnetmon/files/patch-src_fastnetmon.cpp | 19 ++++------------ .../files/patch-src_notify__about__attack.sh | 8 ------- 7 files changed, 9 insertions(+), 80 deletions(-) diff --git a/net-mgmt/fastnetmon/Makefile b/net-mgmt/fastnetmon/Makefile index eb1c8c795456..dc9eb4a446d4 100644 --- a/net-mgmt/fastnetmon/Makefile +++ b/net-mgmt/fastnetmon/Makefile @@ -1,7 +1,6 @@ PORTNAME= fastnetmon -PORTVERSION= 1.2.4 +PORTVERSION= 1.2.5 DISTVERSIONPREFIX= v -PORTREVISION= 3 CATEGORIES= net-mgmt security MAINTAINER= farrokhi@FreeBSD.org @@ -58,7 +57,7 @@ post-patch: s|"/etc/|"${PREFIX}/etc/|g; s|/root/fastnetmon|${DATADIR}|g' \ ${WRKSRC}/src/fastnetmon.conf ${WRKSRC}/src/fastnetmon.cpp @${REINPLACE_CMD} -e 's|%%PREFIX%%|${PREFIX}|g' \ - ${WRKSRC}/src/man/fastnetmon.8 ${WRKSRC}/src/fast_platform.h.template + ${WRKSRC}/src/man/fastnetmon.8 post-install: ${MV} ${STAGEDIR}${PREFIX}/etc/${PORTNAME}.conf \ diff --git a/net-mgmt/fastnetmon/distinfo b/net-mgmt/fastnetmon/distinfo index ae85613297b9..ef5b9939a04a 100644 --- a/net-mgmt/fastnetmon/distinfo +++ b/net-mgmt/fastnetmon/distinfo @@ -1,3 +1,3 @@ -TIMESTAMP = 1677848493 -SHA256 (pavel-odintsov-fastnetmon-v1.2.4_GH0.tar.gz) = 84cd5db0e270f6c268923592eabd5cb0d1689293d9d9f6f0634af548b29f9bb4 -SIZE (pavel-odintsov-fastnetmon-v1.2.4_GH0.tar.gz) = 1056097 +TIMESTAMP = 1686746794 +SHA256 (pavel-odintsov-fastnetmon-v1.2.5_GH0.tar.gz) = d92a1f16e60b6ab6f5c5e023a215570e9352ce9d0c9a9d7209416f8cd0227ae6 +SIZE (pavel-odintsov-fastnetmon-v1.2.5_GH0.tar.gz) = 1383370 diff --git a/net-mgmt/fastnetmon/files/patch-src_fast__endianless.hpp b/net-mgmt/fastnetmon/files/patch-src_fast__endianless.hpp deleted file mode 100644 index 3b80a205bcde..000000000000 --- a/net-mgmt/fastnetmon/files/patch-src_fast__endianless.hpp +++ /dev/null @@ -1,10 +0,0 @@ ---- src/fast_endianless.hpp.orig 2023-03-04 15:33:46 UTC -+++ src/fast_endianless.hpp -@@ -12,6 +12,7 @@ - // For be64toh and htobe64 - #if defined(__FreeBSD__) || defined(__DragonFly__) - #include -+#include - #endif - - // Linux standard functions for endian conversions are ugly because there are no checks about arguments length diff --git a/net-mgmt/fastnetmon/files/patch-src_fast__library.cpp b/net-mgmt/fastnetmon/files/patch-src_fast__library.cpp deleted file mode 100644 index 86b2dcd4bb68..000000000000 --- a/net-mgmt/fastnetmon/files/patch-src_fast__library.cpp +++ /dev/null @@ -1,15 +0,0 @@ ---- src/fast_library.cpp.orig 2023-03-05 11:34:07 UTC -+++ src/fast_library.cpp -@@ -1249,7 +1249,11 @@ bool get_interface_number_by_device_name(int socket_fd - return false; - } - -- interface_number = ifr.ifr_ifindex; -+ #ifdef __FreeBSD__ -+ interface_number = ifr.ifr_ifru.ifru_index; -+ #else -+ interface_number = ifr.ifr_ifindex; -+ #endif - #else - /* Fallback to if_nametoindex(3) otherwise. */ - interface_number = if_nametoindex(interface_name.c_str()); diff --git a/net-mgmt/fastnetmon/files/patch-src_fast__platform.h.template b/net-mgmt/fastnetmon/files/patch-src_fast__platform.h.template deleted file mode 100644 index bbf14617178a..000000000000 --- a/net-mgmt/fastnetmon/files/patch-src_fast__platform.h.template +++ /dev/null @@ -1,26 +0,0 @@ ---- src/fast_platform.h.template.orig 2023-03-01 14:23:34 UTC -+++ src/fast_platform.h.template -@@ -9,19 +9,19 @@ class FastnetmonPlatformConfigurtion { - std::string fastnetmon_version = "${FASTNETMON_APPLICATION_VERSION}"; - - std::string pid_path = "/var/run/fastnetmon.pid"; -- std::string global_config_path = "/etc/fastnetmon.conf"; -+ std::string global_config_path = "%%PREFIX%%/etc/fastnetmon.conf"; - - std::string log_file_path = "/var/log/fastnetmon.log"; - std::string attack_details_folder = "/var/log/fastnetmon_attacks"; - - // Default path to notify script -- std::string notify_script_path = "/usr/local/bin/notify_about_attack.sh"; -+ std::string notify_script_path = "%%PREFIX%%/bin/notify_about_attack.sh"; - - // Default path to file with networks for whitelising -- std::string white_list_path = "/etc/networks_whitelist"; -+ std::string white_list_path = "%%PREFIX%%/etc/networks_whitelist"; - - // Default path to file with all networks listing -- std::string networks_list_path = "/etc/networks_list"; -+ std::string networks_list_path = "%%PREFIX%%/etc/networks_list"; - - /* Platform specific paths end */ - }; diff --git a/net-mgmt/fastnetmon/files/patch-src_fastnetmon.cpp b/net-mgmt/fastnetmon/files/patch-src_fastnetmon.cpp index b0ba26165d1b..0883c1581808 100644 --- a/net-mgmt/fastnetmon/files/patch-src_fastnetmon.cpp +++ b/net-mgmt/fastnetmon/files/patch-src_fastnetmon.cpp @@ -1,17 +1,6 @@ ---- src/fastnetmon.cpp.orig 2023-03-01 14:23:34 UTC +--- src/fastnetmon.cpp.orig 2023-05-23 06:20:59 UTC +++ src/fastnetmon.cpp -@@ -12,8 +12,8 @@ - #include - - #include --#include // struct arphdr --#include -+//#include // struct arphdr -+//#include - #include - #include - #include -@@ -161,7 +161,7 @@ unsigned int stats_thread_initial_call_delay = 30; +@@ -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 @@ -20,7 +9,7 @@ // Each this seconds we will check about available data in bucket unsigned int check_for_availible_for_processing_packets_buckets = 1; -@@ -435,7 +435,7 @@ std::string exabgp_community_subnet = ""; +@@ -430,7 +430,7 @@ std::string exabgp_community_subnet = ""; std::string exabgp_community_host = ""; @@ -29,7 +18,7 @@ std::string exabgp_next_hop = ""; // Graphite monitoring -@@ -519,7 +519,7 @@ void sigpipe_handler_for_popen(int signo) { +@@ -514,7 +514,7 @@ void sigpipe_handler_for_popen(int signo) { #ifdef GEOIP bool geoip_init() { // load GeoIP ASN database to memory diff --git a/net-mgmt/fastnetmon/files/patch-src_notify__about__attack.sh b/net-mgmt/fastnetmon/files/patch-src_notify__about__attack.sh deleted file mode 100644 index dc4a974f3297..000000000000 --- a/net-mgmt/fastnetmon/files/patch-src_notify__about__attack.sh +++ /dev/null @@ -1,8 +0,0 @@ ---- src/notify_about_attack.sh.orig 2023-03-06 10:33:26 UTC -+++ src/notify_about_attack.sh -@@ -1,4 +1,4 @@ --#!/usr/bin/env bash -+#!/bin/sh - - # - # Hello, lovely FastNetMon customer. I'm really happy to see you here