From 5314da15984198049738e9ca58b1b566fec403a7 Mon Sep 17 00:00:00 2001 From: Paul P Komkoff Jr Date: Nov 16 2006 23:03:36 +0000 Subject: Fix flow report 72 (by reaper@surnet.ru) bz212928 --- diff --git a/flow-tools-0.68.rpt72.patch b/flow-tools-0.68.rpt72.patch new file mode 100644 index 0000000..6ab2bf4 --- /dev/null +++ b/flow-tools-0.68.rpt72.patch @@ -0,0 +1,15 @@ +--- flow-tools-0.68/lib/ftstat.c.orig 2005-05-10 21:48:12.000000000 +0600 ++++ flow-tools-0.68/lib/ftstat.c 2006-04-10 14:59:28.000000000 +0600 +@@ -11673,10 +11673,10 @@ + ftch_recprefix_tag, ftch_recprefix_tagp); + + FT_RECGET_DSTADDR(cur,rec,*fo); +- FT_RECGET_DST_TAG(cur,rec,*fo); ++ FT_RECGET_SRC_TAG(cur,rec,*fo); + + ftch_recprefix_tag.prefix = cur.dstaddr; +- ftch_recprefix_tag.tag = cur.dst_tag; ++ ftch_recprefix_tag.tag = cur.src_tag; + + /* only use mask if option set */ + if (rpt->options & (FT_STAT_OPT_DST_PREFIX_MASK|FT_STAT_OPT_DST_PREFIX_LEN)) { diff --git a/flow-tools.spec b/flow-tools.spec index 164a8e2..c7121d3 100644 --- a/flow-tools.spec +++ b/flow-tools.spec @@ -1,7 +1,7 @@ Version: 0.68 Name: flow-tools Summary: Tool set for working with NetFlow data -Release: 11%{?dist} +Release: 12%{?dist} Group: Applications/System License: BSD URL: http://www.splintered.net/sw/flow-tools/ @@ -14,6 +14,7 @@ Patch5: flow-tools-0.68-0005-Fix-breakage-on-64bit-platforms.patch Patch6: flow-tools-0.68-0006-Fix-unitialized-variable-in-flow-send.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 +Patch9: flow-tools-0.68.rpt72.patch 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 @@ -54,6 +55,7 @@ libft. %patch6 -p1 %patch7 -p1 %patch8 -p1 +%patch9 -p1 %build autoreconf -f -i -s @@ -92,6 +94,9 @@ rm -rf $RPM_BUILD_ROOT %{_includedir}/*.h %changelog +* Thu Nov 16 2006 Paul P Komkoff Jr - 0.68-12 +- Fix flow report 72 (by reaper@surnet.ru) bz#212928 + * Sun Sep 10 2006 Paul P Komkoff Jr - 0.68-11 - rebuild