packages: netperf/netperf-scripts.patch - fix some more scripts

glen glen at pld-linux.org
Mon Feb 21 13:09:52 CET 2011


Author: glen                         Date: Mon Feb 21 12:09:52 2011 GMT
Module: packages                      Tag: HEAD
---- Log message:
- fix some more scripts

---- Files affected:
packages/netperf:
   netperf-scripts.patch (1.3 -> 1.4) 

---- Diffs:

================================================================
Index: packages/netperf/netperf-scripts.patch
diff -u packages/netperf/netperf-scripts.patch:1.3 packages/netperf/netperf-scripts.patch:1.4
--- packages/netperf/netperf-scripts.patch:1.3	Mon Feb 21 12:58:18 2011
+++ packages/netperf/netperf-scripts.patch	Mon Feb 21 13:09:47 2011
@@ -1,18 +1,20 @@
---- netperf-2.3/doc/examples/arr_script.orig	2004-06-26 00:09:50.000000000 +0200
-+++ netperf-2.3/doc/examples/arr_script	2004-07-17 19:57:46.029406272 +0200
-@@ -10,8 +10,8 @@
-   TOLERANCE=15
+--- netperf-2.4.5-scripts/doc/examples/arr_script	2011-02-21 14:04:33.210661848 +0200
++++ netperf-2.4.5-scripts/doc/examples/arr_script	2011-02-21 14:04:33.210661848 +0200
+@@ -1,3 +1,4 @@
++#!/bin/sh
+ # this is retained mostly for historical purposes and may not be
+ # up to date for contemporary netperf versions
+ #
+@@ -13,6 +14,5 @@
    MAX_RETRIES=3
  
 -  NETPERF="/usr/local/netperf/netperf"
 -  NETPERF="./netperf"
-+# NETPERF="/usr/local/netperf/netperf"
 +  NETPERF="/usr/bin/netperf"
  
    NPROC_LIST=""
-   RR_SIZES=""
---- netperf-2.4.5/doc/examples/packet_byte_script~	2007-11-09 01:29:45.000000000 +0200
-+++ netperf-2.4.5/doc/examples/packet_byte_script	2011-02-21 13:23:56.222935773 +0200
+--- netperf-2.4.5/doc/examples/packet_byte_script	2007-11-09 01:29:45.000000000 +0200
++++ netperf-2.4.5-scripts/doc/examples/packet_byte_script	2011-02-21 13:32:49.530443373 +0200
 @@ -25,7 +25,7 @@
  fi
  
@@ -22,8 +24,8 @@
  
  
  # at what port will netserver be waiting? If you decide to run
---- netperf-2.3/doc/examples/snapshot_script.orig	2004-06-26 00:09:50.000000000 +0200
-+++ netperf-2.3/doc/examples/snapshot_script	2004-07-17 19:58:36.233774048 +0200
+--- netperf-2.4.5/doc/examples/snapshot_script	2007-06-02 01:06:03.000000000 +0300
++++ netperf-2.4.5-scripts/doc/examples/snapshot_script	2011-02-21 13:32:49.533776462 +0200
 @@ -37,7 +37,7 @@
  #
  # where is netperf installed, there are a few possible places:
@@ -33,21 +35,21 @@
  
  
  # there should be no more than two parms passed
---- netperf-2.3/doc/examples/tcp_range_script.orig	2004-06-26 00:09:50.000000000 +0200
-+++ netperf-2.3/doc/examples/tcp_range_script	2004-07-17 20:00:29.887496056 +0200
-@@ -43,8 +43,8 @@
+--- netperf-2.4.5-scripts/doc/examples/tcp_range_script	2011-02-21 14:05:38.182552753 +0200
++++ netperf-2.4.5-scripts/doc/examples/tcp_range_script	2011-02-21 14:05:38.182552753 +0200
+@@ -42,9 +42,7 @@
+ 
  # where is netperf, and are there any "constant" options such as 
  # the netserver port number
