packages: netperf/netperf-scripts.patch, netperf/netperf.spec, netperf/netp...

glen glen at pld-linux.org
Mon Feb 21 12:58:23 CET 2011 

Author: glen                         Date: Mon Feb 21 11:58:23 2011 GMT
Module: packages                      Tag: HEAD
---- Log message:
- up to 2.4.5

---- Files affected:
packages/netperf:
   netperf-scripts.patch (1.2 -> 1.3) , netperf.spec (1.16 -> 1.17) , netperf-makefile.patch (1.4 -> NONE)  (REMOVED)

---- Diffs:

================================================================
Index: packages/netperf/netperf-scripts.patch
diff -u packages/netperf/netperf-scripts.patch:1.2 packages/netperf/netperf-scripts.patch:1.3
--- packages/netperf/netperf-scripts.patch:1.2	Sat Jul 17 22:02:04 2004
+++ packages/netperf/netperf-scripts.patch	Mon Feb 21 12:58:18 2011
@@ -1,5 +1,5 @@
---- netperf-2.3/arr_script.orig	2004-06-26 00:09:50.000000000 +0200
-+++ netperf-2.3/arr_script	2004-07-17 19:57:46.029406272 +0200
+--- 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
    MAX_RETRIES=3
@@ -11,19 +11,19 @@
  
    NPROC_LIST=""
    RR_SIZES=""
---- netperf-2.3/packet_byte_script.orig	2004-06-26 00:09:50.000000000 +0200
-+++ netperf-2.3/packet_byte_script	2004-07-17 19:58:04.905536664 +0200
-@@ -22,7 +22,7 @@
+--- 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
+@@ -25,7 +25,7 @@
  fi
  
  # where is netperf
--NETPERF_CMD=${NETPERF_CMD:=/opt/netperf/netperf}
-+NETPERF_CMD=${NETPERF_CMD:=/usr/bin/netperf}
+-NETPERF_DIR=${NETPERF_DIR:=/opt/netperf2/bin}
++NETPERF_DIR=${NETPERF_DIR:=/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.3/snapshot_script.orig	2004-06-26 00:09:50.000000000 +0200
-+++ netperf-2.3/snapshot_script	2004-07-17 19:58:36.233774048 +0200
+--- 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
 @@ -37,7 +37,7 @@
  #
  # where is netperf installed, there are a few possible places:
@@ -33,8 +33,8 @@
  
  
  # there should be no more than two parms passed
---- netperf-2.3/tcp_range_script.orig	2004-06-26 00:09:50.000000000 +0200
-+++ netperf-2.3/tcp_range_script	2004-07-17 20:00:29.887496056 +0200
+--- 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 @@
  # where is netperf, and are there any "constant" options such as 
  # the netserver port number
@@ -46,8 +46,8 @@
  
  # How accurate we want the estimate of performance: 
  #      maximum and minimum test iterations (-i)
---- netperf-2.3/tcp_rr_script.orig	2004-06-26 00:09:50.000000000 +0200
-+++ netperf-2.3/tcp_rr_script	2004-07-17 20:01:26.950821112 +0200
+--- 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
 @@ -25,7 +25,7 @@
  # where the programs are
  #NETHOME=/usr/local/netperf
@@ -57,8 +57,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/tcp_stream_script.orig	2004-06-26 00:09:50.000000000 +0200
-+++ netperf-2.3/tcp_stream_script	2004-07-17 20:01:43.181353696 +0200
+--- 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
 @@ -24,7 +24,7 @@
  # where the programs are
  #NETHOME=/usr/local/netperf
@@ -68,8 +68,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/udp_rr_script.orig	2004-06-26 00:09:50.000000000 +0200
-+++ netperf-2.3/udp_rr_script	2004-07-17 19:59:50.935417672 +0200
+--- 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
 @@ -22,7 +22,7 @@
  
  #NETHOME=/usr/local/netperf
@@ -79,8 +79,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/udp_stream_script.orig	2004-06-26 00:09:50.000000000 +0200
-+++ netperf-2.3/udp_stream_script	2004-07-17 19:59:36.725577896 +0200
+--- 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
 @@ -19,7 +19,7 @@
  
  #NETHOME=/usr/local/netperf

================================================================
Index: packages/netperf/netperf.spec
diff -u packages/netperf/netperf.spec:1.16 packages/netperf/netperf.spec:1.17
--- packages/netperf/netperf.spec:1.16	Tue Feb 13 08:16:49 2007
+++ packages/netperf/netperf.spec	Mon Feb 21 12:58:18 2011
@@ -1,19 +1,17 @@
 # $Revision$, $Date$
 # TODO:
-# - init for netserver
+# - init for netserver (maybe not, you don't need it running 24x7, do you?)
 Summary:	Performance testing tool for TCP/UDP
 Summary(es.UTF-8):	Mide la Velocidad de la Conecion entre dos maquinas
 Summary(pl.UTF-8):	Narzędzie do testowania wydajności dla TCP/UDP
 Summary(pt_BR.UTF-8):	Ferramenta para testes de performance de rede TCP/UDP
 Name:		netperf
-Version:	2.3
-Release:	3
+Version:	2.4.5
+Release:	1
 License:	distributable
 Group:		Networking
-#Source0:	ftp://ftp.cup.hp.com/dist/networking/benchmarks/netperf/%{name}-%{version}.tar.gz
-Source0:	%{name}-%{version}.tar.gz
-# Source0-md5:	df61b8db5e38d58cdf81748635614d33
-Patch0:		%{name}-makefile.patch
+Source0:	ftp://ftp.netperf.org/netperf/%{name}-%{version}.tar.bz2
+# Source0-md5:	5cfaae1d024551161b8eafbd48faedf4
 Patch1:		%{name}-scripts.patch
 URL:		http://www.netperf.org/
 BuildRoot:	%{tmpdir}/%{name}-%{version}-root-%(id -u -n)
@@ -43,52 +41,51 @@
 
 %prep
 %setup -q
-%patch0 -p1
 %patch1 -p1
 
+# cleanup backups after patching
+find '(' -name '*~' -o -name '*.orig' ')' -print0 | xargs -0 -r -l512 rm -f
+
 %build
-%{__make} \
-	CC="%{__cc}" \
-	LDFLAGS="%{rpmldflags}" \
-	OPTFLAGS="%{rpmcflags}"
+%configure
+%{__make}
 
 %install
 rm -rf $RPM_BUILD_ROOT
-install -d $RPM_BUILD_ROOT{%{_bindir},%{_mandir}/man1,%{doc}/scripts}
+%{__make} install \
+	DESTDIR=$RPM_BUILD_ROOT
+
+for a in doc/examples/*; do
+	s=${a##*/}
+	install -p $a $RPM_BUILD_ROOT%{_bindir}/%{name}-$s
+done
 
