22 files changed, 95 insertions, 103 deletions

diff --git a/benchmarks/netperf/files/patch-configure b/benchmarks/netperf/files/patch-configure
index 49d35272d24b..31f10b135692 100644
--- a/benchmarks/netperf/files/patch-configure
+++ b/benchmarks/netperf/files/patch-configure
@@ -1,6 +1,6 @@
---- ./configure.orig	2012-05-12 07:05:20.000000000 +1000
-+++ ./configure	2012-05-12 07:22:49.000000000 +1000
-@@ -6567,7 +6567,7 @@
+--- configure.orig	2015-07-20 17:30:24 UTC
++++ configure
+@@ -6567,7 +6567,7 @@ fi
  done
  
  		case "$host" in
@@ -9,7 +9,7 @@
  			# FreeBSD 7.x and later SCTP support doesn't need -lsctp.
  			;;
  		*)
-@@ -7142,7 +7142,7 @@
+@@ -7142,7 +7142,7 @@ ac_cv_lib_kstat=ac_cv_lib_kstat_main
  			enable_cpuutil="kstat - auto"
  			NETCPU_SOURCE="kstat"
  			;;
diff --git a/benchmarks/netperf/files/patch-arr_script b/benchmarks/netperf/files/patch-doc_examples_arr__script
index 2a9e6b32d9a6..69f3f3f134e5 100644
--- a/benchmarks/netperf/files/patch-arr_script
+++ b/benchmarks/netperf/files/patch-doc_examples_arr__script
@@ -1,6 +1,6 @@
---- doc/examples/arr_script.orig	Wed Sep  8 15:57:17 1999
-+++ doc/examples/arr_script	Wed Sep  8 15:57:56 1999
-@@ -10,8 +10,7 @@
+--- doc/examples/arr_script.orig	2011-02-10 17:04:20 UTC
++++ doc/examples/arr_script
+@@ -12,8 +12,7 @@ init_parms() {
    TOLERANCE=15
    MAX_RETRIES=3
  
diff --git a/benchmarks/netperf/files/patch-bloat.sh b/benchmarks/netperf/files/patch-doc_examples_bloat.sh
index 32a55dee4707..8a0aff68146a 100644
--- a/benchmarks/netperf/files/patch-bloat.sh
+++ b/benchmarks/netperf/files/patch-doc_examples_bloat.sh
@@ -1,5 +1,5 @@
---- doc/examples/bloat.sh.orig	2012-10-05 02:25:19.000000000 +0200
-+++ doc/examples/bloat.sh	2015-10-19 15:18:22.392273000 +0200
+--- doc/examples/bloat.sh.orig	2012-10-05 00:25:19 UTC
++++ doc/examples/bloat.sh
 @@ -3,12 +3,7 @@
  # buffer bloat on latency.  We assume that netperf has been compiled
  # with demo-mode enabled via ./configure --enable-demo
@@ -14,7 +14,7 @@
  
  CHUNK=60
  
-@@ -20,7 +15,7 @@
+@@ -20,7 +15,7 @@ echo "Starting netperf TCP_RR at $RR_STA
  # in more accurate demo intervals once the STREAM test kicks-in, but a
  # somewhat lower transaction rate.  not unlike enabling histogram
  # mode.
@@ -23,7 +23,7 @@
  
  # sleep CHUNK seconds
  sleep $CHUNK
-@@ -29,7 +24,7 @@
+@@ -29,7 +24,7 @@ sleep $CHUNK
  
  STREAM_START=`date +%s`
  echo "Starting netperf TCP_STREAM test at $STREAM_START" | tee -a bloat.log
diff --git a/benchmarks/netperf/files/patch-packet_byte_script b/benchmarks/netperf/files/patch-doc_examples_packet__byte__script
index b3bb8ddd5aec..17318deedc0c 100644
--- a/benchmarks/netperf/files/patch-packet_byte_script
+++ b/benchmarks/netperf/files/patch-doc_examples_packet__byte__script
@@ -1,6 +1,6 @@
---- doc/examples/packet_byte_script.orig	2007-11-09 08:29:45.000000000 +0900
-+++ doc/examples/packet_byte_script	2009-06-16 15:35:37.000000000 +0900
-@@ -25,7 +25,7 @@
+--- doc/examples/packet_byte_script.orig	2011-02-10 17:04:20 UTC
++++ doc/examples/packet_byte_script
+@@ -25,7 +25,7 @@ if [ $# -eq 0 ]; then
  fi
  
  # where is netperf
diff --git a/benchmarks/netperf/files/patch-runemomni.sh b/benchmarks/netperf/files/patch-doc_examples_runemomni.sh
index 939f3508fa25..caaa54ffb138 100644
--- a/benchmarks/netperf/files/patch-runemomni.sh
+++ b/benchmarks/netperf/files/patch-doc_examples_runemomni.sh
@@ -1,5 +1,5 @@
---- doc/examples/runemomni.sh.orig	2011-07-28 22:35:06.000000000 +0200
-+++ doc/examples/runemomni.sh	2015-10-19 15:22:10.484922000 +0200
+--- doc/examples/runemomni.sh.orig	2011-07-28 20:35:06 UTC
++++ doc/examples/runemomni.sh
 @@ -1,6 +1,8 @@
  # a script to run a set of single-instance netperf tests
  # between two machines
@@ -9,7 +9,7 @@
  # the length in seconds of each test iteration. the actual
  # run time will then be somewhere between that times min
  # and max iteration for confidence intervals
-@@ -81,7 +83,7 @@
+@@ -81,7 +83,7 @@ do
        fi
        for j in $set
        do 
@@ -18,7 +18,7 @@
        done
      done
    fi
-@@ -100,7 +102,7 @@
+@@ -100,7 +102,7 @@ do
        fi
        for j in $set
        do
@@ -27,7 +27,7 @@
        done
      done
    fi
-@@ -119,7 +121,7 @@
+@@ -119,7 +121,7 @@ do
        fi
        for j in $set
        do
@@ -36,7 +36,7 @@
        done
      done
    fi
-@@ -138,7 +140,7 @@
+@@ -138,7 +140,7 @@ do
        fi
        for j in $set
        do
@@ -45,7 +45,7 @@
        done
      done
    fi
-@@ -151,7 +153,7 @@
+@@ -151,7 +153,7 @@ do
      do
        for req in $reqs; do
          for burst in $bursts; do
@@ -54,7 +54,7 @@
          done
        done
      done
-@@ -165,7 +167,7 @@
+@@ -165,7 +167,7 @@ do
      do
         for req in $reqs; do
           for burst in $bursts; do
@@ -63,7 +63,7 @@
           done
         done
      done
-@@ -180,7 +182,7 @@
+@@ -180,7 +182,7 @@ do
      for i in $netperf_CPUs
      do
        for req in $reqs; do
diff --git a/benchmarks/netperf/files/patch-runemomniagg2.sh b/benchmarks/netperf/files/patch-doc_examples_runemomniagg2.sh
index e39d00419b0a..9a64a32bf259 100644
--- a/benchmarks/netperf/files/patch-runemomniagg2.sh
+++ b/benchmarks/netperf/files/patch-doc_examples_runemomniagg2.sh
@@ -1,5 +1,5 @@
---- doc/examples/runemomniagg2.sh.orig	2011-07-28 20:37:22.000000000 +0200
-+++ doc/examples/runemomniagg2.sh	2015-10-19 15:35:43.704236000 +0200
+--- doc/examples/runemomniagg2.sh.orig	2011-07-28 18:37:22 UTC
++++ doc/examples/runemomniagg2.sh
 @@ -1,4 +1,7 @@
  #set -x
 +
@@ -8,7 +8,7 @@
  # edit and add to this array as necessary
  # the hosts you will use should be contiguous
  # starting at index zero
-@@ -84,11 +87,11 @@
+@@ -84,11 +87,11 @@ echo four dl585 G5 clients rh5.2, each w
    echo TCP_STREAM
    for i in $concurrent_sessions; do
      j=0; 
@@ -22,7 +22,7 @@
        j=`expr $j + 1`;
      done;
      wait;
-@@ -99,11 +102,11 @@
+@@ -99,11 +102,11 @@ echo four dl585 G5 clients rh5.2, each w
    echo TCP_MAERTS
    for i in $concurrent_sessions; do
      j=0;
@@ -36,7 +36,7 @@
        j=`expr $j + 1`;
      done;
      wait;
-@@ -115,11 +118,11 @@
+@@ -115,11 +118,11 @@ echo four dl585 G5 clients rh5.2, each w
    HDR="-P 1"
    for i in $concurrent_sessions;
      do j=0;
@@ -50,7 +50,7 @@
        j=`expr $j + 1`;
      done;
      wait;
-@@ -130,14 +133,14 @@
+@@ -130,14 +133,14 @@ echo four dl585 G5 clients rh5.2, each w
    echo TCP_RR aggregates
    HDR="-P 1"
    for i in $concurrent_sessions; do
diff --git a/benchmarks/netperf/files/patch-doc_examples_runemomniaggdemo.sh b/benchmarks/netperf/files/patch-doc_examples_runemomniaggdemo.sh
new file mode 100644
index 000000000000..e2ba57a8a08f
--- /dev/null
+++ b/benchmarks/netperf/files/patch-doc_examples_runemomniaggdemo.sh
@@ -0,0 +1,11 @@
+--- doc/examples/runemomniaggdemo.sh.orig	2013-05-10 18:14:25 UTC
++++ doc/examples/runemomniaggdemo.sh
+@@ -138,7 +138,7 @@ then
+ fi
+ 
+ # allow the netperf binary to be used to be overridden 
+-NETPERF=${NETPERF:="netperf"}
++NETPERF="%%PREFIX%%/bin/netperf"
+ 
+ if [ $NUM_REMOTE_HOSTS -lt 2 ]
+ then
diff --git a/benchmarks/netperf/files/patch-sctp_stream_script b/benchmarks/netperf/files/patch-doc_examples_sctp__stream__script
index d3b60119e17d..4bcc090e94ae 100644
--- a/benchmarks/netperf/files/patch-sctp_stream_script
+++ b/benchmarks/netperf/files/patch-doc_examples_sctp__stream__script
@@ -1,6 +1,6 @@
---- doc/examples/sctp_stream_script.bak	Fri Oct 21 07:58:11 2005
-+++ doc/examples/sctp_stream_script	Thu Nov  9 13:20:35 2006
-@@ -24,7 +24,7 @@
+--- doc/examples/sctp_stream_script.orig	2011-02-10 17:04:20 UTC
++++ doc/examples/sctp_stream_script
+@@ -24,7 +24,7 @@ fi
  # where the programs are
  #NETHOME=/usr/local/netperf
  #NETHOME="/opt/netperf"
diff --git a/benchmarks/netperf/files/patch-snapshot_script b/benchmarks/netperf/files/patch-doc_examples_snapshot__script
index 1310ab3b8064..c29a0a9467ac 100644
--- a/benchmarks/netperf/files/patch-snapshot_script
+++ b/benchmarks/netperf/files/patch-doc_examples_snapshot__script
@@ -1,5 +1,5 @@
---- doc/examples/snapshot_script	2 Aug 1999 12:01:24 -0000	1.1.1.1
-+++ doc/examples/snapshot_script	21 Jan 2003 00:45:21 -0000
+--- doc/examples/snapshot_script.orig	2011-02-10 17:04:20 UTC
++++ doc/examples/snapshot_script
 @@ -37,7 +37,7 @@
  #
  # where is netperf installed, there are a few possible places:
diff --git a/benchmarks/netperf/files/patch-tcp_range_script b/benchmarks/netperf/files/patch-doc_examples_tcp__range__script
index 8ed69996ae42..29a14d41e13c 100644
--- a/benchmarks/netperf/files/patch-tcp_range_script
+++ b/benchmarks/netperf/files/patch-doc_examples_tcp__range__script
@@ -1,6 +1,6 @@
---- doc/examples/tcp_range_script	2 Aug 1999 12:01:24 -0000	1.1.1.1
-+++ doc/examples/tcp_range_script	21 Jan 2003 00:45:21 -0000
-@@ -43,7 +43,7 @@
+--- doc/examples/tcp_range_script.orig	2011-02-10 17:04:20 UTC
++++ doc/examples/tcp_range_script
+@@ -43,7 +43,7 @@ PORT=""
  # where is netperf, and are there any "constant" options such as 
  # the netserver port number
  #NETHOME=/usr/etc/net_perf
diff --git a/benchmarks/netperf/files/patch-tcp_rr_script b/benchmarks/netperf/files/patch-doc_examples_tcp__rr__script
index 5e10843ab2f7..aaa6d8a7bbdc 100644
--- a/benchmarks/netperf/files/patch-tcp_rr_script
+++ b/benchmarks/netperf/files/patch-doc_examples_tcp__rr__script
@@ -1,8 +1,6 @@
---- doc/examples/tcp_rr_script	2 Aug 1999 12:01:24 -0000	1.1.1.1
-+++ doc/examples/tcp_rr_script	21 Jan 2003 00:45:21 -0000
-@@ -23,9 +23,9 @@
- fi
- 
+--- doc/examples/tcp_rr_script.orig	2011-02-10 17:04:20 UTC
++++ doc/examples/tcp_rr_script
+@@ -25,7 +25,7 @@ fi
  # where the programs are
  #NETHOME=/usr/local/netperf
  #NETHOME="/opt/netperf"
diff --git a/benchmarks/netperf/files/patch-doc_examples_tcp__stream__script b/benchmarks/netperf/files/patch-doc_examples_tcp__stream__script
new file mode 100644
index 000000000000..20365f24961c
--- /dev/null
+++ b/benchmarks/netperf/files/patch-doc_examples_tcp__stream__script
@@ -0,0 +1,11 @@
+--- doc/examples/tcp_stream_script.orig	2011-02-10 17:04:20 UTC
++++ doc/examples/tcp_stream_script
+@@ -24,7 +24,7 @@ fi
+ # where the programs are
+ #NETHOME=/usr/local/netperf
+ #NETHOME="/opt/netperf"
+-NETHOME=.
++NETHOME=%%PREFIX%%/bin
+ 
+ # at what port will netserver be waiting? If you decide to run
+ # netserver at a different port than the default of 12865, then set
diff --git a/benchmarks/netperf/files/patch-udp_rr_script b/benchmarks/netperf/files/patch-doc_examples_udp__rr__script
index 83f9ca184848..03ec4228cc28 100644
--- a/benchmarks/netperf/files/patch-udp_rr_script
+++ b/benchmarks/netperf/files/patch-doc_examples_udp__rr__script
@@ -1,8 +1,6 @@
---- doc/examples/udp_rr_script	2 Aug 1999 12:01:24 -0000	1.1.1.1
-+++ doc/examples/udp_rr_script	21 Jan 2003 00:45:21 -0000
-@@ -20,9 +20,9 @@
- 
- # where the programs are
+--- doc/examples/udp_rr_script.orig	2011-02-10 17:04:20 UTC
++++ doc/examples/udp_rr_script
+@@ -22,7 +22,7 @@ fi
  
  #NETHOME=/usr/local/netperf
  #NETHOME="/opt/netperf"
diff --git a/benchmarks/netperf/files/patch-udp_stream_script b/benchmarks/netperf/files/patch-doc_examples_udp__stream__script
index 4dbc2058fcf1..5237033f32b6 100644
--- a/benchmarks/netperf/files/patch-udp_stream_script
+++ b/benchmarks/netperf/files/patch-doc_examples_udp__stream__script
@@ -1,8 +1,6 @@
---- doc/examples/udp_stream_script	2 Aug 1999 12:01:23 -0000	1.1.1.1
-+++ doc/examples/udp_stream_script	21 Jan 2003 00:45:21 -0000
-@@ -17,9 +17,9 @@
- 
- # where the programs are
+--- doc/examples/udp_stream_script.orig	2011-02-10 17:04:20 UTC
++++ doc/examples/udp_stream_script
+@@ -19,7 +19,7 @@ fi
  
  #NETHOME=/usr/local/netperf
  #NETHOME="/opt/netperf"
diff --git a/benchmarks/netperf/files/patch-netperf.man b/benchmarks/netperf/files/patch-doc_netperf.man
index afdccde69549..0e6515408c06 100644
--- a/benchmarks/netperf/files/patch-netperf.man
+++ b/benchmarks/netperf/files/patch-doc_netperf.man
@@ -1,6 +1,6 @@
---- doc/netperf.man.orig	2011-06-30 02:03:05.000000000 +0200
-+++ doc/netperf.man	2013-01-29 21:38:34.000000000 +0100
-@@ -53,8 +53,7 @@
+--- doc/netperf.man.orig	2011-06-30 00:03:05 UTC
++++ doc/netperf.man
+@@ -53,8 +53,7 @@ a test (possibly at the expense of perfo
  .TP
  .B \-D [secs,units] (*)
  Display interim results at least every secs seconds uning units as the
diff --git a/benchmarks/netperf/files/patch-dscp.c b/benchmarks/netperf/files/patch-dscp.c
deleted file mode 100644
index 3354b085e6aa..000000000000
--- a/benchmarks/netperf/files/patch-dscp.c
+++ /dev/null
@@ -1,10 +0,0 @@
---- src/dscp.c.orig	2012-04-04 08:51:29.000000000 +0900
-+++ src/dscp.c	2012-08-24 11:12:14.866495927 +0900
-@@ -50,6 +50,7 @@
-  */
- 
- #if HAVE_NETINET_IN_SYSTM_H
-+#include <sys/types.h>
- #include <netinet/in_systm.h>
- #endif
- #if HAVE_NETINET_IP_H
diff --git a/benchmarks/netperf/files/patch-netcpu_sysctl.c b/benchmarks/netperf/files/patch-netcpu_sysctl.c
deleted file mode 100644
index cf96284de13d..000000000000
--- a/benchmarks/netperf/files/patch-netcpu_sysctl.c
+++ /dev/null
@@ -1,11 +0,0 @@
---- src/netcpu_sysctl.c.orig	2014-06-04 01:37:37.000000000 +0200
-+++ src/netcpu_sysctl.c	2015-10-19 16:05:51.583777000 +0200
-@@ -6,6 +6,8 @@
- #endif
- 
- #include <stdio.h>
-+#include <stdlib.h>
-+#include <string.h>
- #include <unistd.h>
- 
- #if HAVE_INTTYPES_H
diff --git a/benchmarks/netperf/files/patch-runemomniaggdemo.sh b/benchmarks/netperf/files/patch-runemomniaggdemo.sh
deleted file mode 100644
index 0c5ab9e01da8..000000000000
--- a/benchmarks/netperf/files/patch-runemomniaggdemo.sh
+++ /dev/null
@@ -1,11 +0,0 @@
---- doc/examples/runemomniaggdemo.sh.orig	2013-05-10 20:14:25.000000000 +0200
-+++ doc/examples/runemomniaggdemo.sh	2015-10-19 15:37:46.597952000 +0200
-@@ -138,7 +138,7 @@
- fi
- 
- # allow the netperf binary to be used to be overridden 
--NETPERF=${NETPERF:="netperf"}
-+NETPERF="%%PREFIX%%/bin/netperf"
- 
- if [ $NUM_REMOTE_HOSTS -lt 2 ]
- then
diff --git a/benchmarks/netperf/files/patch-src_dscp.c b/benchmarks/netperf/files/patch-src_dscp.c
new file mode 100644
index 000000000000..43f33fc55353
--- /dev/null
+++ b/benchmarks/netperf/files/patch-src_dscp.c
@@ -0,0 +1,10 @@
+--- src/dscp.c.orig	2012-10-11 20:42:06 UTC
++++ src/dscp.c
+@@ -54,6 +54,7 @@ const char * iptos2str(int iptos);
+  */
+ 
+ #if HAVE_NETINET_IN_SYSTM_H
++#include <sys/types.h>
+ #include <netinet/in_systm.h>
+ #endif
+ #if HAVE_NETINET_IP_H
diff --git a/benchmarks/netperf/files/patch-src_netcpu__sysctl.c b/benchmarks/netperf/files/patch-src_netcpu__sysctl.c
new file mode 100644
index 000000000000..b9b3c99aa54e
--- /dev/null
+++ b/benchmarks/netperf/files/patch-src_netcpu__sysctl.c
@@ -0,0 +1,11 @@
+--- src/netcpu_sysctl.c.orig	2014-06-03 23:37:37 UTC
++++ src/netcpu_sysctl.c
+@@ -6,6 +6,8 @@ char   netcpu_sysctl_id[]="\
+ #endif
+ 
+ #include <stdio.h>
++#include <stdlib.h>
++#include <string.h>
+ #include <unistd.h>
+ 
+ #if HAVE_INTTYPES_H
diff --git a/benchmarks/netperf/files/patch-nettest_unix.c b/benchmarks/netperf/files/patch-src_nettest__unix.c
index fb6e6b3b21de..8078f397c183 100644
--- a/benchmarks/netperf/files/patch-nettest_unix.c
+++ b/benchmarks/netperf/files/patch-src_nettest__unix.c
@@ -1,6 +1,6 @@
---- src/nettest_unix.c.orig	2012-06-19 22:35:37.000000000 +0200
-+++ src/nettest_unix.c	2015-10-19 16:15:15.347526000 +0200
-@@ -2714,7 +2714,6 @@
+--- src/nettest_unix.c.orig	2012-06-19 20:35:37 UTC
++++ src/nettest_unix.c
+@@ -2714,7 +2714,6 @@ bytes  bytes  bytes   bytes  secs.   per
         that sort of rot... */
  
  #ifdef WANT_INTERVALS
diff --git a/benchmarks/netperf/files/patch-tcp_stream_script b/benchmarks/netperf/files/patch-tcp_stream_script
deleted file mode 100644
index bff83ea174db..000000000000
--- a/benchmarks/netperf/files/patch-tcp_stream_script
+++ /dev/null
@@ -1,13 +0,0 @@
---- doc/examples/tcp_stream_script	2 Aug 1999 12:01:23 -0000	1.1.1.1
-+++ doc/examples/tcp_stream_script	21 Jan 2003 00:45:21 -0000
-@@ -22,9 +22,9 @@
- fi
- 
- # where the programs are
- #NETHOME=/usr/local/netperf
- #NETHOME="/opt/netperf"
--NETHOME=.
-+NETHOME=%%PREFIX%%/bin
- 
- # at what port will netserver be waiting? If you decide to run
- # netserver at a differnet port than the default of 12865, then set