diff --git a/flow-tools-c99.patch b/flow-tools-c99.patch deleted file mode 100644 index c9fd14e..0000000 --- a/flow-tools-c99.patch +++ /dev/null @@ -1,59 +0,0 @@ -Add a new header file that provides function prototypes for flex/bison -integration. This avoids implicit function declarations and build -failures with future compilers. - -diff --git a/src/acllex.l b/src/acllex.l -index 74dd8882f2fed262..3ab5e3c0cd897f70 100644 ---- a/src/acllex.l -+++ b/src/acllex.l -@@ -11,6 +11,7 @@ - - #include "acl2.h" - #include "aclyacc.h" -+#include "aclparse.h" - %} - - byte ([0-9]+) -diff --git a/src/aclparse.h b/src/aclparse.h -new file mode 100644 -index 0000000000000000..f113fc26d7513042 ---- /dev/null -+++ b/src/aclparse.h -@@ -0,0 +1,3 @@ -+int yylex (void); -+void yyerror(const char *msg); -+int yyparse (void); -diff --git a/src/aclyacc.y b/src/aclyacc.y -index 60001b6e4c820271..711b7eb169b59aba 100644 ---- a/src/aclyacc.y -+++ b/src/aclyacc.y -@@ -2,6 +2,7 @@ - #include - #include "acl2.h" - #include /* XXX REMOVE */ -+#include "aclparse.h" - - /* XXX remove */ - unsigned char fmt_buf[32]; -diff --git a/src/flow-filter.c b/src/flow-filter.c -index 3c1bfea989b2a129..305e2ed4399ca33d 100644 ---- a/src/flow-filter.c -+++ b/src/flow-filter.c -@@ -47,6 +47,7 @@ - #endif - - #include "acl2.h" -+#include "aclparse.h" - - /* - * TODO -@@ -58,9 +59,7 @@ int ip_net_only; - - extern struct acl_list acl_list; - --int yyparse (void); - void usage(void); --void yyerror(const char *msg); - - extern FILE *yyin; - extern char *yytext; diff --git a/flow-tools.spec b/flow-tools.spec index a6cf761..8683b6d 100644 --- a/flow-tools.spec +++ b/flow-tools.spec @@ -12,9 +12,8 @@ Version: 0.68.5.1 Name: flow-tools Summary: Tool set for working with NetFlow data -Release: 45%{?dist} -# Automatically converted from old format: BSD - review is highly recommended. -License: LicenseRef-Callaway-BSD +Release: 29%{?dist} +License: BSD URL: http://code.google.com/p/%{name}/ Source0: http://%{name}.googlecode.com/files/%{name}-%{version}.tar.bz2 Source1: flow-capture.service @@ -22,7 +21,6 @@ Source2: flow-capture.sysconfig Patch0: flow-werror-fix.patch # Fix extern usage Patch1: flow-tools-extern.patch -Patch2: flow-tools-c99.patch BuildRequires: gcc %if 0%{with openssl} @@ -35,10 +33,12 @@ BuildRequires: bison BuildRequires: flex BuildRequires: doxygen %if 0%{?fedora} >= 31 -BuildRequires: python3.12 +BuildRequires: /usr/bin/2to3 %endif +Requires(pre): shadow-utils BuildRequires: systemd-rpm-macros -BuildRequires: make +Provides: group(%username) +Provides: user(%username) %description @@ -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* -python3.12 -m lib2to3 --write --nobackups bin/flow* +2to3 --write --nobackups bin/flow* %else sed -i '1s|^#!.*python|#!/usr/bin/python2|' bin/flow* %endif @@ -116,13 +116,7 @@ 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 %post @@ -220,7 +218,6 @@ install -m0644 -D flow-tools.sysusers.conf %{buildroot}%{_sysusersdir}/flow-tool %attr(-,flow-tools,flow-tools) %{_localstatedir}/%{name}/ %dir %{_datadir}/%{name}/ %{_datadir}/%{name}/* -%{_sysusersdir}/flow-tools.conf %files devel %{_libdir}/*.so @@ -236,54 +233,6 @@ 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 - -* 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 - -* Wed Jul 17 2024 Fedora Release Engineering - 0.68.5.1-41 -- Rebuilt for https://fedoraproject.org/wiki/Fedora_41_Mass_Rebuild - -* Wed Jan 24 2024 Fedora Release Engineering - 0.68.5.1-40 -- Rebuilt for https://fedoraproject.org/wiki/Fedora_40_Mass_Rebuild - -* Fri Jan 19 2024 Fedora Release Engineering - 0.68.5.1-39 -- Rebuilt for https://fedoraproject.org/wiki/Fedora_40_Mass_Rebuild - -* Wed Jul 19 2023 Fedora Release Engineering - 0.68.5.1-38 -- Rebuilt for https://fedoraproject.org/wiki/Fedora_39_Mass_Rebuild - -* Thu Jan 19 2023 Florian Weimer - 0.68.5.1-37 -- C99 compatibility fixes (#2162330) - -* Thu Jan 19 2023 Fedora Release Engineering - 0.68.5.1-36 -- Rebuilt for https://fedoraproject.org/wiki/Fedora_38_Mass_Rebuild - -* Thu Jul 21 2022 Fedora Release Engineering - 0.68.5.1-35 -- Rebuilt for https://fedoraproject.org/wiki/Fedora_37_Mass_Rebuild - -* Thu Jan 20 2022 Fedora Release Engineering - 0.68.5.1-34 -- Rebuilt for https://fedoraproject.org/wiki/Fedora_36_Mass_Rebuild - -* Wed Jul 21 2021 Fedora Release Engineering - 0.68.5.1-33 -- Rebuilt for https://fedoraproject.org/wiki/Fedora_35_Mass_Rebuild - -* Mon Feb 08 2021 Pavel Raiskup - 0.68.5.1-32 -- rebuild for libpq ABI fix rhbz#1908268 - -* Tue Jan 26 2021 Fedora Release Engineering - 0.68.5.1-31 -- Rebuilt for https://fedoraproject.org/wiki/Fedora_34_Mass_Rebuild - -* Mon Jul 27 2020 Fedora Release Engineering - 0.68.5.1-30 -- Rebuilt for https://fedoraproject.org/wiki/Fedora_33_Mass_Rebuild - * Tue Jan 28 2020 Orion Poplawski - 0.68.5.1-29 - Add patch to fix extern usage for gcc 10