From: Jo-Philipp Wich <jow@openwrt.org>
Date: Sun, 5 Feb 2012 16:11:41 +0000 (+0000)
Subject: [packages_10.03.2] srelay: merge r29066
X-Git-Url: http://git.lede-project.org./?a=commitdiff_plain;h=59aaa21ac1112e59c4b7809abd013758a5718e33;p=openwrt%2Fsvn-archive%2Farchive.git

[packages_10.03.2] srelay: merge r29066

SVN-Revision: 30262
---

diff --git a/net/srelay/Makefile b/net/srelay/Makefile
index 7a8cb4233b..d579d1d506 100644
--- a/net/srelay/Makefile
+++ b/net/srelay/Makefile
@@ -1,5 +1,5 @@
 #
-# Copyright (C) 2006-2010 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:=srelay
 PKG_VERSION:=0.4.8b3
-PKG_RELEASE:=1
+PKG_RELEASE:=2
 
 PKG_SOURCE:=$(PKG_NAME)-$(PKG_VERSION).tar.gz
 PKG_SOURCE_URL:=@SF/socks-relay
diff --git a/net/srelay/files/srelay.init b/net/srelay/files/srelay.init
index 6d2343888e..95d1d81376 100644
--- a/net/srelay/files/srelay.init
+++ b/net/srelay/files/srelay.init
@@ -1,13 +1,14 @@
 #!/bin/sh /etc/rc.common
-# Copyright (C) 2006 OpenWrt.org
+# Copyright (C) 2006-2011 OpenWrt.org
+
 START=50
 
+SERVICE_USE_PID=1
+
 start() {
-	if [ -f /etc/srelay.conf ];then
-		srelay -c /etc/srelay.conf -r -s 
-	fi
+	service_start /usr/bin/srelay -c /etc/srelay.conf -r -s 
 }
 
 stop() {
-	killall srelay
+	service_stop /usr/bin/srelay
 }