From 15a177ac175a81dab3e916e2ecc7ca498e715833 Mon Sep 17 00:00:00 2001 From: Dennis Gilmore Date: Thu, 12 Jan 2012 20:33:30 -0600 Subject: [PATCH 01/51] - Rebuilt for https://fedoraproject.org/wiki/Fedora_17_Mass_Rebuild --- flow-tools.spec | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) diff --git a/flow-tools.spec b/flow-tools.spec index ae8cb8b..355cfd8 100644 --- a/flow-tools.spec +++ b/flow-tools.spec @@ -8,7 +8,7 @@ Version: 0.68.5.1 Name: flow-tools Summary: Tool set for working with NetFlow data -Release: 3%{?dist} +Release: 4%{?dist} Group: Applications/System License: BSD URL: http://code.google.com/p/%{name}/ @@ -219,6 +219,9 @@ fi %doc docs/*.html ChangeLog.old TODO INSTALL SECURITY %changelog +* Fri Jan 13 2012 Fedora Release Engineering - 0.68.5.1-4 +- Rebuilt for https://fedoraproject.org/wiki/Fedora_17_Mass_Rebuild + * Mon Mar 28 2011 Orion Poplawski - 0.68.5.1-3 - Rebuild for new mysql - Add LDFLAGS for mysql on 64-bit From 111c79b84327bac0e6e6339db2846b3a9837b37b Mon Sep 17 00:00:00 2001 From: Jon Ciesla Date: Tue, 24 Apr 2012 13:15:28 -0500 Subject: [PATCH 02/51] Migrate to systemd. --- flow-capture.service | 14 +++++++++++++ flow-tools.spec | 50 ++++++++++++++++++++++++++++++-------------- 2 files changed, 48 insertions(+), 16 deletions(-) create mode 100644 flow-capture.service diff --git a/flow-capture.service b/flow-capture.service new file mode 100644 index 0000000..4f03bd5 --- /dev/null +++ b/flow-capture.service @@ -0,0 +1,14 @@ +[Unit] +Description=Flow-capture Capture Traffic Flow Data +After=network.target + +[Service] +User=flow-tools +Group=flow-tools +Type=forking +EnvironmentFile=-/etc/sysconfig/flow-capture +PIDFile=/run/flow-capture.pid +ExecStart=/usr/bin/flow-capture -p /run/flow-capture.pid $OPTIONS + +[Install] +WantedBy=multi-user.target diff --git a/flow-tools.spec b/flow-tools.spec index 355cfd8..94af69b 100644 --- a/flow-tools.spec +++ b/flow-tools.spec @@ -8,21 +8,23 @@ Version: 0.68.5.1 Name: flow-tools Summary: Tool set for working with NetFlow data -Release: 4%{?dist} +Release: 5%{?dist} Group: Applications/System License: BSD URL: http://code.google.com/p/%{name}/ Source0: http://%{name}.googlecode.com/files/%{name}-%{version}.tar.bz2 -Source1: flow-capture.init +Source1: flow-capture.service Source2: flow-capture.sysconfig BuildRequires: openssl-devel mysql-devel postgresql-devel zlib-devel BuildRequires: bison flex tcp_wrappers-devel BuildRequires: fedora-usermgmt-devel doxygen %{?FE_USERADD_REQ} BuildRoot: %(mktemp -ud %{_tmppath}/%{name}-%{version}-%{release}-XXXXXX) -Requires(post): initscripts chkconfig -Requires(preun): initscripts chkconfig -Requires(postun): initscripts +Requires(post): systemd-units +Requires(preun): systemd-units +Requires(postun): systemd-units +# For triggerun +Requires(post): systemd-sysv Provides: group(%username) = %uid Provides: user(%username) = %uid @@ -109,8 +111,8 @@ rm -rf $RPM_BUILD_ROOT make DESTDIR=$RPM_BUILD_ROOT install find $RPM_BUILD_ROOT -type f -name "*.la" -exec rm -f {} ';' mkdir -p $RPM_BUILD_ROOT%{_localstatedir}/%{name} -install -d $RPM_BUILD_ROOT%{_initrddir} -install -m 0755 %SOURCE1 $RPM_BUILD_ROOT%{_initrddir}/flow-capture +install -d $RPM_BUILD_ROOT%{_unitdir} +install -m 0644 %SOURCE1 $RPM_BUILD_ROOT%{_unitdir}/flow-capture.service install -d $RPM_BUILD_ROOT%{_sysconfdir}/sysconfig install -m 0644 %SOURCE2 $RPM_BUILD_ROOT%{_sysconfdir}/sysconfig/flow-capture @@ -124,22 +126,35 @@ rm -rf $RPM_BUILD_ROOT %post /sbin/ldconfig -/sbin/chkconfig --add flow-capture +if [ $1 -eq 1 ] ; then + # Initial installation + /bin/systemctl daemon-reload >/dev/null 2>&1 || : +fi %preun -if [ $1 = 0 ]; then - /sbin/service flow-capture stop >/dev/null 2>&1 - /sbin/chkconfig --del flow-capture +if [ $1 -eq 0 ] ; then + # Package removal, not upgrade + /bin/systemctl --no-reload disable flow-capture.service > /dev/null 2>&1 || : + /bin/systemctl stop flow-capture.service > /dev/null 2>&1 || : fi %postun /sbin/ldconfig -if [ "$1" -ge "1" ]; then - /sbin/service flow-capture condrestart >/dev/null 2>&1 || : +/bin/systemctl daemon-reload >/dev/null 2>&1 || : +if [ $1 -ge 1 ] ; then + # Package upgrade, not uninstall + /bin/systemctl try-restart flow-capture.service >/dev/null 2>&1 || : fi -%__fe_userdel %username &>/dev/null || : -%__fe_groupdel %username &>/dev/null || : +%triggerun -- flow-tools < 0.68.5.1-5 +# Save the current service runlevel info +# User must manually run systemd-sysv-convert --apply flow-capture +# to migrate them to systemd targets +/usr/bin/systemd-sysv-convert --save flow-capture >/dev/null 2>&1 ||: + +# Run these because the SysV package being removed won't do them +/sbin/chkconfig --del flow-capture >/dev/null 2>&1 || : +/bin/systemctl try-restart flow-capture.service >/dev/null 2>&1 || : %files %defattr(-,root,root) @@ -197,7 +212,7 @@ fi %config(noreplace) %{_sysconfdir}/%{name}/cfg/* %config(noreplace) %{_sysconfdir}/%{name}/sym/* %config(noreplace) %{_sysconfdir}/sysconfig/flow-capture -%{_initrddir}/flow-capture +%{_unitdir}/flow-capture.service %attr(-,flow-tools,flow-tools) %{_localstatedir}/%{name}/ %dir %{_datadir}/%{name}/ %{_datadir}/%{name}/* @@ -219,6 +234,9 @@ fi %doc docs/*.html ChangeLog.old TODO INSTALL SECURITY %changelog +* Tue Apr 24 2012 Jon Ciesla - 0.68.5.1-5 +- Migrate to systemd, BZ 767392. + * Fri Jan 13 2012 Fedora Release Engineering - 0.68.5.1-4 - Rebuilt for https://fedoraproject.org/wiki/Fedora_17_Mass_Rebuild From 335074eaa4ba8d2c09de66d28a7ca07dccc91191 Mon Sep 17 00:00:00 2001 From: Dennis Gilmore Date: Wed, 18 Jul 2012 21:43:27 -0500 Subject: [PATCH 03/51] - Rebuilt for https://fedoraproject.org/wiki/Fedora_18_Mass_Rebuild --- flow-tools.spec | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) diff --git a/flow-tools.spec b/flow-tools.spec index 94af69b..741cbdb 100644 --- a/flow-tools.spec +++ b/flow-tools.spec @@ -8,7 +8,7 @@ Version: 0.68.5.1 Name: flow-tools Summary: Tool set for working with NetFlow data -Release: 5%{?dist} +Release: 6%{?dist} Group: Applications/System License: BSD URL: http://code.google.com/p/%{name}/ @@ -234,6 +234,9 @@ fi %doc docs/*.html ChangeLog.old TODO INSTALL SECURITY %changelog +* Thu Jul 19 2012 Fedora Release Engineering - 0.68.5.1-6 +- Rebuilt for https://fedoraproject.org/wiki/Fedora_18_Mass_Rebuild + * Tue Apr 24 2012 Jon Ciesla - 0.68.5.1-5 - Migrate to systemd, BZ 767392. From 4387c7629d76b0a277ccabe6e66df11b6badd06c Mon Sep 17 00:00:00 2001 From: Dennis Gilmore Date: Wed, 13 Feb 2013 15:48:14 -0600 Subject: [PATCH 04/51] - Rebuilt for https://fedoraproject.org/wiki/Fedora_19_Mass_Rebuild --- flow-tools.spec | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) diff --git a/flow-tools.spec b/flow-tools.spec index 741cbdb..6ef4beb 100644 --- a/flow-tools.spec +++ b/flow-tools.spec @@ -8,7 +8,7 @@ Version: 0.68.5.1 Name: flow-tools Summary: Tool set for working with NetFlow data -Release: 6%{?dist} +Release: 7%{?dist} Group: Applications/System License: BSD URL: http://code.google.com/p/%{name}/ @@ -234,6 +234,9 @@ fi %doc docs/*.html ChangeLog.old TODO INSTALL SECURITY %changelog +* Wed Feb 13 2013 Fedora Release Engineering - 0.68.5.1-7 +- Rebuilt for https://fedoraproject.org/wiki/Fedora_19_Mass_Rebuild + * Thu Jul 19 2012 Fedora Release Engineering - 0.68.5.1-6 - Rebuilt for https://fedoraproject.org/wiki/Fedora_18_Mass_Rebuild From 5183ab38a65a3ffdc65e0a7e454d0bf17aeba46e Mon Sep 17 00:00:00 2001 From: Jon Ciesla Date: Thu, 11 Apr 2013 06:30:48 -0500 Subject: [PATCH 05/51] Migrated away from fedora-usermgmt. --- flow-tools.spec | 18 ++++++++++++------ 1 file changed, 12 insertions(+), 6 deletions(-) diff --git a/flow-tools.spec b/flow-tools.spec index 6ef4beb..6e17a04 100644 --- a/flow-tools.spec +++ b/flow-tools.spec @@ -8,7 +8,7 @@ Version: 0.68.5.1 Name: flow-tools Summary: Tool set for working with NetFlow data -Release: 7%{?dist} +Release: 8%{?dist} Group: Applications/System License: BSD URL: http://code.google.com/p/%{name}/ @@ -17,8 +17,8 @@ Source1: flow-capture.service Source2: flow-capture.sysconfig BuildRequires: openssl-devel mysql-devel postgresql-devel zlib-devel BuildRequires: bison flex tcp_wrappers-devel -BuildRequires: fedora-usermgmt-devel doxygen -%{?FE_USERADD_REQ} +BuildRequires: doxygen +Requires(pre): shadow-utils BuildRoot: %(mktemp -ud %{_tmppath}/%{name}-%{version}-%{release}-XXXXXX) Requires(post): systemd-units Requires(preun): systemd-units @@ -120,9 +120,12 @@ install -m 0644 %SOURCE2 $RPM_BUILD_ROOT%{_sysconfdir}/sysconfig/flow-capture rm -rf $RPM_BUILD_ROOT %pre -%__fe_groupadd %uid -r %username &>/dev/null || : -%__fe_useradd %uid -r -s /sbin/nologin -d %homedir -M \ - -c '%gecos' -g %username %username &>/dev/null || : +getent group %{username} >/dev/null || groupadd -r %{username} -g %{uid} +getent passwd %{username} >/dev/null || \ + useradd -r -g %{username} -d %{homedir} -s /sbin/nologin -u %{uid} \ + -c '%{gecos}' %{username} +exit 0 + %post /sbin/ldconfig @@ -234,6 +237,9 @@ fi %doc docs/*.html ChangeLog.old TODO INSTALL SECURITY %changelog +* Wed Apr 10 2013 Jon Ciesla - 0.68.5.1-8 +- Migrate from fedora-usermgmt to guideline scriptlets. + * Wed Feb 13 2013 Fedora Release Engineering - 0.68.5.1-7 - Rebuilt for https://fedoraproject.org/wiki/Fedora_19_Mass_Rebuild From 0e42db59f8a3debb2878d1a9a0de8c54818e5651 Mon Sep 17 00:00:00 2001 From: Dennis Gilmore Date: Sat, 3 Aug 2013 06:29:50 -0500 Subject: [PATCH 06/51] - Rebuilt for https://fedoraproject.org/wiki/Fedora_20_Mass_Rebuild --- flow-tools.spec | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) diff --git a/flow-tools.spec b/flow-tools.spec index 6e17a04..2bc9121 100644 --- a/flow-tools.spec +++ b/flow-tools.spec @@ -8,7 +8,7 @@ Version: 0.68.5.1 Name: flow-tools Summary: Tool set for working with NetFlow data -Release: 8%{?dist} +Release: 9%{?dist} Group: Applications/System License: BSD URL: http://code.google.com/p/%{name}/ @@ -237,6 +237,9 @@ fi %doc docs/*.html ChangeLog.old TODO INSTALL SECURITY %changelog +* Sat Aug 03 2013 Fedora Release Engineering - 0.68.5.1-9 +- Rebuilt for https://fedoraproject.org/wiki/Fedora_20_Mass_Rebuild + * Wed Apr 10 2013 Jon Ciesla - 0.68.5.1-8 - Migrate from fedora-usermgmt to guideline scriptlets. From 9b9516cfb2fffc93bd657346b20b758a6a6d3241 Mon Sep 17 00:00:00 2001 From: "Paul P. Komkoff" Date: Fri, 23 Aug 2013 11:47:27 +0400 Subject: [PATCH 07/51] Try to fix bz#929362 --- flow-capture.service | 5 ++--- flow-tools.spec | 5 ++++- 2 files changed, 6 insertions(+), 4 deletions(-) diff --git a/flow-capture.service b/flow-capture.service index 4f03bd5..546bddf 100644 --- a/flow-capture.service +++ b/flow-capture.service @@ -5,10 +5,9 @@ After=network.target [Service] User=flow-tools Group=flow-tools -Type=forking +Type=simple EnvironmentFile=-/etc/sysconfig/flow-capture -PIDFile=/run/flow-capture.pid -ExecStart=/usr/bin/flow-capture -p /run/flow-capture.pid $OPTIONS +ExecStart=/usr/bin/flow-capture -D $OPTIONS [Install] WantedBy=multi-user.target diff --git a/flow-tools.spec b/flow-tools.spec index 2bc9121..deb2b6a 100644 --- a/flow-tools.spec +++ b/flow-tools.spec @@ -8,7 +8,7 @@ Version: 0.68.5.1 Name: flow-tools Summary: Tool set for working with NetFlow data -Release: 9%{?dist} +Release: 10%{?dist} Group: Applications/System License: BSD URL: http://code.google.com/p/%{name}/ @@ -237,6 +237,9 @@ fi %doc docs/*.html ChangeLog.old TODO INSTALL SECURITY %changelog +* Fri Aug 23 2013 i@stingr.net - 0.68.5.1-10 +- Try to fix bz#929362 + * Sat Aug 03 2013 Fedora Release Engineering - 0.68.5.1-9 - Rebuilt for https://fedoraproject.org/wiki/Fedora_20_Mass_Rebuild From 1b3ef19a212336afd51b3ca821e381f5865a9852 Mon Sep 17 00:00:00 2001 From: "Paul P. Komkoff" Date: Sat, 28 Sep 2013 21:41:33 +0400 Subject: [PATCH 08/51] bz#1013218 --- flow-tools.spec | 14 ++++++++------ 1 file changed, 8 insertions(+), 6 deletions(-) diff --git a/flow-tools.spec b/flow-tools.spec index deb2b6a..dc4d4ef 100644 --- a/flow-tools.spec +++ b/flow-tools.spec @@ -1,6 +1,5 @@ %bcond_without fedora -%global uid 40 %global username flow-tools %global homedir %{_localstatedir}/%{name} %global gecos "Network flow monitoring" @@ -8,7 +7,7 @@ Version: 0.68.5.1 Name: flow-tools Summary: Tool set for working with NetFlow data -Release: 10%{?dist} +Release: 11%{?dist} Group: Applications/System License: BSD URL: http://code.google.com/p/%{name}/ @@ -25,8 +24,8 @@ Requires(preun): systemd-units Requires(postun): systemd-units # For triggerun Requires(post): systemd-sysv -Provides: group(%username) = %uid -Provides: user(%username) = %uid +Provides: group(%username) +Provides: user(%username) %description @@ -120,9 +119,9 @@ install -m 0644 %SOURCE2 $RPM_BUILD_ROOT%{_sysconfdir}/sysconfig/flow-capture rm -rf $RPM_BUILD_ROOT %pre -getent group %{username} >/dev/null || groupadd -r %{username} -g %{uid} +getent group %{username} >/dev/null || groupadd -r %{username} getent passwd %{username} >/dev/null || \ - useradd -r -g %{username} -d %{homedir} -s /sbin/nologin -u %{uid} \ + useradd -r -g %{username} -d %{homedir} -s /sbin/nologin \ -c '%{gecos}' %{username} exit 0 @@ -237,6 +236,9 @@ fi %doc docs/*.html ChangeLog.old TODO INSTALL SECURITY %changelog +* Sat Sep 28 2013 Paul Komkoff - 0.68.5.1-11 +- Try to fix bz#1013218 as per https://fedoraproject.org/wiki/Packaging:UsersAndGroups + * Fri Aug 23 2013 i@stingr.net - 0.68.5.1-10 - Try to fix bz#929362 From ddd76e7ffe85a63e6f460890775b7f68e5aca2a2 Mon Sep 17 00:00:00 2001 From: "Paul P. Komkoff" Date: Sat, 21 Dec 2013 17:06:06 +0400 Subject: [PATCH 09/51] bz#850114 --- flow-tools.spec | 42 +++++++++++------------------------------- 1 file changed, 11 insertions(+), 31 deletions(-) diff --git a/flow-tools.spec b/flow-tools.spec index dc4d4ef..3dcf140 100644 --- a/flow-tools.spec +++ b/flow-tools.spec @@ -7,7 +7,7 @@ Version: 0.68.5.1 Name: flow-tools Summary: Tool set for working with NetFlow data -Release: 11%{?dist} +Release: 12%{?dist} Group: Applications/System License: BSD URL: http://code.google.com/p/%{name}/ @@ -19,11 +19,10 @@ BuildRequires: bison flex tcp_wrappers-devel BuildRequires: doxygen Requires(pre): shadow-utils BuildRoot: %(mktemp -ud %{_tmppath}/%{name}-%{version}-%{release}-XXXXXX) -Requires(post): systemd-units -Requires(preun): systemd-units -Requires(postun): systemd-units -# For triggerun -Requires(post): systemd-sysv +Requires(post): systemd +Requires(preun): systemd +Requires(postun): systemd +BuildRequires: systemd Provides: group(%username) Provides: user(%username) @@ -128,35 +127,13 @@ exit 0 %post /sbin/ldconfig -if [ $1 -eq 1 ] ; then - # Initial installation - /bin/systemctl daemon-reload >/dev/null 2>&1 || : -fi +%systemd_post flow-capture.service %preun -if [ $1 -eq 0 ] ; then - # Package removal, not upgrade - /bin/systemctl --no-reload disable flow-capture.service > /dev/null 2>&1 || : - /bin/systemctl stop flow-capture.service > /dev/null 2>&1 || : -fi +%systemd_preun flow-capture.service %postun -/sbin/ldconfig -/bin/systemctl daemon-reload >/dev/null 2>&1 || : -if [ $1 -ge 1 ] ; then - # Package upgrade, not uninstall - /bin/systemctl try-restart flow-capture.service >/dev/null 2>&1 || : -fi - -%triggerun -- flow-tools < 0.68.5.1-5 -# Save the current service runlevel info -# User must manually run systemd-sysv-convert --apply flow-capture -# to migrate them to systemd targets -/usr/bin/systemd-sysv-convert --save flow-capture >/dev/null 2>&1 ||: - -# Run these because the SysV package being removed won't do them -/sbin/chkconfig --del flow-capture >/dev/null 2>&1 || : -/bin/systemctl try-restart flow-capture.service >/dev/null 2>&1 || : +%systemd_postun %files %defattr(-,root,root) @@ -236,6 +213,9 @@ fi %doc docs/*.html ChangeLog.old TODO INSTALL SECURITY %changelog +* Sat Dec 21 2013 Paul Komkoff - 0.68.5.1-12 +- bz#850114 + * Sat Sep 28 2013 Paul Komkoff - 0.68.5.1-11 - Try to fix bz#1013218 as per https://fedoraproject.org/wiki/Packaging:UsersAndGroups From 2e6cf256924c7668a942afe3a59bdcc263be78b8 Mon Sep 17 00:00:00 2001 From: Dennis Gilmore Date: Sat, 7 Jun 2014 07:22:12 -0500 Subject: [PATCH 10/51] - Rebuilt for https://fedoraproject.org/wiki/Fedora_21_Mass_Rebuild --- flow-tools.spec | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) diff --git a/flow-tools.spec b/flow-tools.spec index 3dcf140..ccb219b 100644 --- a/flow-tools.spec +++ b/flow-tools.spec @@ -7,7 +7,7 @@ Version: 0.68.5.1 Name: flow-tools Summary: Tool set for working with NetFlow data -Release: 12%{?dist} +Release: 13%{?dist} Group: Applications/System License: BSD URL: http://code.google.com/p/%{name}/ @@ -213,6 +213,9 @@ exit 0 %doc docs/*.html ChangeLog.old TODO INSTALL SECURITY %changelog +* Sat Jun 07 2014 Fedora Release Engineering - 0.68.5.1-13 +- Rebuilt for https://fedoraproject.org/wiki/Fedora_21_Mass_Rebuild + * Sat Dec 21 2013 Paul Komkoff - 0.68.5.1-12 - bz#850114 From ec84e01f67011529ccb36e5f02b899eb4ef0de8f Mon Sep 17 00:00:00 2001 From: Peter Robinson Date: Tue, 17 Jun 2014 13:08:23 +0100 Subject: [PATCH 11/51] fix syslog() calls to have string format --- flow-tools.spec | 7 ++++++- flow-werror-fix.patch | 49 +++++++++++++++++++++++++++++++++++++++++++ 2 files changed, 55 insertions(+), 1 deletion(-) create mode 100644 flow-werror-fix.patch diff --git a/flow-tools.spec b/flow-tools.spec index ccb219b..0245e0c 100644 --- a/flow-tools.spec +++ b/flow-tools.spec @@ -7,13 +7,14 @@ Version: 0.68.5.1 Name: flow-tools Summary: Tool set for working with NetFlow data -Release: 13%{?dist} +Release: 14%{?dist} Group: Applications/System License: BSD URL: http://code.google.com/p/%{name}/ Source0: http://%{name}.googlecode.com/files/%{name}-%{version}.tar.bz2 Source1: flow-capture.service Source2: flow-capture.sysconfig +Patch0: flow-werror-fix.patch BuildRequires: openssl-devel mysql-devel postgresql-devel zlib-devel BuildRequires: bison flex tcp_wrappers-devel BuildRequires: doxygen @@ -88,6 +89,7 @@ This package contains additional documentation, such as man pages in html format %prep %setup -q +%patch0 -p1 %build %configure \ @@ -213,6 +215,9 @@ exit 0 %doc docs/*.html ChangeLog.old TODO INSTALL SECURITY %changelog +* Tue Jun 17 2014 Marcin Juszkiewicz - 0.68.5.1-14 +- fix syslog() calls to have string format + * Sat Jun 07 2014 Fedora Release Engineering - 0.68.5.1-13 - Rebuilt for https://fedoraproject.org/wiki/Fedora_21_Mass_Rebuild diff --git a/flow-werror-fix.patch b/flow-werror-fix.patch new file mode 100644 index 0000000..59b1349 --- /dev/null +++ b/flow-werror-fix.patch @@ -0,0 +1,49 @@ +diff --git a/lib/fterr.c b/lib/fterr.c +index 1bb5c89..5b47207 100644 +--- a/lib/fterr.c ++++ b/lib/fterr.c +@@ -112,7 +112,7 @@ void fterr_info(const char *fmt, ...) + fprintf(((fterr_file) ? fterr_file : stderr), "%s\n", buf2); + + if (fterr_flags & FTERR_SYSLOG) +- syslog(LOG_INFO, buf); ++ syslog(LOG_INFO, "%s", buf); + + } /* fterr_info */ + +@@ -134,7 +134,7 @@ void fterr_err(int code, const char *fmt, ...) + + if (fterr_flags & FTERR_SYSLOG) { + snprintf(buf2, 1024, "%s: %s", buf, strerror(errno)); +- syslog(LOG_INFO, buf2); ++ syslog(LOG_INFO, "%s", buf2); + } + + if (fterr_exit) +@@ -159,7 +159,7 @@ void fterr_errx(int code, const char *fmt, ...) + } + + if (fterr_flags & FTERR_SYSLOG) +- syslog(LOG_INFO, buf); ++ syslog(LOG_INFO, "%s", buf); + + if (fterr_exit) + fterr_exit(code); +@@ -183,7 +183,7 @@ void fterr_warnx(const char *fmt, ...) + } + + if (fterr_flags & FTERR_SYSLOG) +- syslog(LOG_INFO, buf); ++ syslog(LOG_INFO, "%s", buf); + + } /* fterr_warnx */ + +@@ -205,7 +205,7 @@ void fterr_warn(const char *fmt, ...) + + if (fterr_flags & FTERR_SYSLOG) { + snprintf(buf2, 1024, "%s: %s", buf, strerror(errno)); +- syslog(LOG_INFO, buf2); ++ syslog(LOG_INFO, "%s", buf2); + } + + } /* fterr_warn */ From 6fe0bdb0946bc25d52028fac40b4d4f4eb39d14f Mon Sep 17 00:00:00 2001 From: Peter Robinson Date: Sat, 16 Aug 2014 12:41:10 +0000 Subject: [PATCH 12/51] - Rebuilt for https://fedoraproject.org/wiki/Fedora_21_22_Mass_Rebuild --- flow-tools.spec | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) diff --git a/flow-tools.spec b/flow-tools.spec index 0245e0c..f75bead 100644 --- a/flow-tools.spec +++ b/flow-tools.spec @@ -7,7 +7,7 @@ Version: 0.68.5.1 Name: flow-tools Summary: Tool set for working with NetFlow data -Release: 14%{?dist} +Release: 15%{?dist} Group: Applications/System License: BSD URL: http://code.google.com/p/%{name}/ @@ -215,6 +215,9 @@ exit 0 %doc docs/*.html ChangeLog.old TODO INSTALL SECURITY %changelog +* Sat Aug 16 2014 Fedora Release Engineering - 0.68.5.1-15 +- Rebuilt for https://fedoraproject.org/wiki/Fedora_21_22_Mass_Rebuild + * Tue Jun 17 2014 Marcin Juszkiewicz - 0.68.5.1-14 - fix syslog() calls to have string format From 4020aaa644e91370c15a8da82e27804961e90b86 Mon Sep 17 00:00:00 2001 From: Orion Poplawski Date: Mon, 13 Apr 2015 15:31:38 -0600 Subject: [PATCH 13/51] Drop %defattr() --- flow-tools.spec | 4 ---- 1 file changed, 4 deletions(-) diff --git a/flow-tools.spec b/flow-tools.spec index f75bead..b4497da 100644 --- a/flow-tools.spec +++ b/flow-tools.spec @@ -138,7 +138,6 @@ exit 0 %systemd_postun %files -%defattr(-,root,root) %doc README README.fork COPYING ChangeLog %{_mandir}/man1/flow-capture.1* %{_mandir}/man1/flow-cat.1* @@ -199,19 +198,16 @@ exit 0 %{_datadir}/%{name}/* %files devel -%defattr(-,root,root,-) %{_libdir}/*.so %{_includedir}/*.h %files rrdtool -%defattr(-,root,root) %{_bindir}/flow-rpt2rrd %{_bindir}/flow-log2rrd %{_mandir}/man1/flow-rpt2rrd.1* %{_mandir}/man1/flow-log2rrd.1* %files docs -%defattr(-,root,root) %doc docs/*.html ChangeLog.old TODO INSTALL SECURITY %changelog From 766bfe30870dc508051d3bf7639f397c4ac08f50 Mon Sep 17 00:00:00 2001 From: Dennis Gilmore Date: Wed, 17 Jun 2015 06:28:25 +0000 Subject: [PATCH 14/51] - Rebuilt for https://fedoraproject.org/wiki/Fedora_23_Mass_Rebuild --- flow-tools.spec | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) diff --git a/flow-tools.spec b/flow-tools.spec index b4497da..e0a096e 100644 --- a/flow-tools.spec +++ b/flow-tools.spec @@ -7,7 +7,7 @@ Version: 0.68.5.1 Name: flow-tools Summary: Tool set for working with NetFlow data -Release: 15%{?dist} +Release: 16%{?dist} Group: Applications/System License: BSD URL: http://code.google.com/p/%{name}/ @@ -211,6 +211,9 @@ exit 0 %doc docs/*.html ChangeLog.old TODO INSTALL SECURITY %changelog +* Wed Jun 17 2015 Fedora Release Engineering - 0.68.5.1-16 +- Rebuilt for https://fedoraproject.org/wiki/Fedora_23_Mass_Rebuild + * Sat Aug 16 2014 Fedora Release Engineering - 0.68.5.1-15 - Rebuilt for https://fedoraproject.org/wiki/Fedora_21_22_Mass_Rebuild From 6bb6d14d0594ef157e1cc71f713ce74e555e9de3 Mon Sep 17 00:00:00 2001 From: Dennis Gilmore Date: Wed, 3 Feb 2016 20:36:39 +0000 Subject: [PATCH 15/51] - Rebuilt for https://fedoraproject.org/wiki/Fedora_24_Mass_Rebuild --- flow-tools.spec | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) diff --git a/flow-tools.spec b/flow-tools.spec index e0a096e..fb694c2 100644 --- a/flow-tools.spec +++ b/flow-tools.spec @@ -7,7 +7,7 @@ Version: 0.68.5.1 Name: flow-tools Summary: Tool set for working with NetFlow data -Release: 16%{?dist} +Release: 17%{?dist} Group: Applications/System License: BSD URL: http://code.google.com/p/%{name}/ @@ -211,6 +211,9 @@ exit 0 %doc docs/*.html ChangeLog.old TODO INSTALL SECURITY %changelog +* Wed Feb 03 2016 Fedora Release Engineering - 0.68.5.1-17 +- Rebuilt for https://fedoraproject.org/wiki/Fedora_24_Mass_Rebuild + * Wed Jun 17 2015 Fedora Release Engineering - 0.68.5.1-16 - Rebuilt for https://fedoraproject.org/wiki/Fedora_23_Mass_Rebuild From 43dd03a8c7e46f6f80635a431d27d91ed5191afe Mon Sep 17 00:00:00 2001 From: Fedora Release Engineering Date: Fri, 10 Feb 2017 09:52:13 +0000 Subject: [PATCH 16/51] - Rebuilt for https://fedoraproject.org/wiki/Fedora_26_Mass_Rebuild --- flow-tools.spec | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) diff --git a/flow-tools.spec b/flow-tools.spec index fb694c2..c6a209a 100644 --- a/flow-tools.spec +++ b/flow-tools.spec @@ -7,7 +7,7 @@ Version: 0.68.5.1 Name: flow-tools Summary: Tool set for working with NetFlow data -Release: 17%{?dist} +Release: 18%{?dist} Group: Applications/System License: BSD URL: http://code.google.com/p/%{name}/ @@ -211,6 +211,9 @@ exit 0 %doc docs/*.html ChangeLog.old TODO INSTALL SECURITY %changelog +* Fri Feb 10 2017 Fedora Release Engineering - 0.68.5.1-18 +- Rebuilt for https://fedoraproject.org/wiki/Fedora_26_Mass_Rebuild + * Wed Feb 03 2016 Fedora Release Engineering - 0.68.5.1-17 - Rebuilt for https://fedoraproject.org/wiki/Fedora_24_Mass_Rebuild From ddfcb46e3442427ad155d639a9a39df8cffdbf19 Mon Sep 17 00:00:00 2001 From: Orion Poplawski Date: Fri, 10 Feb 2017 15:49:12 -0700 Subject: [PATCH 17/51] Build with openssl support - does not work with openssl 1.1 --- flow-tools.spec | 23 ++++++++++++++++++++--- 1 file changed, 20 insertions(+), 3 deletions(-) diff --git a/flow-tools.spec b/flow-tools.spec index c6a209a..f4bac9a 100644 --- a/flow-tools.spec +++ b/flow-tools.spec @@ -1,4 +1,9 @@ -%bcond_without fedora +# Does not support openssl 1.1 +%if 0%{?fedora} >= 26 +%bcond_with openssl +%else +%bcond_without openssl +%endif %global username flow-tools %global homedir %{_localstatedir}/%{name} @@ -15,8 +20,15 @@ Source0: http://%{name}.googlecode.com/files/%{name}-%{version}.tar.bz2 Source1: flow-capture.service Source2: flow-capture.sysconfig Patch0: flow-werror-fix.patch -BuildRequires: openssl-devel mysql-devel postgresql-devel zlib-devel -BuildRequires: bison flex tcp_wrappers-devel +%if 0%{with openssl} +BuildRequires: openssl-devel +%endif +BuildRequires: mysql-devel +BuildRequires: postgresql-devel +BuildRequires: zlib-devel +BuildRequires: bison +BuildRequires: flex +BuildRequires: tcp_wrappers-devel BuildRequires: doxygen Requires(pre): shadow-utils BuildRoot: %(mktemp -ud %{_tmppath}/%{name}-%{version}-%{release}-XXXXXX) @@ -99,7 +111,9 @@ This package contains additional documentation, such as man pages in html format --enable-static=no \ --with-mysql \ --with-postgresql \ +%if 0%{with openssl} --with-openssl +%endif sed -i 's|^hardcode_libdir_flag_spec=.*|hardcode_libdir_flag_spec=""|g' libtool sed -i 's|^runpath_var=LD_RUN_PATH|runpath_var=DIE_RPATH_DIE|g' libtool @@ -211,6 +225,9 @@ exit 0 %doc docs/*.html ChangeLog.old TODO INSTALL SECURITY %changelog +* Fri Feb 10 2017 Orion Poplawski - 0.68.5.1-19 +- Build with openssl support - does not work with openssl 1.1 + * Fri Feb 10 2017 Fedora Release Engineering - 0.68.5.1-18 - Rebuilt for https://fedoraproject.org/wiki/Fedora_26_Mass_Rebuild From fd70904b9935eb0ac8305724387a632d17ec9bc4 Mon Sep 17 00:00:00 2001 From: Fedora Release Engineering Date: Wed, 26 Jul 2017 08:31:35 +0000 Subject: [PATCH 18/51] - Rebuilt for https://fedoraproject.org/wiki/Fedora_27_Mass_Rebuild --- flow-tools.spec | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) diff --git a/flow-tools.spec b/flow-tools.spec index f4bac9a..2abc778 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: 18%{?dist} +Release: 19%{?dist} Group: Applications/System License: BSD URL: http://code.google.com/p/%{name}/ @@ -225,6 +225,9 @@ exit 0 %doc docs/*.html ChangeLog.old TODO INSTALL SECURITY %changelog +* Wed Jul 26 2017 Fedora Release Engineering - 0.68.5.1-19 +- Rebuilt for https://fedoraproject.org/wiki/Fedora_27_Mass_Rebuild + * Fri Feb 10 2017 Orion Poplawski - 0.68.5.1-19 - Build with openssl support - does not work with openssl 1.1 From afe0c46057a2bd2e9b35ad9ecf4398714d491a49 Mon Sep 17 00:00:00 2001 From: Fedora Release Engineering Date: Wed, 2 Aug 2017 20:39:38 +0000 Subject: [PATCH 19/51] - Rebuilt for https://fedoraproject.org/wiki/Fedora_27_Binutils_Mass_Rebuild --- flow-tools.spec | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) diff --git a/flow-tools.spec b/flow-tools.spec index 2abc778..723327f 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: 19%{?dist} +Release: 20%{?dist} Group: Applications/System License: BSD URL: http://code.google.com/p/%{name}/ @@ -225,6 +225,9 @@ exit 0 %doc docs/*.html ChangeLog.old TODO INSTALL SECURITY %changelog +* Wed Aug 02 2017 Fedora Release Engineering - 0.68.5.1-20 +- Rebuilt for https://fedoraproject.org/wiki/Fedora_27_Binutils_Mass_Rebuild + * Wed Jul 26 2017 Fedora Release Engineering - 0.68.5.1-19 - Rebuilt for https://fedoraproject.org/wiki/Fedora_27_Mass_Rebuild From 71aaec08954b467bba52a5c9f5d13d496bcbe17d Mon Sep 17 00:00:00 2001 From: Fedora Release Engineering Date: Wed, 7 Feb 2018 09:51:21 +0000 Subject: [PATCH 20/51] - Rebuilt for https://fedoraproject.org/wiki/Fedora_28_Mass_Rebuild Signed-off-by: Fedora Release Engineering --- flow-tools.spec | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) diff --git a/flow-tools.spec b/flow-tools.spec index 723327f..2ecf35d 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: 20%{?dist} +Release: 21%{?dist} Group: Applications/System License: BSD URL: http://code.google.com/p/%{name}/ @@ -225,6 +225,9 @@ exit 0 %doc docs/*.html ChangeLog.old TODO INSTALL SECURITY %changelog +* Wed Feb 07 2018 Fedora Release Engineering - 0.68.5.1-21 +- Rebuilt for https://fedoraproject.org/wiki/Fedora_28_Mass_Rebuild + * Wed Aug 02 2017 Fedora Release Engineering - 0.68.5.1-20 - Rebuilt for https://fedoraproject.org/wiki/Fedora_27_Binutils_Mass_Rebuild From 48a6ab318eaa3790e114b4cb48fce611d7e9326c Mon Sep 17 00:00:00 2001 From: Igor Gnatenko Date: Fri, 9 Feb 2018 09:04:29 +0100 Subject: [PATCH 21/51] Escape macros in %changelog Reference: https://lists.fedoraproject.org/archives/list/devel@lists.fedoraproject.org/thread/Y2ZUKK2B7T2IKXPMODNF6HB2O5T5TS6H/ Signed-off-by: Igor Gnatenko --- flow-tools.spec | 7 +++++-- 1 file changed, 5 insertions(+), 2 deletions(-) diff --git a/flow-tools.spec b/flow-tools.spec index 2ecf35d..3502587 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: 21%{?dist} +Release: 22%{?dist} Group: Applications/System License: BSD URL: http://code.google.com/p/%{name}/ @@ -225,6 +225,9 @@ exit 0 %doc docs/*.html ChangeLog.old TODO INSTALL SECURITY %changelog +* Fri Feb 09 2018 Igor Gnatenko - 0.68.5.1-22 +- Escape macros in %%changelog + * Wed Feb 07 2018 Fedora Release Engineering - 0.68.5.1-21 - Rebuilt for https://fedoraproject.org/wiki/Fedora_28_Mass_Rebuild @@ -395,7 +398,7 @@ exit 0 - simplify %%files - use more macros - change Group to Application/System -- own/create %{_localstatedir}/ft/ +- own/create %%{_localstatedir}/ft/ - add BR: autoconf - don't need generic INSTALL - mark config files as such From 7c6159adce0d2bd815ffa4f44c54a152f1dee662 Mon Sep 17 00:00:00 2001 From: Igor Gnatenko Date: Tue, 13 Feb 2018 23:22:48 +0100 Subject: [PATCH 22/51] Remove BuildRoot definition None of currently supported distributions need that. It was needed last for EL5 which is EOL now Signed-off-by: Igor Gnatenko --- flow-tools.spec | 1 - 1 file changed, 1 deletion(-) diff --git a/flow-tools.spec b/flow-tools.spec index 3502587..78ffb3c 100644 --- a/flow-tools.spec +++ b/flow-tools.spec @@ -31,7 +31,6 @@ BuildRequires: flex BuildRequires: tcp_wrappers-devel BuildRequires: doxygen Requires(pre): shadow-utils -BuildRoot: %(mktemp -ud %{_tmppath}/%{name}-%{version}-%{release}-XXXXXX) Requires(post): systemd Requires(preun): systemd Requires(postun): systemd From adbd81316124bb9e3c883ae1aaf830506305de5b Mon Sep 17 00:00:00 2001 From: Igor Gnatenko Date: Wed, 14 Feb 2018 08:01:29 +0100 Subject: [PATCH 23/51] Remove %clean section None of currently supported distributions need that. Last one was EL5 which is EOL for a while. Signed-off-by: Igor Gnatenko --- flow-tools.spec | 3 --- 1 file changed, 3 deletions(-) diff --git a/flow-tools.spec b/flow-tools.spec index 78ffb3c..fdba94b 100644 --- a/flow-tools.spec +++ b/flow-tools.spec @@ -129,9 +129,6 @@ install -m 0644 %SOURCE1 $RPM_BUILD_ROOT%{_unitdir}/flow-capture.service install -d $RPM_BUILD_ROOT%{_sysconfdir}/sysconfig install -m 0644 %SOURCE2 $RPM_BUILD_ROOT%{_sysconfdir}/sysconfig/flow-capture -%clean -rm -rf $RPM_BUILD_ROOT - %pre getent group %{username} >/dev/null || groupadd -r %{username} getent passwd %{username} >/dev/null || \ From 7668b0b454b1e6b1a6f44a0fe6a52012c3177c60 Mon Sep 17 00:00:00 2001 From: Orion Poplawski Date: Tue, 27 Feb 2018 20:36:16 -0700 Subject: [PATCH 24/51] Remove /bin/env deps (bug #1512889) Drop tcp_wrappers support (bug #1518764) Use mariadb-connector-c-devel (bug #1494095) Add BR gcc --- flow-tools.spec | 35 +++++++++++++++++++++++------------ 1 file changed, 23 insertions(+), 12 deletions(-) diff --git a/flow-tools.spec b/flow-tools.spec index fdba94b..8d3f2ac 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: 22%{?dist} +Release: 23%{?dist} Group: Applications/System License: BSD URL: http://code.google.com/p/%{name}/ @@ -20,15 +20,15 @@ Source0: http://%{name}.googlecode.com/files/%{name}-%{version}.tar.bz2 Source1: flow-capture.service Source2: flow-capture.sysconfig Patch0: flow-werror-fix.patch +BuildRequires: gcc %if 0%{with openssl} BuildRequires: openssl-devel %endif -BuildRequires: mysql-devel +BuildRequires: mariadb-connector-c-devel BuildRequires: postgresql-devel BuildRequires: zlib-devel BuildRequires: bison BuildRequires: flex -BuildRequires: tcp_wrappers-devel BuildRequires: doxygen Requires(pre): shadow-utils Requires(post): systemd @@ -51,7 +51,8 @@ contributed and are included in the distribution. %package devel Summary: Development files for flow-tools Group: Development/Libraries -Requires: %{name} = %{version}-%{release} zlib-devel +Requires: %{name} = %{version}-%{release} +Requires: zlib-devel %description devel Flow-tools is library and a collection of programs used to collect, @@ -68,7 +69,8 @@ libft. %package rrdtool Summary: Scripts for flow-tools to build rrd graphs Group: Applications/System -Requires: %{name} = %{version}-%{release} rrdtool-python +Requires: %{name} = %{version}-%{release} +Requires: python2-rrdtool %description rrdtool Flow-tools is library and a collection of programs used to collect, @@ -79,7 +81,7 @@ of custom applications for NetFlow export versions 1,5,6 and the 14 currently defined version 8 subversions. A Perl and Python interface have been contributed and are included in the distribution. -This package contains scripts that use python-rrdtool to create rrds and graphs +This package contains scripts that use python2-rrdtool to create rrds and graphs from flow data. %package docs @@ -101,10 +103,14 @@ This package contains additional documentation, such as man pages in html format %prep %setup -q %patch0 -p1 +# Remove /bin/env deps +sed -i '1s|^#!.*python|#!/usr/bin/python2|' bin/flow* +sed -i '1s|^#!.*perl|#!/usr/bin/perl|' utils/* +# Fix mariadb-connector-c detection +sed -i s/my_init/mysql_init/g configure %build %configure \ - LDFLAGS=-L%{_libdir}/mysql \ --localstatedir=%{_localstatedir}/%{name} \ --sysconfdir=%{_sysconfdir}/%{name} \ --enable-static=no \ @@ -117,11 +123,10 @@ This package contains additional documentation, such as man pages in html format sed -i 's|^hardcode_libdir_flag_spec=.*|hardcode_libdir_flag_spec=""|g' libtool sed -i 's|^runpath_var=LD_RUN_PATH|runpath_var=DIE_RPATH_DIE|g' libtool -make RPM_OPT_FLAGS="$RPM_OPT_FLAGS" %{?_smp_mflags} +%make_build RPM_OPT_FLAGS="$RPM_OPT_FLAGS" %install -rm -rf $RPM_BUILD_ROOT -make DESTDIR=$RPM_BUILD_ROOT install +%make_install find $RPM_BUILD_ROOT -type f -name "*.la" -exec rm -f {} ';' mkdir -p $RPM_BUILD_ROOT%{_localstatedir}/%{name} install -d $RPM_BUILD_ROOT%{_unitdir} @@ -221,6 +226,12 @@ exit 0 %doc docs/*.html ChangeLog.old TODO INSTALL SECURITY %changelog +* Tue Feb 27 2018 Orion Poplawski - 0.68.5.1-23 +- Remove /bin/env deps (bug #1512889) +- Drop tcp_wrappers support (bug #1518764) +- Use mariadb-connector-c-devel (bug #1494095) +- Add BR gcc + * Fri Feb 09 2018 Igor Gnatenko - 0.68.5.1-22 - Escape macros in %%changelog @@ -408,10 +419,10 @@ exit 0 - Make libft shared library - Split to plain/devel -* Fri Jan 7 2004 William Emmanuel S. Yu +* Fri Jan 9 2004 William Emmanuel S. Yu - updated RPM file for version 0.67 -* Tue Aug 8 2003 William Emmanuel S. Yu +* Tue Aug 5 2003 William Emmanuel S. Yu - fixed SQL bug - update flow-export documentation From e44827f667e87b513313f7c665b7eaf9fd4b4849 Mon Sep 17 00:00:00 2001 From: Fedora Release Engineering Date: Fri, 13 Jul 2018 00:40:33 +0000 Subject: [PATCH 25/51] - Rebuilt for https://fedoraproject.org/wiki/Fedora_29_Mass_Rebuild Signed-off-by: Fedora Release Engineering --- flow-tools.spec | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) diff --git a/flow-tools.spec b/flow-tools.spec index 8d3f2ac..7bdf84f 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: 23%{?dist} +Release: 24%{?dist} Group: Applications/System License: BSD URL: http://code.google.com/p/%{name}/ @@ -226,6 +226,9 @@ exit 0 %doc docs/*.html ChangeLog.old TODO INSTALL SECURITY %changelog +* Fri Jul 13 2018 Fedora Release Engineering - 0.68.5.1-24 +- Rebuilt for https://fedoraproject.org/wiki/Fedora_29_Mass_Rebuild + * Tue Feb 27 2018 Orion Poplawski - 0.68.5.1-23 - Remove /bin/env deps (bug #1512889) - Drop tcp_wrappers support (bug #1518764) From a3208c417df8a489e4fef70554c43869579a7340 Mon Sep 17 00:00:00 2001 From: Pavel Raiskup Date: Wed, 5 Sep 2018 15:15:44 +0200 Subject: [PATCH 26/51] BuildRequires: s/postgresql-devel/libpq-devel/ That's because we moved libpq.so.5 into libpq package. Related: rhbz#1618698, rhbz#1623764 --- flow-tools.spec | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/flow-tools.spec b/flow-tools.spec index 7bdf84f..ec8dcc1 100644 --- a/flow-tools.spec +++ b/flow-tools.spec @@ -25,7 +25,7 @@ BuildRequires: gcc BuildRequires: openssl-devel %endif BuildRequires: mariadb-connector-c-devel -BuildRequires: postgresql-devel +BuildRequires: libpq-devel BuildRequires: zlib-devel BuildRequires: bison BuildRequires: flex From 5d7f5170266ed6a504208ba472f73430a6b63400 Mon Sep 17 00:00:00 2001 From: Igor Gnatenko Date: Mon, 28 Jan 2019 20:17:44 +0100 Subject: [PATCH 27/51] Remove obsolete Group tag References: https://fedoraproject.org/wiki/Changes/Remove_Group_Tag --- flow-tools.spec | 4 ---- 1 file changed, 4 deletions(-) diff --git a/flow-tools.spec b/flow-tools.spec index ec8dcc1..56be8cc 100644 --- a/flow-tools.spec +++ b/flow-tools.spec @@ -13,7 +13,6 @@ Version: 0.68.5.1 Name: flow-tools Summary: Tool set for working with NetFlow data Release: 24%{?dist} -Group: Applications/System License: BSD URL: http://code.google.com/p/%{name}/ Source0: http://%{name}.googlecode.com/files/%{name}-%{version}.tar.bz2 @@ -50,7 +49,6 @@ contributed and are included in the distribution. %package devel Summary: Development files for flow-tools -Group: Development/Libraries Requires: %{name} = %{version}-%{release} Requires: zlib-devel @@ -68,7 +66,6 @@ libft. %package rrdtool Summary: Scripts for flow-tools to build rrd graphs -Group: Applications/System Requires: %{name} = %{version}-%{release} Requires: python2-rrdtool @@ -86,7 +83,6 @@ from flow data. %package docs Summary: HTML and other redundant docs for flow-tools -Group: Applications/System Requires: %{name} = %{version}-%{release} %description docs From bebfdde1402db80bc53b2e256a612b1b7b80ddd4 Mon Sep 17 00:00:00 2001 From: Fedora Release Engineering Date: Thu, 31 Jan 2019 19:52:57 +0000 Subject: [PATCH 28/51] - Rebuilt for https://fedoraproject.org/wiki/Fedora_30_Mass_Rebuild Signed-off-by: Fedora Release Engineering --- flow-tools.spec | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) diff --git a/flow-tools.spec b/flow-tools.spec index 56be8cc..614ef95 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: 24%{?dist} +Release: 25%{?dist} License: BSD URL: http://code.google.com/p/%{name}/ Source0: http://%{name}.googlecode.com/files/%{name}-%{version}.tar.bz2 @@ -222,6 +222,9 @@ exit 0 %doc docs/*.html ChangeLog.old TODO INSTALL SECURITY %changelog +* Thu Jan 31 2019 Fedora Release Engineering - 0.68.5.1-25 +- Rebuilt for https://fedoraproject.org/wiki/Fedora_30_Mass_Rebuild + * Fri Jul 13 2018 Fedora Release Engineering - 0.68.5.1-24 - Rebuilt for https://fedoraproject.org/wiki/Fedora_29_Mass_Rebuild From 3fecae42732b5f3b57f84e408084cf76f8190ebd Mon Sep 17 00:00:00 2001 From: Fedora Release Engineering Date: Thu, 25 Jul 2019 00:45:41 +0000 Subject: [PATCH 29/51] - Rebuilt for https://fedoraproject.org/wiki/Fedora_31_Mass_Rebuild Signed-off-by: Fedora Release Engineering --- flow-tools.spec | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) diff --git a/flow-tools.spec b/flow-tools.spec index 614ef95..29e05f0 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: 25%{?dist} +Release: 26%{?dist} License: BSD URL: http://code.google.com/p/%{name}/ Source0: http://%{name}.googlecode.com/files/%{name}-%{version}.tar.bz2 @@ -222,6 +222,9 @@ exit 0 %doc docs/*.html ChangeLog.old TODO INSTALL SECURITY %changelog +* Thu Jul 25 2019 Fedora Release Engineering - 0.68.5.1-26 +- Rebuilt for https://fedoraproject.org/wiki/Fedora_31_Mass_Rebuild + * Thu Jan 31 2019 Fedora Release Engineering - 0.68.5.1-25 - Rebuilt for https://fedoraproject.org/wiki/Fedora_30_Mass_Rebuild From 0daff6da1045bef90c30f6699b7a0d3310325b33 Mon Sep 17 00:00:00 2001 From: Orion Poplawski Date: Tue, 30 Jul 2019 21:01:32 -0600 Subject: [PATCH 30/51] Fix systemd macro usage --- flow-tools.spec | 12 ++++++------ 1 file changed, 6 insertions(+), 6 deletions(-) diff --git a/flow-tools.spec b/flow-tools.spec index 29e05f0..867b823 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: 26%{?dist} +Release: 27%{?dist} License: BSD URL: http://code.google.com/p/%{name}/ Source0: http://%{name}.googlecode.com/files/%{name}-%{version}.tar.bz2 @@ -30,10 +30,7 @@ BuildRequires: bison BuildRequires: flex BuildRequires: doxygen Requires(pre): shadow-utils -Requires(post): systemd -Requires(preun): systemd -Requires(postun): systemd -BuildRequires: systemd +BuildRequires: systemd-rpm-macros Provides: group(%username) Provides: user(%username) @@ -146,7 +143,7 @@ exit 0 %systemd_preun flow-capture.service %postun -%systemd_postun +%systemd_postun flow-capture.service %files %doc README README.fork COPYING ChangeLog @@ -222,6 +219,9 @@ exit 0 %doc docs/*.html ChangeLog.old TODO INSTALL SECURITY %changelog +* Tue Jul 30 2019 Orion Poplawski - 0.68.5.1-27 +- Fix systemd macro usage + * Thu Jul 25 2019 Fedora Release Engineering - 0.68.5.1-26 - Rebuilt for https://fedoraproject.org/wiki/Fedora_31_Mass_Rebuild From 77d5e39f67bdcf5f81360f2375cd80beaf263c35 Mon Sep 17 00:00:00 2001 From: Orion Poplawski Date: Wed, 21 Aug 2019 20:42:33 -0600 Subject: [PATCH 31/51] Use python 3 for Fedora 31+ (bugz#1737952) --- flow-tools.spec | 21 ++++++++++++++++++--- 1 file changed, 18 insertions(+), 3 deletions(-) diff --git a/flow-tools.spec b/flow-tools.spec index 867b823..3887957 100644 --- a/flow-tools.spec +++ b/flow-tools.spec @@ -1,5 +1,5 @@ # Does not support openssl 1.1 -%if 0%{?fedora} >= 26 +%if 0%{?fedora} %bcond_with openssl %else %bcond_without openssl @@ -12,7 +12,7 @@ Version: 0.68.5.1 Name: flow-tools Summary: Tool set for working with NetFlow data -Release: 27%{?dist} +Release: 28%{?dist} License: BSD URL: http://code.google.com/p/%{name}/ Source0: http://%{name}.googlecode.com/files/%{name}-%{version}.tar.bz2 @@ -29,6 +29,9 @@ BuildRequires: zlib-devel BuildRequires: bison BuildRequires: flex BuildRequires: doxygen +%if 0%{?fedora} >= 31 +BuildRequires: /usr/bin/2to3 +%endif Requires(pre): shadow-utils BuildRequires: systemd-rpm-macros Provides: group(%username) @@ -64,7 +67,11 @@ libft. %package rrdtool Summary: Scripts for flow-tools to build rrd graphs Requires: %{name} = %{version}-%{release} +%if 0%{?fedora} >= 31 +Requires: python3-rrdtool +%else Requires: python2-rrdtool +%endif %description rrdtool Flow-tools is library and a collection of programs used to collect, @@ -75,7 +82,7 @@ of custom applications for NetFlow export versions 1,5,6 and the 14 currently defined version 8 subversions. A Perl and Python interface have been contributed and are included in the distribution. -This package contains scripts that use python2-rrdtool to create rrds and graphs +This package contains scripts that use python-rrdtool to create rrds and graphs from flow data. %package docs @@ -97,7 +104,12 @@ This package contains additional documentation, such as man pages in html format %setup -q %patch0 -p1 # Remove /bin/env deps +%if 0%{?fedora} >= 31 +sed -i '1s|^#!.*python|#!/usr/bin/python3|' bin/flow* +2to3 --write --nobackups bin/flow* +%else sed -i '1s|^#!.*python|#!/usr/bin/python2|' bin/flow* +%endif sed -i '1s|^#!.*perl|#!/usr/bin/perl|' utils/* # Fix mariadb-connector-c detection sed -i s/my_init/mysql_init/g configure @@ -219,6 +231,9 @@ exit 0 %doc docs/*.html ChangeLog.old TODO INSTALL SECURITY %changelog +* Wed Aug 21 2019 Orion Poplawski - 0.68.5.1-28 +- Use python 3 for Fedora 31+ (bugz#1737952) + * Tue Jul 30 2019 Orion Poplawski - 0.68.5.1-27 - Fix systemd macro usage From 61ed33ab67251599c26a2e2636f1926b0448ab8a Mon Sep 17 00:00:00 2001 From: Orion Poplawski Date: Mon, 27 Jan 2020 20:48:44 -0700 Subject: [PATCH 32/51] Add patch to fix extern usage for gcc 10 --- flow-tools-extern.patch | 12 ++++++++++++ flow-tools.spec | 11 ++++++++--- 2 files changed, 20 insertions(+), 3 deletions(-) create mode 100644 flow-tools-extern.patch diff --git a/flow-tools-extern.patch b/flow-tools-extern.patch new file mode 100644 index 0000000..9c0afa9 --- /dev/null +++ b/flow-tools-extern.patch @@ -0,0 +1,12 @@ +diff -up flow-tools-0.68.5.1/src/flow-filter.c.extern flow-tools-0.68.5.1/src/flow-filter.c +--- flow-tools-0.68.5.1/src/flow-filter.c.extern 2008-01-27 13:48:55.000000000 -0700 ++++ flow-tools-0.68.5.1/src/flow-filter.c 2020-01-27 20:44:13.176636051 -0700 +@@ -56,7 +56,7 @@ + int debug; + int ip_net_only; + +-struct acl_list acl_list; ++extern struct acl_list acl_list; + + int yyparse (void); + void usage(void); diff --git a/flow-tools.spec b/flow-tools.spec index 3887957..8683b6d 100644 --- a/flow-tools.spec +++ b/flow-tools.spec @@ -12,13 +12,16 @@ Version: 0.68.5.1 Name: flow-tools Summary: Tool set for working with NetFlow data -Release: 28%{?dist} +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 Source2: flow-capture.sysconfig Patch0: flow-werror-fix.patch +# Fix extern usage +Patch1: flow-tools-extern.patch + BuildRequires: gcc %if 0%{with openssl} BuildRequires: openssl-devel @@ -101,8 +104,7 @@ contributed and are included in the distribution. This package contains additional documentation, such as man pages in html format. %prep -%setup -q -%patch0 -p1 +%autosetup -p1 # Remove /bin/env deps %if 0%{?fedora} >= 31 sed -i '1s|^#!.*python|#!/usr/bin/python3|' bin/flow* @@ -231,6 +233,9 @@ exit 0 %doc docs/*.html ChangeLog.old TODO INSTALL SECURITY %changelog +* Tue Jan 28 2020 Orion Poplawski - 0.68.5.1-29 +- Add patch to fix extern usage for gcc 10 + * Wed Aug 21 2019 Orion Poplawski - 0.68.5.1-28 - Use python 3 for Fedora 31+ (bugz#1737952) From 57db730e31dbc00462994e8c1f8f72558467c7f8 Mon Sep 17 00:00:00 2001 From: Fedora Release Engineering Date: Mon, 27 Jul 2020 17:37:06 +0000 Subject: [PATCH 33/51] - Rebuilt for https://fedoraproject.org/wiki/Fedora_33_Mass_Rebuild Signed-off-by: Fedora Release Engineering --- flow-tools.spec | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) diff --git a/flow-tools.spec b/flow-tools.spec index 8683b6d..aaaafe0 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: 29%{?dist} +Release: 30%{?dist} License: BSD URL: http://code.google.com/p/%{name}/ Source0: http://%{name}.googlecode.com/files/%{name}-%{version}.tar.bz2 @@ -233,6 +233,9 @@ exit 0 %doc docs/*.html ChangeLog.old TODO INSTALL SECURITY %changelog +* 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 From 669cd5f72c22cbe5494ade7a949c8116fe9eb062 Mon Sep 17 00:00:00 2001 From: Tom Stellard Date: Tue, 5 Jan 2021 00:41:18 +0000 Subject: [PATCH 34/51] Add BuildRequires: make https://fedoraproject.org/wiki/Changes/Remove_make_from_BuildRoot --- flow-tools.spec | 1 + 1 file changed, 1 insertion(+) diff --git a/flow-tools.spec b/flow-tools.spec index aaaafe0..a9fb27e 100644 --- a/flow-tools.spec +++ b/flow-tools.spec @@ -37,6 +37,7 @@ BuildRequires: /usr/bin/2to3 %endif Requires(pre): shadow-utils BuildRequires: systemd-rpm-macros +BuildRequires: make Provides: group(%username) Provides: user(%username) From 00be7efaf9fd5b0a6e249d2f3b822d4556f09b86 Mon Sep 17 00:00:00 2001 From: Fedora Release Engineering Date: Tue, 26 Jan 2021 05:42:32 +0000 Subject: [PATCH 35/51] - Rebuilt for https://fedoraproject.org/wiki/Fedora_34_Mass_Rebuild Signed-off-by: Fedora Release Engineering --- flow-tools.spec | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) diff --git a/flow-tools.spec b/flow-tools.spec index a9fb27e..9ad5fb7 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: 30%{?dist} +Release: 31%{?dist} License: BSD URL: http://code.google.com/p/%{name}/ Source0: http://%{name}.googlecode.com/files/%{name}-%{version}.tar.bz2 @@ -234,6 +234,9 @@ exit 0 %doc docs/*.html ChangeLog.old TODO INSTALL SECURITY %changelog +* 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 From 7798d3e6005e0b2598ed00fac313a30bca2536c6 Mon Sep 17 00:00:00 2001 From: Pavel Raiskup Date: Mon, 8 Feb 2021 09:25:11 +0100 Subject: [PATCH 36/51] rebuild for libpq ABI fix Related: rhbz#1908268 --- flow-tools.spec | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) diff --git a/flow-tools.spec b/flow-tools.spec index 9ad5fb7..34f52ff 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: 31%{?dist} +Release: 32%{?dist} License: BSD URL: http://code.google.com/p/%{name}/ Source0: http://%{name}.googlecode.com/files/%{name}-%{version}.tar.bz2 @@ -234,6 +234,9 @@ exit 0 %doc docs/*.html ChangeLog.old TODO INSTALL SECURITY %changelog +* 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 From c8580fa589e87d6b2f2527f564044147e81f31ca Mon Sep 17 00:00:00 2001 From: Fedora Release Engineering Date: Wed, 21 Jul 2021 23:08:07 +0000 Subject: [PATCH 37/51] - Rebuilt for https://fedoraproject.org/wiki/Fedora_35_Mass_Rebuild Signed-off-by: Fedora Release Engineering --- flow-tools.spec | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) diff --git a/flow-tools.spec b/flow-tools.spec index 34f52ff..7cb0924 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: 32%{?dist} +Release: 33%{?dist} License: BSD URL: http://code.google.com/p/%{name}/ Source0: http://%{name}.googlecode.com/files/%{name}-%{version}.tar.bz2 @@ -234,6 +234,9 @@ exit 0 %doc docs/*.html ChangeLog.old TODO INSTALL SECURITY %changelog +* 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 From da0a03013002bc378618e0b7e6215c42cd0f6810 Mon Sep 17 00:00:00 2001 From: Fedora Release Engineering Date: Thu, 20 Jan 2022 03:10:54 +0000 Subject: [PATCH 38/51] - Rebuilt for https://fedoraproject.org/wiki/Fedora_36_Mass_Rebuild Signed-off-by: Fedora Release Engineering --- flow-tools.spec | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) diff --git a/flow-tools.spec b/flow-tools.spec index 7cb0924..3680abb 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: 33%{?dist} +Release: 34%{?dist} License: BSD URL: http://code.google.com/p/%{name}/ Source0: http://%{name}.googlecode.com/files/%{name}-%{version}.tar.bz2 @@ -234,6 +234,9 @@ exit 0 %doc docs/*.html ChangeLog.old TODO INSTALL SECURITY %changelog +* 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 From 0fe819d45bf8f8a4d6c7a35c082abf71a78002ff Mon Sep 17 00:00:00 2001 From: Fedora Release Engineering Date: Thu, 21 Jul 2022 03:21:33 +0000 Subject: [PATCH 39/51] Rebuilt for https://fedoraproject.org/wiki/Fedora_37_Mass_Rebuild Signed-off-by: Fedora Release Engineering --- flow-tools.spec | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) diff --git a/flow-tools.spec b/flow-tools.spec index 3680abb..9b62066 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: 34%{?dist} +Release: 35%{?dist} License: BSD URL: http://code.google.com/p/%{name}/ Source0: http://%{name}.googlecode.com/files/%{name}-%{version}.tar.bz2 @@ -234,6 +234,9 @@ exit 0 %doc docs/*.html ChangeLog.old TODO INSTALL SECURITY %changelog +* 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 From 95147493b19a09d69a9bb00b756881d511839087 Mon Sep 17 00:00:00 2001 From: Fedora Release Engineering Date: Thu, 19 Jan 2023 03:37:52 +0000 Subject: [PATCH 40/51] Rebuilt for https://fedoraproject.org/wiki/Fedora_38_Mass_Rebuild Signed-off-by: Fedora Release Engineering --- flow-tools.spec | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) diff --git a/flow-tools.spec b/flow-tools.spec index 9b62066..0815a58 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: 35%{?dist} +Release: 36%{?dist} License: BSD URL: http://code.google.com/p/%{name}/ Source0: http://%{name}.googlecode.com/files/%{name}-%{version}.tar.bz2 @@ -234,6 +234,9 @@ exit 0 %doc docs/*.html ChangeLog.old TODO INSTALL SECURITY %changelog +* 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 From 5590477b99c33b61a4d18436453a29e398be01aa Mon Sep 17 00:00:00 2001 From: Florian Weimer Date: Thu, 19 Jan 2023 12:16:52 +0100 Subject: [PATCH 41/51] C99 compatibility fixes (#2162330) Related to: --- flow-tools-c99.patch | 59 ++++++++++++++++++++++++++++++++++++++++++++ flow-tools.spec | 6 ++++- 2 files changed, 64 insertions(+), 1 deletion(-) create mode 100644 flow-tools-c99.patch diff --git a/flow-tools-c99.patch b/flow-tools-c99.patch new file mode 100644 index 0000000..c9fd14e --- /dev/null +++ b/flow-tools-c99.patch @@ -0,0 +1,59 @@ +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 0815a58..377765d 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: 36%{?dist} +Release: 37%{?dist} License: BSD URL: http://code.google.com/p/%{name}/ Source0: http://%{name}.googlecode.com/files/%{name}-%{version}.tar.bz2 @@ -21,6 +21,7 @@ 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} @@ -234,6 +235,9 @@ exit 0 %doc docs/*.html ChangeLog.old TODO INSTALL SECURITY %changelog +* 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 From 6397f12daae746adb19e0baf5533f754cb026c3d Mon Sep 17 00:00:00 2001 From: Fedora Release Engineering Date: Wed, 19 Jul 2023 19:55:48 +0000 Subject: [PATCH 42/51] Rebuilt for https://fedoraproject.org/wiki/Fedora_39_Mass_Rebuild Signed-off-by: Fedora Release Engineering --- flow-tools.spec | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) diff --git a/flow-tools.spec b/flow-tools.spec index 377765d..bf26ac4 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: 37%{?dist} +Release: 38%{?dist} License: BSD URL: http://code.google.com/p/%{name}/ Source0: http://%{name}.googlecode.com/files/%{name}-%{version}.tar.bz2 @@ -235,6 +235,9 @@ exit 0 %doc docs/*.html ChangeLog.old TODO INSTALL SECURITY %changelog +* 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) From af92d97bc98d3449bee1748617fd62ac4bbe51c8 Mon Sep 17 00:00:00 2001 From: Fedora Release Engineering Date: Fri, 19 Jan 2024 19:31:02 +0000 Subject: [PATCH 43/51] Rebuilt for https://fedoraproject.org/wiki/Fedora_40_Mass_Rebuild --- flow-tools.spec | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) diff --git a/flow-tools.spec b/flow-tools.spec index bf26ac4..dd910fe 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: 38%{?dist} +Release: 39%{?dist} License: BSD URL: http://code.google.com/p/%{name}/ Source0: http://%{name}.googlecode.com/files/%{name}-%{version}.tar.bz2 @@ -235,6 +235,9 @@ exit 0 %doc docs/*.html ChangeLog.old TODO INSTALL SECURITY %changelog +* 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 From d0d654f9a82d5ecf25490d403aec0856d8377e99 Mon Sep 17 00:00:00 2001 From: Fedora Release Engineering Date: Wed, 24 Jan 2024 11:46:20 +0000 Subject: [PATCH 44/51] Rebuilt for https://fedoraproject.org/wiki/Fedora_40_Mass_Rebuild --- flow-tools.spec | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) diff --git a/flow-tools.spec b/flow-tools.spec index dd910fe..1d25637 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: 39%{?dist} +Release: 40%{?dist} License: BSD URL: http://code.google.com/p/%{name}/ Source0: http://%{name}.googlecode.com/files/%{name}-%{version}.tar.bz2 @@ -235,6 +235,9 @@ exit 0 %doc docs/*.html ChangeLog.old TODO INSTALL SECURITY %changelog +* 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 From 23eb92d01e87652d55c1e6b92d5613765438c6ae Mon Sep 17 00:00:00 2001 From: Fedora Release Engineering Date: Wed, 17 Jul 2024 23:20:33 +0000 Subject: [PATCH 45/51] Rebuilt for https://fedoraproject.org/wiki/Fedora_41_Mass_Rebuild --- flow-tools.spec | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) diff --git a/flow-tools.spec b/flow-tools.spec index 1d25637..a0c2971 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: 40%{?dist} +Release: 41%{?dist} License: BSD URL: http://code.google.com/p/%{name}/ Source0: http://%{name}.googlecode.com/files/%{name}-%{version}.tar.bz2 @@ -235,6 +235,9 @@ exit 0 %doc docs/*.html ChangeLog.old TODO INSTALL SECURITY %changelog +* 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 From 74593b54b0ba666696361b63c9fec1b3e7bca131 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Miroslav=20Such=C3=BD?= Date: Wed, 28 Aug 2024 09:40:10 +0200 Subject: [PATCH 46/51] convert license to SPDX This is part of https://fedoraproject.org/wiki/Changes/SPDX_Licenses_Phase_4 --- flow-tools.spec | 8 ++++++-- 1 file changed, 6 insertions(+), 2 deletions(-) diff --git a/flow-tools.spec b/flow-tools.spec index a0c2971..a6ee1bd 100644 --- a/flow-tools.spec +++ b/flow-tools.spec @@ -12,8 +12,9 @@ Version: 0.68.5.1 Name: flow-tools Summary: Tool set for working with NetFlow data -Release: 41%{?dist} -License: BSD +Release: 42%{?dist} +# Automatically converted from old format: BSD - review is highly recommended. +License: LicenseRef-Callaway-BSD URL: http://code.google.com/p/%{name}/ Source0: http://%{name}.googlecode.com/files/%{name}-%{version}.tar.bz2 Source1: flow-capture.service @@ -235,6 +236,9 @@ exit 0 %doc docs/*.html ChangeLog.old TODO INSTALL SECURITY %changelog +* 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 From 311a467f2850df82a37cde9ef797054ed7bb4c2e Mon Sep 17 00:00:00 2001 From: Fedora Release Engineering Date: Thu, 16 Jan 2025 18:29:50 +0000 Subject: [PATCH 47/51] 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 48/51] 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 49/51] 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 50/51] 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 96e2834a8c5d902b94acc6c68b51f6e52749ffc6 Mon Sep 17 00:00:00 2001 From: Fedora Release Engineering Date: Wed, 23 Jul 2025 20:37:52 +0000 Subject: [PATCH 51/51] 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