From: Nicolas Thill <nico@openwrt.org>
Date: Sat, 29 Sep 2007 18:37:34 +0000 (+0000)
Subject: peerguardian fixes: add dependency on queue netfilter module, run the actual daemon... 
X-Git-Url: http://git.openwrt.org/?p=openwrt%2Fsvn-archive%2Farchive.git;a=commitdiff_plain;h=6ea14527db408c2fd2c76c9f8c34cd9d39be90ae

peerguardian fixes: add dependency on queue netfilter module, run the actual daemon in the initcript (not the control program) and set exec perms on it


SVN-Revision: 9072
---

diff --git a/net/peerguardian/Makefile b/net/peerguardian/Makefile
index 9020052a85..f184dcfd7e 100644
--- a/net/peerguardian/Makefile
+++ b/net/peerguardian/Makefile
@@ -15,7 +15,6 @@ PKG_RELEASE:=1
 PKG_SOURCE:=pglinux-$(PKG_VERSION).tar.gz
 PKG_SOURCE_URL:=@SF/peerguardian
 PKG_MD5SUM:=0fb2bc5501b031604fc56eec3bd35fa4
-PKG_CAT:=zcat
 
 PKG_BUILD_DIR:=$(BUILD_DIR)/pglinux-$(PKG_VERSION)
 
@@ -26,14 +25,16 @@ include $(INCLUDE_DIR)/package.mk
 define Package/peerguardian
   SECTION:=net
   CATEGORY:=Network
-  DEPENDS:= +libncurses +libpthread +uclibcxx
+  DEPENDS:= +kmod-ipt-queue +libncurses +libpthread +uclibcxx
   TITLE:=PeerGuardian for Linux
-  DESCRIPTION:=\
-	PeerGuardian helps protect your privacy by blocking many ranges \\\
-	of aggressive IPs while you use P2P.
   URL:=http://phoenixlabs.org/
 endef
 
+define Package/peerguardian/description
+ PeerGuardian helps protect your privacy by blocking many ranges  of aggressive 
+ IPs while you use P2P.
+endef
+
 define Package/peerguardian/conffiles
 /etc/PG.conf
 /etc/p2p.p2b.p2p
diff --git a/net/peerguardian/files/peerguardian.init b/net/peerguardian/files/peerguardian.init
old mode 100644
new mode 100755
index 3da3aa4b2a..c0cb8be16b
--- a/net/peerguardian/files/peerguardian.init
+++ b/net/peerguardian/files/peerguardian.init
@@ -2,16 +2,11 @@
 # Copyright (C) 2006 OpenWrt.org
 START=50
 
-BIN=pgtext
-DEFAULT=/etc/default/$BIN
-RUN_D=/var/run
-PID_F=$RUN_D/$BIN_${IF}_${ID}.pid
+BIN=peerguardnf
+CFG_F=/etc/PG.conf
+OPTIONS="-c $CFG_F -d"
 
 start() {
-	[ -f $DEFAULT ] && . $DEFAULT
 	$BIN $OPTIONS
 }
 
-stop() {
-	[ -f $PID_F ] && kill $(cat $PID_F) >/dev/null 2>&1
-}