From 874562d514362bf63133a25690afbd50ad0d36c2 Mon Sep 17 00:00:00 2001 From: Jesse Keating Date: Sun, 20 Apr 2008 18:03:30 +0000 Subject: [PATCH 1/4] Initialize branch F-9 for flow-tools --- branch | 1 + 1 file changed, 1 insertion(+) create mode 100644 branch diff --git a/branch b/branch new file mode 100644 index 0000000..1c26f78 --- /dev/null +++ b/branch @@ -0,0 +1 @@ +F-9 From 06fb25abbf04c31dfc0b982b27e1e2e58c544cc3 Mon Sep 17 00:00:00 2001 From: Paul P Komkoff Jr Date: Tue, 3 Feb 2009 14:59:18 +0000 Subject: [PATCH 2/4] flow-tools-0.68.4.1-1: Upstream update, -rrdtool package split --- .cvsignore | 2 +- flow-tools.spec | 108 +++++++++++++++++++++++++++++++++++++++++++++--- sources | 2 +- 3 files changed, 104 insertions(+), 8 deletions(-) diff --git a/.cvsignore b/.cvsignore index cab314e..98b866e 100644 --- a/.cvsignore +++ b/.cvsignore @@ -1 +1 @@ -flow-tools-0.68.4.tar.bz2 +flow-tools-0.68.4.1.tar.bz2 diff --git a/flow-tools.spec b/flow-tools.spec index d449131..b40ff52 100644 --- a/flow-tools.spec +++ b/flow-tools.spec @@ -5,7 +5,7 @@ %global homedir %{_localstatedir}/%{name} %global gecos "Network flow monitoring" -Version: 0.68.4 +Version: 0.68.4.1 Name: flow-tools Summary: Tool set for working with NetFlow data Release: 1%{?dist} @@ -15,7 +15,6 @@ URL: http://code.google.com/p/%{name}/ Source0: http://%{name}.googlecode.com/files/%{name}-%{version}.tar.bz2 Source1: flow-capture.init Source2: flow-capture.sysconfig -Requires: rrdtool-python BuildRequires: openssl-devel mysql-devel postgresql-devel zlib-devel BuildRequires: bison flex tcp_wrappers-devel BuildRequires: fedora-usermgmt-devel doxygen @@ -54,6 +53,39 @@ 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 -q @@ -66,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 @@ -107,10 +142,53 @@ fi %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/ @@ -128,7 +206,25 @@ fi %{_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 +* Mon Feb 2 2009 Paul P Komkoff Jr - 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 - 0.68.4-2 +- rebuild for dependencies + * Mon Mar 31 2008 Paul P Komkoff Jr - 0.68.4-1 - New upstream version diff --git a/sources b/sources index 87d5125..3a5ebef 100644 --- a/sources +++ b/sources @@ -1 +1 @@ -5741720ad01b5a83a9bb7eaa991dcbb6 flow-tools-0.68.4.tar.bz2 +cee8aac4deb62953270183db2643cbb4 flow-tools-0.68.4.1.tar.bz2 From bb5fc533dfbc240dbb96cb8d28475476f6bfaa15 Mon Sep 17 00:00:00 2001 From: Bill Nottingham Date: Thu, 26 Nov 2009 01:28:21 +0000 Subject: [PATCH 3/4] Fix typo that causes a failure to update the common directory. (releng #2781) --- Makefile | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/Makefile b/Makefile index 3535a42..5323001 100644 --- a/Makefile +++ b/Makefile @@ -4,7 +4,7 @@ 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 +for d in common ../common ../../common ; do if [ -f $$d/Makefile.common ] ; then if [ -f $$d/CVS/Root -a -w $$d/Makefile.common ] ; then cd $$d ; cvs -Q update ; fi ; echo "$$d/Makefile.common" ; break ; fi ; done endef MAKEFILE_COMMON := $(shell $(find-makefile-common)) From 43ec4859783d083872adc580811fabf5dba90945 Mon Sep 17 00:00:00 2001 From: Fedora Release Engineering Date: Wed, 28 Jul 2010 14:34:51 +0000 Subject: [PATCH 4/4] dist-git conversion --- .cvsignore => .gitignore | 0 Makefile | 21 --------------------- branch | 1 - 3 files changed, 22 deletions(-) rename .cvsignore => .gitignore (100%) delete mode 100644 Makefile delete mode 100644 branch diff --git a/.cvsignore b/.gitignore similarity index 100% rename from .cvsignore rename to .gitignore diff --git a/Makefile b/Makefile deleted file mode 100644 index 5323001..0000000 --- a/Makefile +++ /dev/null @@ -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 $$d/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) diff --git a/branch b/branch deleted file mode 100644 index 1c26f78..0000000 --- a/branch +++ /dev/null @@ -1 +0,0 @@ -F-9