Merge pull request #89 from SeattleMeshnet/master

cjdns: import package from github.com:SeattleMeshnet/meshbox

diff --git a/babeld/Makefile b/babeld/Makefile
index 43a91b8beb3163210b77c2e19bb76f105e6899f7..1607b049387c9536ae0c35e1d39449dd494d6d2b 100644 (file)
--- a/babeld/Makefile
+++ b/babeld/Makefile
@@ -8,12 +8,12 @@
 include $(TOPDIR)/rules.mk
 
 PKG_NAME:=babeld
-PKG_VERSION:=1.5.1
+PKG_VERSION:=1.6.0
 PKG_RELEASE:=1
 
 PKG_SOURCE:=$(PKG_NAME)-$(PKG_VERSION).tar.gz
 PKG_SOURCE_URL:=http://www.pps.univ-paris-diderot.fr/~jch/software/files/
-PKG_MD5SUM:=20e3284d5ad291d7ba2ad91d5b47de10
+PKG_MD5SUM:=b0602a6124ddafb37225bd1a2d8abb13
 PKG_LICENSE:=MIT
 
 include $(INCLUDE_DIR)/package.mk

diff --git a/hnetd/Makefile b/hnetd/Makefile
index b88d1d3caf918d8d826e001bacb15d0b84a8343a..c497f6122982d34160e5794656087e67b8e1ac27 100644 (file)
--- a/hnetd/Makefile
+++ b/hnetd/Makefile
@@ -7,8 +7,8 @@
 include $(TOPDIR)/rules.mk
 
 PKG_NAME:=hnetd
-PKG_SOURCE_VERSION:=082ebb2aa7a542a198afe38c0d8c8126f0762bdf
-PKG_VERSION:=2015-04-15-$(PKG_SOURCE_VERSION)
+PKG_SOURCE_VERSION:=6a5348ca13ae257c02431df499e78b695049324f
+PKG_VERSION:=2015-04-17-$(PKG_SOURCE_VERSION)
 PKG_RELEASE:=1
 
 PKG_SOURCE_PROTO:=git

diff --git a/nat46/Makefile b/nat46/Makefile
index 4cbc494894b523d8104b0d90e173e8670391ce42..f30fbc9d2d3ab277af99071fc73e853f08c7a246 100644 (file)
--- a/nat46/Makefile
+++ b/nat46/Makefile
@@ -9,14 +9,14 @@ include $(TOPDIR)/rules.mk
 include $(INCLUDE_DIR)/kernel.mk
 
 PKG_NAME:=nat46
-PKG_VERSION:=3
+PKG_VERSION:=4
 PKG_RELEASE:=$(PKG_SOURCE_VERSION)
 
 PKG_SOURCE:=$(PKG_NAME)-$(PKG_VERSION).tar.xz
 PKG_SOURCE_SUBDIR:=$(PKG_NAME)-$(PKG_VERSION)
 PKG_SOURCE_URL:=https://github.com/ayourtch/nat46.git
 PKG_SOURCE_PROTO:=git
-PKG_SOURCE_VERSION:=a28e24b45c31bfa61447d0bdd591478cff1cad10
+PKG_SOURCE_VERSION:=ccbba8595d7ccbc2ccb1e7d81b420e9587f07fe5
 PKG_MAINTAINER:=Steven Barth <cyrus@openwrt.org>
 PKG_LICENSE:=GPL-2.0
 

diff --git a/nat46/files/464xlat.sh b/nat46/files/464xlat.sh
index 680d2301aebbcc4e0af4913ffcaa2d9887b83650..8154f7f88570b41c3e6cced96bc20bd7fc27676e 100755 (executable)
--- a/nat46/files/464xlat.sh
+++ b/nat46/files/464xlat.sh
@@ -22,7 +22,7 @@
 proto_464xlat_setup() {
        local cfg="$1"
        local iface="$2"
-       local link="464xlat-$cfg"
+       local link="464-$cfg"
 
        local ip6addr ip6prefix tunlink zone
        json_get_vars ip6addr ip6prefix tunlink zone