miredo: merge r28924

SVN-Revision: 30174

diff --git a/ipv6/miredo/Makefile b/ipv6/miredo/Makefile
index 6fa08cc1392052ad49160c62ad31c9ce20691b6c..f3c73b35c5fd30d73b2d536f9161f8dc41a51a65 100644 (file)
--- 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 d18dc19ee10b05904d69512ef013cf218049626c..e82820feb008a993d0b04c7e27faffb24c7c074c 100644 (file)
--- 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 c44e80151b40f582e631058d2d1dbeae40f05ff6..0a83c96ba72bbb00439b6a0a00e90528272c7e49 100644 (file)
--- 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
 }