public inbox for git-commits@fedoraproject.org
help / color / mirror / Atom feed
* [rpms/fastnetmon] f44: Rebase to version 1.2.9
@ 2026-06-25  7:44 Dmitry Belyavskiy
  0 siblings, 0 replies; only message in thread
From: Dmitry Belyavskiy @ 2026-06-25  7:44 UTC (permalink / raw)
  To: git-commits

A new commit has been pushed.

Repo   : rpms/fastnetmon
Branch : f44
Commit : def42f9e2acff860e3e3a9988866a00343a94533
Author : Dmitry Belyavskiy <beldmit@gmail.com>
Date   : 2026-06-25T09:32:31+02:00
Stats  : +14/-128 in 5 file(s)
URL    : https://src.fedoraproject.org/rpms/fastnetmon/c/def42f9e2acff860e3e3a9988866a00343a94533?branch=f44

Log:
Rebase to version 1.2.9

---
diff --git a/.gitignore b/.gitignore
index 5c4367d..380b154 100644
--- a/.gitignore
+++ b/.gitignore
@@ -1 +1,2 @@
 /420e7b873253fdc1b52b517d9c28db39bf384427.tar.gz
+/v1.2.9.tar.gz

diff --git a/0001-Boost-migration-patch-by-Marek-Zarychta.-Closes-1027.patch b/0001-Boost-migration-patch-by-Marek-Zarychta.-Closes-1027.patch
deleted file mode 100644
index e1f7f1a..0000000
--- a/0001-Boost-migration-patch-by-Marek-Zarychta.-Closes-1027.patch
+++ /dev/null
@@ -1,69 +0,0 @@
-From 19cfcb106e45e1bed51f449f08277f3349079f37 Mon Sep 17 00:00:00 2001
-From: Pavel Odintsov <pavel.odintsov@gmail.com>
-Date: Wed, 19 Feb 2025 14:58:13 +0300
-Subject: [PATCH] Boost migration patch by Marek Zarychta. Closes #1027
-
----
- src/fast_library.cpp | 20 +++++++++-----------
- 1 file changed, 9 insertions(+), 11 deletions(-)
-
-diff --git a/src/fast_library.cpp b/src/fast_library.cpp
-index 4ac76d7b..3643cf5f 100644
---- a/src/fast_library.cpp
-+++ b/src/fast_library.cpp
-@@ -1162,15 +1162,13 @@ std::string serialize_statistic_counters_about_attack(attack_details_t& current_
- 
- std::string dns_lookup(std::string domain_name) {
-     try {
--        boost::asio::io_service io_service;
--        boost::asio::ip::tcp::resolver resolver(io_service);
-+        boost::asio::io_context io_context;
-+        boost::asio::ip::tcp::resolver resolver(io_context);
- 
--        boost::asio::ip::tcp::resolver::query query(domain_name, "");
-+        auto results = resolver.resolve(domain_name, "");
- 
--        for (boost::asio::ip::tcp::resolver::iterator i = resolver.resolve(query);
--             i != boost::asio::ip::tcp::resolver::iterator(); ++i) {
--            boost::asio::ip::tcp::endpoint end = *i;
--            return end.address().to_string();
-+        for (const auto& entry : results) {
-+            return entry.endpoint().address().to_string();
-         }
-     } catch (std::exception& e) {
-         return "";
-@@ -1487,7 +1485,7 @@ bool validate_ipv6_or_ipv4_host(const std::string host) {
-     boost::system::error_code ec;
- 
-     // Try to build it from string representation
--    boost::asio::ip::address::from_string(host, ec);
-+    boost::asio::ip::make_address(host, ec);
- 
-     // If we failed to parse it
-     if (ec) {
-@@ -1595,7 +1593,7 @@ bool execute_web_request_secure(std::string address,
-             return false;
-         }
- 
--        auto end_point = r.resolve(boost::asio::ip::tcp::resolver::query{ host, port }, ec);
-+        auto end_point = r.resolve(host, port, ec);
- 
-         if (ec) {
-             logger << log4cpp::Priority::ERROR << "Could not resolve peer address in execute_web_request " << ec;
-@@ -1749,11 +1747,11 @@ bool execute_web_request(std::string address,
- 
-         // Normal boost::asio setup
-         // std::string const host = "178.62.227.110";
--        boost::asio::io_service ios;
-+        boost::asio::io_context ios;
-         boost::asio::ip::tcp::resolver r(ios);
-         boost::asio::ip::tcp::socket sock(ios);
- 
--        auto end_point = r.resolve(boost::asio::ip::tcp::resolver::query{ host, port }, ec);
-+        auto end_point = r.resolve(host, port, ec);
- 
-         if (ec) {
-             error_text = "Could not resolve peer address in execute_web_request " + ec.message();
--- 
-2.52.0
-

diff --git a/fastnetmon-pr968-g++13-header.patch b/fastnetmon-pr968-g++13-header.patch
deleted file mode 100644
index bb275f1..0000000
--- a/fastnetmon-pr968-g++13-header.patch
+++ /dev/null
@@ -1,28 +0,0 @@
-From 43134b54bc696e4871674a4d5412d762cc559b07 Mon Sep 17 00:00:00 2001
-From: Mamoru TASAKA <mtasaka@fedoraproject.org>
-Date: Tue, 28 Feb 2023 17:35:03 +0900
-Subject: [PATCH] BUILDFIX: add missing header for g++13
-
-With g++13, the following error is produced:
-
-```
-src/metrics/../abstract_subnet_counters.hpp:79:28: error: 'std::function' has not been declared
-```
-
-Fix this error by including additional header.
----
- src/abstract_subnet_counters.hpp | 1 +
- 1 file changed, 1 insertion(+)
-
-diff --git a/src/abstract_subnet_counters.hpp b/src/abstract_subnet_counters.hpp
-index 74b82368..80fdd058 100644
---- a/src/abstract_subnet_counters.hpp
-+++ b/src/abstract_subnet_counters.hpp
-@@ -3,6 +3,7 @@
- #include <mutex>
- #include <unordered_map>
- #include <algorithm>
-+#include <functional>
- 
- // I keep these declaration here because of following error:
- // error: there are no arguments to ‘increment_outgoing_counters’ that depend on a template parameter, so a declaration

diff --git a/fastnetmon.spec b/fastnetmon.spec
index 67a7326..e2c6ba0 100644
--- a/fastnetmon.spec
+++ b/fastnetmon.spec
@@ -3,44 +3,19 @@
 %global  fastnetmon_group          %{fastnetmon_user}
 %global  fastnetmon_config_path    %{_sysconfdir}/fastnetmon.conf
 
-# We use commit version as we're still in progress of testing FastNetMon on Fedora.
-# We're planning to cut next stable release in next few weeks
-%global  commit0 420e7b873253fdc1b52b517d9c28db39bf384427
-%global  shortcommit0 %(c=%{commit0}; echo ${c:0:7})
-%global  date 20220528
-
 Name:              fastnetmon
-Version:           1.2.1
-Release:           32.%{date}git%{shortcommit0}%{?dist}
+Version:           1.2.9
+Release:           1%{?dist}
 
 Summary:           DDoS detection tool with sFlow, Netflow, IPFIX and port mirror support
 # Automatically converted from old format: GPLv2 - review is highly recommended.
 License:           GPL-2.0-only
 URL:               https://fastnetmon.com
 
-# https://fedoraproject.org/wiki/Changes/EncourageI686LeafRemoval
-%if %{undefined fc40} && %{undefined fc41}
 ExcludeArch:       %{ix86}
-%endif
 
-Source0:           https://github.com/pavel-odintsov/fastnetmon/archive/%{commit0}.tar.gz
+Source0:           https://github.com/pavel-odintsov/fastnetmon/archive/refs/tags/v%{version}.tar.gz
 Source1:           fastnetmon.sysusers
-# https://github.com/pavel-odintsov/fastnetmon/pull/968
-# Adding missing header for g++13
-Patch0:            fastnetmon-pr968-g++13-header.patch
-# Boost migration patch by Marek Zarychta. Closes #1027
-# https://github.com/pavel-odintsov/fastnetmon/commit/f02063204d2b07a525d70e502571b31514653604
-#
-# Backported to 420e7b8
-#
-# Fixes:
-#
-# Add support for Boost 1.87.0 (Boost.Asio removals)
-# https://github.com/pavel-odintsov/fastnetmon/issues/1027
-#
-# fastnetmon: FTBFS in Fedora Rawhide/F44 with Boost 1.90
-# https://bugzilla.redhat.com/show_bug.cgi?id=2429533
-Patch1:            0001-Boost-migration-patch-by-Marek-Zarychta.-Closes-1027.patch
 
 BuildRequires:     make
 BuildRequires:     gcc
@@ -63,8 +38,12 @@ BuildRequires:     mongo-c-driver-devel
 BuildRequires:     json-c-devel
 BuildRequires:     systemd
 BuildRequires:     systemd-rpm-macros
+BuildRequires:     elfutils-libelf-devel
+BuildRequires:     libbpf-devel
 
 Requires(pre):     shadow-utils
+Requires:          elfutils-libelf
+Requires:          libbpf
 
 %{?systemd_requires}
 
@@ -72,7 +51,7 @@ Requires(pre):     shadow-utils
 DDoS detection tool with sFlow, Netflow, IPFIX and port mirror support.
 
 %prep
-%autosetup -n %{name}-%{commit0} -p1
+%autosetup -n %{name}-%{version} -p1
 
 %build
 # https://fedoraproject.org/wiki/Changes/OpensslDeprecateEngine
@@ -115,7 +94,7 @@ install -D -p -m 0644 %{SOURCE1} %{buildroot}%{_sysusersdir}/fastnetmon.conf
 %systemd_preun fastnetmon.service
 
 %postun
-%systemd_postun_with_restart fastnetmon.service 
+%systemd_postun_with_restart fastnetmon.service
 
 %files
 
@@ -135,6 +114,9 @@ install -D -p -m 0644 %{SOURCE1} %{buildroot}%{_sysusersdir}/fastnetmon.conf
 %doc README.md SECURITY.md THANKS.md
 
 %changelog
+* Wed Jun 24 2026 Dmitry Belyavskiy <beldmit@gmail.com> - 1.2.9-1
+- Rebase to version 1.2.9
+
 * Wed Jan 28 2026 Benjamin A. Beasley <code@musicinmybrain.net> - 1.2.1-32.20220528git420e7b8
 - Rebuilt for abseil-cpp 20260107.0
 

diff --git a/sources b/sources
index fa9a06a..9dbf231 100644
--- a/sources
+++ b/sources
@@ -1 +1 @@
-SHA512 (420e7b873253fdc1b52b517d9c28db39bf384427.tar.gz) = ce514a11170ff6a23b88650b4bec4d90228b4dc4dfbe0c1cbca0b266a55144e145a075495bb248f4166f07284f7dafeb14873aaedebdf8a5f14c8f3093f56cf3
+SHA512 (v1.2.9.tar.gz) = a6fd0447255a7b066ac345a1edffa946f9810d2f1dd86fea099aa519765b901c9f77027c88840ccf7dfa09d97448ea5d10a2a3761568b18b4ddc385301b31f34

^ permalink raw reply related	[flat|nested] only message in thread

only message in thread, other threads:[~2026-06-25  7:44 UTC | newest]

Thread overview: (only message) (download: mbox.gz / follow: Atom feed)
-- links below jump to the message on this page --
2026-06-25  7:44 [rpms/fastnetmon] f44: Rebase to version 1.2.9 Dmitry Belyavskiy

This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox