aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorSteven Barth <steven@midlink.org>2012-11-29 20:14:14 +0000
committerSteven Barth <steven@midlink.org>2012-11-29 20:14:14 +0000
commit53241a5e18f30e66f16ddf9fdeeb22eef50031c1 (patch)
tree89993e6747b67bfdcbf63ca69a0508d2a170f33a
parent13a478551d908175ee38e96b658f724a87d6d064 (diff)
downloadupstream-53241a5e18f30e66f16ddf9fdeeb22eef50031c1.tar.gz
upstream-53241a5e18f30e66f16ddf9fdeeb22eef50031c1.tar.bz2
upstream-53241a5e18f30e66f16ddf9fdeeb22eef50031c1.zip
6relayd: Fix some RFC 6204 compatibility issues
git-svn-id: svn://svn.openwrt.org/openwrt/trunk@34419 3c298f89-4303-0410-b956-a3cf2f4a3e73
-rw-r--r--package/network/ipv6/6relayd/Makefile6
-rw-r--r--package/network/ipv6/6relayd/files/6relayd.init7
2 files changed, 4 insertions, 9 deletions
diff --git a/package/network/ipv6/6relayd/Makefile b/package/network/ipv6/6relayd/Makefile
index 7d6c6e2d98..e0a12d32f5 100644
--- 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 f1c100b2e5..8c50336d0c 100644
--- 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
}