From: swalker <swalker@3c298f89-4303-0410-b956-a3cf2f4a3e73>
Date: Sun, 3 Jul 2011 21:07:13 +0000 (+0000)
Subject: [packages] darkstat: update to 3.0.714, use service_kill
X-Git-Url: http://207.154.207.93/?a=commitdiff_plain;h=3c3ef3cd09a2b091f01aef338df1a19cbe6f98e4;p=packages.git

[packages] darkstat: update to 3.0.714, use service_kill


git-svn-id: svn://svn.openwrt.org/openwrt/packages@27421 3c298f89-4303-0410-b956-a3cf2f4a3e73
---

diff --git a/net/darkstat/Makefile b/net/darkstat/Makefile
index c3f624aa1..62ab82e27 100644
--- a/net/darkstat/Makefile
+++ b/net/darkstat/Makefile
@@ -1,5 +1,5 @@
 #
-# Copyright (C) 2007-2010 OpenWrt.org
+# Copyright (C) 2007-2011 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:=darkstat
-PKG_VERSION:=3.0.713
+PKG_VERSION:=3.0.714
 PKG_RELEASE:=1
 
 PKG_SOURCE:=$(PKG_NAME)-$(PKG_VERSION).tar.bz2
 PKG_SOURCE_URL:=http://dmr.ath.cx/net/darkstat
-PKG_MD5SUM:=3fd2a4ddb123ad11bb99f1094a6206d9
+PKG_MD5SUM:=eef385fadc8dbb611d3d4c4d8fa94817
 
 PKG_INSTALL:=1
 
@@ -38,6 +38,7 @@ define Package/darkstat/conffiles
 endef
 
 CONFIGURE_ARGS += \
+	--disable-debug \
 	--with-chroot-dir=/var/empty
 
 define Build/Compile
diff --git a/net/darkstat/files/darkstat.init b/net/darkstat/files/darkstat.init
index baa1bbd38..93bee6b61 100644
--- a/net/darkstat/files/darkstat.init
+++ b/net/darkstat/files/darkstat.init
@@ -1,8 +1,9 @@
 #!/bin/sh /etc/rc.common
-# Copyright (C) 2007 OpenWrt.org
+# Copyright (C) 2007-2011 OpenWrt.org
 
 START=60
 RUN_D=/var/empty
+PID_F=$RUN_D/darkstat.pid
 
 start() {
 	mkdir -p $RUN_D
@@ -24,9 +25,11 @@ start_darkstat() {
 		-i "$ifname" \
 		${httpaddr:+-b "$httpaddr"} \
 		${httpport:+-p "$httpport"} \
-		--chroot $RUN_D
+		--chroot $RUN_D \
+		--pidfile $PID_F
 }
 
 stop() {
-	killall darkstat
+	service_kill darkstat $PID_F
+	rm -f $PID_F
 }