From 23e08c2a2fac5cc35af7f441a4c6dc58a9209a97 Mon Sep 17 00:00:00 2001
From: jow <jow@3c298f89-4303-0410-b956-a3cf2f4a3e73>
Date: Sun, 5 Feb 2012 16:16:52 +0000
Subject: [PATCH] [packages_10.03.2] tinyproxy: merge r29173

git-svn-id: svn://svn.openwrt.org/openwrt/branches/packages_10.03.2@30268 3c298f89-4303-0410-b956-a3cf2f4a3e73
---
 net/tinyproxy/Makefile               |  2 +-
 net/tinyproxy/files/tinyproxy.config |  2 +-
 net/tinyproxy/files/tinyproxy.init   | 23 +++++++++++++----------
 3 files changed, 15 insertions(+), 12 deletions(-)

diff --git a/net/tinyproxy/Makefile b/net/tinyproxy/Makefile
index e6daa1e..a6b61ce 100644
--- a/net/tinyproxy/Makefile
+++ b/net/tinyproxy/Makefile
@@ -9,7 +9,7 @@ include $(TOPDIR)/rules.mk
 
 PKG_NAME:=tinyproxy
 PKG_VERSION:=1.8.2
-PKG_RELEASE:=4
+PKG_RELEASE:=5
 
 PKG_SOURCE:=$(PKG_NAME)-$(PKG_VERSION).tar.bz2
 PKG_SOURCE_URL:=http://www.banu.com/pub/tinyproxy/1.8/
diff --git a/net/tinyproxy/files/tinyproxy.config b/net/tinyproxy/files/tinyproxy.config
index ffccc40..dc4fb4f 100644
--- a/net/tinyproxy/files/tinyproxy.config
+++ b/net/tinyproxy/files/tinyproxy.config
@@ -3,7 +3,7 @@ config tinyproxy
 #
 # Enable the proxy
 #
-option enable 0
+option enabled 0
 
 #
 # Name of the user the tinyproxy daemon should switch to after the port
diff --git a/net/tinyproxy/files/tinyproxy.init b/net/tinyproxy/files/tinyproxy.init
index cff10c0..be7234a 100644
--- a/net/tinyproxy/files/tinyproxy.init
+++ b/net/tinyproxy/files/tinyproxy.init
@@ -1,25 +1,28 @@
 #!/bin/sh /etc/rc.common
-# Copyright (C) 2008 OpenWrt.org
+# Copyright (C) 2008-2011 OpenWrt.org
+
 START=50
 
-DAEMON=/usr/sbin/tinyproxy
 CFGFILE=/var/etc/tinyproxy.conf
 
+section_enabled() {
+	config_get_bool enabled "$1" 'enabled' 0
+	[ $enabled -gt 0 ]
+}
+
 start() {
-	config_load tinyproxy
-	config_foreach start_proxy tinyproxy
+	config_load 'tinyproxy'
+	config_foreach start_proxy 'tinyproxy'
 }
 
 stop() {
-	start-stop-daemon -q -x "$DAEMON" -K
-	rm -f $CFGFILE
+	service_stop /usr/sbin/tinyproxy
 }
 
 start_proxy() {
-	config_get_bool enable "$1" enable
-	[ "$enable" -eq "1" ] || return 0
+	section_enabled "$1" || return 1
 
-	mkdir -p /var/etc
+	mkdir -m0755 -p /var/etc
 	echo '### AUTOGENERATED CONFIGURATION' > $CFGFILE
 	echo '### DO NOT EDIT' >> $CFGFILE
 	echo '### SEE /etc/config/tinyproxy INSTEAD' >> $CFGFILE
@@ -69,7 +72,7 @@ start_proxy() {
 
 	config_foreach write_upstream upstream
 
-	start-stop-daemon -q -x "$DAEMON" -S -- -c "$CFGFILE"
+	service_start /usr/sbin/tinyproxy -c "$CFGFILE"
 }
 
 write_upstream() {
-- 
2.11.0