public inbox for git-commits@fedoraproject.org
help / color / mirror / Atom feed
* [rpms/fastnetmon] f43: Rebase to version 1.2.9
@ 2026-06-25 8:43 Dmitry Belyavskiy
0 siblings, 0 replies; only message in thread
From: Dmitry Belyavskiy @ 2026-06-25 8:43 UTC (permalink / raw)
To: git-commits
A new commit has been pushed.
Repo : rpms/fastnetmon
Branch : f43
Commit : 9ea2f6738ccee2ca707cc888bf00145989232284
Author : Dmitry Belyavskiy <beldmit@gmail.com>
Date : 2026-06-25T10:20:28+02:00
Stats : +14/-46 in 4 file(s)
URL : https://src.fedoraproject.org/rpms/fastnetmon/c/9ea2f6738ccee2ca707cc888bf00145989232284?branch=f43
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/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 f1ed7c1..6a3f174 100644
--- a/fastnetmon.spec
+++ b/fastnetmon.spec
@@ -3,31 +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: 26.%{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
BuildRequires: make
BuildRequires: gcc
@@ -50,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}
@@ -59,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
@@ -102,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
@@ -122,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
+
* Mon Sep 08 2025 Benjamin A. Beasley <code@musicinmybrain.net> - 1.2.1-26.20220528git420e7b8
- Rebuilt for abseil-cpp 20250814.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 8:43 UTC | newest]
Thread overview: (only message) (download: mbox.gz / follow: Atom feed)
-- links below jump to the message on this page --
2026-06-25 8:43 [rpms/fastnetmon] f43: 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