odhcp6c: some more fixes for map / lw4o6 support

git-svn-id: svn://svn.openwrt.org/openwrt/trunk@40728 3c298f89-4303-0410-b956-a3cf2f4a3e73

diff --git a/package/network/ipv6/odhcp6c/Makefile b/package/network/ipv6/odhcp6c/Makefile
index e8bdbde..26a599b 100644 (file)
--- a/package/network/ipv6/odhcp6c/Makefile
+++ b/package/network/ipv6/odhcp6c/Makefile
@@ -8,14 +8,14 @@
 include $(TOPDIR)/rules.mk
 
 PKG_NAME:=odhcp6c
 include $(TOPDIR)/rules.mk
 
 PKG_NAME:=odhcp6c

-PKG_VERSION:=2014-04-30
+PKG_VERSION:=2014-05-08

 PKG_RELEASE=$(PKG_SOURCE_VERSION)
 
 PKG_SOURCE:=$(PKG_NAME)-$(PKG_VERSION).tar.bz2
 PKG_SOURCE_SUBDIR:=$(PKG_NAME)-$(PKG_VERSION)
 PKG_SOURCE_URL:=git://github.com/sbyx/odhcp6c.git
 PKG_SOURCE_PROTO:=git
 PKG_RELEASE=$(PKG_SOURCE_VERSION)
 
 PKG_SOURCE:=$(PKG_NAME)-$(PKG_VERSION).tar.bz2
 PKG_SOURCE_SUBDIR:=$(PKG_NAME)-$(PKG_VERSION)
 PKG_SOURCE_URL:=git://github.com/sbyx/odhcp6c.git
 PKG_SOURCE_PROTO:=git

-PKG_SOURCE_VERSION:=a0bbaf5bffc66b1693577a374a9a599e313aefe1
+PKG_SOURCE_VERSION:=fa291eaf4ea0d94e84e9fb617ff81abae04a2835

 PKG_MAINTAINER:=Steven Barth <steven@midlink.org>
 
 include $(INCLUDE_DIR)/package.mk
 PKG_MAINTAINER:=Steven Barth <steven@midlink.org>
 
 include $(INCLUDE_DIR)/package.mk

diff --git a/package/network/ipv6/odhcp6c/files/dhcpv6.script b/package/network/ipv6/odhcp6c/files/dhcpv6.script
index 3599284..7a7f76f 100755 (executable)
--- a/package/network/ipv6/odhcp6c/files/dhcpv6.script
+++ b/package/network/ipv6/odhcp6c/files/dhcpv6.script
@@ -115,6 +115,7 @@ setup_interface () {
                json_add_string proto map
                json_add_string type "$MAPTYPE"
                json_add_string rule "$MAPRULE"
                json_add_string proto map
                json_add_string type "$MAPTYPE"
                json_add_string rule "$MAPRULE"

+               json_add_string tunlink "$INTERFACE"

                [ -n "$ZONE_MAP" ] && json_add_string zone "$ZONE_MAP"
                [ -n "$IFACE_MAP_DELEGATE" ] && json_add_boolean delegate "$IFACE_MAP_DELEGATE"
                json_close_object
                [ -n "$ZONE_MAP" ] && json_add_string zone "$ZONE_MAP"
                [ -n "$IFACE_MAP_DELEGATE" ] && json_add_boolean delegate "$IFACE_MAP_DELEGATE"
                json_close_object