Clean up, and patches.

(Portage version: 2.2.10/cvs/Linux x86_64, signed Manifest commit with key A792A613)

8 files changed, 37 insertions, 46 deletions

diff --git a/net-misc/iperf/ChangeLog b/net-misc/iperf/ChangeLog
index f6610cf433ec..bca379fd4234 100644
--- a/net-misc/iperf/ChangeLog
+++ b/net-misc/iperf/ChangeLog
@@ -1,6 +1,14 @@
 # ChangeLog for net-misc/iperf
-# Copyright 1999-2013 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/net-misc/iperf/ChangeLog,v 1.44 2013/09/05 16:04:40 dev-zero Exp $
+# Copyright 1999-2014 Gentoo Foundation; Distributed under the GPL v2
+# $Header: /var/cvsroot/gentoo-x86/net-misc/iperf/ChangeLog,v 1.45 2014/07/18 16:15:59 jer Exp $
+
+  18 Jul 2014; Jeroen Roovers <jer@gentoo.org> iperf-2.0.5-r2.ebuild,
+  files/iperf-bidirectional-tcp-server.patch,
+  files/iperf-cast-to-max_size_t-instead-of-int.patch,
+  files/iperf-die-on-bind-fail.patch, files/iperf-fix-bandwidth-limit.patch,
+  files/iperf-fix-format-security-ftbfs.patch,
+  files/iperf-ipv6_mcast_check.patch:
+  Clean up, and patches.
 
 *iperf-2.0.5-r2 (05 Sep 2013)
 
diff --git a/net-misc/iperf/files/iperf-bidirectional-tcp-server.patch b/net-misc/iperf/files/iperf-bidirectional-tcp-server.patch
index 571b73c9c664..88a1a4f00c4c 100644
--- a/net-misc/iperf/files/iperf-bidirectional-tcp-server.patch
+++ b/net-misc/iperf/files/iperf-bidirectional-tcp-server.patch
@@ -6,8 +6,8 @@ Author: Roberto Lumbreras <rover@debian.org>
 Bug-Redhat: https://bugzilla.redhat.com/show_bug.cgi?id=449796
 Forwarded: http://sourceforge.net/tracker/?func=detail&aid=1983829&group_id=128336&atid=711371
 
