This makes this version of netperf work with the netperf-wrapper testing tool
used for testing for bufferbloat.
---
net/netperf/Makefile |8 +---
net/netperf/patches/001-dccp.patch | 38
2 files changed, 5 insertions(+), 41 deletions(-)
delete mode 100644 net/netperf/patches/001-dccp.patch
diff --git a/net/netperf/Makefile b/net/netperf/Makefile
index 815853e..3f1fb6e 100644
--- a/net/netperf/Makefile
+++ b/net/netperf/Makefile
@@ -8,12 +8,12 @@
include $(TOPDIR)/rules.mk
PKG_NAME:=netperf
-PKG_VERSION:=2.4.5
-PKG_RELEASE:=2
+PKG_VERSION:=2.6.0
+PKG_RELEASE:=1
PKG_SOURCE:=$(PKG_NAME)-$(PKG_VERSION).tar.bz2
PKG_SOURCE_URL:=ftp://ftp.netperf.org/netperf/
-PKG_MD5SUM:=5cfaae1d024551161b8eafbd48faedf4
+PKG_MD5SUM:=9654ffdfd4c4f2c93ce3733cd9ed9236
include $(INCLUDE_DIR)/package.mk
@@ -24,6 +24,8 @@ define Package/netperf
URL:=http://www.netperf.org/
endef
+CONFIGURE_ARGS += --enable-demo
+
define Package/netperf/install
$(INSTALL_DIR) $(1)/etc/init.d
$(INSTALL_BIN) ./files/netserver.init $(1)/etc/init.d/netserver
diff --git a/net/netperf/patches/001-dccp.patch
b/net/netperf/patches/001-dccp.patch
deleted file mode 100644
index ae84cee..000
--- a/net/netperf/patches/001-dccp.patch
+++ /dev/null
@@ -1,38 +0,0 @@
-[PATCH] fix build on systems where IPROTO_DCCP is defined, but SOCK_DCCP isn't
-
-On some systems (E.G. uClibc 0.9.31) IPROTO_DCCP is defined, but SOCK_DCCP
-isn't - Causing the build to break. Fix it by checking for both before
-using.
-
-Signed-off-by: Peter Korsgaard jac...@sunsite.dk
- src/netsh.c |2 +-
- src/nettest_bsd.c |2 +-
- 2 files changed, 2 insertions(+), 2 deletions(-)
-
-Index: netperf-2.4.5/src/netsh.c
-===
netperf-2.4.5.orig/src/netsh.c
-+++ netperf-2.4.5/src/netsh.c
-@@ -452,7 +452,7 @@ parse_protocol(char protocol_string[])
- return IPPROTO_SDP;
- }
- #endif
--#ifdef IPPROTO_DCCP
-+#if defined(IPPROTO_DCCP) defined(SOCK_DCCP)
- if (!strcasecmp(temp,dccp)) {
- socket_type = SOCK_DCCP;
- return IPPROTO_DCCP;
-Index: netperf-2.4.5/src/nettest_bsd.c
-===
netperf-2.4.5.orig/src/nettest_bsd.c
-+++ netperf-2.4.5/src/nettest_bsd.c
-@@ -712,7 +712,7 @@ complete_addrinfo(char *controlhost, cha
-that we did this so the code for the Solaris kludge can do
-the fix-up for us. also flip error over to EAI_AGAIN and
-make sure we don't count this time around the loop. */
--#if defined(IPPROTO_DCCP)
-+#if defined(IPPROTO_DCCP) defined(SOCK_DCCP)
- /* only tweak on this one the second time around, after we've
-kludged the ai_protocol field */
- if ((hints.ai_socktype == SOCK_DCCP)
--
1.7.9.5
___
openwrt-devel mailing list
openwrt-devel@lists.openwrt.org
https://lists.openwrt.org/mailman/listinfo/openwrt-devel
