[packages_10.03.2] privoxy: merge r29151, r29805

git-svn-id: svn://svn.openwrt.org/openwrt/branches/packages_10.03.2@30241 3c298f89-4303-0410-b956-a3cf2f4a3e73

diff --git a/net/privoxy/Makefile b/net/privoxy/Makefile
index 2cc6bff..e4b45cf 100644 (file)
--- a/net/privoxy/Makefile
+++ b/net/privoxy/Makefile
@@ -1,5 +1,5 @@
 #
-# Copyright (C) 2006-2011 OpenWrt.org
+# Copyright (C) 2006-2012 OpenWrt.org
 #
 # This is free software, licensed under the GNU General Public License v2.
 # See /LICENSE for more information.
@@ -8,12 +8,12 @@
 include $(TOPDIR)/rules.mk
 
 PKG_NAME:=privoxy
-PKG_VERSION:=3.0.17
-PKG_RELEASE:=2
+PKG_VERSION:=3.0.19
+PKG_RELEASE:=1
 
 PKG_SOURCE:=$(PKG_NAME)-$(PKG_VERSION)-stable-src.tar.gz
 PKG_SOURCE_URL:=@SF/ijbswa
-PKG_MD5SUM:=9d363d738a3f3d73e774d6dfeafdb15f
+PKG_MD5SUM:=57acc79059565cc42eda67982842785d
 
 PKG_BUILD_DIR:=$(BUILD_DIR)/$(PKG_NAME)-$(PKG_VERSION)-stable
 PKG_FIXUP:=autoreconf

diff --git a/net/privoxy/files/privoxy.init b/net/privoxy/files/privoxy.init
index 85479b3..0afe4c4 100644 (file)
--- 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
 }