---- iperf-2.0.5.orig/src/Client.cpp
-+++ iperf-2.0.5/src/Client.cpp
+--- a/src/Client.cpp
++++ b/src/Client.cpp
 @@ -212,10 +212,12 @@ void Client::Run( void ) {
      char* readAt = mBuf;
  
diff --git a/net-misc/iperf/files/iperf-cast-to-max_size_t-instead-of-int.patch b/net-misc/iperf/files/iperf-cast-to-max_size_t-instead-of-int.patch
index 8919d81c012b..34d37eef671d 100644
--- a/net-misc/iperf/files/iperf-cast-to-max_size_t-instead-of-int.patch
+++ b/net-misc/iperf/files/iperf-cast-to-max_size_t-instead-of-int.patch
@@ -7,8 +7,8 @@ Author: Roberto Lumbreras <rover@debian.org>
 Bug-Debian: http://bugs.debian.org/346099
 Forwarded: https://sourceforge.net/tracker/index.php?func=detail&aid=3140391&group_id=128336&atid=711371
 
---- iperf-2.0.4.orig/src/Settings.cpp.orig	2008-04-08 04:37:54.000000000 +0200
-+++ iperf-2.0.4/src/Settings.cpp	2008-05-07 17:41:03.923942801 +0200
+--- a/src/Settings.cpp
++++ b/src/Settings.cpp
 @@ -458,7 +458,7 @@
          case 't': // seconds to write for
              // time mode (instead of amount mode)
diff --git a/net-misc/iperf/files/iperf-die-on-bind-fail.patch b/net-misc/iperf/files/iperf-die-on-bind-fail.patch
index 4dca6db8d985..1f54cf556d29 100644
--- a/net-misc/iperf/files/iperf-die-on-bind-fail.patch
+++ b/net-misc/iperf/files/iperf-die-on-bind-fail.patch
@@ -6,8 +6,8 @@ Author: Deny IP Any Any <denyipanyany@gmail.com>
 Bug-Debian: http://bugs.debian.org/517239
 Forwarded: https://sourceforge.net/tracker/?func=detail&aid=3140400&group_id=128336&atid=711371
 
---- iperf-2.0.4/src/Listener.cpp	2009-02-23 16:20:31.000000000 -0500
-+++ iperf-2.0.4-fixed/src/Listener.cpp	2009-02-23 16:20:40.000000000 -0500
+--- a/src/Listener.cpp
++++ b/src/Listener.cpp
 @@ -333,7 +333,7 @@
  #endif
      {
diff --git a/net-misc/iperf/files/iperf-fix-bandwidth-limit.patch b/net-misc/iperf/files/iperf-fix-bandwidth-limit.patch
index 12b8fb14e671..eb9df8cd31b3 100644
--- a/net-misc/iperf/files/iperf-fix-bandwidth-limit.patch
+++ b/net-misc/iperf/files/iperf-fix-bandwidth-limit.patch
@@ -5,10 +5,8 @@
 low bandwidth limit was specified.
 
 
-Index: compat/delay.cpp
-===================================================================
---- compat/delay.cpp	(revision 81)
-+++ compat/delay.cpp	(working copy)
+--- a/compat/delay.cpp
++++ b/compat/delay.cpp
 @@ -63,8 +63,9 @@ void delay_loop(unsigned long usec)
  {
      struct timespec requested, remaining;
diff --git a/net-misc/iperf/files/iperf-fix-format-security-ftbfs.patch b/net-misc/iperf/files/iperf-fix-format-security-ftbfs.patch
index ee2e67b085d0..2f5b03277209 100644
--- a/net-misc/iperf/files/iperf-fix-format-security-ftbfs.patch
+++ b/net-misc/iperf/files/iperf-fix-format-security-ftbfs.patch
@@ -3,9 +3,8 @@ Description: iperf format string FTBFS with -Werror=format-security
 Author: Simon Paillard <spaillard@debian.org>
 Bug-Debian: http://bugs.debian.org/643408
 
-diff -Nur iperf-2.0.5/compat/Thread.c iperf-2.0.5-nmu/compat/Thread.c
---- iperf-2.0.5/compat/Thread.c	2010-03-31 01:08:24.000000000 +0200
-+++ iperf-2.0.5-nmu/compat/Thread.c	2011-11-15 09:13:32.000000000 +0100
+--- a/compat/Thread.c
++++ b/compat/Thread.c
 @@ -381,7 +381,7 @@
      Condition_Lock( thread_sNum_cond );
      thread_sNum -= nonterminating_num;
@@ -15,9 +14,8 @@ diff -Nur iperf-2.0.5/compat/Thread.c iperf-2.0.5-nmu/compat/Thread.c
      }
      nonterminating_num = 0;
      Condition_Signal( &thread_sNum_cond );
-diff -Nur iperf-2.0.5/src/ReportDefault.c iperf-2.0.5-nmu/src/ReportDefault.c
---- iperf-2.0.5/src/ReportDefault.c	2010-03-31 00:57:17.000000000 +0200
-+++ iperf-2.0.5-nmu/src/ReportDefault.c	2011-11-15 09:16:52.000000000 +0100
+--- a/src/ReportDefault.c
++++ b/src/ReportDefault.c
 @@ -78,7 +78,7 @@
      if ( stats->mUDP != (char)kMode_Server ) {
          // TCP Reporting
@@ -63,9 +61,8 @@ diff -Nur iperf-2.0.5/src/ReportDefault.c iperf-2.0.5-nmu/src/ReportDefault.c
          } else {
              mtu = inMSS + 40;
              net = "unknown interface";
-diff -Nur iperf-2.0.5/src/Reporter.c iperf-2.0.5-nmu/src/Reporter.c
---- iperf-2.0.5/src/Reporter.c	2011-11-15 19:44:41.000000000 +0100
-+++ iperf-2.0.5-nmu/src/Reporter.c	2011-11-15 09:17:14.000000000 +0100
+--- a/src/Reporter.c
++++ b/src/Reporter.c
 @@ -896,7 +896,7 @@
          } else if ( checkMSS_MTU( inMSS, 576 ) ) {
              net = "minimum";
@@ -75,9 +72,8 @@ diff -Nur iperf-2.0.5/src/Reporter.c iperf-2.0.5-nmu/src/Reporter.c
          } else {
              mtu = inMSS + 40;
              net = "unknown interface";
-diff -Nur iperf-2.0.5/src/Settings.cpp iperf-2.0.5-nmu/src/Settings.cpp
---- iperf-2.0.5/src/Settings.cpp	2011-11-15 19:44:41.000000000 +0100
-+++ iperf-2.0.5-nmu/src/Settings.cpp	2011-11-15 09:18:46.000000000 +0100
+--- a/src/Settings.cpp
++++ b/src/Settings.cpp
 @@ -375,8 +375,8 @@
              break;
  
diff --git a/net-misc/iperf/files/iperf-ipv6_mcast_check.patch b/net-misc/iperf/files/iperf-ipv6_mcast_check.patch
index cd700a6b67c1..bef05259a4d8 100644
--- a/net-misc/iperf/files/iperf-ipv6_mcast_check.patch
+++ b/net-misc/iperf/files/iperf-ipv6_mcast_check.patch
@@ -9,8 +9,8 @@ Description: Fix improper check for IPv6 family when sending multicast
 Author: Luca Bruno <lucab@debian.org>

 Last-Update: 2012-05-24

 

---- iperf-2.0.5.orig/src/PerfSocket.cpp

-+++ iperf-2.0.5/src/PerfSocket.cpp

+--- a/src/PerfSocket.cpp

++++ b/src/PerfSocket.cpp

 @@ -109,7 +109,7 @@ void SetSocketOptions( thread_Settings *

      if ( isMulticast( inSettings ) && ( inSettings->mTTL > 0 ) ) {

  	int val = inSettings->mTTL;

diff --git a/net-misc/iperf/iperf-2.0.5-r2.ebuild b/net-misc/iperf/iperf-2.0.5-r2.ebuild
index 2c8ea547bb1b..77193f68f050 100644
--- a/net-misc/iperf/iperf-2.0.5-r2.ebuild
+++ b/net-misc/iperf/iperf-2.0.5-r2.ebuild
@@ -1,9 +1,8 @@
-# Copyright 1999-2013 Gentoo Foundation
+# Copyright 1999-2014 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/net-misc/iperf/iperf-2.0.5-r2.ebuild,v 1.1 2013/09/05 16:04:40 dev-zero Exp $
-
-EAPI="5"
+# $Header: /var/cvsroot/gentoo-x86/net-misc/iperf/iperf-2.0.5-r2.ebuild,v 1.2 2014/07/18 16:15:59 jer Exp $
 
+EAPI=5
 inherit base
 
 DESCRIPTION="Tool to measure IP bandwidth using UDP or TCP"
@@ -15,16 +14,13 @@ SLOT="0"
 KEYWORDS="~amd64 ~arm ~hppa ~ppc ~ppc64 ~sparc ~x86 ~x86-fbsd ~x86-freebsd ~amd64-linux ~x86-linux ~ppc-macos ~x86-macos ~m68k-mint"
 IUSE="ipv6 threads debug"
 
-DEPEND=""
-RDEPEND=""
-
 PATCHES=(
-	"${FILESDIR}"/"${PN}"-fix-bandwidth-limit.patch
-	"${FILESDIR}"/"${PN}"-cast-to-max_size_t-instead-of-int.patch
-	"${FILESDIR}"/"${PN}"-die-on-bind-fail.patch
-	"${FILESDIR}"/"${PN}"-bidirectional-tcp-server.patch
-	"${FILESDIR}"/"${PN}"-fix-format-security-ftbfs.patch
-	"${FILESDIR}"/"${PN}"-ipv6_mcast_check.patch
+	"${FILESDIR}"/${PN}-fix-bandwidth-limit.patch
+	"${FILESDIR}"/${PN}-cast-to-max_size_t-instead-of-int.patch
+	"${FILESDIR}"/${PN}-die-on-bind-fail.patch
+	"${FILESDIR}"/${PN}-bidirectional-tcp-server.patch
+	"${FILESDIR}"/${PN}-fix-format-security-ftbfs.patch
+	"${FILESDIR}"/${PN}-ipv6_mcast_check.patch
 	)
 DOCS="INSTALL README"
 
@@ -41,10 +37,3 @@ src_install() {
 	newinitd "${FILESDIR}"/${PN}.initd-r1 ${PN}
 	newconfd "${FILESDIR}"/${PN}.confd ${PN}
 }
-
-pkg_postinst() {
-	echo
-	einfo "To run iperf in server mode, run:"
-	einfo "  /etc/init.d/iperf start"
-	echo
-}