- #NETHOME=/usr/etc/net_perf
+-#NETHOME=/usr/etc/net_perf
 -NETHOME="."
 -NETPERF=$NETHOME/netperf $PORT
-+#NETHOME="."
-+NETPERF=/usr/bin/netperf $PORT
++NETPERF="/usr/bin/netperf $PORT"
  
  # How accurate we want the estimate of performance: 
  #      maximum and minimum test iterations (-i)
---- netperf-2.3/doc/examples/tcp_rr_script.orig	2004-06-26 00:09:50.000000000 +0200
-+++ netperf-2.3/doc/examples/tcp_rr_script	2004-07-17 20:01:26.950821112 +0200
+--- netperf-2.4.5/doc/examples/tcp_rr_script	2007-06-02 01:06:03.000000000 +0300
++++ netperf-2.4.5-scripts/doc/examples/tcp_rr_script	2011-02-21 13:32:49.533776462 +0200
 @@ -25,7 +25,7 @@
  # where the programs are
  #NETHOME=/usr/local/netperf
@@ -57,8 +59,8 @@
  
  # at what port will netserver be waiting? If you decide to run
  # netserver at a differnet port than the default of 12865, then set
---- netperf-2.3/doc/examples/tcp_stream_script.orig	2004-06-26 00:09:50.000000000 +0200
-+++ netperf-2.3/doc/examples/tcp_stream_script	2004-07-17 20:01:43.181353696 +0200
+--- netperf-2.4.5/doc/examples/tcp_stream_script	2007-06-02 01:06:03.000000000 +0300
++++ netperf-2.4.5-scripts/doc/examples/tcp_stream_script	2011-02-21 13:32:49.533776462 +0200
 @@ -24,7 +24,7 @@
  # where the programs are
  #NETHOME=/usr/local/netperf
@@ -68,8 +70,8 @@
  
  # at what port will netserver be waiting? If you decide to run
  # netserver at a differnet port than the default of 12865, then set
---- netperf-2.3/doc/examples/udp_rr_script.orig	2004-06-26 00:09:50.000000000 +0200
-+++ netperf-2.3/doc/examples/udp_rr_script	2004-07-17 19:59:50.935417672 +0200
+--- netperf-2.4.5/doc/examples/udp_rr_script	2007-06-02 01:06:03.000000000 +0300
++++ netperf-2.4.5-scripts/doc/examples/udp_rr_script	2011-02-21 13:32:49.537109551 +0200
 @@ -22,7 +22,7 @@
  
  #NETHOME=/usr/local/netperf
@@ -79,14 +81,25 @@
  
  # at what port will netserver be waiting? If you decide to run
  # netserver at a differnet port than the default of 12865, then set
---- netperf-2.3/doc/examples/udp_stream_script.orig	2004-06-26 00:09:50.000000000 +0200
-+++ netperf-2.3/doc/examples/udp_stream_script	2004-07-17 19:59:36.725577896 +0200
+--- netperf-2.4.5/doc/examples/udp_stream_script	2007-06-02 01:06:03.000000000 +0300
++++ netperf-2.4.5-scripts/doc/examples/udp_stream_script	2011-02-21 13:32:49.537109551 +0200
 @@ -19,7 +19,7 @@
  
  #NETHOME=/usr/local/netperf
  #NETHOME="/opt/netperf"
 -NETHOME="."
 +NETHOME="/usr/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
+--- netperf-2.4.5//doc/examples/sctp_stream_script	2007-06-02 01:06:03.000000000 +0300
++++ netperf-2.4.5-scripts/doc/examples/sctp_stream_script	2011-02-21 14:04:53.472505842 +0200
+@@ -24,7 +24,7 @@
+ # where the programs are
+ #NETHOME=/usr/local/netperf
+ #NETHOME="/opt/netperf"
+-NETHOME=.
++NETHOME=/usr/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
================================================================

---- CVS-web:
    http://cvs.pld-linux.org/cgi-bin/cvsweb.cgi/packages/netperf/netperf-scripts.patch?r1=1.3&r2=1.4&f=u



More information about the pld-cvs-commit mailing list