[packages_10.03.2] netperf: merge r29050

git-svn-id: svn://svn.openwrt.org/openwrt/branches/packages_10.03.2@30226 3c298f89-4303-0410-b956-a3cf2f4a3e73

diff --git a/net/netperf/Makefile b/net/netperf/Makefile
index 09f0633..815853e 100644 (file)
--- a/net/netperf/Makefile
+++ b/net/netperf/Makefile
@@ -1,5 +1,5 @@
 #
-# Copyright (C) 2006-2009 OpenWrt.org
+# Copyright (C) 2006-2011 OpenWrt.org
 #
 # This is free software, licensed under the GNU General Public License v2.
 # See /LICENSE for more information.
@@ -9,7 +9,7 @@ include $(TOPDIR)/rules.mk
 
 PKG_NAME:=netperf
 PKG_VERSION:=2.4.5
-PKG_RELEASE:=1
+PKG_RELEASE:=2
 
 PKG_SOURCE:=$(PKG_NAME)-$(PKG_VERSION).tar.bz2
 PKG_SOURCE_URL:=ftp://ftp.netperf.org/netperf/

diff --git a/net/netperf/files/netserver.init b/net/netperf/files/netserver.init
index 6d3ccdd..42fcf33 100644 (file)
--- a/net/netperf/files/netserver.init
+++ b/net/netperf/files/netserver.init
@@ -1,11 +1,12 @@
 #!/bin/sh /etc/rc.common
-# Copyright (C) 2006 OpenWrt.org
+# Copyright (C) 2006-2011 OpenWrt.org
+
 START=50
 
 start() {
-       /usr/bin/netserver
+       service_start /usr/bin/netserver
 }
 
 stop() {
-       killall netserver
+       service_stop /usr/bin/netserver
 }