Rebuilt for https://fedoraproject.org/wiki/Fedora_43_Mass_Rebuild

... (rhbz#2244833, rhbz#2340163)

With apologies to python-sig members ;(

.cvsignore

@@ -1 +0,0 @@
-flow-tools-0.68.tar.gz

.gitignore

@@ -0,0 +1,2 @@
+flow-tools-0.68.5.tar.bz2
+/flow-tools-0.68.5.1.tar.bz2

Makefile

@@ -1,21 +0,0 @@
-# Makefile for source rpm: flow-tools
-# $Id$
-NAME := flow-tools
-SPECFILE = $(firstword $(wildcard *.spec))
-
-define find-makefile-common
-for d in common ../common ../../common ; do if [ -f $$d/Makefile.common ] ; then if [ -f $$d/CVS/Root -a -w $$/Makefile.common ] ; then cd $$d ; cvs -Q update ; fi ; echo "$$d/Makefile.common" ; break ; fi ; done
-endef
-
-MAKEFILE_COMMON := $(shell $(find-makefile-common))
-
-ifeq ($(MAKEFILE_COMMON),)
-# attept a checkout
-define checkout-makefile-common
-test -f CVS/Root && { cvs -Q -d $$(cat CVS/Root) checkout common && echo "common/Makefile.common" ; } || { echo "ERROR: I can't figure out how to checkout the 'common' module." ; exit -1 ; } >&2
-endef
-
-MAKEFILE_COMMON := $(shell $(checkout-makefile-common))
-endif
-
-include $(MAKEFILE_COMMON)

flow-capture.init

@@ -0,0 +1,112 @@
+#!/bin/sh
+#
+# flow-capture Capture traffic flow data
+#
+# chkconfig: - 90 10
+# description: Capture traffic flow data
+
+### BEGIN INIT INFO
+# Provides: flow-capture
+# Required-Start: $local_fs $network
+# Required-Stop: $local_fs $network
+# Default-Stop: 0 1 2 3 4 5 6
+# Short-Description: Capture traffic flow data
+# Description: Capture traffic flow data
+### END INIT INFO
+
+# Source function library.
+. /etc/rc.d/init.d/functions
+
+prog="flow-capture"
+exec="/usr/bin/$prog"
+config="/etc/sysconfig/$prog"
+lockfile=/var/lock/subsys/$prog
+
+[ -e $config ] && . $config
+
+# Define the flow-tools username
+FLOWTOOLS_USER="${FLOWTOOLS_USER:-flow-tools}"
+
+# Add pidfile
+OPTIONS="-p /var/run/flow-capture.pid $OPTIONS"
+
+# Check that networking is up.
+if [ "$NETWORKING" = "no" ]
+then
+        exit 0
+fi
+
+start() {
+    [ -x $exec ] || exit 5
+    [ -f $config ] || exit 6
+    echo -n $"Starting $prog: "
+    # if not running, start it up here, usually something like "daemon $exec"
+    daemon --user=$FLOWTOOLS_USER $exec $OPTIONS
+    retval=$?
+    echo
+    [ $retval -eq 0 ] && touch $lockfile
+    return $retval
+}	
+
+stop() {
+    echo -n $"Stopping $prog: "
+    killproc $prog
+    retval=$?
+    echo
+    [ $retval -eq 0 ] && rm -f $lockfile
+    return $retval
+}
+
+restart() {
+    stop
+    start
+}
+
+reload() {
+    restart
+}
+
+force_reload() {
+    restart
+}
+
+rh_status() {
+    # run checks to determine if the service is running or use generic status
+    status $prog
+}
+
+rh_status_q() {
+    rh_status >/dev/null 2>&1
+}
+
+case "$1" in
+    start)
+        rh_status_q && exit 0
+        $1
+        ;;
+    stop)
+        rh_status_q || exit 0
+        $1
+        ;;
+    restart)
+        $1
+        ;;
+    reload)
+        rh_status_q || exit 7
+        $1
+        ;;
+    force-reload)
+        force_reload
+        ;;
+    status)
+        rh_status
+        ;;
+    condrestart|try-restart)
+        rh_status_q || exit 0
+        restart
+        ;;
+    *)
+        echo $"Usage: $0 {start|stop|status|restart|try-restart|reload|force-reload}"
+        exit 2
+esac
+exit $?

flow-capture.service

@@ -0,0 +1,13 @@
+[Unit]
+Description=Flow-capture Capture Traffic Flow Data
+After=network.target 
+
+[Service]
+User=flow-tools
+Group=flow-tools
+Type=simple
+EnvironmentFile=-/etc/sysconfig/flow-capture
+ExecStart=/usr/bin/flow-capture -D $OPTIONS
+
+[Install]
+WantedBy=multi-user.target

flow-capture.sysconfig

@@ -0,0 +1,2 @@
+# Change the source IP and port to what is used on your network
+OPTIONS="-n 287 -N 0 -w /var/flow-tools -S 5 0/0/8818"

flow-tools-0.68-0001-Fix-first-line-of-included-python-scripts.patch

@@ -1,48 +0,0 @@
-From nobody Mon Sep 17 00:00:00 2001
-From: Paul P Komkoff Jr <i@stingr.net>
-Date: Sat, 10 Jun 2006 20:45:55 +0400
-Subject: [PATCH 1/8] Fix first line of included python scripts.
-
-We need to do this to allow execution on FHS-compliant systems.
-
----
-
- bin/flow-log2rrd |    2 +-
- bin/flow-rpt2rrd |    2 +-
- bin/flow-rptfmt  |    2 +-
- 3 files changed, 3 insertions(+), 3 deletions(-)
-
-250b73e99e719fdeb26140e7f8ebab68963e243b
-diff --git a/bin/flow-log2rrd b/bin/flow-log2rrd
-index 0567ba5..db4fdda 100755
---- a/bin/flow-log2rrd
-+++ b/bin/flow-log2rrd
-@@ -1,4 +1,4 @@
--#!/usr/local/bin/python
-+#!/bin/env python
- 
- import getopt
- import os
-diff --git a/bin/flow-rpt2rrd b/bin/flow-rpt2rrd
-index 72a74c7..7698f2b 100755
---- a/bin/flow-rpt2rrd
-+++ b/bin/flow-rpt2rrd
-@@ -1,4 +1,4 @@
--#!/usr/local/bin/python
-+#!/bin/env python
- 
- import getopt
- import os
-diff --git a/bin/flow-rptfmt b/bin/flow-rptfmt
-index 047d1ba..f663fae 100755
---- a/bin/flow-rptfmt
-+++ b/bin/flow-rptfmt
-@@ -1,4 +1,4 @@
--#!/usr/local/bin/python
-+#!/bin/env python
- 
- import sys
- import string
--- 
-1.3.3
-

flow-tools-0.68-0002-Fix-an-invalid-lvalue-in-assignment-compile-error.patch

