From 311b126da0f9b50f39fe7ae03ee8aa43a29a2c75 Mon Sep 17 00:00:00 2001
From: Jo-Philipp Wich <jow@openwrt.org>
Date: Sun, 5 Feb 2012 16:14:40 +0000
Subject: [PATCH] stun: merge r29095, r29199

SVN-Revision: 30265
---
 net/stun/Makefile         |  6 +++++-
 net/stun/files/stund.init | 20 +++++++++++---------
 2 files changed, 16 insertions(+), 10 deletions(-)

diff --git a/net/stun/Makefile b/net/stun/Makefile
index b0ac419df..e7090bf66 100644
--- a/net/stun/Makefile
+++ b/net/stun/Makefile
@@ -9,7 +9,7 @@ include $(TOPDIR)/rules.mk
 
 PKG_NAME:=stund
 PKG_VERSION:=0.96
-PKG_RELEASE:=3
+PKG_RELEASE:=5
 
 PKG_SOURCE:=$(PKG_NAME)_$(PKG_VERSION)_Aug13.tgz
 PKG_SOURCE_URL:=@SF/stun
@@ -73,6 +73,10 @@ define Package/stund/install
 	$(INSTALL_DATA) ./files/stund.config $(1)/etc/config/stund
 endef
 
+define Package/stund/conffiles
+/etc/config/stund
+endef
+
 define Package/stun-client/install
  	$(INSTALL_DIR) $(1)/usr/sbin
 	$(INSTALL_BIN) $(PKG_BUILD_DIR)/client $(1)/usr/sbin/stun-client
diff --git a/net/stun/files/stund.init b/net/stun/files/stund.init
index 177ae58f5..1deada499 100644
--- a/net/stun/files/stund.init
+++ b/net/stun/files/stund.init
@@ -3,26 +3,28 @@
 
 START=70
 
+SERVICE_DAEMONIZE=1
+SERVICE_WRITE_PID=1
+
 start() {
 	local pri_ip sec_ip pri_port sec_port
+
 	parse_opts() {
 		local cfg="$1"
-		config_get pri_ip   "$cfg" primaryip
-		config_get sec_ip   "$cfg" secondaryip
-		config_get pri_port "$cfg" primaryport
-		config_get sec_port "$cfg" secondaryport
+		config_get pri_ip   "$cfg" 'primaryip'
+		config_get sec_ip   "$cfg" 'secondaryip'
+		config_get pri_port "$cfg" 'primaryport'
+		config_get sec_port "$cfg" 'secondaryport'
 	}
 
-	config_load "stund"
+	config_load 'stund'
 	config_foreach parse_opts
 
-	start-stop-daemon -S -p /var/run/stund.pid -m -b \
-		-x /usr/sbin/stund -- \
+	service_start /usr/sbin/stund \
 		${pri_ip:+-h $pri_ip} ${sec_ip:+-a $sec_ip} \
 		${pri_port:+-p $pri_port} ${sec_port:+-o $sec_port}
 }
 
 stop() {
-	service_kill stund /var/run/stund.pid
-	rm -f /var/run/stund.pid
+	service_stop /usr/sbin/stund
 }
-- 
2.30.2