Some cleanups: removed 0.67-debug.patch as debug variable is defined globally in...

Package-Manager: portage-2.1-r2

diff --git a/net-analyzer/flow-tools/ChangeLog b/net-analyzer/flow-tools/ChangeLog
index 88d50ca87ba423d141189e74f80aca63e67d2d00..77501d33e2c0271ede247802ac5f5fccc40d8f41 100644 (file)
--- a/net-analyzer/flow-tools/ChangeLog
+++ b/net-analyzer/flow-tools/ChangeLog
@@ -1,6 +1,17 @@
 # ChangeLog for net-analyzer/flow-tools
 # Copyright 2002-2006 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/net-analyzer/flow-tools/ChangeLog,v 1.20 2006/09/05 17:56:56 pva Exp $
+# $Header: /var/cvsroot/gentoo-x86/net-analyzer/flow-tools/ChangeLog,v 1.21 2006/09/07 06:42:51 pva Exp $
+
+*flow-tools-0.68-r3 (07 Sep 2006)
+
+  07 Sep 2006; Peter Volkov <pva@gentoo.org>
+  +files/flow-tools-0.68-fix-a-zillion-warnings-updated.diff, metadata.xml,
+  +flow-tools-0.68-r3.ebuild:
+  Some cleanups: removed 0.67-debug.patch as debug variable is defined
+  globally in this version. Fixed possible problem on amd64 and both this fix
+  and gcc-4.1 fix integrated into
+  flow-tools-0.68-fix-a-zillion-warnings-updated.diff. Updated longdescription
+  in metadata.xml
 
   05 Sep 2006; Peter Volkov <pva@gentoo.org>
   +files/flow-tools-0.68-gcc-4.1-fix.patch, flow-tools-0.68-r2.ebuild:

diff --git a/net-analyzer/flow-tools/Manifest b/net-analyzer/flow-tools/Manifest
index 4e4332a0f96e8d37e085fa3186d061d0b628c94e..0217d4aaf62f5c839b8805aba97842cc69685a2b 100644 (file)
--- a/net-analyzer/flow-tools/Manifest
+++ b/net-analyzer/flow-tools/Manifest
@@ -22,6 +22,10 @@ AUX flow-tools-0.67-nodebug.patch 933 RMD160 fe974a8a69f168783d7c77ca6aaf302010f
 MD5 f16f4ba51648f2b7f0e3830bc7670f6e files/flow-tools-0.67-nodebug.patch 933
 RMD160 fe974a8a69f168783d7c77ca6aaf302010ffcacb files/flow-tools-0.67-nodebug.patch 933
 SHA256 e862d823543f422319c31e305149b25a0d74ffbc9d0ee98ec756a90fc053b373 files/flow-tools-0.67-nodebug.patch 933
+AUX flow-tools-0.68-fix-a-zillion-warnings-updated.diff 19404 RMD160 81535106be145c56a6a201125ad1cd137ec25378 SHA1 fad3da5429d8d3edef5ea9af09cac11484c4b159 SHA256 03991fe055eae71b58d7ac1b7cb1b4cdfe33566e9ee8c0cd99144b583bb2affe
+MD5 f314eeae896fbee31ee20e8023f0b11c files/flow-tools-0.68-fix-a-zillion-warnings-updated.diff 19404
+RMD160 81535106be145c56a6a201125ad1cd137ec25378 files/flow-tools-0.68-fix-a-zillion-warnings-updated.diff 19404
+SHA256 03991fe055eae71b58d7ac1b7cb1b4cdfe33566e9ee8c0cd99144b583bb2affe files/flow-tools-0.68-fix-a-zillion-warnings-updated.diff 19404
 AUX flow-tools-0.68-fix-a-zillion-warnings.diff 19710 RMD160 977d3cffa5f554aef6a1ae26b82d3950cabd8ff5 SHA1 167cc5c00c46c975a674e1602ffc94fc0243a4fb SHA256 9a220952a32c47ab33c865631adb0bbb6b82350600c806f0156ab3da888a9218
 MD5 98dc78d5d311ce19b972580774781796 files/flow-tools-0.68-fix-a-zillion-warnings.diff 19710
 RMD160 977d3cffa5f554aef6a1ae26b82d3950cabd8ff5 files/flow-tools-0.68-fix-a-zillion-warnings.diff 19710
@@ -47,7 +51,7 @@ MD5 94581c1ca18b1891395fe1f3daeb04ca files/linkme 283
 RMD160 663284e66edca80e03d88db3078cd93d6faca452 files/linkme 283
 SHA256 93cef6b11cb25a9e91b529030e66cd4c709f382993335f2c7252de89c36735da files/linkme 283
 DIST flow-tools-0.66.tar.gz 967711 RMD160 90d045a7c0ae52ed2c5009c66efd160a77b46346 SHA1 a4d48a5d2ff9608fe4da3202362ee73774773be7 SHA256 69a1da02eaabf1fd617ef92fcabf403672709b9adb19d45d8be932167c5fd62a
-DIST flow-tools-0.67.tar.gz 983667
+DIST flow-tools-0.67.tar.gz 983667 RMD160 5a681e642cd1fb1b00d8a0389b628db3b96e076d SHA1 1896dad27db0c89e3e14d86b30aed15581134335 SHA256 c5dc4551cad97f7ba967c9a8e31ce40e5a8b298460f6bebc379da41cf0e88c41
 DIST flow-tools-0.68.tar.gz 987151 RMD160 71bfd1a40cb34fae55b2769d93208d13b3b0a927 SHA1 6259263ac4fbf8a9394224e4053393fa756473c7 SHA256 69d5353b339f917fc141919db042b007d5c8d31c9ad1bc2f989a41aa41d629df
 EBUILD flow-tools-0.66.ebuild 988 RMD160 e1996cd785e18e89699cc010feac4f8c900e7bfd SHA1 825a18595a39f0d2aa0301f6f618b02531d7a127 SHA256 b7c8bd61e92c97893e826956411ac89dec618282b19ec9f324c327e9296e7343
 MD5 62eae60ca698340c11359a45b993c262 flow-tools-0.66.ebuild 988
