public inbox for git-commits@fedoraproject.org
help / color / mirror / Atom feed
* [rpms/fastnetmon] epel10: Patch for Boost 1.90 (1.87+); Fixes RHBZ#2429533
@ 2026-06-26  9:31 Benjamin A. Beasley
  0 siblings, 0 replies; only message in thread
From: Benjamin A. Beasley @ 2026-06-26  9:31 UTC (permalink / raw)
  To: git-commits

A new commit has been pushed.

Repo   : rpms/fastnetmon
Branch : epel10
Commit : 0aa2a3c61d64f138fb69d5275841c0e2bd824fcc
Author : Benjamin A. Beasley <code@musicinmybrain.net>
Date   : 2026-01-14T11:09:23+00:00
Stats  : +86/-1 in 2 file(s)
URL    : https://src.fedoraproject.org/rpms/fastnetmon/c/0aa2a3c61d64f138fb69d5275841c0e2bd824fcc?branch=epel10

Log:
Patch for Boost 1.90 (1.87+); Fixes RHBZ#2429533

---
diff --git a/0001-Boost-migration-patch-by-Marek-Zarychta.-Closes-1027.patch b/0001-Boost-migration-patch-by-Marek-Zarychta.-Closes-1027.patch
new file mode 100644
index 0000000..e1f7f1a
--- /dev/null
+++ b/0001-Boost-migration-patch-by-Marek-Zarychta.-Closes-1027.patch
@@ -0,0 +1,69 @@
+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.spec b/fastnetmon.spec
index ddd52d1..231a2eb 100644
--- a/fastnetmon.spec
+++ b/fastnetmon.spec
@@ -11,7 +11,7 @@
 
 Name:              fastnetmon
 Version:           1.2.1
-Release:           28.%{date}git%{shortcommit0}%{?dist}
+Release:           29.%{date}git%{shortcommit0}%{?dist}
 
 Summary:           DDoS detection tool with sFlow, Netflow, IPFIX and port mirror support
 # Automatically converted from old format: GPLv2 - review is highly recommended.
@@ -28,6 +28,19 @@ 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
@@ -122,6 +135,9 @@ install -D -p -m 0644 %{SOURCE1} %{buildroot}%{_sysusersdir}/fastnetmon.conf
 %doc README.md SECURITY.md THANKS.md
 
 %changelog
+* Wed Jan 14 2026 Benjamin A. Beasley <code@musicinmybrain.net> - 1.2.1-29.20220528git420e7b8
+- Patch for Boost 1.90 (1.87+); Fixes RHBZ#2429533
+
 * Sat Jan 03 2026 Neal Gompa <ngompa@fedoraproject.org> - 1.2.1-28.20220528git420e7b8
 - Rebuild for capnproto 1.3.0
 

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

only message in thread, other threads:[~2026-06-26  9:31 UTC | newest]

Thread overview: (only message) (download: mbox.gz / follow: Atom feed)
-- links below jump to the message on this page --
2026-06-26  9:31 [rpms/fastnetmon] epel10: Patch for Boost 1.90 (1.87+); Fixes RHBZ#2429533 Benjamin A. Beasley

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