-install netperf			$RPM_BUILD_ROOT%{_bindir}
-install netserver		$RPM_BUILD_ROOT%{_bindir}
-install arr_script		$RPM_BUILD_ROOT%{_bindir}/netperf-script_arr
-install snapshot_script		$RPM_BUILD_ROOT%{_bindir}/netperf-script_snapshot
-install tcp_rr_script		$RPM_BUILD_ROOT%{_bindir}/netperf-script_tcp_rr
-install udp_rr_script		$RPM_BUILD_ROOT%{_bindir}/netperf-script_udp_rr
-install packet_byte_script	$RPM_BUILD_ROOT%{_bindir}/netperf-script_packet_byte
-install tcp_range_script	$RPM_BUILD_ROOT%{_bindir}/netperf-script_tcp_range
-install tcp_stream_script	$RPM_BUILD_ROOT%{_bindir}/netperf-script_tcp_stream
-install udp_stream_script	$RPM_BUILD_ROOT%{_bindir}/netperf-script_udp_stream
-install netperf.man		$RPM_BUILD_ROOT%{_mandir}/man1/netperf.1
-install netserver.man		$RPM_BUILD_ROOT%{_mandir}/man1/netserver.1
+rm -f $RPM_BUILD_ROOT%{_bindir}/*Makefile*
+%{__rm} $RPM_BUILD_ROOT%{_infodir}/dir
 
 %clean
 rm -rf $RPM_BUILD_ROOT
 
 %files
 %defattr(644,root,root,755)
-%doc ACKNWLDGMNTS COPYRIGHT README Release_Notes
+%doc AUTHORS COPYING README Release_Notes
 %attr(755,root,root) %{_bindir}/netperf
 %attr(755,root,root) %{_bindir}/netserver
-%{_mandir}/man?/*
+%{_infodir}/netperf.info*
+%{_mandir}/man1/netperf.1*
+%{_mandir}/man1/netserver.1*
 
 %files -n netperf-scripts
 %defattr(644,root,root,755)
-%attr(755,root,root) %{_bindir}/netperf-script_arr
-%attr(755,root,root) %{_bindir}/netperf-script_snapshot
-%attr(755,root,root) %{_bindir}/netperf-script_tcp_rr
-%attr(755,root,root) %{_bindir}/netperf-script_udp_rr
-%attr(755,root,root) %{_bindir}/netperf-script_packet_byte
-%attr(755,root,root) %{_bindir}/netperf-script_tcp_range
-%attr(755,root,root) %{_bindir}/netperf-script_tcp_stream
-%attr(755,root,root) %{_bindir}/netperf-script_udp_stream
+%attr(755,root,root) %{_bindir}/netperf-arr_script
+%attr(755,root,root) %{_bindir}/netperf-packet_byte_script
+%attr(755,root,root) %{_bindir}/netperf-sctp_stream_script
+%attr(755,root,root) %{_bindir}/netperf-snapshot_script
+%attr(755,root,root) %{_bindir}/netperf-tcp_range_script
+%attr(755,root,root) %{_bindir}/netperf-tcp_rr_script
+%attr(755,root,root) %{_bindir}/netperf-tcp_stream_script
+%attr(755,root,root) %{_bindir}/netperf-udp_rr_script
+%attr(755,root,root) %{_bindir}/netperf-udp_stream_script
 
 %define date	%(echo `LC_ALL="C" date +"%a %b %d %Y"`)
 %changelog
@@ -96,6 +93,9 @@
 All persons listed below can be reached at <cvs_login>@pld-linux.org
 
 $Log$
+Revision 1.17  2011/02/21 11:58:18  glen
+- up to 2.4.5
+
 Revision 1.16  2007/02/13 07:16:49  glen
 - tabs in preamble
 
================================================================

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

More information about the pld-cvs-commit mailing list