@@ -65,24 +69,28 @@ EBUILD flow-tools-0.68-r2.ebuild 2679 RMD160 974389b18df919049c0e3dd8ae7acbd281e
 MD5 69e2ede41dc9b40364706cb9c19781ec flow-tools-0.68-r2.ebuild 2679
 RMD160 974389b18df919049c0e3dd8ae7acbd281e088c8 flow-tools-0.68-r2.ebuild 2679
 SHA256 d9b674ad55f01de980b3514633cee448ec0ef531d8e585215b407ea1ab55715f flow-tools-0.68-r2.ebuild 2679
+EBUILD flow-tools-0.68-r3.ebuild 2591 RMD160 54675bd01cc813c3c822b64b5f49a577528f2716 SHA1 c1713545e5b6df8142114e804f1e0e93245c09bf SHA256 b74d6a9f731ef56fb11d127c137df1cd477452eb197bca5b8ad367bd7ed9e5d9
+MD5 7ce859007426b4802a2d5402b93b6693 flow-tools-0.68-r3.ebuild 2591
+RMD160 54675bd01cc813c3c822b64b5f49a577528f2716 flow-tools-0.68-r3.ebuild 2591
+SHA256 b74d6a9f731ef56fb11d127c137df1cd477452eb197bca5b8ad367bd7ed9e5d9 flow-tools-0.68-r3.ebuild 2591
 EBUILD flow-tools-0.68.ebuild 2153 RMD160 0b84e1041cc1728e1570b4cbcd498dcace5c92b6 SHA1 bee0aa97b53bde56a792b83fb3417c669dd323e2 SHA256 f6b1f28187bd32adabaf535f5d918e6a51498c71fda4880c82a9f8dc283a7d63
 MD5 0641e7bbc38958e05e2749d438dd2e22 flow-tools-0.68.ebuild 2153
 RMD160 0b84e1041cc1728e1570b4cbcd498dcace5c92b6 flow-tools-0.68.ebuild 2153
 SHA256 f6b1f28187bd32adabaf535f5d918e6a51498c71fda4880c82a9f8dc283a7d63 flow-tools-0.68.ebuild 2153
-MISC ChangeLog 4014 RMD160 3dad252555ae3c58e622ec19e891c7434455629d SHA1 96a6fc0f686a3d95c922bc28925b3820faab60a2 SHA256 683761d1e692c6e83a884dfef3c9b4a1472dfe9f44849b4b442df99ce9af2afa
-MD5 700fb0746c457f8ed35a2ee69cfde1de ChangeLog 4014
-RMD160 3dad252555ae3c58e622ec19e891c7434455629d ChangeLog 4014
-SHA256 683761d1e692c6e83a884dfef3c9b4a1472dfe9f44849b4b442df99ce9af2afa ChangeLog 4014
-MISC metadata.xml 261 RMD160 1600f5728c5a50cb5f20127dfdfe702bac4dd34d SHA1 9777bd823f03d0f87f382c264e1c8b22ba69609a SHA256 9017e869f21985d99429fb172897e2090a40c06fb7964d5a99816b3daa0c0519
-MD5 657939d746987d289ffa06516ae69d46 metadata.xml 261
-RMD160 1600f5728c5a50cb5f20127dfdfe702bac4dd34d metadata.xml 261
-SHA256 9017e869f21985d99429fb172897e2090a40c06fb7964d5a99816b3daa0c0519 metadata.xml 261
+MISC ChangeLog 4481 RMD160 45d5c722295291f18eb9ac4891bf67d31e5213b6 SHA1 017e1184b6c39d980a75fe7676207c22403e6ddf SHA256 a845c8582b4979d888c5afdc4d6ecdf5a09f61a0af4ba7802009b603301e5aab
+MD5 c1ffcb7a2af9fd443b37f2469f91246d ChangeLog 4481
+RMD160 45d5c722295291f18eb9ac4891bf67d31e5213b6 ChangeLog 4481
+SHA256 a845c8582b4979d888c5afdc4d6ecdf5a09f61a0af4ba7802009b603301e5aab ChangeLog 4481
+MISC metadata.xml 706 RMD160 48d179b230fd01a49853e73fc46f534373bb8488 SHA1 44ba0dd063806d48e8d6aa341c0bc28ea2d932b3 SHA256 4d947ce226ad090ea1274c75c6b360cb14ffdcd2f5730b0e596098aecb1b8daf
+MD5 eaeb632d289698ba9b0c30e0a014a5dd metadata.xml 706
+RMD160 48d179b230fd01a49853e73fc46f534373bb8488 metadata.xml 706
+SHA256 4d947ce226ad090ea1274c75c6b360cb14ffdcd2f5730b0e596098aecb1b8daf metadata.xml 706
 MD5 26ea9970d3da85bfc8580592382b4bc7 files/digest-flow-tools-0.66 247
 RMD160 a80d05a0cbaeb747b9ceb959dbcdb48c29f5c45f files/digest-flow-tools-0.66 247
 SHA256 764c481473f7b45ec8594574a51b54d7d963d786cec79244c3dd00e6b8e3b69b files/digest-flow-tools-0.66 247
-MD5 1101576a17a0a70941408d279474aa97 files/digest-flow-tools-0.67 67
-RMD160 6ae1a858c4652b2a07717985d1beba3a25ef9634 files/digest-flow-tools-0.67 67
-SHA256 24917f146f2a891b802658b0484ee1afdcbe385fd3b21755093ffe0ff8290f8e files/digest-flow-tools-0.67 67
+MD5 79a20375094d1ad379fbed337a5c5e83 files/digest-flow-tools-0.67 247
+RMD160 04afd4803da808a7d5331a88c3e39454aab335aa files/digest-flow-tools-0.67 247
+SHA256 e5ef561a51f4243be4fec610abef197aa9d9e6c998de1e38321d95574fa7b5af files/digest-flow-tools-0.67 247
 MD5 fcf03a34dcb47c4b9b40e694a5f51c6c files/digest-flow-tools-0.68 247
 RMD160 cc28190761ebc35199c32d71a026d51c01dd67ab files/digest-flow-tools-0.68 247
 SHA256 2a161650036d0ba16f3063c2faa0d7216de6320edc9865de530b0ec6c970b1a6 files/digest-flow-tools-0.68 247
@@ -92,3 +100,6 @@ SHA256 2a161650036d0ba16f3063c2faa0d7216de6320edc9865de530b0ec6c970b1a6 files/di
 MD5 fcf03a34dcb47c4b9b40e694a5f51c6c files/digest-flow-tools-0.68-r2 247
 RMD160 cc28190761ebc35199c32d71a026d51c01dd67ab files/digest-flow-tools-0.68-r2 247
 SHA256 2a161650036d0ba16f3063c2faa0d7216de6320edc9865de530b0ec6c970b1a6 files/digest-flow-tools-0.68-r2 247
