From: Nicolas Thill <nico@openwrt.org>
Date: Tue, 15 Nov 2011 03:40:56 +0000 (+0000)
Subject: packages/privoxy: use new service functions
X-Git-Url: http://git.openwrt.org/?p=openwrt%2Fsvn-archive%2Farchive.git;a=commitdiff_plain;hb=c8846e3b03dbdb5bb5c0d71216c309871a8f5bc1

packages/privoxy: use new service functions

Signed-off-by: Peter Wagner <tripolar@gmx.at>

SVN-Revision: 29151
---

diff --git a/net/privoxy/Makefile b/net/privoxy/Makefile
index 2cc6bff646..a70deaca81 100644
--- a/net/privoxy/Makefile
+++ b/net/privoxy/Makefile
@@ -9,7 +9,7 @@ include $(TOPDIR)/rules.mk
 
 PKG_NAME:=privoxy
 PKG_VERSION:=3.0.17
-PKG_RELEASE:=2
+PKG_RELEASE:=3
 
 PKG_SOURCE:=$(PKG_NAME)-$(PKG_VERSION)-stable-src.tar.gz
 PKG_SOURCE_URL:=@SF/ijbswa
diff --git a/net/privoxy/files/privoxy.init b/net/privoxy/files/privoxy.init
index 85479b3382..0afe4c4902 100644
--- a/net/privoxy/files/privoxy.init
+++ b/net/privoxy/files/privoxy.init
@@ -1,16 +1,16 @@
 #!/bin/sh /etc/rc.common
-# Copyright (C) 2006 OpenWrt.org
+# Copyright (C) 2006-2011 OpenWrt.org
+
 START=50
+STOP=50
 
-CFG_F=/etc/privoxy/config
-RUN_D=/var/run
-PID_F=$RUN_D/privoxy.pid
+SERVICE_USE_PID=1
 
 start() {
-	mkdir -p $RUN_D
-	/usr/sbin/privoxy --pidfile $PID_F $CFG_F
+	service_start /usr/sbin/privoxy --pidfile /var/run/privoxy.pid \
+					/etc/privoxy/config
 }
 
 stop() {
-	[ -f $PID_F ] && kill $(cat $PID_F)
+	service_stop /usr/sbin/privoxy
 }