From: Jo-Philipp Wich <jow@openwrt.org>
Date: Sun, 5 Feb 2012 03:26:34 +0000 (+0000)
Subject: [packages_10.03.2] miredo: merge r28924
X-Git-Url: http://git.cdn.openwrt.org/?a=commitdiff_plain;h=abd2a09018c99c9d61018cc01afd5241ea1d0517;p=openwrt%2Fsvn-archive%2Farchive.git

[packages_10.03.2] miredo: merge r28924

SVN-Revision: 30174
---

diff --git a/ipv6/miredo/Makefile b/ipv6/miredo/Makefile
index 6fa08cc139..f3c73b35c5 100644
--- a/ipv6/miredo/Makefile
+++ b/ipv6/miredo/Makefile
@@ -9,7 +9,7 @@ include $(TOPDIR)/rules.mk
 
 PKG_NAME:=miredo
 PKG_VERSION:=1.2.3
-PKG_RELEASE:=1
+PKG_RELEASE:=2
 
 PKG_SOURCE_URL:=http://www.remlab.net/files/miredo/
 PKG_SOURCE:=$(PKG_NAME)-$(PKG_VERSION).tar.bz2
diff --git a/ipv6/miredo/files/miredo-server.init b/ipv6/miredo/files/miredo-server.init
index d18dc19ee1..e82820feb0 100644
--- a/ipv6/miredo/files/miredo-server.init
+++ b/ipv6/miredo/files/miredo-server.init
@@ -1,13 +1,14 @@
 #!/bin/sh /etc/rc.common
-# Copyright (C) 2006 OpenWrt.org
+# Copyright (C) 2006-2011 OpenWrt.org
+
 START=50
 
-PID_F=/var/run/miredo-server.pid
+SERVICE_USE_PID=1
 
 start() {
-	miredo-server
+	service_start /usr/sbin/miredo-server
 }
 
 stop() {
-	[ -f $PID_F ] && kill $(cat $PID_F)
+	service_stop /usr/sbin/miredo-server
 }
diff --git a/ipv6/miredo/files/miredo.init b/ipv6/miredo/files/miredo.init
index c44e80151b..0a83c96ba7 100644
--- a/ipv6/miredo/files/miredo.init
+++ b/ipv6/miredo/files/miredo.init
@@ -1,13 +1,15 @@
 #!/bin/sh /etc/rc.common
-# Copyright (C) 2006 OpenWrt.org
+# Copyright (C) 2006-2011 OpenWrt.org
+
 START=50
 
-PID_F=/var/run/miredo.pid
+# XXX: miredo create a pid file but using it doesn't seem to work
+#SERVICE_USE_PID=1
 
 start() {
-	miredo
+	service_start /usr/sbin/miredo
 }
 
 stop() {
-	[ -f $PID_F ] && kill $(cat $PID_F)
+	service_stop /usr/sbin/miredo
 }