darkstat: update to 3.0.714, use service_kill

SVN-Revision: 27421

diff --git a/net/darkstat/Makefile b/net/darkstat/Makefile
index c3f624aa13b7ce6dce0afd2bf407cb21e7ce96ea..62ab82e27772d8eb8eb1d0326c66e2884feb9a70 100644 (file)
--- 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 baa1bbd387f566ac065bf103aa74b0040dfa0089..93bee6b61955cf2f6332ce94631c7275e202b292 100644 (file)
--- 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
 }