From: Jo-Philipp Wich Date: Tue, 27 Sep 2016 14:20:57 +0000 (+0200) Subject: 6in4: fix invalid local variable declaration (FS#188) X-Git-Url: http://git.lede-project.org./?a=commitdiff_plain;h=864b2d113ad0815c2444575014e7cf51498944db;p=openwrt%2Fstaging%2Fblocktrron.git 6in4: fix invalid local variable declaration (FS#188) Remove an invalid local variable declaration in the tunnel update subshell invocation. Local declarations outside of function scopes are illegal since the Busybox update to version 1.25.0 . Signed-off-by: Jo-Philipp Wich --- diff --git a/package/network/ipv6/6in4/Makefile b/package/network/ipv6/6in4/Makefile index 5d9355fa54..34227ce9ef 100644 --- a/package/network/ipv6/6in4/Makefile +++ b/package/network/ipv6/6in4/Makefile @@ -8,7 +8,7 @@ include $(TOPDIR)/rules.mk PKG_NAME:=6in4 -PKG_VERSION:=23 +PKG_VERSION:=24 PKG_RELEASE:=1 PKG_LICENSE:=GPL-2.0 @@ -19,7 +19,7 @@ define Package/6in4 CATEGORY:=Network DEPENDS:=@IPV6 +kmod-sit +uclient-fetch TITLE:=IPv6-in-IPv4 configuration support - MAINTAINER:=Jo-Philipp Wich + MAINTAINER:=Jo-Philipp Wich PKGARCH:=all endef diff --git a/package/network/ipv6/6in4/files/6in4.sh b/package/network/ipv6/6in4/files/6in4.sh index c358a222fa..45d8ab75ad 100755 --- a/package/network/ipv6/6in4/files/6in4.sh +++ b/package/network/ipv6/6in4/files/6in4.sh @@ -11,7 +11,7 @@ proto_6in4_update() { sh -c ' - local timeout=5 + timeout=5 (while [ $((timeout--)) -gt 0 ]; do sleep 1