xinetd: merge r28748, r28908

SVN-Revision: 30281

diff --git a/net/xinetd/Makefile b/net/xinetd/Makefile
index 9c33cdd0fe892640e0f79952b2758575943d3843..52b1deab27eb30dccc10e7647ded32208b49ff30 100644 (file)
--- a/net/xinetd/Makefile
+++ b/net/xinetd/Makefile
@@ -1,5 +1,5 @@
 # 
-# Copyright (C) 2006 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:=xinetd
 PKG_VERSION:=2.3.14
-PKG_RELEASE:=1
+PKG_RELEASE:=3
 
 PKG_SOURCE:=$(PKG_NAME)-$(PKG_VERSION).tar.gz
 PKG_SOURCE_URL:=http://www.xinetd.org/

diff --git a/net/xinetd/files/xinetd.init b/net/xinetd/files/xinetd.init
index a1747f061911e6a5193e5392bab8da3a10b0c549..1437f587c52e3505a8c3af8b0fee98a0d9cb544e 100644 (file)
--- a/net/xinetd/files/xinetd.init
+++ b/net/xinetd/files/xinetd.init
@@ -1,18 +1,15 @@
 #!/bin/sh /etc/rc.common
-# Copyright (C) 2006 OpenWrt.org
+# Copyright (C) 2006-2011 OpenWrt.org
+
 START=50
 
-DEFAULT=/etc/default/xinetd
-RUN_D=/var/run
-PID_F=$RUN_D/xinetd.pid
+SERVICE_USE_PID=1
 
 start() {
-       [ -f $DEFAULT ] && . $DEFAULT
-       [ -d $RUN_D ] || mkdir -p $RUN_D
-       xinetd $OPTIONS
+       service_start /usr/sbin/xinetd -pidfile /var/run/xinetd.pid
 }
 
 stop() {
-       [ -f $PID_F ] && kill $(cat $PID_F)
+       service_stop /usr/sbin/xinetd
 }