@@ -1,189 +0,0 @@
-From nobody Mon Sep 17 00:00:00 2001
-From: Paul P Komkoff Jr <i@stingr.net>
-Date: Sat, 10 Jun 2006 20:49:45 +0400
-Subject: [PATCH 2/8] Fix an "invalid lvalue in assignment" compile error.
-
----
-
- lib/ftchash.c |    2 +-
- lib/ftio.c    |    4 ++--
- lib/ftlib.h   |    3 ++-
- lib/fttlv.c   |   34 +++++++++++++++++-----------------
- lib/support.c |    5 +++++
- 5 files changed, 27 insertions(+), 21 deletions(-)
-
-075301dae1b92110e6cc339b0df88b7fc82c31a6
-diff --git a/lib/ftchash.c b/lib/ftchash.c
-index 9cc7efa..28bafbf 100644
---- a/lib/ftchash.c
-+++ b/lib/ftchash.c
-@@ -326,7 +326,7 @@ void *ftchash_foreach(struct ftchash *ft
-       (char*)ftch->traverse_chunk->base+ftch->traverse_chunk->next) {
- 
-       ret = ftch->traverse_rec;
--      (char*)ftch->traverse_rec += ftch->d_size;
-+      ftch->traverse_rec = vpadd(ftch->traverse_rec, ftch->d_size);
-       return ret;
- 
-     } else {
-diff --git a/lib/ftio.c b/lib/ftio.c
-index f6c739c..1082416 100644
---- a/lib/ftio.c
-+++ b/lib/ftio.c
-@@ -2267,7 +2267,7 @@ int readn(register int fd, register void
-         break;
- 
-       nleft -= nread;
--      (char*)ptr += nread;
-+      ptr = vpadd(ptr, nread);
-   }
-   return (nbytes - nleft);
- } /* readn */
-@@ -2292,7 +2292,7 @@ int writen(register int fd, register voi
-       return(nwritten); /* error */
- 
-     nleft -= nwritten;
--    (char*)ptr += nwritten;
-+    ptr =  vpadd(ptr,nwritten);
-   }
-   return(nbytes - nleft);
- } /* writen */
-diff --git a/lib/ftlib.h b/lib/ftlib.h
-index f91ad0a..66bf2f3 100644
---- a/lib/ftlib.h
-+++ b/lib/ftlib.h
-@@ -152,7 +152,6 @@ #define FT_PDU_V8_11_MAXFLOWS 44  /* max
- #define FT_PDU_V8_12_MAXFLOWS 44  /* max records in V8 DST_PREFIX_TOS packet */
- #define FT_PDU_V8_13_MAXFLOWS 35  /* max records in V8 PREFIX_TOS packet */
- #define FT_PDU_V8_14_MAXFLOWS 35  /* max records in V8 PREFIX_PORT_TOS packet */
--
- #define FT_PDU_V8_1_VERSION    2  /* version of AS packet */
- #define FT_PDU_V8_2_VERSION    2  /* version of PROTO PORT packet */
- #define FT_PDU_V8_3_VERSION    2  /* version of SRC PREFIX packet */
-@@ -3029,6 +3028,8 @@ #ifndef IN_CLASSD_SSM
- #define IN_CLASSD_SSM(i) (((u_int32_t)(i) & 0xff000000) == 0xe8000000)
- #endif /* IN_CLASSD_SSM */
- 
-+void *vpadd(const void* v, const int change);
-+
- /* MACHINE DEPENDANT */
- #define fmt_uint fmt_uint32
- 
-diff --git a/lib/fttlv.c b/lib/fttlv.c
-index 7035813..330a783 100644
---- a/lib/fttlv.c
-+++ b/lib/fttlv.c
-@@ -68,10 +68,10 @@ int fttlv_enc_uint32(void *buf, int buf_
-   }
- 
-   bcopy(&t, buf, 2);
--  (char*)buf+= 2;
-+  buf = vpadd(buf, 2);
- 
-   bcopy(&len, buf, 2);
--  (char*)buf+= 2;
-+  buf = vpadd(buf, 2);
- 
-   bcopy(&v, buf, 4);
- 
-@@ -107,10 +107,10 @@ int fttlv_enc_uint16(void *buf, int buf_
-   }
- 
-   bcopy(&t, buf, 2);
--  (char*)buf+= 2;
-+  buf = vpadd(buf, 2);
- 
-   bcopy(&len, buf, 2);
--  (char*)buf+= 2;
-+  buf = vpadd(buf, 2);
- 
-   bcopy(&v, buf, 2);
- 
-@@ -145,10 +145,10 @@ int fttlv_enc_uint8(void *buf, int buf_s
-   }
- 
-   bcopy(&t, buf, 2);
--  (char*)buf+= 2;
-+  buf = vpadd(buf, 2);
- 
-   bcopy(&len, buf, 2);
--  (char*)buf+= 2;
-+  buf = vpadd(buf, 2);
- 
-   bcopy(&v, buf, 1);
- 
-@@ -183,10 +183,10 @@ int fttlv_enc_str(void *buf, int buf_siz
-   }
- 
-   bcopy(&t, buf, 2);
--  (char*)buf+= 2;
-+  buf = vpadd(buf, 2);
- 
-   bcopy(&len, buf, 2);
--  (char*)buf+= 2;
-+  buf = vpadd(buf, 2);
- 
-   bcopy(v, buf, len);
- 
-@@ -230,16 +230,16 @@ int fttlv_enc_ifname(void *buf, int buf_
-     return -1;
- 
-   bcopy(&t, buf, 2);
--  (char*)buf+= 2;
-+  buf = vpadd(buf, 2);
- 
-   bcopy(&len, buf, 2);
--  (char*)buf+= 2;
-+  buf = vpadd(buf, 2);
- 
-   bcopy(&ip, buf, 4);
--  (char*)buf += 4;
-+  buf = vpadd(buf, 4);
- 
-   bcopy(&ifIndex, buf, 2);
--  (char*)buf += 2;
-+  buf = vpadd(buf, 2);
- 
-   bcopy(name, buf, n);
- 
-@@ -287,19 +287,19 @@ int fttlv_enc_ifalias(void *buf, int buf
-   }
- 
-   bcopy(&t, buf, 2);
--  (char*)buf+= 2;
-+  buf = vpadd(buf, 2);
- 
-   bcopy(&len, buf, 2);
--  (char*)buf+= 2;
-+  buf = vpadd(buf, 2);
- 
-   bcopy(&ip, buf, 4);
--  (char*)buf += 4;
-+  buf = vpadd(buf, 4);
- 
-   bcopy(&entries, buf, 2);
--  (char*)buf += 2;
-+  buf = vpadd(buf, 2);
- 
-   bcopy(ifIndex_list, buf, esize);
--  (char*)buf += esize;
-+  buf = vpadd(buf, esize);
- 
-   bcopy(name, buf, n);
- 
-diff --git a/lib/support.c b/lib/support.c
-index a32ffe7..2e1db9f 100644
---- a/lib/support.c
-+++ b/lib/support.c
-@@ -736,3 +736,8 @@ int udp_cksum(struct ip *ip, struct udph
-   return sum;
- } /* udp_cksum */
- 
-+// void pointer add
-+
-+void * vpadd(const void *v, const int change) {
-+  return (void *) (((char*) v) + change);
-+}
--- 
-1.3.3
-

flow-tools-0.68-0003-Avoid-external-debug-variable.patch

@@ -1,31 +0,0 @@
-From nobody Mon Sep 17 00:00:00 2001
-From: Paul P Komkoff Jr <i@stingr.net>
-Date: Sat, 10 Jun 2006 20:51:50 +0400
-Subject: [PATCH 3/8] Avoid external "debug" variable.
-
-When buildinf flow-tools as bunch of binaries depending on shared library,
-extern int debug shows in too much places. Disable it for now until better
-solution will be developed.
-
----
-
- lib/ftfile.c |    2 +-
- 1 files changed, 1 insertions(+), 1 deletions(-)
-
-1707e321511feb9b7cb117fb6be4d8bcfa8996de
-diff --git a/lib/ftfile.c b/lib/ftfile.c
-index 2f3ae76..f25e849 100644
---- a/lib/ftfile.c
-+++ b/lib/ftfile.c
-@@ -53,7 +53,7 @@ #endif
- 
- int load_dir(char *prefix, struct ftfile_entries *fte, int flags, int *depth);
- 
--extern int debug;
-+#define debug 0
- 
- /*
-  * function: ftfile_entry_new
--- 
-1.3.3
-

flow-tools-0.68-0004-Make-flow-tools-more-FHS-compliant-and-buildable-by-newer-toolchain.patch

@@ -1,236 +0,0 @@
-From nobody Mon Sep 17 00:00:00 2001
-From: Paul P Komkoff Jr <i@stingr.net>
-Date: Sat, 10 Jun 2006 20:53:33 +0400
-Subject: [PATCH 4/8] Make flow-tools more FHS-compliant and buildable by newer toolchain.
-
-Here we are switching to new toolchain (autoconf, automake & libtool),
-changing some paths (obviously config files should be put in sysconfdir -
-usually etc - and not in localstatedir which is var)
-
----
-
- configs/Makefile.am |    4 ++--
- configure.in        |   45 ++++++++++++++++++++++++++++++---------------
- lib/Makefile.am     |   10 +++++-----
- lib/ftpaths.h.in    |   22 +++++++++++-----------
- src/Makefile.am     |   12 ++++++------
- 5 files changed, 54 insertions(+), 39 deletions(-)
-
-b03c8b4e55c5f6082ff427559ae5a8bc3e95b8f0
-diff --git a/configs/Makefile.am b/configs/Makefile.am
-index 9b06b52..6ca85cc 100644
---- a/configs/Makefile.am
-+++ b/configs/Makefile.am
-@@ -1,6 +1,6 @@
--ftsymdir=$(localstatedir)/sym
-+ftsymdir=$(sysconfdir)/sym
- ftsym_DATA = ip-prot.sym ip-type.sym tcp-port.sym asn.sym tag.sym
- 
--ftcfgdir=$(localstatedir)/cfg
-+ftcfgdir=$(sysconfdir)/cfg
- ftcfg_DATA = map.cfg tag.cfg filter.cfg stat.cfg mask.cfg xlate.cfg
- 
-diff --git a/configure.in b/configure.in
-index 01987e8..597bbbd 100644
---- a/configure.in
-+++ b/configure.in
-@@ -1,31 +1,32 @@
- dnl Process this file with autoconf to produce a configure script.
--AC_INIT(lib/bit1024.c)
-+AC_INIT(flow-tools, 0.68)
- 
--AC_PREFIX_DEFAULT(/usr/local/netflow)
-+AC_PREFIX_DEFAULT(/usr/local/flow-tools)
- 
--AM_INIT_AUTOMAKE(flow-tools, 0.68)
--AM_CONFIG_HEADER(lib/ftconfig.h:lib/ftconfig.h.in) 
-+AM_INIT_AUTOMAKE
-+AM_CONFIG_HEADER(lib/ftconfig.h) 
- 
--CFLAGS="-g -Wall"
-+dnl CFLAGS="-g -Wall"
- 
- dnl Checks for programs.
-+AC_PROG_LIBTOOL
- AC_PROG_CC
- AC_PROG_INSTALL
- AC_PROG_MAKE_SET
- AC_PROG_YACC
- YACC="$YACC -d"
--AC_PROG_RANLIB
- AM_PROG_LEX
- 
- AC_SUBST(YLIB)
- AC_SUBST(MYSQLLIB)
- AC_SUBST(MYSQLCFLAGS)
--AC_SUBST(MYSQLINCLUDE)
-+AC_SUBST(MYSQLLDFLAGS)
- AC_SUBST(PGSQLLIB)
- AC_SUBST(PGSQLCFLAGS)
--AC_SUBST(PGSQLINCLUDE)
-+AC_SUBST(PGSQLLDFLAGS)
- AC_SUBST(CRYPTOLIB)
- AC_SUBST(OPENSSLINCLUDE)
-+AC_SUBST(OPENSSLLDFLAGS)
- 
- dnl extra argument: --with-mysql
- WITH_MYSQL=
-@@ -66,37 +67,51 @@ AC_ARG_WITH(openssl,
- dnl Checks for libraries.
- 
- if test "x$WHERE_MYSQL" != "x"; then
--  LIBS="-L$WHERE_MYSQL/lib/mysql"
-+  old_LIBS="$LIBS"
-+  old_LDFLAGS="$LDFLAGS"
-+  LDFLAGS="$LDFLAGS -L$WHERE_MYSQL/lib/mysql"
-   AC_CHECK_LIB(mysqlclient, my_init,
-     [
--      MYSQLCFLAGS="-L$WHERE_MYSQL/lib/mysql -I$WHERE_MYSQL/include/mysql"
-+      MYSQLCFLAGS="-I$WHERE_MYSQL/include/mysql"
-+      MYSQLLDFLAGS="-L$WHERE_MYSQL/lib/mysql"
-       MYSQLLIB="-lmysqlclient"
-       AC_DEFINE(HAVE_MYSQL)
-     ]
-   )
-+  LIBS="$old_LIBS"
-+  LDFLAGS="$old_LDFLAGS"
- fi
- 
- if test "x$WHERE_OPENSSL" != "x"; then
--  LIBS="-L$WHERE_OPENSSL/lib"
-+  old_LIBS="$LIBS"
-+  old_LDFLAGS="$LDFLAGS"
-+  LDFLAGS="$LDFLAGS -L$WHERE_OPENSSL/lib"
-   AC_CHECK_LIB(crypto, EVP_EncryptUpdate,
-     [
--      OPENSSLCFLAGS="-L$WHERE_OPENSSL/lib -I$WHERE_OPENSSL/include"
-+      OPENSSLCFLAGS="-I$WHERE_OPENSSL/include"
-+      OPENSSLLDFLAGS="-L$WHERE_OPENSSL/lib"
-       CRYPTOLIB="-lcrypto"
-       AC_DEFINE(HAVE_OPENSSL)
-     ]
-   )
-+  LIBS="$old_LIBS"
-+  LDFLAGS="$old_LDFLAGS"
- fi
- 
--
- if test "x$WHERE_PGSQL" != "x"; then
--  LIBS="-L$WHERE_PGSQL/lib/pgsql"
-+  old_LIBS="$LIBS"
-+  old_LDFLAGS="$LDFLAGS"
-+  LDFLAGS="-L$WHERE_PGSQL/lib/pgsql"
-   AC_CHECK_LIB(pq, PQsetdbLogin,
-     [
--      PGSQLCFLAGS="-L$WHERE_PGSQL/lib -I$WHERE_PGSQL/include/pgsql"
-+      PGSQLCFLAGS="-I$WHERE_PGSQL/include/pgsql"
-+      PGSQLLDFLAGS="-L$WHERE_PGSQL/lib"
-       PGSQLLIB="-lpq"
-       AC_DEFINE(HAVE_PGSQL)
-     ]
-   )
-+  LIBS="$old_LIBS"
-+  LDFLAGS="$old_LDFLAGS"
- fi
- 
- AC_CHECK_LIB(y, main,YLIB="$YLIB -ly",)
-diff --git a/lib/Makefile.am b/lib/Makefile.am
-index 08e684a..5a4727b 100644
---- a/lib/Makefile.am
-+++ b/lib/Makefile.am
-@@ -2,17 +2,17 @@ ## Process this file with automake to pr
- 
- #AM_CFLAGS=-g -Wall -Wpointer-arith -Wstrict-prototypes -Wmissing-prototypes -Wmissing-declarations -Wredundant-decls -Wnested-externs
- #AM_CFLAGS=-O2
--AM_CFLAGS=-g -Wall
-+#AM_CFLAGS=-g -Wall
- 
--DEFS=-I. -I$(srcdir)/lib
-+#DEFS=-I. -I$(srcdir)/lib
- 
- include_HEADERS = ftlib.h ftqueue.h radix.h ftpaths.h ftconfig.h
--lib_LIBRARIES = libft.a
-+lib_LTLIBRARIES = libft.la
- 
--libft_a_SOURCES = ftio.c ftswap.c ftencode.c ftdecode.c ftprof.c bit1024.c \
-+libft_la_SOURCES = ftio.c ftswap.c ftencode.c ftdecode.c ftprof.c bit1024.c \
-  fmt.c support.c ftfile.c fttlv.c ftmap.c ftrec.c fterr.c \
-  ftchash.c ftsym.c radix.c fttag.c ftfil.c ftstat.c getdate.c ftxfield.c\
-  ftmask.c ftvar.c ftxlate.c
- 
--libft_a_LIBADD = @LIBOBJS@ 
-+libft_la_LIBADD = $(LTLIBOBJS) $(CRYPTOLIB)
- 
-diff --git a/lib/ftpaths.h.in b/lib/ftpaths.h.in
-index ae8e30a..b0c91b1 100644
---- a/lib/ftpaths.h.in
-+++ b/lib/ftpaths.h.in
-@@ -29,17 +29,17 @@
- #ifndef FTPATHS_H
- #define FTPATHS_H
- 
--#define FT_PATH_CFG_MAP             "@localstatedir@/cfg/map.cfg"
--#define FT_PATH_CFG_TAG             "@localstatedir@/cfg/tag.cfg"
--#define FT_PATH_CFG_FILTER          "@localstatedir@/cfg/filter.cfg"
--#define FT_PATH_CFG_STAT            "@localstatedir@/cfg/stat.cfg"
--#define FT_PATH_CFG_MASK            "@localstatedir@/cfg/mask.cfg"
--#define FT_PATH_CFG_XLATE           "@localstatedir@/cfg/xlate.cfg"
-+#define FT_PATH_CFG_MAP             "@sysconfdir@/cfg/map.cfg"
-+#define FT_PATH_CFG_TAG             "@sysconfdir@/cfg/tag.cfg"
-+#define FT_PATH_CFG_FILTER          "@sysconfdir@/cfg/filter.cfg"
-+#define FT_PATH_CFG_STAT            "@sysconfdir@/cfg/stat.cfg"
-+#define FT_PATH_CFG_MASK            "@sysconfdir@/cfg/mask.cfg"
-+#define FT_PATH_CFG_XLATE           "@sysconfdir@/cfg/xlate.cfg"
- 
--#define FT_PATH_SYM_IP_PROT         "@localstatedir@/sym/ip-prot.sym"
--#define FT_PATH_SYM_IP_TYPE         "@localstatedir@/sym/ip-type.sym"
--#define FT_PATH_SYM_TCP_PORT        "@localstatedir@/sym/tcp-port.sym"
--#define FT_PATH_SYM_ASN             "@localstatedir@/sym/asn.sym"
--#define FT_PATH_SYM_TAG             "@localstatedir@/sym/tag.sym"
-+#define FT_PATH_SYM_IP_PROT         "@sysconfdir@/sym/ip-prot.sym"
-+#define FT_PATH_SYM_IP_TYPE         "@sysconfdir@/sym/ip-type.sym"
-+#define FT_PATH_SYM_TCP_PORT        "@sysconfdir@/sym/tcp-port.sym"
-+#define FT_PATH_SYM_ASN             "@sysconfdir@/sym/asn.sym"
-+#define FT_PATH_SYM_TAG             "@sysconfdir@/sym/tag.sym"
- 
- #endif /* FTPATHS_H */
-diff --git a/src/Makefile.am b/src/Makefile.am
-index c5ac63b..f85f427 100644
---- a/src/Makefile.am
-+++ b/src/Makefile.am
-@@ -7,7 +7,7 @@ DEFS=-I$(srcdir)/../lib -L$(srcdir)/../l
- 
- #AM_CFLAGS=-g -Wall -Wpointer-arith -Wstrict-prototypes -Wmissing-prototypes -Wmissing-declarations -Wredundant-decls -Wnested-externs
- #AM_CFLAGS=-O2
--AM_CFLAGS=-g -Wall
-+#AM_CFLAGS=-g -Wall
- 
- bin_PROGRAMS = flow-capture flow-cat flow-stat flow-print flow-dscan \
-         flow-send flow-receive flow-gen flow-expire \
-@@ -101,9 +101,9 @@ flow_filter_LDADD =  -lft @LEXLIB@ @YLIB
- flow_filter_DEPENDENCIES = ftbuild.h
- 
- flow_export_SOURCES = flow-export.c
--flow_export_LDFLAGS = -L../lib
--flow_export_CFLAGS = @MYSQLCFLAGS@ @PGSQLCFLAGS@
--flow_export_LDADD =  -lft @MYSQLLIB@ @PGSQLLIB@
-+flow_export_LDFLAGS = -L../lib $(MYSQLLDFLAGS) $(PGSQLLDFLAGS)
-+flow_export_CFLAGS = $(MYSQLCFLAGS) $(PGSQLCFLAGS)
-+flow_export_LDADD =  -lft $(MYSQLLIB) $(PGSQLLIB)
- flow_export_DEPENDENCIES = ftbuild.h
- 
- flow_header_SOURCES = flow-header.c
-@@ -117,8 +117,8 @@ flow_split_LDADD =  -lft
- flow_split_DEPENDENCIES = ftbuild.h
- 
- flow_xlate_SOURCES = flow-xlate.c
--flow_xlate_LDFLAGS = -L../lib
--flow_xlate_LDADD =  -lft @CRYPTOLIB@
-+flow_xlate_LDFLAGS = -L../lib $(CRYPTOLDFLAGS)
-+flow_xlate_LDADD =  -lft $(CRYPTOLIB)
- flow_xlate_DEPENDENCIES = ftbuild.h
- 
- flow_tag_SOURCES = flow-tag.c
--- 
-1.3.3
-

flow-tools-0.68-0005-Fix-breakage-on-64bit-platforms.patch

@@ -1,58 +0,0 @@
-From nobody Mon Sep 17 00:00:00 2001
-From: Paul P Komkoff Jr <i@stingr.net>
-Date: Sat, 10 Jun 2006 20:55:20 +0400
-Subject: [PATCH 5/8] Fix breakage on 64bit platforms.
-
-Due to variable size differences it is nesessary to create temporary
-variable of type time_t to hold the time.
-
----
-
- lib/ftfile.c |    8 +++++---
- 1 files changed, 5 insertions(+), 3 deletions(-)
-
-bc0750fd6719d64377e578373ad4325e1440eb6a
-diff --git a/lib/ftfile.c b/lib/ftfile.c
-index f25e849..ec17771 100644
---- a/lib/ftfile.c
-+++ b/lib/ftfile.c
-@@ -413,16 +413,17 @@ void ftfile_pathname(char *buf, int bsiz
-  int done, u_int32 ftime)
- {
-   struct tm *tm;
-+  time_t _t = (time_t) ftime;
-   char *prefix, dbuf[64];
-   long gmt_val;
-   char gmt_sign;
-   int tm_gmtoff;
-   
--  if (!(tm = localtime ((time_t*)&ftime))) {
-+  if (!(tm = localtime (&_t))) {
-     snprintf(buf, bsize, ".");
-   }
- 
--  tm_gmtoff = get_gmtoff(ftime);
-+  tm_gmtoff = get_gmtoff(_t);
- 
-   /* compute GMT offset */
-   if (tm_gmtoff >= 0) {
-@@ -502,6 +503,7 @@ void ftfile_pathname(char *buf, int bsiz
- int ftfile_mkpath(u_int32 ftime, int nest)
- {
-   struct tm *tm;
-+  time_t _t = (time_t) ftime;
-   char buf[32];
- 
-   /* no directories */
-@@ -512,7 +514,7 @@ int ftfile_mkpath(u_int32 ftime, int nes
-   if ((nest > 3) || (nest < -3))
-     return -1;
- 
--  if (!(tm = localtime ((time_t*)&ftime)))
-+  if (!(tm = localtime (&_t)))
-     return -1;
- 
-   if (nest == -1)
--- 
-1.3.3
-

flow-tools-0.68-0006-Fix-unitialized-variable-in-flow-send.patch

@@ -1,30 +0,0 @@
-From nobody Mon Sep 17 00:00:00 2001
-From: Paul P Komkoff Jr <i@stingr.net>
-Date: Sat, 10 Jun 2006 20:57:01 +0400
-Subject: [PATCH 6/8] Fix unitialized variable in flow-send
-
-Variable hdr_len in flow-send.c was not initialized prior to usage in case
-we aren't using spoofing. Fixed.
-
----
-
- src/flow-send.c |    2 +-
- 1 files changed, 1 insertions(+), 1 deletions(-)
-
-e9825a203d8b36576c8b8e92b4ab0ceb74cd0b05
-diff --git a/src/flow-send.c b/src/flow-send.c
-index 83ca926..ad87024 100644
---- a/src/flow-send.c
-+++ b/src/flow-send.c
-@@ -76,7 +76,7 @@ int main(int argc, char **argv)
-   u_int32 privacy_mask;
-   unsigned int v1, v2, one;
-   int i, n, ret, tx_delay, udp_sock;
--  int src_ip_spoof, hdr_len;
-+  int src_ip_spoof, hdr_len = 0;
-   void *rec;
- 
-   /* init fterr */
--- 
-1.3.3
-

flow-tools-0.68-0007-Add-extra-debugging-to-ftpdu_verify.patch

@@ -1,63 +0,0 @@
-From nobody Mon Sep 17 00:00:00 2001
-From: Ben Feinstein <ben@audiun.com>
-Date: Sat, 10 Jun 2006 20:59:13 +0400
-Subject: [PATCH 7/8] Add extra debugging to ftpdu_verify()
-
----
-
- lib/ftdecode.c |   16 +++++++++++++---
- 1 files changed, 13 insertions(+), 3 deletions(-)
-
-6c73ed47b26944f97fa8d5cfed1719b8146c124a
-diff --git a/lib/ftdecode.c b/lib/ftdecode.c
-index ff6b0cf..8884db9 100644
---- a/lib/ftdecode.c
-+++ b/lib/ftdecode.c
-@@ -122,8 +122,10 @@ int ftpdu_verify(struct ftpdu *ftpdu)
-   ret = -1;
- 
-   /* enough bytes to decode the count and version? */
--  if (ftpdu->bused < 4)
-+  if (ftpdu->bused < 4) {
-+    fterr_warnx("not enough bytes to decode the count and version.");
-     goto ftpdu_verify_out_quick;
-+  }
- 
-   ph = (struct ftpdu_header*)&ftpdu->buf;
- 
-@@ -158,15 +160,22 @@ #endif /* LITTLE_ENDIAN */
-     case 5:
- 
-       /* max PDU's in record */
--      if (ph->count > FT_PDU_V5_MAXFLOWS)
-+      if (ph->count > FT_PDU_V5_MAXFLOWS) {
-+	fterr_warnx("too many pdus (%d) in record, max %d", ph->count,
-+		FT_PDU_V5_MAXFLOWS);
-         goto ftpdu_verify_out;
-+      }
-+
- 
-       size = offsetof(struct ftpdu_v5, records) +
-              ph->count * sizeof (struct ftrec_v5);
- 
-       /* PDU received size == PDU expected size? */
--      if (size != ftpdu->bused)
-+      if (size != ftpdu->bused) {
-+        fterr_warnx("pdu received size was wrong.  expected %d got %d",
-+                ftpdu->bused, size);
-         goto ftpdu_verify_out;
-+      }
- 
-       ftpdu->ftv.d_version = 5;
-       ftpdu->decodef = fts3rec_pdu_v5_decode;
-@@ -516,6 +525,7 @@ #endif /* LITTLE_ENDIAN */
-       break; /* 8 */
- 
-       default:
-+	  fterr_warnx("ftpdu version not set.");
-           goto ftpdu_verify_out;
- 
-   } /* switch ph->version */
--- 
-1.3.3
-

flow-tools-0.68-0008-Fix-unitialized-variable-in-flow-export.c.patch

@@ -1,31 +0,0 @@
-From nobody Mon Sep 17 00:00:00 2001
-From: Ben Feinstein <ben@audiun.com>
-Date: Sat, 10 Jun 2006 21:01:04 +0400
-Subject: [PATCH 8/8] Fix unitialized variable in flow-export.c
-
-Without this patch, flow-export utility will misformat its SQL output when
-using the MySQL output format causing the export to fail.  Specifcally, the
-commas between the fields are getting mangled.
-
----
-
- src/flow-export.c |    2 +-
- 1 files changed, 1 insertions(+), 1 deletions(-)
-
-bcb0b33cc9bb9427726db853a093d081dc77a1c6
-diff --git a/src/flow-export.c b/src/flow-export.c
-index 52ae4d2..22b0330 100644
---- a/src/flow-export.c
-+++ b/src/flow-export.c
-@@ -961,7 +961,7 @@ #endif /* PGSQL */
- 
- int fmt_xfields_type(char *buf, u_int64 xfield)
- {
--  int comma;
-+  int comma = 0;
- 
-   buf[0] = 0;
- 
--- 
-1.3.3
-

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 <ftlib.h>
+ #include "acl2.h"
+ #include <stdio.h> /* 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;

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);

flow-tools.spec

@@ -1,22 +1,45 @@
-Version: 0.68
+# Does not support openssl 1.1
+%if 0%{?fedora}
+%bcond_with  openssl
+%else
+%bcond_without  openssl
+%endif
+
+%global username flow-tools
+%global homedir %{_localstatedir}/%{name}
+%global gecos "Network flow monitoring"
+
+Version: 0.68.5.1
 Name: flow-tools
 Summary: Tool set for working with NetFlow data
-Release: 11%{?dist}
+Release: 45%{?dist}
-Group: Applications/System
+# Automatically converted from old format: BSD - review is highly recommended.
-License: BSD 
+License: LicenseRef-Callaway-BSD 
-URL: http://www.splintered.net/sw/flow-tools/
+URL: http://code.google.com/p/%{name}/
-Source0: ftp://ftp.eng.oar.net/pub/flow-tools/flow-tools-%{version}.tar.gz
+Source0: http://%{name}.googlecode.com/files/%{name}-%{version}.tar.bz2
-Patch1: flow-tools-0.68-0001-Fix-first-line-of-included-python-scripts.patch
+Source1: flow-capture.service
-Patch2: flow-tools-0.68-0002-Fix-an-invalid-lvalue-in-assignment-compile-error.patch
+Source2: flow-capture.sysconfig
-Patch3: flow-tools-0.68-0003-Avoid-external-debug-variable.patch
+Patch0:  flow-werror-fix.patch
-Patch4: flow-tools-0.68-0004-Make-flow-tools-more-FHS-compliant-and-buildable-by-newer-toolchain.patch
+# Fix extern usage
-Patch5: flow-tools-0.68-0005-Fix-breakage-on-64bit-platforms.patch
+Patch1:  flow-tools-extern.patch
-Patch6: flow-tools-0.68-0006-Fix-unitialized-variable-in-flow-send.patch
+Patch2: flow-tools-c99.patch
-Patch7: flow-tools-0.68-0007-Add-extra-debugging-to-ftpdu_verify.patch
+
-Patch8: flow-tools-0.68-0008-Fix-unitialized-variable-in-flow-export.c.patch
+BuildRequires: gcc
+%if 0%{with openssl}
+BuildRequires: openssl-devel
+%endif
+BuildRequires: mariadb-connector-c-devel
+BuildRequires: libpq-devel
+BuildRequires: zlib-devel 
+BuildRequires: bison
+BuildRequires: flex
+BuildRequires: doxygen
+%if 0%{?fedora} >= 31
+BuildRequires: python3.12
+%endif
+BuildRequires: systemd-rpm-macros
+BuildRequires: make
 
-BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
-BuildRequires: openssl-devel mysql-devel postgresql-devel autoconf automake libtool zlib-devel bison flex tcp_wrappers
 
 %description
 Flow-tools is library and a collection of programs used to collect, 
@@ -29,8 +52,8 @@ contributed and are included in the distribution.
 
 %package devel
 Summary: Development files for flow-tools
-Group: Development/Libraries
+Requires: %{name} = %{version}-%{release}
-Requires: %{name} = %{version}-%{release} zlib-devel
+Requires: zlib-devel
 
 %description devel
 Flow-tools is library and a collection of programs used to collect,
@@ -44,54 +67,387 @@ contributed and are included in the distribution.
 This package contains header files required to build applications that use
 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,
+send, process, and generate reports from NetFlow data. The tools can be
+used together on a single server or distributed to multiple servers for
+large deployments. The flow-toools library provides an API for development
+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
+from flow data.
+
+%package docs
+Summary: HTML and other redundant docs for flow-tools
+Requires: %{name} = %{version}-%{release}
+
+%description docs
+Flow-tools is library and a collection of programs used to collect,
+send, process, and generate reports from NetFlow data. The tools can be
+used together on a single server or distributed to multiple servers for
+large deployments. The flow-toools library provides an API for development
+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 additional documentation, such as man pages in html format.
+
 %prep
-%setup -q
+%autosetup -p1
-%patch1 -p1
+# Remove /bin/env deps
-%patch2 -p1
+%if 0%{?fedora} >= 31
-%patch3 -p1
+sed -i '1s|^#!.*python|#!/usr/bin/python3|' bin/flow*
-%patch4 -p1
+python3.12 -m lib2to3 --write --nobackups bin/flow*
-%patch5 -p1
+%else
-%patch6 -p1
+sed -i '1s|^#!.*python|#!/usr/bin/python2|' bin/flow*
-%patch7 -p1
+%endif
-%patch8 -p1
+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 <<EOF
+u flow-tools - '%{gecos}' %{homedir} -
+EOF
 
 %build
-autoreconf -f -i -s
+export CFLAGS="$CFLAGS -std=gnu17"
-%configure --localstatedir=%{_localstatedir}/ft --sysconfdir=%{_sysconfdir}/flow-tools --enable-static=no --with-mysql --with-pgsql --with-openssl
+%configure \
-make RPM_OPT_FLAGS="$RPM_OPT_FLAGS" %{?_smp_mflags}
+  --localstatedir=%{_localstatedir}/%{name} \
+  --sysconfdir=%{_sysconfdir}/%{name} \
+  --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
+
+%make_build RPM_OPT_FLAGS="$RPM_OPT_FLAGS"
 
 %install
-rm -rf $RPM_BUILD_ROOT
+%make_install
-%makeinstall localstatedir=$RPM_BUILD_ROOT%{_localstatedir}/ft sysconfdir=$RPM_BUILD_ROOT%{_sysconfdir}/flow-tools
 find $RPM_BUILD_ROOT -type f -name "*.la" -exec rm -f {} ';'
-mkdir -p $RPM_BUILD_ROOT%{_localstatedir}/ft
+mkdir -p $RPM_BUILD_ROOT%{_localstatedir}/%{name}
+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
 
-%clean
+install -m0644 -D flow-tools.sysusers.conf %{buildroot}%{_sysusersdir}/flow-tools.conf
-rm -rf $RPM_BUILD_ROOT
 
-%post -p /sbin/ldconfig
 
-%postun -p /sbin/ldconfig
+
+%post
+/sbin/ldconfig
+%systemd_post flow-capture.service
+
+%preun
+%systemd_preun flow-capture.service
+
+%postun
+%systemd_postun flow-capture.service
 
 %files 
-%defattr(-,root,root)
+%doc README README.fork COPYING ChangeLog
-%doc README TODO COPYING SECURITY ChangeLog docs/*.html
+%{_mandir}/man1/flow-capture.1*
-%{_mandir}/man1/*
+%{_mandir}/man1/flow-cat.1*
-%{_bindir}/*
+%{_mandir}/man1/flow-dscan.1*
+%{_mandir}/man1/flow-expire.1*
+%{_mandir}/man1/flow-export.1*
+%{_mandir}/man1/flow-fanout.1*
+%{_mandir}/man1/flow-filter.1*
+%{_mandir}/man1/flow-gen.1*
+%{_mandir}/man1/flow-header.1*
+%{_mandir}/man1/flow-import.1*
+%{_mandir}/man1/flow-mask.1*
+%{_mandir}/man1/flow-merge.1*
+%{_mandir}/man1/flow-nfilter.1*
+%{_mandir}/man1/flow-print.1*
+%{_mandir}/man1/flow-receive.1*
+%{_mandir}/man1/flow-report.1*
+%{_mandir}/man1/flow-rptfmt.1*
+%{_mandir}/man1/flow-send.1*
+%{_mandir}/man1/flow-split.1*
+%{_mandir}/man1/flow-stat.1*
+%{_mandir}/man1/flow-tag.1*
+%{_mandir}/man1/flow-tools-examples.1*
+%{_mandir}/man1/flow-tools.1*
+%{_mandir}/man1/flow-xlate.1*
+%{_bindir}/flow-capture
+%{_bindir}/flow-cat
+%{_bindir}/flow-dscan
+%{_bindir}/flow-expire
+%{_bindir}/flow-export
+%{_bindir}/flow-fanout
+%{_bindir}/flow-filter
+%{_bindir}/flow-gen
+%{_bindir}/flow-header
+%{_bindir}/flow-import
+%{_bindir}/flow-mask
+%{_bindir}/flow-merge
+%{_bindir}/flow-nfilter
+%{_bindir}/flow-print
+%{_bindir}/flow-receive
+%{_bindir}/flow-report
+%{_bindir}/flow-rptfmt
+%{_bindir}/flow-send
+%{_bindir}/flow-split
+%{_bindir}/flow-stat
+%{_bindir}/flow-tag
+%{_bindir}/flow-xlate
 %{_libdir}/*.so.*
-%dir %{_sysconfdir}/flow-tools/
+%dir %{_sysconfdir}/%{name}/
-%dir %{_sysconfdir}/flow-tools/cfg/
+%dir %{_sysconfdir}/%{name}/cfg/
-%dir %{_sysconfdir}/flow-tools/sym/
+%dir %{_sysconfdir}/%{name}/sym/
-%config(noreplace) %{_sysconfdir}/flow-tools/cfg/*
+%config(noreplace) %{_sysconfdir}/%{name}/cfg/*
-%config(noreplace) %{_sysconfdir}/flow-tools/sym/*
+%config(noreplace) %{_sysconfdir}/%{name}/sym/*
-%{_localstatedir}/ft/
+%config(noreplace) %{_sysconfdir}/sysconfig/flow-capture
+%{_unitdir}/flow-capture.service
+%attr(-,flow-tools,flow-tools) %{_localstatedir}/%{name}/
+%dir %{_datadir}/%{name}/
+%{_datadir}/%{name}/*
+%{_sysusersdir}/flow-tools.conf
 
 %files devel
-%defattr(-,root,root,-)
 %{_libdir}/*.so
 %{_includedir}/*.h
 
+%files rrdtool
+%{_bindir}/flow-rpt2rrd
+%{_bindir}/flow-log2rrd
+%{_mandir}/man1/flow-rpt2rrd.1*
+%{_mandir}/man1/flow-log2rrd.1*
+
+%files docs
+%doc docs/*.html ChangeLog.old TODO INSTALL SECURITY
+
 %changelog
+* Wed Jul 23 2025 Fedora Release Engineering <releng@fedoraproject.org> - 0.68.5.1-45
+- Rebuilt for https://fedoraproject.org/wiki/Fedora_43_Mass_Rebuild
+
+* Tue Feb 11 2025 Zbigniew Jędrzejewski-Szmek <zbyszek@in.waw.pl> - 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 <releng@fedoraproject.org> - 0.68.5.1-43
+- Rebuilt for https://fedoraproject.org/wiki/Fedora_42_Mass_Rebuild
+
+* Wed Aug 28 2024 Miroslav Suchý <msuchy@redhat.com> - 0.68.5.1-42
+- convert license to SPDX
+
+* Wed Jul 17 2024 Fedora Release Engineering <releng@fedoraproject.org> - 0.68.5.1-41
+- Rebuilt for https://fedoraproject.org/wiki/Fedora_41_Mass_Rebuild
+
+* Wed Jan 24 2024 Fedora Release Engineering <releng@fedoraproject.org> - 0.68.5.1-40
+- Rebuilt for https://fedoraproject.org/wiki/Fedora_40_Mass_Rebuild
+
+* Fri Jan 19 2024 Fedora Release Engineering <releng@fedoraproject.org> - 0.68.5.1-39
+- Rebuilt for https://fedoraproject.org/wiki/Fedora_40_Mass_Rebuild
+
+* Wed Jul 19 2023 Fedora Release Engineering <releng@fedoraproject.org> - 0.68.5.1-38
+- Rebuilt for https://fedoraproject.org/wiki/Fedora_39_Mass_Rebuild
+
+* Thu Jan 19 2023 Florian Weimer <fweimer@redhat.com> - 0.68.5.1-37
+- C99 compatibility fixes (#2162330)
+
+* Thu Jan 19 2023 Fedora Release Engineering <releng@fedoraproject.org> - 0.68.5.1-36
+- Rebuilt for https://fedoraproject.org/wiki/Fedora_38_Mass_Rebuild
+
+* Thu Jul 21 2022 Fedora Release Engineering <releng@fedoraproject.org> - 0.68.5.1-35
+- Rebuilt for https://fedoraproject.org/wiki/Fedora_37_Mass_Rebuild
+
+* Thu Jan 20 2022 Fedora Release Engineering <releng@fedoraproject.org> - 0.68.5.1-34
+- Rebuilt for https://fedoraproject.org/wiki/Fedora_36_Mass_Rebuild
+
+* Wed Jul 21 2021 Fedora Release Engineering <releng@fedoraproject.org> - 0.68.5.1-33
+- Rebuilt for https://fedoraproject.org/wiki/Fedora_35_Mass_Rebuild
+
+* Mon Feb 08 2021 Pavel Raiskup <praiskup@redhat.com> - 0.68.5.1-32
+- rebuild for libpq ABI fix rhbz#1908268
+
+* Tue Jan 26 2021 Fedora Release Engineering <releng@fedoraproject.org> - 0.68.5.1-31
+- Rebuilt for https://fedoraproject.org/wiki/Fedora_34_Mass_Rebuild
+
+* Mon Jul 27 2020 Fedora Release Engineering <releng@fedoraproject.org> - 0.68.5.1-30
+- Rebuilt for https://fedoraproject.org/wiki/Fedora_33_Mass_Rebuild
+
+* Tue Jan 28 2020 Orion Poplawski <orion@nwra.com> - 0.68.5.1-29
+- Add patch to fix extern usage for gcc 10
+
+* Wed Aug 21 2019 Orion Poplawski <orio@nwra.com> - 0.68.5.1-28
+- Use python 3 for Fedora 31+ (bugz#1737952)
+
+* Tue Jul 30 2019 Orion Poplawski <orio@nwra.com> - 0.68.5.1-27
+- Fix systemd macro usage
+
+* Thu Jul 25 2019 Fedora Release Engineering <releng@fedoraproject.org> - 0.68.5.1-26
+- Rebuilt for https://fedoraproject.org/wiki/Fedora_31_Mass_Rebuild
+
+* Thu Jan 31 2019 Fedora Release Engineering <releng@fedoraproject.org> - 0.68.5.1-25
+- Rebuilt for https://fedoraproject.org/wiki/Fedora_30_Mass_Rebuild
+
+* Fri Jul 13 2018 Fedora Release Engineering <releng@fedoraproject.org> - 0.68.5.1-24
+- Rebuilt for https://fedoraproject.org/wiki/Fedora_29_Mass_Rebuild
+
+* Tue Feb 27 2018 Orion Poplawski <orio@nwra.com> - 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 <ignatenkobrain@fedoraproject.org> - 0.68.5.1-22
+- Escape macros in %%changelog
+
+* Wed Feb 07 2018 Fedora Release Engineering <releng@fedoraproject.org> - 0.68.5.1-21
+- Rebuilt for https://fedoraproject.org/wiki/Fedora_28_Mass_Rebuild
+
+* Wed Aug 02 2017 Fedora Release Engineering <releng@fedoraproject.org> - 0.68.5.1-20
+- Rebuilt for https://fedoraproject.org/wiki/Fedora_27_Binutils_Mass_Rebuild
+
+* Wed Jul 26 2017 Fedora Release Engineering <releng@fedoraproject.org> - 0.68.5.1-19
+- Rebuilt for https://fedoraproject.org/wiki/Fedora_27_Mass_Rebuild
+
+* Fri Feb 10 2017 Orion Poplawski <orion@cora.nwra.com> - 0.68.5.1-19
+- Build with openssl support - does not work with openssl 1.1
+
+* Fri Feb 10 2017 Fedora Release Engineering <releng@fedoraproject.org> - 0.68.5.1-18
+- Rebuilt for https://fedoraproject.org/wiki/Fedora_26_Mass_Rebuild
+
+* Wed Feb 03 2016 Fedora Release Engineering <releng@fedoraproject.org> - 0.68.5.1-17
+- Rebuilt for https://fedoraproject.org/wiki/Fedora_24_Mass_Rebuild
+
+* Wed Jun 17 2015 Fedora Release Engineering <rel-eng@lists.fedoraproject.org> - 0.68.5.1-16
+- Rebuilt for https://fedoraproject.org/wiki/Fedora_23_Mass_Rebuild
+
+* Sat Aug 16 2014 Fedora Release Engineering <rel-eng@lists.fedoraproject.org> - 0.68.5.1-15
+- Rebuilt for https://fedoraproject.org/wiki/Fedora_21_22_Mass_Rebuild
+
+* Tue Jun 17 2014 Marcin Juszkiewicz <mjuszkiewicz@redhat.com> - 0.68.5.1-14
+- fix syslog() calls to have string format
+
+* Sat Jun 07 2014 Fedora Release Engineering <rel-eng@lists.fedoraproject.org> - 0.68.5.1-13
+- Rebuilt for https://fedoraproject.org/wiki/Fedora_21_Mass_Rebuild
+
+* Sat Dec 21 2013 Paul Komkoff <i@stingr.net> - 0.68.5.1-12
+- bz#850114
+
+* Sat Sep 28 2013 Paul Komkoff <i@stingr.net> - 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
+
+* Sat Aug 03 2013 Fedora Release Engineering <rel-eng@lists.fedoraproject.org> - 0.68.5.1-9
+- Rebuilt for https://fedoraproject.org/wiki/Fedora_20_Mass_Rebuild
+
+* Wed Apr 10 2013 Jon Ciesla <limburgher@gmail.com> - 0.68.5.1-8
+- Migrate from fedora-usermgmt to guideline scriptlets.
+
+* Wed Feb 13 2013 Fedora Release Engineering <rel-eng@lists.fedoraproject.org> - 0.68.5.1-7
+- Rebuilt for https://fedoraproject.org/wiki/Fedora_19_Mass_Rebuild
+
+* Thu Jul 19 2012 Fedora Release Engineering <rel-eng@lists.fedoraproject.org> - 0.68.5.1-6
+- Rebuilt for https://fedoraproject.org/wiki/Fedora_18_Mass_Rebuild
+
+* Tue Apr 24 2012 Jon Ciesla <limburgher@gmail.com> - 0.68.5.1-5
+- Migrate to systemd, BZ 767392.
+
+* Fri Jan 13 2012 Fedora Release Engineering <rel-eng@lists.fedoraproject.org> - 0.68.5.1-4
+- Rebuilt for https://fedoraproject.org/wiki/Fedora_17_Mass_Rebuild
+
+* Mon Mar 28 2011 Orion Poplawski <orion@cora.nwra.com> - 0.68.5.1-3
+- Rebuild for new mysql
+- Add LDFLAGS for mysql on 64-bit
+
+* Tue Feb 08 2011 Fedora Release Engineering <rel-eng@lists.fedoraproject.org> - 0.68.5.1-2
+- Rebuilt for https://fedoraproject.org/wiki/Fedora_15_Mass_Rebuild
+
+* Fri Aug 27 2010 Paul P. Komkoff Jr <i@stingr.net> - 0.68.5.1
+- fix for EINTR while reading/writing in ftio.
+
+* Thu Feb 25 2010 Paul P Komkoff Jr <i@stingr.net> - 0.68.5
+- bunch of fixes from upstream
+
+* Fri Aug 21 2009 Tomas Mraz <tmraz@redhat.com> - 0.68.4.1-4
+- rebuilt with new openssl
+
+* Fri Jul 24 2009 Fedora Release Engineering <rel-eng@lists.fedoraproject.org> - 0.68.4.1-3
+- Rebuilt for https://fedoraproject.org/wiki/Fedora_12_Mass_Rebuild
+
+* Tue Feb 24 2009 Fedora Release Engineering <rel-eng@lists.fedoraproject.org> - 0.68.4.1-2
+- Rebuilt for https://fedoraproject.org/wiki/Fedora_11_Mass_Rebuild
+
+* Mon Feb  2 2009 Paul P Komkoff Jr <i@stingr.net> - 0.68.4.1-1
+- fix for pcap generation, by Dave Plonka
+- split out -rrdtool subpackage, for those who don't need rrdtool on their servers.
+
+* Sat Jan 24 2009 Caolán McNamara <caolanm@redhat.com> - 0.68.4-2
+- rebuild for dependencies
+
+* Mon Mar 31 2008 Paul P Komkoff Jr <i@stingr.net> - 0.68.4-1
+- New upstream version
+
+* Tue Feb 19 2008 Fedora Release Engineering <rel-eng@fedoraproject.org> - 0.68.4-0.2.rc1
+- Autorebuild for GCC 4.3
+
+* Tue Feb 19 2008 Paul P Komkoff Jr <i@stingr.net> - 0.68.4-0.1.rc1
+- new upstream release candidate
+
+* Fri Dec 07 2007 Release Engineering <rel-eng at fedoraproject dot org> - 0.68.3-2
+- Rebuild for deps
+
+* Mon Nov 12 2007 Paul P Komkoff Jr <i@stingr.net> - 0.68.3-1
+- new upstream release
+- build tools as PIE
+- get rid of ftpaths.h
+- do not ship ftconfig.c
+- do not require libft
+
+* Sat Nov  3 2007 Paul P Komkoff Jr <i@stingr.net> - 0.68.2-1
+- New upstream release
+
+* Thu Sep 13 2007 Orion Poplawski <orion@cora.nwra.com> - 0.68.1-2
+- Add user and init scripts
+
+* Sun Aug  5 2007 Paul P Komkoff Jr <i@stingr.net> - 0.68.1-1
+- New upstream release
+
+* Sun Jul 15 2007 Paul P Komkoff Jr <i@stingr.net> - 0.68.1-0.1.rc3
+- New upstream rc
+
+* Sun Jul 15 2007 Paul P Komkoff Jr <i@stingr.net> - 0.68.1-0.1.rc2
+- Switch to 0.68.1 fork
+- Drop all patches
+- Sanitize spec
+
+* Sun Mar 25 2007 Paul P Komkoff Jr <i@stingr.net> - 0.68-16
+- getopt() is now in unistd.h
+
+* Sun Mar 18 2007 Paul P Komkoff Jr <i@stingr.net> - 0.68-15
+- Add runtime dependency for python-rrdtool
+
+* Fri Dec 15 2006 Paul P. Komkoff Jr <i@stingr.net>
+- rebuilt
+
+* Thu Dec 14 2006 Jason L Tibbitts III <tibbs@math.uh.edu> - 0.68-13
+- Rebuild for new Postgres
+
+* Thu Nov 16 2006 Paul P Komkoff Jr <i@stingr.net> - 0.68-12
+- Fix flow report 72 (by reaper@surnet.ru) bz#212928
+
 * Sun Sep 10 2006 Paul P Komkoff Jr <i@stingr.net> - 0.68-11
 - rebuild
 
@@ -125,7 +481,7 @@ rm -rf $RPM_BUILD_ROOT
 - 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
@@ -139,10 +495,10 @@ rm -rf $RPM_BUILD_ROOT
 - Make libft shared library
 - Split to plain/devel
 
-* Fri Jan  7 2004 William Emmanuel S. Yu <wyu@ateneo.edu>
+* Fri Jan  9 2004 William Emmanuel S. Yu <wyu@ateneo.edu>
 - updated RPM file for version 0.67
 
-* Tue Aug  8 2003 William Emmanuel S. Yu <wyu@ateneo.edu>
+* Tue Aug  5 2003 William Emmanuel S. Yu <wyu@ateneo.edu>
 - fixed SQL bug
 - update flow-export documentation
 

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 */

sources

@@ -1 +1 @@
-c9e0a8b53c79611b6bffcb9d510a5a38  flow-tools-0.68.tar.gz
+b8f9a4be19ec22ea6d4031c40a6d5a63  flow-tools-0.68.5.1.tar.bz2