+MD5 fcf03a34dcb47c4b9b40e694a5f51c6c files/digest-flow-tools-0.68-r3 247
+RMD160 cc28190761ebc35199c32d71a026d51c01dd67ab files/digest-flow-tools-0.68-r3 247
+SHA256 2a161650036d0ba16f3063c2faa0d7216de6320edc9865de530b0ec6c970b1a6 files/digest-flow-tools-0.68-r3 247

diff --git a/net-analyzer/flow-tools/files/digest-flow-tools-0.67 b/net-analyzer/flow-tools/files/digest-flow-tools-0.67
index 34f12fdc230a39292ac6c99a1c8181ff4ba29b45..463e830d9dea406b1c4072f8241443c4276745e8 100644 (file)
--- a/net-analyzer/flow-tools/files/digest-flow-tools-0.67
+++ b/net-analyzer/flow-tools/files/digest-flow-tools-0.67
@@ -1 +1,3 @@
 MD5 0ee0a2830effa554d1925236aad6b4fe flow-tools-0.67.tar.gz 983667
+RMD160 5a681e642cd1fb1b00d8a0389b628db3b96e076d flow-tools-0.67.tar.gz 983667
+SHA256 c5dc4551cad97f7ba967c9a8e31ce40e5a8b298460f6bebc379da41cf0e88c41 flow-tools-0.67.tar.gz 983667

diff --git a/net-analyzer/flow-tools/files/digest-flow-tools-0.68-r3 b/net-analyzer/flow-tools/files/digest-flow-tools-0.68-r3
new file mode 100644 (file)
index 0000000..3db6eb9
--- /dev/null
+++ b/net-analyzer/flow-tools/files/digest-flow-tools-0.68-r3
@@ -0,0 +1,3 @@
+MD5 c9e0a8b53c79611b6bffcb9d510a5a38 flow-tools-0.68.tar.gz 987151
+RMD160 71bfd1a40cb34fae55b2769d93208d13b3b0a927 flow-tools-0.68.tar.gz 987151
+SHA256 69d5353b339f917fc141919db042b007d5c8d31c9ad1bc2f989a41aa41d629df flow-tools-0.68.tar.gz 987151

