From: Waldemar Brodkorb <mail@waldemar-brodkorb.de>
Date: Wed, 14 Sep 2005 10:09:37 +0000 (+0000)
Subject: fine tune package, add example conf
X-Git-Url: http://git.lede-project.org./?a=commitdiff_plain;h=b4a71641ca592d0c08ec2f4748ad427c5ff221e0;p=openwrt%2Fstaging%2Frmilecki.git

fine tune package, add example conf

SVN-Revision: 1916
---

diff --git a/openwrt/package/srelay/Makefile b/openwrt/package/srelay/Makefile
index 6fde1138735..485ea26abef 100644
--- a/openwrt/package/srelay/Makefile
+++ b/openwrt/package/srelay/Makefile
@@ -13,6 +13,7 @@ PKG_CAT:=zcat
 
 PKG_BUILD_DIR:=$(BUILD_DIR)/$(PKG_NAME)-$(PKG_VERSION)
 PKG_INSTALL_DIR:=$(PKG_BUILD_DIR)/ipkg-install
+PKG_INIT_LEVEL:=60
 
 include $(TOPDIR)/package/rules.mk
 
@@ -58,8 +59,9 @@ $(PKG_BUILD_DIR)/.built:
 $(IPKG_SRELAY):
 	install -m0755 -d $(IDIR_SRELAY)/usr/bin
 	install -m0755 -d $(IDIR_SRELAY)/etc/init.d
-	cp $(PKG_INSTALL_DIR)/srelay $(IDIR_SRELAY)/usr/bin/
-	cp files/S60srelay $(IDIR_SRELAY)/etc/init.d
-	chmod 755 $(IDIR_SRELAY)/etc/init.d/S60srelay
+	cp -fpR $(PKG_INSTALL_DIR)/srelay $(IDIR_SRELAY)/usr/bin/
+	cp -fpR files/srelay.init $(IDIR_SRELAY)/etc/init.d/S$(PKG_INIT_LEVEL)srelay
+	cp -fpR files/srelay.conf $(IDIR_SRELAY)/etc
+	chmod 755 $(IDIR_SRELAY)/etc/init.d/S$(PKG_INIT_LEVEL)srelay
 	$(RSTRIP) $(IDIR_SRELAY)
 	$(IPKG_BUILD) $(IDIR_SRELAY) $(PACKAGE_DIR)
diff --git a/openwrt/package/srelay/files/S60srelay b/openwrt/package/srelay/files/S60srelay
deleted file mode 100755
index 9e5a5f5654d..00000000000
--- a/openwrt/package/srelay/files/S60srelay
+++ /dev/null
@@ -1,5 +0,0 @@
-#!/bin/sh
-
-if [ -f /etc/srelay.conf ];then
-	srelay -c /etc/srelay.conf -r -s 
-fi
diff --git a/openwrt/package/srelay/files/srelay.conf b/openwrt/package/srelay/files/srelay.conf
new file mode 100644
index 00000000000..e5d53ec966a
--- /dev/null
+++ b/openwrt/package/srelay/files/srelay.conf
@@ -0,0 +1,2 @@
+# allow local subnet to access socks proxy
+192.168.1.0/24 any -
diff --git a/openwrt/package/srelay/files/srelay.init b/openwrt/package/srelay/files/srelay.init
new file mode 100755
index 00000000000..9e5a5f5654d
--- /dev/null
+++ b/openwrt/package/srelay/files/srelay.init
@@ -0,0 +1,5 @@
+#!/bin/sh
+
+if [ -f /etc/srelay.conf ];then
+	srelay -c /etc/srelay.conf -r -s 
+fi