Update gcc4 patch as it was causing bug #106063.

(Portage version: 2.0.52-r1)

4 files changed, 9 insertions, 44 deletions

diff --git a/net-analyzer/flow-tools/ChangeLog b/net-analyzer/flow-tools/ChangeLog
index 1f6241bbe404..bde5564a47c9 100644
--- a/net-analyzer/flow-tools/ChangeLog
+++ b/net-analyzer/flow-tools/ChangeLog
@@ -1,6 +1,11 @@
 # ChangeLog for net-analyzer/flow-tools
 # Copyright 2002-2005 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/net-analyzer/flow-tools/ChangeLog,v 1.15 2005/08/23 13:43:25 ka0ttic Exp $
+# $Header: /var/cvsroot/gentoo-x86/net-analyzer/flow-tools/ChangeLog,v 1.16 2005/09/16 11:12:07 ka0ttic Exp $
+
+  16 Sep 2005; Aaron Walker <ka0ttic@gentoo.org>
+  files/flow-tools-0.67-fix-a-zillion-warnings.diff,
+  files/flow-tools-0.68-fix-a-zillion-warnings.diff:
+  Update gcc4 warnings patch as it was causing bug #106063.
 
   23 Aug 2005; Aaron Walker <ka0ttic@gentoo.org> flow-tools-0.67.ebuild,
   flow-tools-0.68.ebuild, flow-tools-0.68-r1.ebuild:
diff --git a/net-analyzer/flow-tools/Manifest b/net-analyzer/flow-tools/Manifest
index 3eb3eac1d758..474deb678ed9 100644
--- a/net-analyzer/flow-tools/Manifest
+++ b/net-analyzer/flow-tools/Manifest
@@ -1,31 +1,21 @@
------BEGIN PGP SIGNED MESSAGE-----
-Hash: SHA1
-
 MD5 b4137cf5d98a0dc381479c22e6f56bb8 flow-tools-0.67.ebuild 2102
 MD5 8f9c6d7e1e7e86ef04599a7774c85b16 flow-tools-0.66.ebuild 1001
 MD5 a5eba5008729fa7c037c6b4d59277eb6 flow-tools-0.68-r1.ebuild 2466
 MD5 fecd6516b359b067be27796d980a2152 flow-tools-0.68.ebuild 2166
-MD5 87c4faa4b7f5c8cc6a0d7a43c81080d7 ChangeLog 2984
+MD5 0b6c9e51995402c6c36aa1fd1adfdac0 ChangeLog 3200
 MD5 657939d746987d289ffa06516ae69d46 metadata.xml 261
 MD5 4274d0fb58b88876a5767ab9d1c6204c files/digest-flow-tools-0.66 67
 MD5 1101576a17a0a70941408d279474aa97 files/digest-flow-tools-0.67 67
 MD5 4550f09b9ca0a0f2e3e83beadfa3f964 files/digest-flow-tools-0.68 67
 MD5 cfccfe9cd55f47b95bf235bf7fa7d304 files/flow-tools-0.67-gcc34.diff 1403
-MD5 7308473949f268c686c9dfedf343213c files/flow-tools-0.68-fix-a-zillion-warnings.diff 20333
+MD5 98dc78d5d311ce19b972580774781796 files/flow-tools-0.68-fix-a-zillion-warnings.diff 19710
 MD5 c6c737d5afc1661a098632c246dec51e files/flow-tools-0.67-debug.patch 313
 MD5 3164389b3ab0f7170727e6ea6b419256 files/flow-tools-0.67-fix-configure.diff 3510
 MD5 a3079e6e4ce9d077caa0939f51e806f2 files/flowcapture.confd 1590
 MD5 e093ab64e5496e26be23026c3436ddde files/flowcapture.initd 430
 MD5 09baff60cf1fc75fdf326c0d70f0b250 files/flow-tools-0.68-fix-configure.diff 4311
-MD5 16e9d55df0b78a82c236db3bcad399a5 files/flow-tools-0.67-fix-a-zillion-warnings.diff 18805
+MD5 a4c028b5f1d22a56d9020a2ef90ca253 files/flow-tools-0.67-fix-a-zillion-warnings.diff 18222
 MD5 94581c1ca18b1891395fe1f3daeb04ca files/linkme 283
 MD5 f16f4ba51648f2b7f0e3830bc7670f6e files/flow-tools-0.67-nodebug.patch 933
 MD5 4550f09b9ca0a0f2e3e83beadfa3f964 files/digest-flow-tools-0.68-r1 67
 MD5 eddbfc9694d3f0b00a46f84a0e58a651 files/flow-tools-0.67-memleak.patch 465
------BEGIN PGP SIGNATURE-----
-Version: GnuPG v1.4.2 (GNU/Linux)
-
-iD8DBQFDCygREZCkKN40op4RAv9aAKCBDno3ROqbu3cZguKHSt15f97zwACdEDsn
-cpaFteItd+Rutf4T8teBsWA=
-=SBmQ
------END PGP SIGNATURE-----
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
index 2014d864f403..bfbef9a19e04 100644
--- 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
@@ -1,18 +1,3 @@
-diff -urN flow-tools-0.67.orig/lib/ftchash.c flow-tools-0.67/lib/ftchash.c
---- flow-tools-0.67.orig/lib/ftchash.c	2005-01-27 02:45:08.860520536 -0500
-+++ flow-tools-0.67/lib/ftchash.c	2005-01-27 02:45:23.927230048 -0500
-@@ -324,9 +324,10 @@
-     /* more entries in this chunk *? */ 
-     if  ((char*)ftch->traverse_rec <
-       (char*)ftch->traverse_chunk->base+ftch->traverse_chunk->next) {
-+      char *p = (char *)ftch->traverse_rec;
- 
-       ret = ftch->traverse_rec;
--      (char*)ftch->traverse_rec += ftch->d_size;
-+      p += ftch->d_size;
-       return ret;
- 
-     } else {
 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
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
index abfbe4df3c10..6a9beb3daa77 100644
--- 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
@@ -1,18 +1,3 @@
-diff --exclude='*~' --exclude='.*' -I '$Id:' -urN 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 14:04:25.000000000 -0400
-+++ flow-tools-0.68/lib/ftchash.c	2005-05-14 00:07:59.000000000 -0400
-@@ -324,9 +324,10 @@
-     /* more entries in this chunk *? */ 
-     if  ((char*)ftch->traverse_rec <
-       (char*)ftch->traverse_chunk->base+ftch->traverse_chunk->next) {
-+      char *p = (char *)ftch->traverse_rec;
- 
-       ret = ftch->traverse_rec;
--      (char*)ftch->traverse_rec += ftch->d_size;
-+      p += ftch->d_size;
-       return ret;
- 
-     } else {
 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