# HG changeset patch
# User Michael Schloh von Bennewitz <michael@schloh.com>
# Date 1346171855 -7200
# Node ID 3d058537a9dda939b812c871bd38d84dc2b54bfc
# Parent  080279a062dd36f4ceddcb51bf78bcf541ac1bd8
Update to new vendor version, adapt patch logic, and modernize packaging.

diff -r 080279a062dd -r 3d058537a9dd netperf/netperf.patch
--- a/netperf/netperf.patch	Tue Aug 28 18:37:20 2012 +0200
+++ b/netperf/netperf.patch	Tue Aug 28 18:37:35 2012 +0200
@@ -1,46 +1,31 @@
-diff -Nau configure.orig configure
-Index: configure
---- configure.orig	2011-03-21 09:30:50.934813866 +0100
-+++ configure	2011-03-21 09:31:27.459048318 +0100
-@@ -8748,6 +8748,7 @@
- cat confdefs.h >>conftest.$ac_ext
- cat >>conftest.$ac_ext <<_ACEOF
- /* end confdefs.h.  */
-+#include <sys/socket.h>
- #include <netinet/sctp.h>
+diff -Nau src/dscp.c.orig src/dscp.c
+Index: src/dscp.c
+--- src/dscp.c.orig	2012-08-21 12:14:56.541033514 +0200
++++ src/dscp.c	2012-08-21 12:15:00.668991007 +0200
+@@ -50,6 +50,7 @@
+  */
  
- int
-diff -Nau src/net_uuid.c.orig src/net_uuid.c
-Index: src/net_uuid.c
---- src/net_uuid.c.orig	2008-10-25 01:13:44.000000000 +0200
-+++ src/net_uuid.c	2011-03-21 14:23:16.000000000 +0100
-@@ -38,8 +38,10 @@
- #else
- #include <sys/types.h>
- #include <sys/time.h>
-+#if !defined(__APPLE__) && !defined(__MACH__)
- #include <sys/sysinfo.h>
+ #if HAVE_NETINET_IN_SYSTM_H
++#include <stdint.h>
+ #include <netinet/in_systm.h>
  #endif
-+#endif
- 
- /* system dependent call to get the current system time. Returned as
-    100ns ticks since UUID epoch, but resolution may be less than
+ #if HAVE_NETINET_IP_H
 diff -Nau src/nettest_bsd.c.orig src/nettest_bsd.c
 Index: src/nettest_bsd.c
---- src/nettest_bsd.c.orig	2011-03-21 09:20:13.471888999 +0100
-+++ src/nettest_bsd.c	2011-03-21 09:20:16.343927098 +0100
-@@ -97,6 +97,7 @@
- #endif /* NOSTDLIBH */
+--- src/nettest_bsd.c.orig	2012-06-19 22:32:47.000000000 +0200
++++ src/nettest_bsd.c	2012-08-21 12:15:36.378376195 +0200
+@@ -106,6 +106,7 @@
+ #include <netinet/tcp.h>
  
- #ifdef WANT_SCTP
+ #ifdef HAVE_NETINET_SCTP_H
 +#include <sys/socket.h>
  #include <netinet/sctp.h>
  #endif
  
 diff -Nau src/nettest_sctp.c.orig src/nettest_sctp.c
 Index: src/nettest_sctp.c
---- src/nettest_sctp.c.orig	2011-03-21 09:22:57.248890123 +0100
-+++ src/nettest_sctp.c	2011-03-21 09:23:02.907197031 +0100
+--- src/nettest_sctp.c.orig	2012-06-19 22:39:22.000000000 +0200
++++ src/nettest_sctp.c	2012-08-21 12:16:25.314029201 +0200
 @@ -58,6 +58,7 @@
  #include <netinet/sctp.h>
  #include <arpa/inet.h>
diff -r 080279a062dd -r 3d058537a9dd netperf/netperf.spec
--- a/netperf/netperf.spec	Tue Aug 28 18:37:20 2012 +0200
+++ b/netperf/netperf.spec	Tue Aug 28 18:37:35 2012 +0200
@@ -1,6 +1,6 @@
 ##
 ##  netperf.spec -- OpenPKG RPM Package Specification
-##  Copyright (c) 2011 Michael Schloh von Bennewitz <michael@schloh.com>
+##  Copyright (c) 2012 Michael Schloh von Bennewitz <michael@schloh.com>
 ##
 ##  Permission to use, copy, modify, and distribute this software for
 ##  any purpose with or without fee is hereby granted, provided that
@@ -31,20 +31,16 @@
 Class:        EVAL
 Group:        Network
 License:      Commercial
-Version:      2.4.5
-Release:      20110302
+Version:      2.6.0
+Release:      20120800
 
 #   list of sources
 Source0:      ftp://ftp.netperf.org/netperf/netperf-%{version}.tar.bz2
 Patch0:       netperf.patch
 
 #   build information
-Prefix:       %{l_prefix}
-BuildRoot:    %{l_buildroot}
-BuildPreReq:  OpenPKG, openpkg >= 20040130
-PreReq:       OpenPKG, openpkg >= 20040130
-AutoReq:      no
-AutoReqProv:  no
+BuildPreReq:  OpenPKG, openpkg >= 20100101, make
+PreReq:       OpenPKG, openpkg >= 20100101
 
 %description
     Netperf is a benchmark that can be used to measure the performance
@@ -78,7 +74,6 @@
     %{l_make} %{l_mflags -O}
 
 %install
-    rm -rf $RPM_BUILD_ROOT
     %{l_make} %{l_mflags} install DESTDIR=$RPM_BUILD_ROOT
     strip $RPM_BUILD_ROOT%{l_prefix}/bin/*
     %{l_rpmtool} files -v -ofiles -r$RPM_BUILD_ROOT %{l_files_std}
@@ -86,5 +81,4 @@
 %files -f files
 
 %clean
-    rm -rf $RPM_BUILD_ROOT