Really really really fix recv call (bug #336755).

Package-Manager: portage-2.2.0_alpha10/cvs/Linux i686

4 files changed, 20 insertions, 10 deletions

diff --git a/net-analyzer/ethloop/ChangeLog b/net-analyzer/ethloop/ChangeLog
index d9736cf894e2..bc329ffc31f8 100644
--- a/net-analyzer/ethloop/ChangeLog
+++ b/net-analyzer/ethloop/ChangeLog
@@ -1,6 +1,13 @@
 # ChangeLog for net-analyzer/ethloop
 # Copyright 1999-2010 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/net-analyzer/ethloop/ChangeLog,v 1.6 2010/12/01 01:03:37 jer Exp $
+# $Header: /var/cvsroot/gentoo-x86/net-analyzer/ethloop/ChangeLog,v 1.7 2010/12/27 17:32:24 jer Exp $
+
+*ethloop-10-r3 (27 Dec 2010)
+
+  27 Dec 2010; Jeroen Roovers <jer@gentoo.org> -ethloop-10-r2.ebuild,
+  +ethloop-10-r3.ebuild, -files/ethloop-10-gcc44.patch,
+  +files/ethloop-10-gcc45.patch:
+  Really really really fix recv call (bug #336755).
 
 *ethloop-10-r2 (01 Dec 2010)
 
diff --git a/net-analyzer/ethloop/Manifest b/net-analyzer/ethloop/Manifest
index f5de68efb326..3569c05d1692 100644
--- a/net-analyzer/ethloop/Manifest
+++ b/net-analyzer/ethloop/Manifest
@@ -1,7 +1,7 @@
 AUX ethloop-10-gcc4.diff 566 RMD160 0e935be4c69c8857511cb53233ad9da892208386 SHA1 8c59048cf0b7875692455f8c53a28ff9eeeeee4d SHA256 b2ad05b04bb7e9204e58bec9327ebf388f5fe4c44fcdfcac2424d3fc2ffb75d6
-AUX ethloop-10-gcc44.patch 699 RMD160 561f6d3c66a7747d031cec88ea0a8d0df88747e6 SHA1 27b7d4dcf12f5adc601b0f983840f486e46cdc3d SHA256 90985687cd2d5c846a2bdff2a4b65627a08f3918bdea09ff52e7d50e90311379
+AUX ethloop-10-gcc45.patch 784 RMD160 d781ad20b89562b19cf469020deb87d9c89f4379 SHA1 f5145176c6beade563fee88d939554bb483a0f9f SHA256 e9bae29f4073831786ef9ddcef5a75e542ae1fe9319e97e269332723582cf44e
 DIST ethloop10.tgz 3912 RMD160 5e08c0da94a686c55daff04152a667548161fc5c SHA1 de85bf1303b5b53e2b5cce61d35b3a470733c95b SHA256 d1f7b4500946dc6c0e6fe031fcebc789d9e061645cd775fe4005820a75039b86
 EBUILD ethloop-10-r1.ebuild 685 RMD160 1a7eeb9e0d345e56506dcd356584160bc94fcccf SHA1 dc88fa0600fd597a88de284bee35868643385d4c SHA256 c4f2934f95e004e1ba7ac4f274ecc2bbb8e969e8df3297458668a4b6f5a1d974
-EBUILD ethloop-10-r2.ebuild 675 RMD160 d4e622221e083bfebd2b2375751d76e461977fc2 SHA1 45493124bc5ec3881622bf094c91bbf2de2966b8 SHA256 536166b56019096878a2cb23824cd774ef36a39ca189379a1e3203f56d85bd3b
-MISC ChangeLog 1261 RMD160 8c93363e8eff2a86e2126af7b89f6e5551d477ec SHA1 d1acf0e9568694ebad39f257b6894c2f20960405 SHA256 a294496c235174424d856100300324a0594c4785b6f7388809562d4bb0fb7686
+EBUILD ethloop-10-r3.ebuild 675 RMD160 38cb9872e3078b34cdcad8c1390c4929ce310875 SHA1 d2dae900b4c883334c312605540aacf5a500fcec SHA256 5e55e37959e1dcd943de6bd949b329857101f5ddb0b1c3651ceb911d42c3f57e
+MISC ChangeLog 1503 RMD160 dda49503a97a91a5b2051228a3ad4910d4fe5331 SHA1 5d38c8a3b8bcf9fb4d10257f620ca66e4e446c75 SHA256 d0e8753e3f18a930ee65c6e47cc1c9c9abd0f861a134aa76554ffce0519d564a
 MISC metadata.xml 244 RMD160 1706e1664e3e6f905b5ab55f255aff0a0c244158 SHA1 535a1c5171ece46f762ed58a1dc6153912b78c4b SHA256 f63f1dc31aa10aec308b80e6d274fab9a03b84516a215da989eae0b8bef5375b
diff --git a/net-analyzer/ethloop/ethloop-10-r2.ebuild b/net-analyzer/ethloop/ethloop-10-r3.ebuild
index f4511333b68a..54b381c958c5 100644
--- a/net-analyzer/ethloop/ethloop-10-r2.ebuild
+++ b/net-analyzer/ethloop/ethloop-10-r3.ebuild
@@ -1,6 +1,6 @@
 # Copyright 1999-2010 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/net-analyzer/ethloop/ethloop-10-r2.ebuild,v 1.1 2010/12/01 01:03:37 jer Exp $
+# $Header: /var/cvsroot/gentoo-x86/net-analyzer/ethloop/ethloop-10-r3.ebuild,v 1.1 2010/12/27 17:32:24 jer Exp $
 
 EAPI="2"
 
@@ -17,7 +17,7 @@ IUSE=""
 S=${WORKDIR}/${PN}
 
 src_prepare() {
-	epatch "${FILESDIR}"/${P}-gcc44.patch
+	epatch "${FILESDIR}"/${P}-gcc45.patch
 }
 
 src_compile() {
diff --git a/net-analyzer/ethloop/files/ethloop-10-gcc44.patch b/net-analyzer/ethloop/files/ethloop-10-gcc45.patch
index be7f4ddec51a..75b951102245 100644
--- a/net-analyzer/ethloop/files/ethloop-10-gcc44.patch
+++ b/net-analyzer/ethloop/files/ethloop-10-gcc45.patch
@@ -1,7 +1,7 @@
-Fix recv call (bug #336755), add some more includes
+Fix recv call (bug #336755), add some more includes.
 
 --- a/ethloop.c	2002-05-03 15:13:20.000000000 +0200
-+++ b/ethloop.c	2010-12-01 01:51:58.000000000 +0100
++++ b/ethloop.c	2010-12-27 18:21:24.000000000 +0100
 @@ -1,5 +1,7 @@
  /* vim: cin sw=4 ts=4
  */
@@ -18,12 +18,15 @@ Fix recv call (bug #336755), add some more includes
  
  int sock;
  
-@@ -133,7 +136,7 @@
+@@ -133,9 +136,9 @@
  int recv_raw(int tmo)
  {
  	struct pollfd pf = {sock,POLLIN,0};
 -	int r; unsigned short proto;
 +	ssize_t r; unsigned short proto;
  	if(poll(&pf,1,tmo) <= 0) return 0;
- 	r = recv(sock,&buf,1550,0);
+-	r = recv(sock,&buf,1550,0);
++	r = recv(sock,&buf,sizeof(buf),0);
  	if (r <= 0) {
+ 		printf("error recv (%d)\n",r);
+ 		return 0;