Compilation problem with gcc-4.1 is fixed. Thank Ian P. Christian for report and Marcelo Goes for actual fix; bug #138438.

(Portage version: 2.1-r2)

7 files changed, 27 insertions, 2 deletions

diff --git a/net-analyzer/flow-tools/ChangeLog b/net-analyzer/flow-tools/ChangeLog
index a90a1e30e2d6..88d50ca87ba4 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-2006 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/net-analyzer/flow-tools/ChangeLog,v 1.19 2006/03/30 23:54:09 agriffis Exp $
+# $Header: /var/cvsroot/gentoo-x86/net-analyzer/flow-tools/ChangeLog,v 1.20 2006/09/05 17:56:56 pva Exp $
+
+  05 Sep 2006; Peter Volkov <pva@gentoo.org>
+  +files/flow-tools-0.68-gcc-4.1-fix.patch, flow-tools-0.68-r2.ebuild:
+  Compilation problem with gcc-4.1 is fixed. Thank Ian P. Christian for report
+  and Marcelo Goes for actual fix; bug #138438.
 
   30 Mar 2006; Aron Griffis <agriffis@gentoo.org> flow-tools-0.68-r1.ebuild:
   Mark 0.68-r1 ~ia64
diff --git a/net-analyzer/flow-tools/files/digest-flow-tools-0.66 b/net-analyzer/flow-tools/files/digest-flow-tools-0.66
index f9168d8c9b01..6f35c8a5ff0e 100644
--- a/net-analyzer/flow-tools/files/digest-flow-tools-0.66
+++ b/net-analyzer/flow-tools/files/digest-flow-tools-0.66
@@ -1 +1,3 @@
 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.68 b/net-analyzer/flow-tools/files/digest-flow-tools-0.68
index cd3d9265e6ee..3db6eb93276d 100644
--- a/net-analyzer/flow-tools/files/digest-flow-tools-0.68
+++ b/net-analyzer/flow-tools/files/digest-flow-tools-0.68
@@ -1 +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/digest-flow-tools-0.68-r1 b/net-analyzer/flow-tools/files/digest-flow-tools-0.68-r1
index cd3d9265e6ee..3db6eb93276d 100644
--- a/net-analyzer/flow-tools/files/digest-flow-tools-0.68-r1
+++ b/net-analyzer/flow-tools/files/digest-flow-tools-0.68-r1
@@ -1 +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/digest-flow-tools-0.68-r2 b/net-analyzer/flow-tools/files/digest-flow-tools-0.68-r2
index cd3d9265e6ee..3db6eb93276d 100644
--- a/net-analyzer/flow-tools/files/digest-flow-tools-0.68-r2
+++ b/net-analyzer/flow-tools/files/digest-flow-tools-0.68-r2
@@ -1 +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-gcc-4.1-fix.patch b/net-analyzer/flow-tools/files/flow-tools-0.68-gcc-4.1-fix.patch
new file mode 100644
index 000000000000..5ab9170c8406
--- /dev/null
+++ b/net-analyzer/flow-tools/files/flow-tools-0.68-gcc-4.1-fix.patch
@@ -0,0 +1,11 @@
+--- flow-tools-0.68.orig/lib/ftchash.c	2006-07-08 17:32:43.000000000 -0300
++++ flow-tools-0.68/lib/ftchash.c	2006-07-08 18:12:34.000000000 -0300
+@@ -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 --git a/net-analyzer/flow-tools/flow-tools-0.68-r2.ebuild b/net-analyzer/flow-tools/flow-tools-0.68-r2.ebuild
index 3cfa4c0e521a..d77842a8d58b 100644
--- a/net-analyzer/flow-tools/flow-tools-0.68-r2.ebuild
+++ b/net-analyzer/flow-tools/flow-tools-0.68-r2.ebuild
@@ -1,6 +1,6 @@
 # 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.2 2006/02/25 23:59:39 vanquirius Exp $
+# $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
 
@@ -43,6 +43,7 @@ src_unpack() {
 	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"