diff --git a/net-analyzer/flow-tools/files/flow-tools-0.68-fix-a-zillion-warnings-updated.diff b/net-analyzer/flow-tools/files/flow-tools-0.68-fix-a-zillion-warnings-updated.diff
new file mode 100644 (file)
index 0000000..2adfaa2
--- /dev/null
+++ b/net-analyzer/flow-tools/files/flow-tools-0.68-fix-a-zillion-warnings-updated.diff
@@ -0,0 +1,687 @@
+diff -Naur flow-tools-0.68.orig/lib/ftchash.c flow-tools-0.68/lib/ftchash.c
+--- flow-tools-0.68.orig/lib/ftchash.c 2003-08-12 22:04:25.000000000 +0400
++++ flow-tools-0.68/lib/ftchash.c      2006-09-06 22:42:12.000000000 +0400
+@@ -326,7 +326,7 @@
+       (char*)ftch->traverse_chunk->base+ftch->traverse_chunk->next) {
+ 
+       ret = ftch->traverse_rec;
+-      (char*)ftch->traverse_rec += ftch->d_size;
++      ftch->traverse_rec = ((char*)ftch->traverse_rec) + ftch->d_size;
+       return ret;
+ 
+     } else {
+diff -Naur flow-tools-0.68.orig/lib/ftfil.c flow-tools-0.68/lib/ftfil.c
+--- flow-tools-0.68.orig/lib/ftfil.c   2004-01-05 20:55:23.000000000 +0300
++++ flow-tools-0.68/lib/ftfil.c        2006-09-06 22:42:12.000000000 +0400
+@@ -2460,7 +2460,7 @@
+   struct stat sb;
+   struct jump *jmp;
+   struct line_parser lp;
+-  int fd, ret, found;
++  int fd, ret, found = 0;
+   char *buf, *buf2, *c;
+   char sbuf[FT_LP_MAXLINE];
+ 
+@@ -2934,7 +2934,7 @@
+ static int parse_definition_match(struct line_parser *lp, struct ftfil *ftfil)
+ {
+   struct ftfil_match_item *ftmi;
+-  struct ftfil_match *ftm;
++  struct ftfil_match *ftm = NULL;
+   char *c;
+ 
+   if (!lp->cur_def) {
+@@ -3057,7 +3057,7 @@
+   struct ftfil_primitive *ftfp;
+   struct ftfil_def *ftfd;
+   int type, found, valid;
+-  void *eval;
++  void *eval = NULL;
+ 
+   /* foreach definition */
+   FT_SLIST_FOREACH(ftfd, &ftfil->defs, chain) {
+@@ -4984,7 +4984,7 @@
+   char *p, *q, *r, c;
+   int j, flag;
+   unsigned i, i2;
+-  int permit,deny;
++  int permit = 0, deny = 0;
+   u_int32 val;
+ 
+   if (mode == FT_FIL_MODE_DENY) {
+diff -Naur flow-tools-0.68.orig/lib/ftfile.c flow-tools-0.68/lib/ftfile.c
+--- flow-tools-0.68.orig/lib/ftfile.c  2003-02-13 05:38:42.000000000 +0300
++++ flow-tools-0.68/lib/ftfile.c       2006-09-06 22:42:12.000000000 +0400
+@@ -417,12 +417,13 @@
+   long gmt_val;
+   char gmt_sign;
+   int tm_gmtoff;
++  time_t _ftime = (time_t)ftime;
+   
+-  if (!(tm = localtime ((time_t*)&ftime))) {
++  if (!(tm = localtime (&_ftime))) {
+     snprintf(buf, bsize, ".");
+   }
+ 
+-  tm_gmtoff = get_gmtoff(ftime);
++  tm_gmtoff = get_gmtoff(_ftime);
+ 
+   /* compute GMT offset */
+   if (tm_gmtoff >= 0) {
+@@ -503,6 +504,7 @@
+ {
+   struct tm *tm;
+   char buf[32];
++  time_t _ftime = (time_t)ftime;
+ 
+   /* no directories */
+   if (nest == 0)
+@@ -512,7 +514,7 @@
+   if ((nest > 3) || (nest < -3))
+     return -1;
+ 
+-  if (!(tm = localtime ((time_t*)&ftime)))
++  if (!(tm = localtime (&_ftime)))
+     return -1;
+ 
+   if (nest == -1)
+diff -Naur flow-tools-0.68.orig/lib/ftio.c flow-tools-0.68/lib/ftio.c
+--- flow-tools-0.68.orig/lib/ftio.c    2003-02-24 03:51:47.000000000 +0300
++++ flow-tools-0.68/lib/ftio.c 2006-09-06 22:42:12.000000000 +0400
+@@ -2257,6 +2257,7 @@
+ {
+ 
+   int nleft, nread;
++  char *p = ptr;
+ 
+   nleft = nbytes;
+   while (nleft > 0) {
+@@ -2267,7 +2268,7 @@
+         break;
+ 
+       nleft -= nread;
+-      (char*)ptr += nread;
++      p += nread;
+   }
+   return (nbytes - nleft);
+ } /* readn */
+@@ -2284,6 +2285,7 @@
+ {
+ 
+   int nleft, nwritten;
++  char *p = ptr;
+ 
+   nleft = nbytes;
+   while (nleft > 0) {
+@@ -2292,7 +2294,7 @@
+       return(nwritten); /* error */
+ 
+     nleft -= nwritten;
+-    (char*)ptr += nwritten;
++    p += nwritten;
+   }
+   return(nbytes - nleft);
+ } /* writen */
+diff -Naur flow-tools-0.68.orig/lib/ftmask.c flow-tools-0.68/lib/ftmask.c
+--- flow-tools-0.68.orig/lib/ftmask.c  2003-02-13 05:38:42.000000000 +0300
++++ flow-tools-0.68/lib/ftmask.c       2006-09-06 22:42:12.000000000 +0400
+@@ -134,7 +134,7 @@
+   struct stat sb;
+   struct jump *jmp;
+   struct line_parser lp;
+-  int fd, ret, found;
++  int fd, ret, found = 0;
+   char *buf, *buf2, *c;
+ 
+   ret = -1;
+diff -Naur flow-tools-0.68.orig/lib/ftstat.c flow-tools-0.68/lib/ftstat.c
+--- flow-tools-0.68.orig/lib/ftstat.c  2005-05-10 19:48:12.000000000 +0400
++++ flow-tools-0.68/lib/ftstat.c       2006-09-06 22:42:12.000000000 +0400
+@@ -151,7 +151,7 @@
+   struct A *B;\
+   struct tally tally;\
+   char fmt_buf1[32], fmt_buf[1024];\
+-  int len, fmt, sort_flags, sort_offset, comma;\
++  int len, fmt, sort_flags, sort_offset = 0, comma;\
+   fmt = FMT_JUST_LEFT;\
+   fmt_buf1[0] = fmt_buf[0] = 0;\
+   bzero(&tally, sizeof tally);\
+@@ -633,7 +633,7 @@
+   struct fts3rec_all2 cur;\
+   struct A *B;\
+   u_int32 duration_tmp;\
+-  double bps_tmp, pps_tmp;\
++  double bps_tmp = 0, pps_tmp = 0;\
+   B = rpt->data;\
+   STD_ACCUM;
+ 
+@@ -664,7 +664,7 @@
+   struct A *B;\
+   u_int32 hash;\
+   u_int32 duration_tmp;\
+-  double bps_tmp, pps_tmp;\
++  double bps_tmp = 0, pps_tmp = 0;\
+   bzero(&D, sizeof D);\
+   B = rpt->data;\
+   STD_ACCUM;
+@@ -2732,7 +2732,7 @@
+   struct stat sb;
+   struct jump *jmp;
+   struct line_parser lp;
+-  int fd, ret, found;
++  int fd, ret, found = 0;
+   char *buf, *buf2, *c;
+   char sbuf[FT_LP_MAXLINE];
+ 
+@@ -3214,7 +3214,7 @@
+   struct ftstat_rpt_item *ftsrpti;
+   struct ftstat_rpt_out *ftsro;
+   int ret, noclose, pipe, status;
+-  char fmt_tmp[64], fmt_buf[1024], path_buf[1024], *path_run;
++  char fmt_tmp[64], fmt_buf[1024], path_buf[1024], *path_run = NULL;
+   char *mode;
+ 
+   noclose = 0; /* fclose fp */
+diff -Naur flow-tools-0.68.orig/lib/fttag.c flow-tools-0.68/lib/fttag.c
+--- flow-tools-0.68.orig/lib/fttag.c   2004-01-05 20:55:37.000000000 +0300
++++ flow-tools-0.68/lib/fttag.c        2006-09-06 22:42:12.000000000 +0400
+@@ -209,7 +209,7 @@
+   struct stat sb;
+   struct jump *jmp;
+   struct line_parser lp;
+-  int fd, ret, found;
++  int fd, ret, found = 0;
+   char *buf, *buf2, *c;
+   char sbuf[FT_LP_MAXLINE];
+ 
+@@ -1477,7 +1477,7 @@
+   struct fttag_def_term *ftdt;
+   struct fttag_def_term_actions *ftdta;
+   struct fttag_action *fta;
+-  int i, found;
++  int i, found = 0;
+ 
+   /* foreach definition */
+   FT_SLIST_FOREACH(ftd, &fttag->defs, chain) {
+diff -Naur flow-tools-0.68.orig/lib/fttlv.c flow-tools-0.68/lib/fttlv.c
+--- flow-tools-0.68.orig/lib/fttlv.c   2003-02-13 05:38:43.000000000 +0300
++++ flow-tools-0.68/lib/fttlv.c        2006-09-06 22:42:12.000000000 +0400
+@@ -55,6 +55,7 @@
+ int fttlv_enc_uint32(void *buf, int buf_size, int flip, u_int16 t, u_int32 v)
+ {
+   u_int16 len;
++  char *p = buf;
+ 
+   if (buf_size < 8)
+     return -1;
+@@ -67,13 +68,13 @@
+     SWAPINT32(v);
+   }
+ 
+-  bcopy(&t, buf, 2);
+-  (char*)buf+= 2;
++  bcopy(&t, p, 2);
++  p += 2;
+ 
+-  bcopy(&len, buf, 2);
+-  (char*)buf+= 2;
++  bcopy(&len, p, 2);
++  p += 2;
+ 
+-  bcopy(&v, buf, 4);
++  bcopy(&v, p, 4);
+ 
+   return 8;
+ 
+@@ -94,6 +95,7 @@
+ int fttlv_enc_uint16(void *buf, int buf_size, int flip, u_int16 t, u_int16 v)
+ {
+   u_int16 len;
++  char *p = buf;
+ 
+   if (buf_size < 6)
+     return -1;
+@@ -106,13 +108,13 @@
+     SWAPINT16(v);
+   }
+ 
+-  bcopy(&t, buf, 2);
+-  (char*)buf+= 2;
++  bcopy(&t, p, 2);
++  p += 2;
+ 
+-  bcopy(&len, buf, 2);
+-  (char*)buf+= 2;
++  bcopy(&len, p, 2);
++  p += 2;
+ 
+-  bcopy(&v, buf, 2);
++  bcopy(&v, p, 2);
+ 
+   return 6;
+ 
+@@ -133,6 +135,7 @@
+ int fttlv_enc_uint8(void *buf, int buf_size, int flip, u_int16 t, u_int8 v)
+ {
+   u_int16 len;
++  char *p = buf;
+ 
+   if (buf_size < 5)
+     return -1;
+@@ -144,13 +147,13 @@
+     SWAPINT16(len);
+   }
+ 
+-  bcopy(&t, buf, 2);
+-  (char*)buf+= 2;
++  bcopy(&t, p, 2);
++  p += 2;
+ 
+-  bcopy(&len, buf, 2);
+-  (char*)buf+= 2;
++  bcopy(&len, p, 2);
++  p += 2;
+ 
+-  bcopy(&v, buf, 1);
++  bcopy(&v, p, 1);
+ 
+   return 5;
+ 
+@@ -171,7 +174,8 @@
+ int fttlv_enc_str(void *buf, int buf_size, int flip, u_int16 t, char *v)
+ {
+   u_int16 len, len2;
+-
++  char *p = buf;
++  
+   len = len2 = strlen(v)+1;
+ 
+   if (buf_size < 4+len)
+@@ -182,13 +186,13 @@
+     SWAPINT16(len);
+   }
+ 
+-  bcopy(&t, buf, 2);
+-  (char*)buf+= 2;
++  bcopy(&t, p, 2);
++  p += 2;
+ 
+-  bcopy(&len, buf, 2);
+-  (char*)buf+= 2;
++  bcopy(&len, p, 2);
++  p += 2;
+ 
+-  bcopy(v, buf, len);
++  bcopy(v, p, len);
+ 
+   return 4+len2;
+ 
+@@ -214,7 +218,8 @@
+ {
+   u_int16 len, len2;
+   int n;
+-
++  char *p = buf;
++  
+   n = strlen(name)+1;
+ 
+   len = len2 = n+2+4;
+@@ -229,19 +234,19 @@
+   if (buf_size < 4+len)
+     return -1;
+ 
+-  bcopy(&t, buf, 2);
+-  (char*)buf+= 2;
++  bcopy(&t, p, 2);
++  p += 2;
+ 
+-  bcopy(&len, buf, 2);
+-  (char*)buf+= 2;
++  bcopy(&len, p, 2);
++  p += 2;
+ 
+-  bcopy(&ip, buf, 4);
+-  (char*)buf += 4;
++  bcopy(&ip, p, 4);
++  p += 4;
+ 
+-  bcopy(&ifIndex, buf, 2);
+-  (char*)buf += 2;
++  bcopy(&ifIndex, p, 2);
++  p += 2;
+ 
+-  bcopy(name, buf, n);
++  bcopy(name, p, n);
+ 
+   return 4+len2;
+ 
+@@ -267,6 +272,7 @@
+ {
+   u_int16 len, len2;
+   int n,i,esize;
++  char *p = buf;
+ 
+   n = strlen(name)+1;
+   esize = (entries*2);
+@@ -286,22 +292,22 @@
+     SWAPINT16(entries);
+   }
+ 
+-  bcopy(&t, buf, 2);
+-  (char*)buf+= 2;
++  bcopy(&t, p, 2);
++  p += 2;
+ 
+-  bcopy(&len, buf, 2);
+-  (char*)buf+= 2;
++  bcopy(&len, p, 2);
++  p += 2;
+ 
+-  bcopy(&ip, buf, 4);
+-  (char*)buf += 4;
++  bcopy(&ip, p, 4);
++  p += 4;
+ 
+-  bcopy(&entries, buf, 2);
+-  (char*)buf += 2;
++  bcopy(&entries, p, 2);
++  p += 2;
+ 
+-  bcopy(ifIndex_list, buf, esize);
+-  (char*)buf += esize;
++  bcopy(ifIndex_list, p, esize);
++  p += esize;
+ 
+-  bcopy(name, buf, n);
++  bcopy(name, p, n);
+ 
+   return 4+len2;
+ 
+diff -Naur flow-tools-0.68.orig/lib/ftxlate.c flow-tools-0.68/lib/ftxlate.c
+--- flow-tools-0.68.orig/lib/ftxlate.c 2005-05-11 18:03:30.000000000 +0400
++++ flow-tools-0.68/lib/ftxlate.c      2006-09-06 22:42:12.000000000 +0400
+@@ -297,7 +297,7 @@
+   struct stat sb;
+   struct jump *jmp;
+   struct line_parser lp;
+-  int fd, ret, found;
++  int fd, ret, found = 0;
+   char *buf, *buf2, *c;
+   char sbuf[FT_LP_MAXLINE];
+ 
+@@ -1504,7 +1504,7 @@
+   struct ftxlate_def_term_actions *ftxta;
+   struct ftxlate_action *ftxa;
+   struct ftxlate_act_ip_addr_anon *ftxiaa;
+-  int i, found;
++  int i, found = 0;
+ 
+   /* foreach action do any additional initialization */
+   FT_SLIST_FOREACH(ftxa, &ftxlate->actions, chain) {
+diff -Naur flow-tools-0.68.orig/lib/radix.c flow-tools-0.68/lib/radix.c
+--- flow-tools-0.68.orig/lib/radix.c   2003-02-13 05:05:25.000000000 +0300
++++ flow-tools-0.68/lib/radix.c        2006-09-06 22:42:12.000000000 +0400
+@@ -902,6 +902,7 @@
+ rn_init(void)
+ {
+       char *cp, *cplim;
++      void **p = (void **)&mask_rnhead;
+       if (max_keylen == 0) {
+               printf("rn_init: radix functions require max_keylen be set\n");
+               return;
+@@ -912,7 +913,7 @@
+       addmask_key = cplim = rn_ones + max_keylen;
+       while (cp < cplim)
+               *cp++ = -1;
+-      if (rn_inithead((void **)&mask_rnhead, 0) == 0)
++      if (rn_inithead(p, 0) == 0)
+               panic("rn_init 2");
+ }
+ 
+diff -Naur flow-tools-0.68.orig/lib/support.c flow-tools-0.68/lib/support.c
+--- flow-tools-0.68.orig/lib/support.c 2003-02-13 05:38:43.000000000 +0300
++++ flow-tools-0.68/lib/support.c      2006-09-06 22:42:12.000000000 +0400
+@@ -286,7 +286,7 @@
+   struct in_addr *ina;
+   u_long addr = 0;
+   u_int n;
+-  int dns, shift;
++  int dns, shift = 0;
+   char *t;
+ 
+   /* if there is anything ascii in here, this may be a hostname */
+@@ -627,6 +627,8 @@
+ {
+   char *c, *cs, *c2, *p, *p2;
+   int len, ret, done, nodir;
++
++  c = cs = c2 = p = p2 = NULL;
+  
+   len = strlen(path);
+   c = (char*)0L;
+diff -Naur flow-tools-0.68.orig/src/flow-capture.c flow-tools-0.68/src/flow-capture.c
+--- flow-tools-0.68.orig/src/flow-capture.c    2004-01-05 20:56:50.000000000 +0300
++++ flow-tools-0.68/src/flow-capture.c 2006-09-06 22:42:12.000000000 +0400
+@@ -145,7 +145,7 @@
+   struct ftpeeri ftpi;
+   struct ftver ftv;
+   struct ftchash *ftch;
+-  struct ftchash_rec_exp ftch_recexp, *ftch_recexpp;
++  struct ftchash_rec_exp ftch_recexp, *ftch_recexpp = NULL;
+   struct rotate rot;
+   struct file cap_file;
+   struct fttag fttag;
+diff -Naur flow-tools-0.68.orig/src/flow-cat.c flow-tools-0.68/src/flow-cat.c
+--- flow-tools-0.68.orig/src/flow-cat.c        2005-05-10 19:52:10.000000000 +0400
++++ flow-tools-0.68/src/flow-cat.c     2006-09-06 22:42:12.000000000 +0400
+@@ -65,14 +65,14 @@
+   struct ftset ftset;
+   struct ftfile_entries **fte;
+   struct ftfile_entry *fty;
+-  int i, out_fd, out_fd_plain, in_fd, disable_mmap, in_fd_plain, sort;
++  int i, out_fd, out_fd_plain, in_fd, disable_mmap, in_fd_plain = 0, sort;
+   int fields;
+   int x, n, fd, flags, fte_entries, preload, time_filter;
+   char *fname, *out_fname;
+   char *rec;
+   u_long total_bytes;
+   u_int32 total_flows, lost_flows, corrupt_flows, total_streams;
+-  u_int32 time_start, time_end, time_tmp1, time_tmp2, time_delta;
++  u_int32 time_start, time_end, time_tmp1 = 0, time_tmp2 = 0, time_delta;
+   u_int32 time_low, time_high;
+ 
+   /* init fterr */
+diff -Naur flow-tools-0.68.orig/src/flow-dscan.c flow-tools-0.68/src/flow-dscan.c
+--- flow-tools-0.68.orig/src/flow-dscan.c      2005-05-10 19:53:11.000000000 +0400
++++ flow-tools-0.68/src/flow-dscan.c   2006-09-06 22:42:12.000000000 +0400
+@@ -618,8 +618,8 @@
+ {
+   FILE *FP;
+   int done;
+-  struct dscan_rec *drp;
+-  struct dscan_dst *ddp;
++  struct dscan_rec *drp = NULL;
++  struct dscan_dst *ddp = NULL;
+   char type;
+   char buf[1024];
+   u_int32 ip, hash, depth, flags, h, time, nports, i, j;
+diff -Naur flow-tools-0.68.orig/src/flow-export.c flow-tools-0.68/src/flow-export.c
+--- flow-tools-0.68.orig/src/flow-export.c     2004-03-31 07:11:14.000000000 +0400
++++ flow-tools-0.68/src/flow-export.c  2006-09-06 22:42:12.000000000 +0400
+@@ -865,7 +865,7 @@
+   struct ftver ftv;
+   char fields[1024], values[1024], query[3*1024];
+   char *rec;
+-  char *db_host, *db_name, *db_table, *db_user, *db_pwd, *db_tmp, *tmp;
++  char *db_host, *db_name, *db_table, *db_user, *db_pwd, *db_tmp = NULL, *tmp;
+   char *db_port;
+   int len;
+ 
+@@ -961,7 +961,7 @@
+ 
+ int fmt_xfields_type(char *buf, u_int64 xfield)
+ {
+-  int comma;
++  int comma = 0;
+ 
+   buf[0] = 0;
+ 
+diff -Naur flow-tools-0.68.orig/src/flow-fanout.c flow-tools-0.68/src/flow-fanout.c
+--- flow-tools-0.68.orig/src/flow-fanout.c     2005-05-10 19:52:52.000000000 +0400
++++ flow-tools-0.68/src/flow-fanout.c  2006-09-06 22:42:12.000000000 +0400
+@@ -100,8 +100,8 @@
+   struct tm *tm;
+   time_t now, time_startup;
+   fd_set rfd;
+-  struct ip *ip_hdr;
+-  struct udphdr *udp_hdr;
++  struct ip *ip_hdr = NULL;
++  struct udphdr *udp_hdr = NULL;
+   struct ftpeeri ftpi;
+   struct ftpdu ftpdu;
+   struct ftver ftv;
+diff -Naur flow-tools-0.68.orig/src/flow-filter.c flow-tools-0.68/src/flow-filter.c
+--- flow-tools-0.68.orig/src/flow-filter.c     2004-11-03 05:06:35.000000000 +0300
++++ flow-tools-0.68/src/flow-filter.c  2006-09-06 22:42:12.000000000 +0400
+@@ -75,15 +75,15 @@
+   struct ftset ftset;
+   struct ftver ftv;
+   struct ftprof ftp;
+-  u_int32 time_start, time_end, exaddr;
++  u_int32 time_start, time_end, exaddr = 0;
+   int i, ret;
+   char *acl_fname, *acl_std_src_name, *acl_std_dst_name;
+   char *acl_std_nexthop_name;
+   char *acl_ext_name, *str, *strm;
+-  int acl_std_src_index, acl_std_src_index2;
+-  int acl_std_dst_index, acl_std_dst_index2;
+-  int acl_std_nexthop_index, acl_std_nexthop_index2;
+-  int acl_ext_index, acl_ext_index2;
++  int acl_std_src_index, acl_std_src_index2 = 0;
++  int acl_std_dst_index, acl_std_dst_index2 = 0;
++  int acl_std_nexthop_index, acl_std_nexthop_index2 = 0;
++  int acl_ext_index, acl_ext_index2 = 0;
+   struct acl_ip_ext_entry tmp_ext;
+   int keep_input_time;
+   int filter_input, filter_output, filter_srcport, filter_dstport;
+diff -Naur flow-tools-0.68.orig/src/flow-import.c flow-tools-0.68/src/flow-import.c
+--- flow-tools-0.68.orig/src/flow-import.c     2003-11-11 19:53:57.000000000 +0300
++++ flow-tools-0.68/src/flow-import.c  2006-09-06 22:42:12.000000000 +0400
+@@ -1060,9 +1060,9 @@
+   struct ftpdu_header ftheader, ftheader2;
+   struct ftpdu ftpdu;
+   struct ftseq ftseq;
+-  size_t rlen, len;
++  size_t rlen, len = 0;
+   void (*xlate)(void *in_rec, void *out_rec);
+-  int ret, n, i, offset;
++  int ret = 0, n, i, offset;
+   char xl_rec[FT_IO_MAXREC], *out_rec;
+ 
+   bzero (&ftpdu, sizeof ftpdu);
+diff -Naur flow-tools-0.68.orig/src/flow-mask.c flow-tools-0.68/src/flow-mask.c
+--- flow-tools-0.68.orig/src/flow-mask.c       2003-04-02 22:03:02.000000000 +0400
++++ flow-tools-0.68/src/flow-mask.c    2006-09-06 22:42:12.000000000 +0400
+@@ -59,7 +59,7 @@
+   struct fts3rec_offsets fo;
+   char *rec;
+   char *fname, *dname;
+-  u_int32 total_flows, cap_start, cap_end;
++  u_int32 total_flows, cap_start = 0, cap_end = 0;
+   u_int32 time_start, time_end;
+   int i, keep_input_time;
+ 
+diff -Naur flow-tools-0.68.orig/src/flow-nfilter.c flow-tools-0.68/src/flow-nfilter.c
+--- flow-tools-0.68.orig/src/flow-nfilter.c    2004-01-05 20:57:18.000000000 +0300
++++ flow-tools-0.68/src/flow-nfilter.c 2006-09-06 22:42:12.000000000 +0400
+@@ -60,7 +60,7 @@
+   struct ftvar ftvar;
+   char *rec;
+   char *fname, *dname;
+-  u_int32 total_flows, cap_start, cap_end;
++  u_int32 total_flows, cap_start = 0, cap_end = 0;
+   u_int32 time_start, time_end;
+   int i, keep_input_time;
+ 
+diff -Naur flow-tools-0.68.orig/src/flow-print.c flow-tools-0.68/src/flow-print.c
+--- flow-tools-0.68.orig/src/flow-print.c      2003-04-02 22:03:02.000000000 +0400
++++ flow-tools-0.68/src/flow-print.c   2006-09-06 22:42:12.000000000 +0400
+@@ -96,7 +96,7 @@
+ {
+   struct ftio ftio;
+   struct ftprof ftp;
+-  int i, format_index, set_format, ret;
++  int i, format_index = 0, set_format, ret;
+   int print_header, options, debug;
+   char cc; /* comment character */
+ 
+diff -Naur flow-tools-0.68.orig/src/flow-send.c flow-tools-0.68/src/flow-send.c
+--- flow-tools-0.68.orig/src/flow-send.c       2004-03-31 07:15:41.000000000 +0400
++++ flow-tools-0.68/src/flow-send.c    2006-09-06 22:42:12.000000000 +0400
+@@ -63,8 +63,8 @@
+ int main(int argc, char **argv)
+ {
+   struct sockaddr_in loc_addr, rem_addr;
+-  struct ip *ip_hdr;
+-  struct udphdr *udp_hdr;
++  struct ip *ip_hdr = NULL;
++  struct udphdr *udp_hdr = NULL;
+   struct ftio ftio;
+   struct ftprof ftp;
+   struct ftver ftv, ftv2;
+@@ -75,8 +75,8 @@
+   char xl_rec[FT_IO_MAXREC], *out_rec;
+   u_int32 privacy_mask;
+   unsigned int v1, v2, one;
+-  int i, n, ret, tx_delay, udp_sock;
+-  int src_ip_spoof, hdr_len;
++  int i, n, ret = 0, tx_delay, udp_sock;
++  int src_ip_spoof, hdr_len = 0;
+   void *rec;
+ 
+   /* init fterr */
+diff -Naur flow-tools-0.68.orig/src/flow-stat.c flow-tools-0.68/src/flow-stat.c
+--- flow-tools-0.68.orig/src/flow-stat.c       2004-11-03 05:12:36.000000000 +0300
++++ flow-tools-0.68/src/flow-stat.c    2006-09-06 22:42:12.000000000 +0400
+@@ -3575,7 +3575,7 @@
+   char fmt_buf[256], fmt_buf2[64];
+   int32 i, start, end, increment, x;
+   int s, len;
+-  u_int plines;
++  u_int plines = 0;
+   u_int32 *index;
+ 
+   s = abs(args->sort_order);
+diff -Naur flow-tools-0.68.orig/src/flow-tag.c flow-tools-0.68/src/flow-tag.c
+--- flow-tools-0.68.orig/src/flow-tag.c        2004-01-05 21:00:40.000000000 +0300
++++ flow-tools-0.68/src/flow-tag.c     2006-09-06 22:42:12.000000000 +0400
+@@ -60,7 +60,7 @@
+   struct fttag_def *ftd;
+   struct ftvar ftvar;
+   int i, keep_input_time;
+-  u_int32 total_flows, cap_start, cap_end;
++  u_int32 total_flows, cap_start = 0, cap_end = 0;
+   u_int32 time_start, time_end;
+   char *tag_defs, *tag_active;
+   char *rec_in, *rec_out;
+diff -Naur flow-tools-0.68.orig/src/flow-xlate.c flow-tools-0.68/src/flow-xlate.c
+--- flow-tools-0.68.orig/src/flow-xlate.c      2004-01-05 21:00:40.000000000 +0300
++++ flow-tools-0.68/src/flow-xlate.c   2006-09-06 22:42:12.000000000 +0400
+@@ -53,7 +53,7 @@
+   struct ftio ftio_in, ftio_out;
+   struct ftprof ftp;
+   struct ftxlate ftxlate;
+-  struct ftxlate_def *ftfd;
++  struct ftxlate_def *ftfd = NULL;
+   struct ftver ftv_in, ftv_out;
+   struct ftset ftset;
+   struct fts3rec_offsets fo;
+@@ -61,7 +61,7 @@
+   char *rec, out_rec[FT_IO_MAXREC];
+   char *fname, *dname;
+   unsigned int v1, v2;
+-  u_int32 total_flows, cap_start, cap_end;
++  u_int32 total_flows, cap_start = 0, cap_end = 0;
+   u_int32 time_start, time_end;
+   int i, n, keep_input_time;
+   int xlate_version;

diff --git a/net-analyzer/flow-tools/flow-tools-0.68-r3.ebuild b/net-analyzer/flow-tools/flow-tools-0.68-r3.ebuild
new file mode 100644 (file)
index 0000000..f23b263
--- /dev/null
+++ b/net-analyzer/flow-tools/flow-tools-0.68-r3.ebuild
@@ -0,0 +1,94 @@
+# Copyright 1999-2006 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Header: /var/cvsroot/gentoo-x86/net-analyzer/flow-tools/flow-tools-0.68-r3.ebuild,v 1.1 2006/09/07 06:42:51 pva Exp $
+
+inherit eutils flag-o-matic
+
+DESCRIPTION="Flow-tools is a package for collecting and processing NetFlow data"
+HOMEPAGE="http://www.splintered.net/sw/flow-tools/"
+SRC_URI="ftp://ftp.eng.oar.net/pub/flow-tools/${P}.tar.gz"
+
+LICENSE="BSD"
+SLOT="0"
+KEYWORDS="~amd64 ~ppc ~x86"
+IUSE="mysql postgres debug ssl"
+
+RDEPEND="sys-apps/tcp-wrappers
+       sys-libs/zlib
+       sys-devel/flex
+       !postgres? ( mysql? ( dev-db/mysql ) )
+       !mysql? ( postgres? ( dev-db/postgresql ) )
+       ssl? ( dev-libs/openssl )"
+
+DEPEND="${RDEPEND}
+       sys-devel/bison"
+
+pkg_setup() {
+       if use mysql && use postgres ; then
+               echo
+               eerror "The mysql and postgres USE flags are mutually exclusive."
+               eerror "Please choose either USE=mysql or USE=postgres, but not both."
+               die
+       fi
+
+       enewgroup flows
+       enewuser flows -1 -1 /var/lib/flows flows
+}
+
+src_unpack() {
+       unpack ${A}
+       cd "${S}"
+       epatch "${FILESDIR}"/${P}-fix-configure.diff
+       epatch "${FILESDIR}"/${P}-fix-a-zillion-warnings-updated.diff
+       use debug || epatch ${FILESDIR}/${PN}-0.67-nodebug.patch
+       epatch "${FILESDIR}"/${PN}-0.67-memleak.patch
+
+       sed -i "s|^[^#]\(^.*CFLAGS=\).*$|\1-Wall|g" \
+               configure.in src/Makefile.am lib/Makefile.am || die "sed CFLAGS failed"
+
+       # bug 122842, we have /usr/bin/python and not /usr/local/bin/python
+       sed -i -e "s:/usr/local/bin/python:/usr/bin/python:g" \
+               "${S}"/bin/flow-{rptfmt,rpt2rrd,log2rrd}
+}
+
+src_compile() {
+       einfo "Running autoreconf"
+       autoreconf -f -i || die "autoreconf failed"
+
+       use mysql && append-flags "-L/usr/lib/mysql -I/usr/include/mysql"
+       use postgres && append-flags "-L/usr/lib/postgres -I/usr/include/postgres"
+
+       econf \
+               --localstatedir=/etc/flow-tools \
+               --enable-lfs \
+               $(use_with ssl openssl) \
+               $(use_with mysql) \
+               $(use_with postgres pgsql) \
+               || die "econf failed"
+
+       emake CFLAGS="${CFLAGS}" || die "emake failed"
+}
+
+src_install() {
+       make DESTDIR="${D}" install || die "make install failed"
+       dodoc ChangeLog README SECURITY TODO
+
+       keepdir /var/lib/flows
+       keepdir /var/lib/flows/bin
+       exeinto /var/lib/flows/bin
+       doexe "${FILESDIR}"/linkme
+       keepdir /var/run/flows
+
+       newinitd "${FILESDIR}/flowcapture.initd" flowcapture
+       newconfd "${FILESDIR}/flowcapture.confd" flowcapture
+
+}
+
+pkg_postinst() {
+       chown flows:flows /var/run/flows
+       chown flows:flows /var/lib/flows
+       chown flows:flows /var/lib/flows/bin
+       chmod 0755 /var/run/flows
+       chmod 0755 /var/lib/flows
+       chmod 0755 /var/lib/flows/bin
+}

diff --git a/net-analyzer/flow-tools/metadata.xml b/net-analyzer/flow-tools/metadata.xml
index d2cd26e1834e582a5c3643bc059e3b76c31e873d..06e97e70143b6d4ce124ed58ebb733ddf87d55c2 100644 (file)
--- a/net-analyzer/flow-tools/metadata.xml
+++ b/net-analyzer/flow-tools/metadata.xml
@@ -2,5 +2,13 @@
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
 <herd>netmon</herd>
-<longdescription>Flow-tools is a package for collecting and processing NetFlow data</longdescription>
+       <longdescription lang="en">
+               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.
+       </longdescription>
 </pkgmetadata>