Update iperf to 2.0.2.

Fixes configuring of multicast support and ipv6 support on NetBSD.
Add patches to deal with:
  setsockopt(..., IP_MULTICAST_TTL,..) takes a u_char arg (not int).
  On NetBSD and Solaris (probably other BSD's) ipv6 multicast group
  join is done with IPV6_JOIN_GROUP not linux's IPV6_ADD_MEMERSHIP.

5 files changed, 63 insertions, 6 deletions

diff --git a/net/iperf/Makefile b/net/iperf/Makefile
index 4ab114553dd..92193a4edf1 100644
--- a/net/iperf/Makefile
+++ b/net/iperf/Makefile
@@ -1,6 +1,6 @@
-# $NetBSD: Makefile,v 1.11 2005/04/11 21:46:48 tv Exp $
+# $NetBSD: Makefile,v 1.12 2005/10/07 20:29:52 markd Exp $
 
-DISTNAME=	iperf-2.0.1
+DISTNAME=	iperf-2.0.2
 CATEGORIES=	net
 MASTER_SITES=	http://dast.nlanr.net/Projects/Iperf2.0/
 
diff --git a/net/iperf/distinfo b/net/iperf/distinfo
index 215794c9038..43af80ea78f 100644
--- a/net/iperf/distinfo
+++ b/net/iperf/distinfo
@@ -1,5 +1,8 @@
-$NetBSD: distinfo,v 1.5 2005/02/24 12:13:50 agc Exp $
+$NetBSD: distinfo,v 1.6 2005/10/07 20:29:52 markd Exp $
 
-SHA1 (iperf-2.0.1.tar.gz) = 880cd6bcdfe43832288a1ce63d0d7453e1860d0c
-RMD160 (iperf-2.0.1.tar.gz) = c7a4fa09c2a00b76c7660db3321ab59c92d37273
-Size (iperf-2.0.1.tar.gz) = 220446 bytes
+SHA1 (iperf-2.0.2.tar.gz) = 5cbda4199c2c6c9417d0d0d0cd840de3009fa36a
+RMD160 (iperf-2.0.2.tar.gz) = 8e3627f718ddc9aea109fceb0c8a0359cd054447
+Size (iperf-2.0.2.tar.gz) = 233595 bytes
+SHA1 (patch-aa) = 0758967ce641c823f7f5cf1e233736e411019684
+SHA1 (patch-ab) = e10e9119c5e830c186630aca72536ed1431fdbdc
+SHA1 (patch-ac) = e46304be305b099b79acdfd31a57b537a360d669
diff --git a/net/iperf/patches/patch-aa b/net/iperf/patches/patch-aa
new file mode 100644
index 00000000000..e2b160256a2
--- /dev/null
+++ b/net/iperf/patches/patch-aa
@@ -0,0 +1,14 @@
+$NetBSD: patch-aa,v 1.3 2005/10/07 20:29:52 markd Exp $
+
+--- configure.orig	2005-05-03 08:22:07.000000000 +1200
++++ configure
+@@ -11915,6 +11915,9 @@ cat >>conftest.$ac_ext <<_ACEOF
+ int
+ main ()
+ {
++#if !defined(IPV6_ADD_MEMBERSHIP) && defined(IPV6_JOIN_GROUP)
++#define IPV6_ADD_MEMBERSHIP IPV6_JOIN_GROUP
++#endif
+ #ifndef IPV6_ADD_MEMBERSHIP
+   char *p = (char *) IPV6_ADD_MEMBERSHIP;
+ #endif
diff --git a/net/iperf/patches/patch-ab b/net/iperf/patches/patch-ab
new file mode 100644
index 00000000000..6844deeb494
--- /dev/null
+++ b/net/iperf/patches/patch-ab
@@ -0,0 +1,25 @@
+$NetBSD: patch-ab,v 1.1 2005/10/07 20:29:52 markd Exp $
+
+--- src/Listener.cpp.orig	2005-05-03 08:09:27.000000000 +1200
++++ src/Listener.cpp
+@@ -369,6 +369,9 @@ void Listener::McastJoin( ) {
+         WARN_errno( rc == SOCKET_ERROR, "multicast join" );
+     }
+ #ifdef HAVE_IPV6_MULTICAST
++#if !defined(IPV6_ADD_MEMBERSHIP) && defined(IPV6_JOIN_GROUP)
++#define IPV6_ADD_MEMBERSHIP IPV6_JOIN_GROUP
++#endif
+       else {
+         struct ipv6_mreq mreq;
+ 
+@@ -393,8 +396,9 @@ void Listener::McastJoin( ) {
+ void Listener::McastSetTTL( int val ) {
+ #ifdef HAVE_MULTICAST
+     if ( !SockAddr_isIPv6( &mSettings->local ) ) {
++        u_char uval = val;
+         int rc = setsockopt( mSettings->mSock, IPPROTO_IP, IP_MULTICAST_TTL,
+-                             (char*) &val, sizeof(val));
++                             (char*) &uval, sizeof(uval));
+         WARN_errno( rc == SOCKET_ERROR, "multicast ttl" );
+     }
+ #ifdef HAVE_IPV6_MULTICAST
diff --git a/net/iperf/patches/patch-ac b/net/iperf/patches/patch-ac
new file mode 100644
index 00000000000..f092be136fa
--- /dev/null
+++ b/net/iperf/patches/patch-ac
@@ -0,0 +1,15 @@
+$NetBSD: patch-ac,v 1.1 2005/10/07 20:29:52 markd Exp $
+
+--- src/PerfSocket.cpp.orig	2005-10-07 13:34:29.000000000 +1300
++++ src/PerfSocket.cpp
+@@ -95,8 +95,9 @@ void SetSocketOptions( thread_Settings *
+ 	int val = inSettings->mTTL;
+ #ifdef HAVE_MULTICAST
+ 	if ( !SockAddr_isIPv6( &inSettings->local ) ) {
++	    u_char uval = val;
+ 	    int rc = setsockopt( inSettings->mSock, IPPROTO_IP, IP_MULTICAST_TTL,
+-		    (const void*) &val, (Socklen_t) sizeof(val));
++		    (const void*) &uval, (Socklen_t) sizeof(uval));
+ 
+ 	    WARN_errno( rc == SOCKET_ERROR, "multicast ttl" );
+ 	}