6relayd: Fix some RFC 6204 compatibility issues

SVN-Revision: 34419

diff --git a/package/network/ipv6/6relayd/Makefile b/package/network/ipv6/6relayd/Makefile
index 7d6c6e2d98eaf0e71d2c739975acd8ba5669ed91..e0a12d32f556332439ec11d6320d31977b6c8c21 100644 (file)
--- a/package/network/ipv6/6relayd/Makefile
+++ b/package/network/ipv6/6relayd/Makefile
@@ -8,14 +8,14 @@
 include $(TOPDIR)/rules.mk
 
 PKG_NAME:=6relayd
-PKG_VERSION:=2012-11-17
+PKG_VERSION:=2012-11-27
 PKG_RELEASE=$(PKG_SOURCE_VERSION)
 
 PKG_SOURCE:=$(PKG_NAME)-$(PKG_VERSION).tar.bz2
 PKG_SOURCE_SUBDIR:=$(PKG_NAME)-$(PKG_VERSION)
-PKG_SOURCE_URL:=git://nbd.name/6relayd.git
+PKG_SOURCE_URL:=git://github.com/sbyx/6relayd.git
 PKG_SOURCE_PROTO:=git
-PKG_SOURCE_VERSION:=f0fec4df02e3310de134e46e9826dbeedb86119a
+PKG_SOURCE_VERSION:=fa0f64a2d916ba488141c7272af7b355dd1002eb
 
 PKG_MAINTAINER:=Steven Barth <steven@midlink.org>
 

diff --git a/package/network/ipv6/6relayd/files/6relayd.init b/package/network/ipv6/6relayd/files/6relayd.init
index f1c100b2e5f17fcaf2f7cce9fd2b0b7c90dd326e..8c50336d0cb2da1ac52b4d2473a63b8f6d00ddf7 100644 (file)
--- a/package/network/ipv6/6relayd/files/6relayd.init
+++ b/package/network/ipv6/6relayd/files/6relayd.init
@@ -64,12 +64,7 @@ start_6relayd() {
        [ $always_rewrite_dns -eq 1 ] && append args "-n"
 
        # In server mode the first interface needs to be passed twice
-       [ "$mode" == "server" ] && {
-               for iface in $ifaces; do
-                       ifaces="$iface $ifaces"
-                       break
-               done
-       }
+       [ "$mode" == "server" ] && ifaces=". $ifaces"
 
        service_start /usr/sbin/6relayd $args $ifaces
 }