orion pushed to flow-tools (epel7). "Update to 0.68.5"
notifications at fedoraproject.org
notifications at fedoraproject.org
Mon Apr 13 21:34:51 UTC 2015
>From c4055b7c5a3962185a30fc579c5e6170dfd686e8 Mon Sep 17 00:00:00 2001
From: Orion Poplawski <orion at fedoraproject.org>
Date: Mon, 12 Jul 2010 15:08:35 +0000
Subject: Update to 0.68.5
diff --git a/.cvsignore b/.cvsignore
index dfa1622..05baf6d 100644
--- a/.cvsignore
+++ b/.cvsignore
@@ -1 +1 @@
-flow-tools-0.68.1.tar.bz2
+flow-tools-0.68.5.tar.bz2
diff --git a/flow-capture.init b/flow-capture.init
new file mode 100644
index 0000000..0931a32
--- /dev/null
+++ b/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 $?
diff --git a/flow-capture.sysconfig b/flow-capture.sysconfig
new file mode 100644
index 0000000..33a3d07
--- /dev/null
+++ b/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"
diff --git a/flow-tools.spec b/flow-tools.spec
index f6c4fa4..d1d6ea1 100644
--- a/flow-tools.spec
+++ b/flow-tools.spec
@@ -1,4 +1,11 @@
-Version: 0.68.1
+%bcond_without fedora
+
+%global uid 40
+%global username flow-tools
+%global homedir %{_localstatedir}/%{name}
+%global gecos "Network flow monitoring"
+
+Version: 0.68.5
Name: flow-tools
Summary: Tool set for working with NetFlow data
Release: 1%{?dist}
@@ -6,10 +13,19 @@ Group: Applications/System
License: BSD
URL: http://code.google.com/p/%{name}/
Source0: http://%{name}.googlecode.com/files/%{name}-%{version}.tar.bz2
-Requires: rrdtool-python
+Source1: flow-capture.init
+Source2: flow-capture.sysconfig
BuildRequires: openssl-devel mysql-devel postgresql-devel zlib-devel
-BuildRequires: bison flex tcp_wrappers
+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
+Provides: group(%username) = %uid
+Provides: user(%username) = %uid
+
%description
Flow-tools is library and a collection of programs used to collect,
@@ -37,8 +53,41 @@ 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
+Group: Applications/System
+Requires: %{name} = %{version}-%{release} rrdtool-python
+
+%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
+Group: Applications/System
+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 -qn %{name}-%{version}
+%setup -q
%build
%configure \
@@ -49,6 +98,9 @@ libft.
--with-postgresql \
--with-openssl
+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}
%install
@@ -56,27 +108,96 @@ 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%{_sysconfdir}/sysconfig
+install -m 0644 %SOURCE2 $RPM_BUILD_ROOT%{_sysconfdir}/sysconfig/flow-capture
%clean
rm -rf $RPM_BUILD_ROOT
-%post -p /sbin/ldconfig
+%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 || :
+
+%post
+/sbin/ldconfig
+/sbin/chkconfig --add flow-capture
-%postun -p /sbin/ldconfig
+%preun
+if [ $1 = 0 ]; then
+ /sbin/service flow-capture stop >/dev/null 2>&1
+ /sbin/chkconfig --del flow-capture
+fi
+
+%postun
+/sbin/ldconfig
+if [ "$1" -ge "1" ]; then
+ /sbin/service flow-capture condrestart >/dev/null 2>&1 || :
+fi
+
+%__fe_userdel %username &>/dev/null || :
+%__fe_groupdel %username &>/dev/null || :
%files
%defattr(-,root,root)
-%doc README README.fork INSTALL TODO COPYING SECURITY ChangeLog ChangeLog.old
-%doc docs/*.html
-%{_mandir}/man1/*
-%{_bindir}/*
+%doc README README.fork COPYING ChangeLog
+%{_mandir}/man1/flow-capture.1*
+%{_mandir}/man1/flow-cat.1*
+%{_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}/%{name}/
%dir %{_sysconfdir}/%{name}/cfg/
%dir %{_sysconfdir}/%{name}/sym/
%config(noreplace) %{_sysconfdir}/%{name}/cfg/*
%config(noreplace) %{_sysconfdir}/%{name}/sym/*
-%{_localstatedir}/%{name}/
+%config(noreplace) %{_sysconfdir}/sysconfig/flow-capture
+%{_initrddir}/flow-capture
+%attr(-,flow-tools,flow-tools) %{_localstatedir}/%{name}/
%dir %{_datadir}/%{name}/
%{_datadir}/%{name}/*
@@ -85,7 +206,62 @@ rm -rf $RPM_BUILD_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
+* Thu Feb 25 2010 Paul P Komkoff Jr <i at stingr.net> - 0.68.5
+- bunch of fixes from upstream
+
+* Fri Aug 21 2009 Tomas Mraz <tmraz at redhat.com> - 0.68.4.1-4
+- rebuilt with new openssl
+
+* Fri Jul 24 2009 Fedora Release Engineering <rel-eng at 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 at 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 at 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 at redhat.com> - 0.68.4-2
+- rebuild for dependencies
+
+* Mon Mar 31 2008 Paul P Komkoff Jr <i at stingr.net> - 0.68.4-1
+- New upstream version
+
+* Tue Feb 19 2008 Fedora Release Engineering <rel-eng at fedoraproject.org> - 0.68.4-0.2.rc1
+- Autorebuild for GCC 4.3
+
+* Tue Feb 19 2008 Paul P Komkoff Jr <i at 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 at 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 at stingr.net> - 0.68.2-1
+- New upstream release
+
+* Thu Sep 13 2007 Orion Poplawski <orion at cora.nwra.com> - 0.68.1-2
+- Add user and init scripts
+
* Sun Aug 5 2007 Paul P Komkoff Jr <i at stingr.net> - 0.68.1-1
- New upstream release
diff --git a/import.log b/import.log
new file mode 100644
index 0000000..26a1cff
--- /dev/null
+++ b/import.log
@@ -0,0 +1 @@
+flow-tools-0_68_5-1_el6:EL-5:flow-tools-0.68.5-1.el6.src.rpm:1278947297
diff --git a/sources b/sources
index 70affe8..bc93b26 100644
--- a/sources
+++ b/sources
@@ -1 +1 @@
-b8388d0f81ce49e4ca97d9f79da3a2a5 flow-tools-0.68.1.tar.bz2
+3c5e75da2822ab6b4947c928c09ea365 flow-tools-0.68.5.tar.bz2
--
cgit v0.10.2
http://pkgs.fedoraproject.org/cgit/flow-tools.git/commit/?h=epel7&id=c4055b7c5a3962185a30fc579c5e6170dfd686e8
More information about the scm-commits
mailing list