diff options
| author |   Peter Volkov <pva@gentoo.org> | 2006-09-23 19:22:54 +0000 |
|---|---|---|
| committer | Peter Volkov <pva@gentoo.org> | 2006-09-23 19:22:54 +0000 |
| commit | 68404d5cbb5cd75f41d732951021050a708aaece (patch) | |
| tree | d0f26b1265a715c389848a81bf61f8c1f9b6aaab /net-analyzer/flow-tools | |
| parent | Remove old ebuilds. (diff) | |
| download | gentoo-2-68404d5cbb5cd75f41d732951021050a708aaece.tar.gz gentoo-2-68404d5cbb5cd75f41d732951021050a708aaece.tar.bz2 gentoo-2-68404d5cbb5cd75f41d732951021050a708aaece.zip | |
Remove old ebuilds.
(Portage version: 2.1.1)
(Unsigned Manifest commit)
Diffstat (limited to 'net-analyzer/flow-tools')
16 files changed, 4 insertions, 2007 deletions
diff --git a/net-analyzer/flow-tools/Manifest b/net-analyzer/flow-tools/Manifest index 6bcfc55441fa..c841c1534547 100644 --- a/net-analyzer/flow-tools/Manifest +++ b/net-analyzer/flow-tools/Manifest @@ -1,22 +1,3 @@ ------BEGIN PGP SIGNED MESSAGE----- -Hash: SHA1 - -AUX flow-tools-0.67-debug.patch 313 RMD160 e95daf54cd3628df7b5a1e356164e0dbeb89b049 SHA1 c2b90063dcbb8712c3255cc4a09d7260b317a8c1 SHA256 1e97af78f3495ef22ee01cc12a1d79d70f412d2382d42fa1d2b64c072342ca24 -MD5 c6c737d5afc1661a098632c246dec51e files/flow-tools-0.67-debug.patch 313 -RMD160 e95daf54cd3628df7b5a1e356164e0dbeb89b049 files/flow-tools-0.67-debug.patch 313 -SHA256 1e97af78f3495ef22ee01cc12a1d79d70f412d2382d42fa1d2b64c072342ca24 files/flow-tools-0.67-debug.patch 313 -AUX flow-tools-0.67-fix-a-zillion-warnings.diff 18222 RMD160 d8f1cdee5c1b879c455ea2e54b6e45d516ff0145 SHA1 6969c8eaa76c4805d80079e53e5e593f131ce8bc SHA256 38fabef07d6504b677a2b432f73bf9dd3dac7b5827a1990ed75a54fbadbd49dc -MD5 a4c028b5f1d22a56d9020a2ef90ca253 files/flow-tools-0.67-fix-a-zillion-warnings.diff 18222 -RMD160 d8f1cdee5c1b879c455ea2e54b6e45d516ff0145 files/flow-tools-0.67-fix-a-zillion-warnings.diff 18222 -SHA256 38fabef07d6504b677a2b432f73bf9dd3dac7b5827a1990ed75a54fbadbd49dc files/flow-tools-0.67-fix-a-zillion-warnings.diff 18222 -AUX flow-tools-0.67-fix-configure.diff 3510 RMD160 5bc66e00c494e2146345b8fc82f637257430ebc6 SHA1 47bedb7f7e02898cc0f74b25a53aed59330bf638 SHA256 83c99e50fa2676f7e3f6f23e363418ef9d0101ff6395b7e8d74f9e6f85df1888 -MD5 3164389b3ab0f7170727e6ea6b419256 files/flow-tools-0.67-fix-configure.diff 3510 -RMD160 5bc66e00c494e2146345b8fc82f637257430ebc6 files/flow-tools-0.67-fix-configure.diff 3510 -SHA256 83c99e50fa2676f7e3f6f23e363418ef9d0101ff6395b7e8d74f9e6f85df1888 files/flow-tools-0.67-fix-configure.diff 3510 -AUX flow-tools-0.67-gcc34.diff 1403 RMD160 89ba14d45fce5faebf508535c59134aaf9650c96 SHA1 90757c1dfd7805efdfc23d1f2fe0c42bb17ca8f2 SHA256 58a5278b148f91598d991f77d56bad806f5914237e0688c9ab9baabc202a2196 -MD5 cfccfe9cd55f47b95bf235bf7fa7d304 files/flow-tools-0.67-gcc34.diff 1403 -RMD160 89ba14d45fce5faebf508535c59134aaf9650c96 files/flow-tools-0.67-gcc34.diff 1403 -SHA256 58a5278b148f91598d991f77d56bad806f5914237e0688c9ab9baabc202a2196 files/flow-tools-0.67-gcc34.diff 1403 AUX flow-tools-0.67-memleak.patch 465 RMD160 6e04608d9ce2cd9da945451a668be1e2426eb88a SHA1 68e777246680b23861504aabe7132dc04e2667f7 SHA256 185b1751d4b9208be73917f8dfd90662f61e7fedc617a0dad15cf4141bc473bd MD5 eddbfc9694d3f0b00a46f84a0e58a651 files/flow-tools-0.67-memleak.patch 465 RMD160 6e04608d9ce2cd9da945451a668be1e2426eb88a files/flow-tools-0.67-memleak.patch 465 @@ -29,10 +10,6 @@ AUX flow-tools-0.68-fix-a-zillion-warnings-updated.diff 19404 RMD160 81535106be1 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 -SHA256 9a220952a32c47ab33c865631adb0bbb6b82350600c806f0156ab3da888a9218 files/flow-tools-0.68-fix-a-zillion-warnings.diff 19710 AUX flow-tools-0.68-fix-configure.diff 4311 RMD160 fd14ccfd4def9c5f5ca77f368c512abaf8ac4a04 SHA1 8ba5adac524978f3662020976bd40b28e3296d57 SHA256 bc0877413e4eb8548219065b4b48dd9104972fa31031735f9c63b203dfb5ab9e MD5 09baff60cf1fc75fdf326c0d70f0b250 files/flow-tools-0.68-fix-configure.diff 4311 RMD160 fd14ccfd4def9c5f5ca77f368c512abaf8ac4a04 files/flow-tools-0.68-fix-configure.diff 4311 @@ -53,63 +30,19 @@ AUX linkme 283 RMD160 663284e66edca80e03d88db3078cd93d6faca452 SHA1 ebf19e1a1b0b 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 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 -RMD160 e1996cd785e18e89699cc010feac4f8c900e7bfd flow-tools-0.66.ebuild 988 -SHA256 b7c8bd61e92c97893e826956411ac89dec618282b19ec9f324c327e9296e7343 flow-tools-0.66.ebuild 988 -EBUILD flow-tools-0.67.ebuild 2089 RMD160 4831cdebd63ec54cad9353657f7bd4de6215871d SHA1 0cd6828365a99829050f5308b5329848bd8b6b18 SHA256 46a53c179f098110368bf8ead41a35538ace6d8e401dbcbe02e092853094ba5e -MD5 7560f60590cd065777a483a5fa729842 flow-tools-0.67.ebuild 2089 -RMD160 4831cdebd63ec54cad9353657f7bd4de6215871d flow-tools-0.67.ebuild 2089 -SHA256 46a53c179f098110368bf8ead41a35538ace6d8e401dbcbe02e092853094ba5e flow-tools-0.67.ebuild 2089 -EBUILD flow-tools-0.68-r1.ebuild 2457 RMD160 26daab452eb19f1888b8f9c9e1255749c24885bb SHA1 0cc20ae5ef9890145cc335dbdc7f0f7119ec8fa9 SHA256 fcbd253ee072ea02a011235e27740157ffb1e8b16e3585624fe6e2c55f4976e1 -MD5 d970d5a61be9ba00bb95ba5f54694f02 flow-tools-0.68-r1.ebuild 2457 -RMD160 26daab452eb19f1888b8f9c9e1255749c24885bb flow-tools-0.68-r1.ebuild 2457 -SHA256 fcbd253ee072ea02a011235e27740157ffb1e8b16e3585624fe6e2c55f4976e1 flow-tools-0.68-r1.ebuild 2457 -EBUILD flow-tools-0.68-r2.ebuild 2679 RMD160 974389b18df919049c0e3dd8ae7acbd281e088c8 SHA1 3fb789a11fbaf5bac8a79e7a31c1572d969675a7 SHA256 d9b674ad55f01de980b3514633cee448ec0ef531d8e585215b407ea1ab55715f -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 2590 RMD160 213da0d94ffdd9d5c330b4ab38080c82c1d4ab64 SHA1 a54893191b6a99ab027e5e6c54db92703bb5c296 SHA256 4a2694e426025c9388f6275a4f15893b99b4a6926e3ab23d556ba7305495104d MD5 98191620d29b727b1bfb81e07d396b45 flow-tools-0.68-r3.ebuild 2590 RMD160 213da0d94ffdd9d5c330b4ab38080c82c1d4ab64 flow-tools-0.68-r3.ebuild 2590 SHA256 4a2694e426025c9388f6275a4f15893b99b4a6926e3ab23d556ba7305495104d flow-tools-0.68-r3.ebuild 2590 -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 4829 RMD160 d4007ede2aba98b8706a87d6ab8ba0710b097327 SHA1 9bc0ad127eedb57d7ebf82092a568a1fcec7fcb8 SHA256 570e98019acadf5713e1e5ac3fe336eaee1fa2115fb92f4d4a7194686c38a086 -MD5 e6c8d80c6299411ee8844476e3c4bb8f ChangeLog 4829 -RMD160 d4007ede2aba98b8706a87d6ab8ba0710b097327 ChangeLog 4829 -SHA256 570e98019acadf5713e1e5ac3fe336eaee1fa2115fb92f4d4a7194686c38a086 ChangeLog 4829 +MISC ChangeLog 5258 RMD160 2cacf4e0e9be33a104de6766ad38f9f7e804d7ed SHA1 f6d0432f91ef652faf7b011f76d89341c41c3dc2 SHA256 45545ee315c0818d3ba24db3885c18fb04a77615f09299ca96c44fdd970da036 +MD5 690b9a77fe2e74b8d2b5ff5e18292ee9 ChangeLog 5258 +RMD160 2cacf4e0e9be33a104de6766ad38f9f7e804d7ed ChangeLog 5258 +SHA256 45545ee315c0818d3ba24db3885c18fb04a77615f09299ca96c44fdd970da036 ChangeLog 5258 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 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 -MD5 fcf03a34dcb47c4b9b40e694a5f51c6c files/digest-flow-tools-0.68-r1 247 -RMD160 cc28190761ebc35199c32d71a026d51c01dd67ab files/digest-flow-tools-0.68-r1 247 -SHA256 2a161650036d0ba16f3063c2faa0d7216de6320edc9865de530b0ec6c970b1a6 files/digest-flow-tools-0.68-r1 247 -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 ------BEGIN PGP SIGNATURE----- -Version: GnuPG v1.2.4 (GNU/Linux) - -iD8DBQFFA0PV/NoSW7FuNV8RAie/AKCYtZ78X3w2qAgSuk9uko0UjUqiXwCfcLca -zPp2Lytic+phAB6flAXyxvI= -=0Wkt ------END PGP SIGNATURE----- diff --git a/net-analyzer/flow-tools/files/digest-flow-tools-0.66 b/net-analyzer/flow-tools/files/digest-flow-tools-0.66 deleted file mode 100644 index 6f35c8a5ff0e..000000000000 --- a/net-analyzer/flow-tools/files/digest-flow-tools-0.66 +++ /dev/null @@ -1,3 +0,0 @@ -MD5 a32f02be71b29f0d4fe65c0d196d0093 flow-tools-0.66.tar.gz 967711 -RMD160 90d045a7c0ae52ed2c5009c66efd160a77b46346 flow-tools-0.66.tar.gz 967711 -SHA256 69a1da02eaabf1fd617ef92fcabf403672709b9adb19d45d8be932167c5fd62a flow-tools-0.66.tar.gz 967711 diff --git a/net-analyzer/flow-tools/files/digest-flow-tools-0.67 b/net-analyzer/flow-tools/files/digest-flow-tools-0.67 deleted file mode 100644 index 463e830d9dea..000000000000 --- a/net-analyzer/flow-tools/files/digest-flow-tools-0.67 +++ /dev/null @@ -1,3 +0,0 @@ -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 b/net-analyzer/flow-tools/files/digest-flow-tools-0.68 deleted file mode 100644 index 3db6eb93276d..000000000000 --- a/net-analyzer/flow-tools/files/digest-flow-tools-0.68 +++ /dev/null @@ -1,3 +0,0 @@ -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/digest-flow-tools-0.68-r1 b/net-analyzer/flow-tools/files/digest-flow-tools-0.68-r1 deleted file mode 100644 index 3db6eb93276d..000000000000 --- a/net-analyzer/flow-tools/files/digest-flow-tools-0.68-r1 +++ /dev/null @@ -1,3 +0,0 @@ -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/digest-flow-tools-0.68-r2 b/net-analyzer/flow-tools/files/digest-flow-tools-0.68-r2 deleted file mode 100644 index 3db6eb93276d..000000000000 --- a/net-analyzer/flow-tools/files/digest-flow-tools-0.68-r2 +++ /dev/null @@ -1,3 +0,0 @@ -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.67-debug.patch b/net-analyzer/flow-tools/files/flow-tools-0.67-debug.patch deleted file mode 100644 index 035ecf193f88..000000000000 --- a/net-analyzer/flow-tools/files/flow-tools-0.67-debug.patch +++ /dev/null @@ -1,10 +0,0 @@ ---- flow-tools-0.67.orig/src/flow-export.c 2005-03-25 12:50:39.000000000 -0800 -+++ flow-tools-0.67/src/flow-export.c 2005-03-25 12:51:02.000000000 -0800 -@@ -691,6 +691,7 @@ - char *db_host, *db_name, *db_table, *db_user, *db_pwd, *db_tmp, *tmp; - int db_port; - int len; -+ int debug; - - MYSQL mysql; - diff --git a/net-analyzer/flow-tools/files/flow-tools-0.67-fix-a-zillion-warnings.diff b/net-analyzer/flow-tools/files/flow-tools-0.67-fix-a-zillion-warnings.diff deleted file mode 100644 index bfbef9a19e04..000000000000 --- a/net-analyzer/flow-tools/files/flow-tools-0.67-fix-a-zillion-warnings.diff +++ /dev/null @@ -1,654 +0,0 @@ -diff -urN flow-tools-0.67.orig/lib/ftfil.c flow-tools-0.67/lib/ftfil.c ---- flow-tools-0.67.orig/lib/ftfil.c 2005-01-27 02:45:08.870519016 -0500 -+++ flow-tools-0.67/lib/ftfil.c 2005-01-27 02:45:23.933229136 -0500 -@@ -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; - - ret = -1; -@@ -3020,7 +3020,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) { -@@ -4947,7 +4947,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 -urN flow-tools-0.67.orig/lib/ftfile.c flow-tools-0.67/lib/ftfile.c ---- flow-tools-0.67.orig/lib/ftfile.c 2005-01-27 02:45:08.874518408 -0500 -+++ flow-tools-0.67/lib/ftfile.c 2005-01-27 02:45:23.936228680 -0500 -@@ -417,8 +417,9 @@ - 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, "."); - } - -@@ -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 -urN flow-tools-0.67.orig/lib/ftio.c flow-tools-0.67/lib/ftio.c ---- flow-tools-0.67.orig/lib/ftio.c 2005-01-27 02:45:08.861520384 -0500 -+++ flow-tools-0.67/lib/ftio.c 2005-01-27 02:45:23.939228224 -0500 -@@ -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 -urN flow-tools-0.67.orig/lib/ftmask.c flow-tools-0.67/lib/ftmask.c ---- flow-tools-0.67.orig/lib/ftmask.c 2005-01-27 02:45:08.874518408 -0500 -+++ flow-tools-0.67/lib/ftmask.c 2005-01-27 02:45:23.939228224 -0500 -@@ -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 -urN flow-tools-0.67.orig/lib/ftstat.c flow-tools-0.67/lib/ftstat.c ---- flow-tools-0.67.orig/lib/ftstat.c 2005-01-27 02:45:08.858520840 -0500 -+++ flow-tools-0.67/lib/ftstat.c 2005-01-27 02:45:23.962224728 -0500 -@@ -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; -@@ -2729,7 +2729,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; -@@ -3200,7 +3200,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 -urN flow-tools-0.67.orig/lib/fttag.c flow-tools-0.67/lib/fttag.c ---- flow-tools-0.67.orig/lib/fttag.c 2005-01-27 02:45:08.872518712 -0500 -+++ flow-tools-0.67/lib/fttag.c 2005-01-27 02:45:23.964224424 -0500 -@@ -241,7 +241,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; -@@ -1492,7 +1492,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 -urN flow-tools-0.67.orig/lib/fttlv.c flow-tools-0.67/lib/fttlv.c ---- flow-tools-0.67.orig/lib/fttlv.c 2005-01-27 02:45:08.872518712 -0500 -+++ flow-tools-0.67/lib/fttlv.c 2005-01-27 02:45:23.975222752 -0500 -@@ -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 -urN flow-tools-0.67.orig/lib/ftxlate.c flow-tools-0.67/lib/ftxlate.c ---- flow-tools-0.67.orig/lib/ftxlate.c 2005-01-27 02:45:08.870519016 -0500 -+++ flow-tools-0.67/lib/ftxlate.c 2005-01-27 02:45:23.977222448 -0500 -@@ -172,7 +172,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; -@@ -1038,7 +1038,7 @@ - struct ftxlate_def_term *ftxt; - struct ftxlate_def_term_actions *ftxta; - struct ftxlate_action *ftxa; -- int found; -+ int found = 0; - - /* foreach definition */ - FT_SLIST_FOREACH(ftx, &ftxlate->defs, chain) { -diff -urN flow-tools-0.67.orig/lib/radix.c flow-tools-0.67/lib/radix.c ---- flow-tools-0.67.orig/lib/radix.c 2005-01-27 02:45:08.855521296 -0500 -+++ flow-tools-0.67/lib/radix.c 2005-01-27 02:45:23.977222448 -0500 -@@ -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 -urN flow-tools-0.67.orig/lib/support.c flow-tools-0.67/lib/support.c ---- flow-tools-0.67.orig/lib/support.c 2005-01-27 02:45:08.861520384 -0500 -+++ flow-tools-0.67/lib/support.c 2005-01-27 02:45:23.978222296 -0500 -@@ -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 -urN flow-tools-0.67.orig/src/flow-capture.c flow-tools-0.67/src/flow-capture.c ---- flow-tools-0.67.orig/src/flow-capture.c 2005-01-27 02:45:08.878517800 -0500 -+++ flow-tools-0.67/src/flow-capture.c 2005-01-27 02:45:23.979222144 -0500 -@@ -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 -urN flow-tools-0.67.orig/src/flow-cat.c flow-tools-0.67/src/flow-cat.c ---- flow-tools-0.67.orig/src/flow-cat.c 2005-01-27 02:45:08.880517496 -0500 -+++ flow-tools-0.67/src/flow-cat.c 2005-01-27 02:45:23.980221992 -0500 -@@ -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 -urN flow-tools-0.67.orig/src/flow-dscan.c flow-tools-0.67/src/flow-dscan.c ---- flow-tools-0.67.orig/src/flow-dscan.c 2005-01-27 02:45:08.880517496 -0500 -+++ flow-tools-0.67/src/flow-dscan.c 2005-01-27 02:45:23.981221840 -0500 -@@ -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 -urN flow-tools-0.67.orig/src/flow-export.c flow-tools-0.67/src/flow-export.c ---- flow-tools-0.67.orig/src/flow-export.c 2005-01-27 02:45:08.880517496 -0500 -+++ flow-tools-0.67/src/flow-export.c 2005-01-27 02:50:09.946748472 -0500 -@@ -864,7 +864,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; - -@@ -960,7 +960,7 @@ - - int fmt_xfields_type(char *buf, u_int64 xfield) - { -- int comma; -+ int comma = 0; - - buf[0] = 0; - -diff -urN flow-tools-0.67.orig/src/flow-fanout.c flow-tools-0.67/src/flow-fanout.c ---- flow-tools-0.67.orig/src/flow-fanout.c 2005-01-27 02:45:08.882517192 -0500 -+++ flow-tools-0.67/src/flow-fanout.c 2005-01-27 02:45:23.982221688 -0500 -@@ -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 -urN flow-tools-0.67.orig/src/flow-filter.c flow-tools-0.67/src/flow-filter.c ---- flow-tools-0.67.orig/src/flow-filter.c 2005-01-27 02:45:08.875518256 -0500 -+++ flow-tools-0.67/src/flow-filter.c 2005-01-27 02:45:23.983221536 -0500 -@@ -80,10 +80,10 @@ - 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 -urN flow-tools-0.67.orig/src/flow-import.c flow-tools-0.67/src/flow-import.c ---- flow-tools-0.67.orig/src/flow-import.c 2005-01-27 02:45:08.877517952 -0500 -+++ flow-tools-0.67/src/flow-import.c 2005-01-27 02:45:23.984221384 -0500 -@@ -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 -urN flow-tools-0.67.orig/src/flow-mask.c flow-tools-0.67/src/flow-mask.c ---- flow-tools-0.67.orig/src/flow-mask.c 2005-01-27 02:45:08.875518256 -0500 -+++ flow-tools-0.67/src/flow-mask.c 2005-01-27 02:45:23.984221384 -0500 -@@ -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 -urN flow-tools-0.67.orig/src/flow-nfilter.c flow-tools-0.67/src/flow-nfilter.c ---- flow-tools-0.67.orig/src/flow-nfilter.c 2005-01-27 02:45:08.879517648 -0500 -+++ flow-tools-0.67/src/flow-nfilter.c 2005-01-27 02:45:23.984221384 -0500 -@@ -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 -urN flow-tools-0.67.orig/src/flow-print.c flow-tools-0.67/src/flow-print.c ---- flow-tools-0.67.orig/src/flow-print.c 2005-01-27 02:45:08.878517800 -0500 -+++ flow-tools-0.67/src/flow-print.c 2005-01-27 02:45:23.999219104 -0500 -@@ -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 -urN flow-tools-0.67.orig/src/flow-send.c flow-tools-0.67/src/flow-send.c ---- flow-tools-0.67.orig/src/flow-send.c 2005-01-27 02:45:08.875518256 -0500 -+++ flow-tools-0.67/src/flow-send.c 2005-01-27 02:45:24.000218952 -0500 -@@ -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 -urN flow-tools-0.67.orig/src/flow-stat.c flow-tools-0.67/src/flow-stat.c ---- flow-tools-0.67.orig/src/flow-stat.c 2005-01-27 02:45:08.876518104 -0500 -+++ flow-tools-0.67/src/flow-stat.c 2005-01-27 02:45:24.003218496 -0500 -@@ -3572,7 +3572,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 -urN flow-tools-0.67.orig/src/flow-tag.c flow-tools-0.67/src/flow-tag.c ---- flow-tools-0.67.orig/src/flow-tag.c 2005-01-27 02:45:08.881517344 -0500 -+++ flow-tools-0.67/src/flow-tag.c 2005-01-27 02:45:24.004218344 -0500 -@@ -59,7 +59,7 @@ - struct fttag fttag; - struct fttag_def *ftd; - 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 -urN flow-tools-0.67.orig/src/flow-xlate.c flow-tools-0.67/src/flow-xlate.c ---- flow-tools-0.67.orig/src/flow-xlate.c 2005-01-27 02:45:08.879517648 -0500 -+++ flow-tools-0.67/src/flow-xlate.c 2005-01-27 02:45:24.004218344 -0500 -@@ -53,14 +53,14 @@ - 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; - 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/files/flow-tools-0.67-fix-configure.diff b/net-analyzer/flow-tools/files/flow-tools-0.67-fix-configure.diff deleted file mode 100644 index 19cd58fb0a5b..000000000000 --- a/net-analyzer/flow-tools/files/flow-tools-0.67-fix-configure.diff +++ /dev/null @@ -1,150 +0,0 @@ -diff -urN flow-tools-0.67.orig/acconfig.h flow-tools-0.67/acconfig.h ---- flow-tools-0.67.orig/acconfig.h 2005-01-27 02:12:31.445092912 -0500 -+++ flow-tools-0.67/acconfig.h 1969-12-31 19:00:00.000000000 -0500 -@@ -1,26 +0,0 @@ -- --/* Name of package. */ --#undef PACKAGE -- --/* Version of package. */ --#undef VERSION -- --/* Linux */ --#undef _BSD_SOURCE -- --/* Linux */ --#undef HAVE_FEATURES_H -- --/* BSD socket */ --#undef HAVE_SOCK_SIN_LEN -- --/* MYSQL */ --#undef HAVE_MYSQL -- --/* PGSQL */ --#undef HAVE_PGSQL -- --/* DEC */ --#undef HAVE_LL_STRTOUL -- -- -diff -urN flow-tools-0.67.orig/configure.in flow-tools-0.67/configure.in ---- flow-tools-0.67.orig/configure.in 2005-01-27 02:12:31.444093064 -0500 -+++ flow-tools-0.67/configure.in 2005-01-27 02:27:27.114930400 -0500 -@@ -17,6 +17,38 @@ - AC_PROG_RANLIB - AM_PROG_LEX - -+AC_ARG_WITH(mysql, -+ [ --with-mysql Compile in MySQL support. (default=no)], -+ [ac_with_mysql=$withval], -+ [ac_with_mysql=no]) -+ -+if test x$ac_with_mysql = xyes ; then -+ LIBS="-L/usr/lib/mysql" -+ AC_CHECK_LIB(mysqlclient, my_init, -+ [ -+ MYSQLCFLAGS="-L/usr/lib/mysql -I/usr/include/mysql" -+ MYSQLLIB="-lmysqlclient" -+ AC_DEFINE([HAVE_MYSQL], 1, [Compile MySQL support]) -+ ] -+ ) -+fi -+ -+AC_ARG_WITH(pgsql, -+ [ --with-pgsql Compile in PostgreSQL support (default=no)], -+ [ac_with_pgsql=$withval], -+ [ac_with_pgsql=no]) -+ -+if test x$ac_with_pgsql = xyes ; then -+ LIBS="-L/usr/lib/postgresql" -+ AC_CHECK_LIB(pq, PQsetdbLogin, -+ [ -+ PGSQLCFLAGS="-L/usr/lib/postgresql -I/usr/include/postgresql" -+ PGSQLLIB="-lpq" -+ AC_DEFINE([HAVE_PGSQL], 1, [Compile PostgreSQL support]) -+ ] -+ ) -+fi -+ - AC_SUBST(YLIB) - AC_SUBST(MYSQLLIB) - AC_SUBST(MYSQLCFLAGS) -@@ -25,54 +57,6 @@ - AC_SUBST(PGSQLCFLAGS) - AC_SUBST(PGSQLINCLUDE) - --dnl extra argument: --with-mysql --WITH_MYSQL= --AC_ARG_WITH(mysql, --[ --with-mysql[=PATH] Compile in MySQL support. (default=no)], --[ if test -x "$withval"; then -- WHERE_MYSQL=$withval -- else -- WHERE_MYSQL="/usr" -- fi --] --) -- --dnl extra argument: --with-pgsql --WITH_PGSQL= --AC_ARG_WITH(pgsql, --[ --with-pgsql[=PATH] Compile in PostgreSQL support. (default=no)], --[ if test -x "$withval"; then -- WHERE_PGSQL=$withval -- else -- WHERE_PGSQL="/usr" -- fi --] --) -- --dnl Checks for libraries. -- --if test "x$WHERE_MYSQL" != "x"; then -- LIBS="-L$WHERE_MYSQL/lib/mysql" -- AC_CHECK_LIB(mysqlclient, my_init, -- [ -- MYSQLCFLAGS="-L$WHERE_MYSQL/lib/mysql -I$WHERE_MYSQL/include/mysql" -- MYSQLLIB="-lmysqlclient" -- AC_DEFINE(HAVE_MYSQL) -- ] -- ) --fi -- --if test "x$WHERE_PGSQL" != "x"; then -- LIBS="-L$WHERE_PGSQL/lib/pgsql" -- AC_CHECK_LIB(pq, PQsetdbLogin, -- [ -- PGSQLCFLAGS="-L$WHERE_PGSQL/lib -I$WHERE_PGSQL/include/pgsql" -- PGSQLLIB="-lpq" -- AC_DEFINE(HAVE_PGSQL) -- ] -- ) --fi -- - AC_CHECK_LIB(y, main,YLIB="$YLIB -ly",) - AC_CHECK_LIB(z, zlibVersion) - case "X$LIBS" in -@@ -95,11 +79,11 @@ - #include <sys/socket.h> - #include <netinet/in.h>], - [struct sockaddr_in sock; sock.sin_len = sizeof(sock);], --echo yes;AC_DEFINE(HAVE_SOCK_SIN_LEN), -+echo yes;AC_DEFINE([HAVE_SOCK_SIN_LEN], 1, [Define if sockaddr_in.sin_len member exists]), - echo no) - - --AC_DEFINE(_BSD_SOURCE) -+AC_DEFINE([_BSD_SOURCE], 1, [Define BSD source]) - - dnl Checks for typedefs, structures, and compiler characteristics. - AC_C_CONST -@@ -136,7 +120,7 @@ - } - ], - [AC_MSG_RESULT(yes) -- AC_DEFINE(HAVE_LL_STRTOUL) -+ AC_DEFINE([HAVE_LL_STRTOUL], 1, [Define if strtoul returns 64 bits]) - ], - [AC_MSG_RESULT(no)], - ) diff --git a/net-analyzer/flow-tools/files/flow-tools-0.67-gcc34.diff b/net-analyzer/flow-tools/files/flow-tools-0.67-gcc34.diff deleted file mode 100644 index ea3a1bb60a3e..000000000000 --- a/net-analyzer/flow-tools/files/flow-tools-0.67-gcc34.diff +++ /dev/null @@ -1,52 +0,0 @@ -diff -urN flow-tools-0.67.orig/src/flow-cat.c flow-tools-0.67/src/flow-cat.c ---- flow-tools-0.67.orig/src/flow-cat.c 2005-01-25 22:46:00.000000000 -0500 -+++ flow-tools-0.67/src/flow-cat.c 2005-01-26 22:24:32.066024216 -0500 -@@ -551,6 +551,7 @@ - break; - - next_file: -+ ; - - } /* FOREACH filename in dir */ - -diff -urN flow-tools-0.67.orig/src/flow-dscan.c flow-tools-0.67/src/flow-dscan.c ---- flow-tools-0.67.orig/src/flow-dscan.c 2005-01-25 22:46:00.000000000 -0500 -+++ flow-tools-0.67/src/flow-dscan.c 2005-01-26 22:25:37.492077944 -0500 -@@ -560,6 +560,7 @@ - ager(&ds, total_flows32); - - skip2: -+ ; - - - } /* while rec */ -@@ -806,6 +807,7 @@ - fterr_info("ager: reset hash run"); - - skip3: -+ ; - - } /* ager */ - -diff -urN flow-tools-0.67.orig/src/flow-fanout.c flow-tools-0.67/src/flow-fanout.c ---- flow-tools-0.67.orig/src/flow-fanout.c 2005-01-25 22:46:00.000000000 -0500 -+++ flow-tools-0.67/src/flow-fanout.c 2005-01-26 22:27:26.381524232 -0500 -@@ -840,6 +840,7 @@ - } /* fte.buf_size */ - - skip1: -+ ; - - } /* if FD_ISSET */ - -diff -urN flow-tools-0.67.orig/src/flow-receive.c flow-tools-0.67/src/flow-receive.c ---- flow-tools-0.67.orig/src/flow-receive.c 2005-01-25 22:46:00.000000000 -0500 -+++ flow-tools-0.67/src/flow-receive.c 2005-01-26 22:26:54.761331232 -0500 -@@ -733,6 +733,7 @@ - } /* for */ - - skip1: -+ ; - - } /* if FD_ISSET */ - diff --git a/net-analyzer/flow-tools/files/flow-tools-0.68-fix-a-zillion-warnings.diff b/net-analyzer/flow-tools/files/flow-tools-0.68-fix-a-zillion-warnings.diff deleted file mode 100644 index 6a9beb3daa77..000000000000 --- a/net-analyzer/flow-tools/files/flow-tools-0.68-fix-a-zillion-warnings.diff +++ /dev/null @@ -1,670 +0,0 @@ -diff --exclude='*~' --exclude='.*' -I '$Id:' -urN 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 12:55:23.000000000 -0500 -+++ flow-tools-0.68/lib/ftfil.c 2005-05-14 00:08:44.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 --exclude='*~' --exclude='.*' -I '$Id:' -urN 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-12 21:38:42.000000000 -0500 -+++ flow-tools-0.68/lib/ftfile.c 2005-05-14 00:07:59.000000000 -0400 -@@ -417,8 +417,9 @@ - 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, "."); - } - -@@ -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 --exclude='*~' --exclude='.*' -I '$Id:' -urN 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-23 19:51:47.000000000 -0500 -+++ flow-tools-0.68/lib/ftio.c 2005-05-14 00:07:59.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 --exclude='*~' --exclude='.*' -I '$Id:' -urN 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-12 21:38:42.000000000 -0500 -+++ flow-tools-0.68/lib/ftmask.c 2005-05-14 00:07:59.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 --exclude='*~' --exclude='.*' -I '$Id:' -urN 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 11:48:12.000000000 -0400 -+++ flow-tools-0.68/lib/ftstat.c 2005-05-14 00:07:59.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 --exclude='*~' --exclude='.*' -I '$Id:' -urN 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 12:55:37.000000000 -0500 -+++ flow-tools-0.68/lib/fttag.c 2005-05-14 00:07:59.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 --exclude='*~' --exclude='.*' -I '$Id:' -urN 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-12 21:38:43.000000000 -0500 -+++ flow-tools-0.68/lib/fttlv.c 2005-05-14 00:07:59.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 --exclude='*~' --exclude='.*' -I '$Id:' -urN 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 10:03:30.000000000 -0400 -+++ flow-tools-0.68/lib/ftxlate.c 2005-05-14 00:09:10.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 --exclude='*~' --exclude='.*' -I '$Id:' -urN 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-12 21:05:25.000000000 -0500 -+++ flow-tools-0.68/lib/radix.c 2005-05-14 00:07:59.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 --exclude='*~' --exclude='.*' -I '$Id:' -urN 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-12 21:38:43.000000000 -0500 -+++ flow-tools-0.68/lib/support.c 2005-05-14 00:07:59.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 --exclude='*~' --exclude='.*' -I '$Id:' -urN 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 12:56:50.000000000 -0500 -+++ flow-tools-0.68/src/flow-capture.c 2005-05-14 00:07:59.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 --exclude='*~' --exclude='.*' -I '$Id:' -urN 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 11:52:10.000000000 -0400 -+++ flow-tools-0.68/src/flow-cat.c 2005-05-14 00:07:59.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 --exclude='*~' --exclude='.*' -I '$Id:' -urN 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 11:53:11.000000000 -0400 -+++ flow-tools-0.68/src/flow-dscan.c 2005-05-14 00:07:59.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 --exclude='*~' --exclude='.*' -I '$Id:' -urN 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-30 22:11:14.000000000 -0500 -+++ flow-tools-0.68/src/flow-export.c 2005-05-14 00:07:59.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 --exclude='*~' --exclude='.*' -I '$Id:' -urN 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 11:52:52.000000000 -0400 -+++ flow-tools-0.68/src/flow-fanout.c 2005-05-14 00:07:59.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 --exclude='*~' --exclude='.*' -I '$Id:' -urN 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-02 21:06:35.000000000 -0500 -+++ flow-tools-0.68/src/flow-filter.c 2005-05-14 00:11:48.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 --exclude='*~' --exclude='.*' -I '$Id:' -urN 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 11:53:57.000000000 -0500 -+++ flow-tools-0.68/src/flow-import.c 2005-05-14 00:07:59.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 --exclude='*~' --exclude='.*' -I '$Id:' -urN 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 13:03:02.000000000 -0500 -+++ flow-tools-0.68/src/flow-mask.c 2005-05-14 00:07:59.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 --exclude='*~' --exclude='.*' -I '$Id:' -urN 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 12:57:18.000000000 -0500 -+++ flow-tools-0.68/src/flow-nfilter.c 2005-05-14 00:07:59.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 --exclude='*~' --exclude='.*' -I '$Id:' -urN 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 13:03:02.000000000 -0500 -+++ flow-tools-0.68/src/flow-print.c 2005-05-14 00:07:59.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 --exclude='*~' --exclude='.*' -I '$Id:' -urN 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-30 22:15:41.000000000 -0500 -+++ flow-tools-0.68/src/flow-send.c 2005-05-14 00:07:59.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 --exclude='*~' --exclude='.*' -I '$Id:' -urN 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-02 21:12:36.000000000 -0500 -+++ flow-tools-0.68/src/flow-stat.c 2005-05-14 00:07:59.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 --exclude='*~' --exclude='.*' -I '$Id:' -urN 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 13:00:40.000000000 -0500 -+++ flow-tools-0.68/src/flow-tag.c 2005-05-14 00:07:59.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 --exclude='*~' --exclude='.*' -I '$Id:' -urN 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 13:00:40.000000000 -0500 -+++ flow-tools-0.68/src/flow-xlate.c 2005-05-14 00:07:59.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.66.ebuild b/net-analyzer/flow-tools/flow-tools-0.66.ebuild deleted file mode 100644 index 15b0b9e0392b..000000000000 --- a/net-analyzer/flow-tools/flow-tools-0.66.ebuild +++ /dev/null @@ -1,40 +0,0 @@ -# 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.66.ebuild,v 1.8 2006/02/25 23:59:39 vanquirius Exp $ - -inherit eutils toolchain-funcs - -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="x86" - -IUSE="" - -DEPEND="virtual/libc - sys-apps/tcp-wrappers - sys-libs/zlib" - -src_unpack() { - unpack ${A} - cd ${S} - epatch ${FILESDIR}/${PN}-0.67-gcc34.diff -} - -src_compile() { - aclocal - automake - econf \ - --without-mysql \ - --localstatedir=/etc/flow-tools \ - CC="$(tc-getCC)" CFLAGS="$CFLAGS" || die - emake CC="$(tc-getCC)" CFLAGS="$CFLAGS" || die -} - -src_install() { - einstall localstatedir=$D/etc/flow-tools CC="$(tc-getCC)" CFLAGS="$CFLAGS" - dodoc AUTHORS NEWS ChangeLog README SECURITY TODO -} diff --git a/net-analyzer/flow-tools/flow-tools-0.67.ebuild b/net-analyzer/flow-tools/flow-tools-0.67.ebuild deleted file mode 100644 index 120e458cf3fc..000000000000 --- a/net-analyzer/flow-tools/flow-tools-0.67.ebuild +++ /dev/null @@ -1,78 +0,0 @@ -# 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.67.ebuild,v 1.8 2006/02/25 23:59:39 vanquirius 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="~x86 ~amd64" -IUSE="mysql postgres debug" - -RDEPEND="virtual/libc - sys-apps/tcp-wrappers - sys-libs/zlib - sys-devel/flex - !postgres? ( mysql? ( dev-db/mysql ) ) - !mysql? ( postgres? ( dev-db/postgresql ) )" - -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 flowtools - enewuser flowtools -1 -1 /var/lib/flow-tools flowtools -} - -src_unpack() { - unpack ${A} - cd ${S} - epatch ${FILESDIR}/${P}-fix-configure.diff - epatch ${FILESDIR}/${P}-gcc34.diff - epatch ${FILESDIR}/${P}-fix-a-zillion-warnings.diff - use debug || epatch ${FILESDIR}/${P}-nodebug.patch - epatch ${FILESDIR}/${P}-memleak.patch - epatch ${FILESDIR}/${P}-debug.patch - - sed -i "s|\(^.*CFLAGS=\).*$|\1-Wall|" \ - configure.in src/Makefile.am lib/Makefile.am || die "sed CFLAGS failed" -} - -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 \ - $(use_with mysql) \ - $(use_with postgres pgsql) \ - || die "econf failed" - - emake CFLAGS="${CFLAGS}" || die "emake failed" -} - -src_install() { - make install DESTDIR="${D}" || die "make install failed" - dodoc ChangeLog README SECURITY TODO - - keepdir /var/lib/flow-tools -} - -pkg_postinst() { - chown flowtools:flowtools /var/lib/flow-tools - chmod 0750 /var/lib/flow-tools -} diff --git a/net-analyzer/flow-tools/flow-tools-0.68-r1.ebuild b/net-analyzer/flow-tools/flow-tools-0.68-r1.ebuild deleted file mode 100644 index 9de125d40d1a..000000000000 --- a/net-analyzer/flow-tools/flow-tools-0.68-r1.ebuild +++ /dev/null @@ -1,91 +0,0 @@ -# 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-r1.ebuild,v 1.6 2006/03/30 23:54:09 agriffis 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 ~ia64 ~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.diff - use debug || epatch ${FILESDIR}/${PN}-0.67-nodebug.patch - epatch ${FILESDIR}/${PN}-0.67-memleak.patch - epatch ${FILESDIR}/${PN}-0.67-debug.patch - - sed -i "s|^[^#]\(^.*CFLAGS=\).*$|\1-Wall|g" \ - configure.in src/Makefile.am lib/Makefile.am || die "sed CFLAGS failed" -} - -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/flow-tools-0.68-r2.ebuild b/net-analyzer/flow-tools/flow-tools-0.68-r2.ebuild deleted file mode 100644 index d77842a8d58b..000000000000 --- a/net-analyzer/flow-tools/flow-tools-0.68-r2.ebuild +++ /dev/null @@ -1,96 +0,0 @@ -# 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-r2.ebuild,v 1.3 2006/09/05 17:56:56 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.diff - use debug || epatch ${FILESDIR}/${PN}-0.67-nodebug.patch - epatch "${FILESDIR}"/${PN}-0.67-memleak.patch - epatch "${FILESDIR}"/${PN}-0.67-debug.patch - epatch "${FILESDIR}"/${PN}-0.68-gcc-4.1-fix.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/flow-tools-0.68.ebuild b/net-analyzer/flow-tools/flow-tools-0.68.ebuild deleted file mode 100644 index a5052d1e4b37..000000000000 --- a/net-analyzer/flow-tools/flow-tools-0.68.ebuild +++ /dev/null @@ -1,80 +0,0 @@ -# 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.ebuild,v 1.3 2006/02/25 23:59:39 vanquirius 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="~x86 ~amd64" -IUSE="mysql postgres debug ssl" - -RDEPEND="virtual/libc - 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 flowtools - enewuser flowtools -1 -1 /var/lib/flow-tools flowtools -} - -src_unpack() { - unpack ${A} - cd ${S} - epatch ${FILESDIR}/${P}-fix-configure.diff - epatch ${FILESDIR}/${P}-fix-a-zillion-warnings.diff - use debug || epatch ${FILESDIR}/${PN}-0.67-nodebug.patch - epatch ${FILESDIR}/${PN}-0.67-memleak.patch - epatch ${FILESDIR}/${PN}-0.67-debug.patch - - sed -i "s|^[^#]\(^.*CFLAGS=\).*$|\1-Wall|g" \ - configure.in src/Makefile.am lib/Makefile.am || die "sed CFLAGS failed" -} - -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/flow-tools -} - -pkg_postinst() { - chown flowtools:flowtools /var/lib/flow-tools - chmod 0750 /var/lib/flow-tools -} |