From 311a467f2850df82a37cde9ef797054ed7bb4c2e Mon Sep 17 00:00:00 2001 From: Fedora Release Engineering Date: Thu, 16 Jan 2025 18:29:50 +0000 Subject: [PATCH 1/6] Rebuilt for https://fedoraproject.org/wiki/Fedora_42_Mass_Rebuild --- flow-tools.spec | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) diff --git a/flow-tools.spec b/flow-tools.spec index a6ee1bd..ebe1f9c 100644 --- a/flow-tools.spec +++ b/flow-tools.spec @@ -12,7 +12,7 @@ Version: 0.68.5.1 Name: flow-tools Summary: Tool set for working with NetFlow data -Release: 42%{?dist} +Release: 43%{?dist} # Automatically converted from old format: BSD - review is highly recommended. License: LicenseRef-Callaway-BSD URL: http://code.google.com/p/%{name}/ @@ -236,6 +236,9 @@ exit 0 %doc docs/*.html ChangeLog.old TODO INSTALL SECURITY %changelog +* Thu Jan 16 2025 Fedora Release Engineering - 0.68.5.1-43 +- Rebuilt for https://fedoraproject.org/wiki/Fedora_42_Mass_Rebuild + * Wed Aug 28 2024 Miroslav Suchý - 0.68.5.1-42 - convert license to SPDX From 95595bde3187aa850ef7e14de982492b92486abb Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Zbigniew=20J=C4=99drzejewski-Szmek?= Date: Tue, 11 Feb 2025 15:35:16 +0100 Subject: [PATCH 2/6] Add sysusers.d config file to allow rpm to create users/groups automatically See https://fedoraproject.org/wiki/Changes/RPMSuportForSystemdSysusers. --- flow-tools.spec | 20 ++++++++++++-------- 1 file changed, 12 insertions(+), 8 deletions(-) diff --git a/flow-tools.spec b/flow-tools.spec index ebe1f9c..93fdf4b 100644 --- a/flow-tools.spec +++ b/flow-tools.spec @@ -12,7 +12,7 @@ Version: 0.68.5.1 Name: flow-tools Summary: Tool set for working with NetFlow data -Release: 43%{?dist} +Release: 44%{?dist} # Automatically converted from old format: BSD - review is highly recommended. License: LicenseRef-Callaway-BSD URL: http://code.google.com/p/%{name}/ @@ -37,7 +37,6 @@ BuildRequires: doxygen %if 0%{?fedora} >= 31 BuildRequires: /usr/bin/2to3 %endif -Requires(pre): shadow-utils BuildRequires: systemd-rpm-macros BuildRequires: make Provides: group(%username) @@ -119,6 +118,11 @@ sed -i '1s|^#!.*perl|#!/usr/bin/perl|' utils/* # Fix mariadb-connector-c detection sed -i s/my_init/mysql_init/g configure +# Create a sysusers.d config file +cat >flow-tools.sysusers.conf </dev/null || groupadd -r %{username} -getent passwd %{username} >/dev/null || \ - useradd -r -g %{username} -d %{homedir} -s /sbin/nologin \ - -c '%{gecos}' %{username} -exit 0 +install -m0644 -D flow-tools.sysusers.conf %{buildroot}%{_sysusersdir}/flow-tools.conf + %post @@ -221,6 +221,7 @@ exit 0 %attr(-,flow-tools,flow-tools) %{_localstatedir}/%{name}/ %dir %{_datadir}/%{name}/ %{_datadir}/%{name}/* +%{_sysusersdir}/flow-tools.conf %files devel %{_libdir}/*.so @@ -236,6 +237,9 @@ exit 0 %doc docs/*.html ChangeLog.old TODO INSTALL SECURITY %changelog +* Tue Feb 11 2025 Zbigniew Jędrzejewski-Szmek - 0.68.5.1-44 +- Add sysusers.d config file to allow rpm to create users/groups automatically + * Thu Jan 16 2025 Fedora Release Engineering - 0.68.5.1-43 - Rebuilt for https://fedoraproject.org/wiki/Fedora_42_Mass_Rebuild From 0fae65d297c10edbe547122e62616431919d050a Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Zbigniew=20J=C4=99drzejewski-Szmek?= Date: Fri, 14 Mar 2025 15:59:43 +0100 Subject: [PATCH 3/6] Drop Provides for user/group with uid/gid This duplicates the autogenerated Provides. --- flow-tools.spec | 2 -- 1 file changed, 2 deletions(-) diff --git a/flow-tools.spec b/flow-tools.spec index 93fdf4b..ec39933 100644 --- a/flow-tools.spec +++ b/flow-tools.spec @@ -39,8 +39,6 @@ BuildRequires: /usr/bin/2to3 %endif BuildRequires: systemd-rpm-macros BuildRequires: make -Provides: group(%username) -Provides: user(%username) %description From 23a5f53cc021c34b35e6270eecd77078605f5927 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Zbigniew=20J=C4=99drzejewski-Szmek?= Date: Fri, 14 Mar 2025 16:03:46 +0100 Subject: [PATCH 4/6] Fix FTBFS ... (rhbz#2244833, rhbz#2340163) With apologies to python-sig members ;( --- flow-tools.spec | 5 +++-- 1 file changed, 3 insertions(+), 2 deletions(-) diff --git a/flow-tools.spec b/flow-tools.spec index ec39933..dd5ac92 100644 --- a/flow-tools.spec +++ b/flow-tools.spec @@ -35,7 +35,7 @@ BuildRequires: bison BuildRequires: flex BuildRequires: doxygen %if 0%{?fedora} >= 31 -BuildRequires: /usr/bin/2to3 +BuildRequires: python3.12 %endif BuildRequires: systemd-rpm-macros BuildRequires: make @@ -108,7 +108,7 @@ This package contains additional documentation, such as man pages in html format # Remove /bin/env deps %if 0%{?fedora} >= 31 sed -i '1s|^#!.*python|#!/usr/bin/python3|' bin/flow* -2to3 --write --nobackups bin/flow* +python3.12 -m lib2to3 --write --nobackups bin/flow* %else sed -i '1s|^#!.*python|#!/usr/bin/python2|' bin/flow* %endif @@ -122,6 +122,7 @@ u flow-tools - '%{gecos}' %{homedir} - EOF %build +export CFLAGS="$CFLAGS -std=gnu17" %configure \ --localstatedir=%{_localstatedir}/%{name} \ --sysconfdir=%{_sysconfdir}/%{name} \ From d733a4c209ed7ba32f8a4e971a19c595253b4abb Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Zbigniew=20J=C4=99drzejewski-Szmek?= Date: Fri, 14 Mar 2025 16:03:46 +0100 Subject: [PATCH 5/6] Fix FTBFS ... (rhbz#2244833, rhbz#2340163) With apologies to python-sig members ;( (cherry picked from commit 23a5f53cc021c34b35e6270eecd77078605f5927) --- flow-tools.spec | 5 +++-- 1 file changed, 3 insertions(+), 2 deletions(-) diff --git a/flow-tools.spec b/flow-tools.spec index a6ee1bd..479669b 100644 --- a/flow-tools.spec +++ b/flow-tools.spec @@ -35,7 +35,7 @@ BuildRequires: bison BuildRequires: flex BuildRequires: doxygen %if 0%{?fedora} >= 31 -BuildRequires: /usr/bin/2to3 +BuildRequires: python3.12 %endif Requires(pre): shadow-utils BuildRequires: systemd-rpm-macros @@ -111,7 +111,7 @@ This package contains additional documentation, such as man pages in html format # Remove /bin/env deps %if 0%{?fedora} >= 31 sed -i '1s|^#!.*python|#!/usr/bin/python3|' bin/flow* -2to3 --write --nobackups bin/flow* +python3.12 -m lib2to3 --write --nobackups bin/flow* %else sed -i '1s|^#!.*python|#!/usr/bin/python2|' bin/flow* %endif @@ -120,6 +120,7 @@ sed -i '1s|^#!.*perl|#!/usr/bin/perl|' utils/* sed -i s/my_init/mysql_init/g configure %build +export CFLAGS="$CFLAGS -std=gnu17" %configure \ --localstatedir=%{_localstatedir}/%{name} \ --sysconfdir=%{_sysconfdir}/%{name} \ From 96e2834a8c5d902b94acc6c68b51f6e52749ffc6 Mon Sep 17 00:00:00 2001 From: Fedora Release Engineering Date: Wed, 23 Jul 2025 20:37:52 +0000 Subject: [PATCH 6/6] Rebuilt for https://fedoraproject.org/wiki/Fedora_43_Mass_Rebuild --- flow-tools.spec | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) diff --git a/flow-tools.spec b/flow-tools.spec index dd5ac92..a6cf761 100644 --- a/flow-tools.spec +++ b/flow-tools.spec @@ -12,7 +12,7 @@ Version: 0.68.5.1 Name: flow-tools Summary: Tool set for working with NetFlow data -Release: 44%{?dist} +Release: 45%{?dist} # Automatically converted from old format: BSD - review is highly recommended. License: LicenseRef-Callaway-BSD URL: http://code.google.com/p/%{name}/ @@ -236,6 +236,9 @@ install -m0644 -D flow-tools.sysusers.conf %{buildroot}%{_sysusersdir}/flow-tool %doc docs/*.html ChangeLog.old TODO INSTALL SECURITY %changelog +* Wed Jul 23 2025 Fedora Release Engineering - 0.68.5.1-45 +- Rebuilt for https://fedoraproject.org/wiki/Fedora_43_Mass_Rebuild + * Tue Feb 11 2025 Zbigniew Jędrzejewski-Szmek - 0.68.5.1-44 - Add sysusers.d config file to allow rpm to create users/groups automatically