From: Jo-Philipp Wich <jow@openwrt.org>
Date: Mon, 17 Oct 2011 12:45:07 +0000 (+0000)
Subject: 6in4: sync with HE.net endpoint update changes
X-Git-Url: http://git.lede-project.org./?a=commitdiff_plain;h=b656b87d136d7038aa045a221fd2ce5b9a903ef1;p=openwrt%2Fstaging%2Fmans0n.git

6in4: sync with HE.net endpoint update changes

SVN-Revision: 28475
---

diff --git a/package/6in4/Makefile b/package/6in4/Makefile
index 14b7eac816..fb0803a8a6 100644
--- a/package/6in4/Makefile
+++ b/package/6in4/Makefile
@@ -8,8 +8,8 @@
 include $(TOPDIR)/rules.mk
 
 PKG_NAME:=6in4
-PKG_VERSION:=9
-PKG_RELEASE:=2
+PKG_VERSION:=10
+PKG_RELEASE:=1
 
 include $(INCLUDE_DIR)/package.mk
 
diff --git a/package/6in4/files/6in4.hotplug b/package/6in4/files/6in4.hotplug
index 9df993498a..3d9def448e 100644
--- a/package/6in4/files/6in4.hotplug
+++ b/package/6in4/files/6in4.hotplug
@@ -37,12 +37,12 @@ if [ "$ACTION" = ifup ]; then
 			uci_set_state network "$cfg" ipaddr "$wanip"
 
 			[ -n "$tunnelid" ] && [ -n "$username" ] && [ -n "$password" ] && {
-				[ "${#password}" == 32 -a -z "${password//[a-f0-9]/}" ] || {
+				[ "${#password}" == 32 -a -z "${password//[a-fA-F0-9]/}" ] || {
 					password="$(echo -n "$password" | md5sum)"; password="${password%% *}"
 				}
 
 				(
-					local url="http://ipv4.tunnelbroker.net/ipv4_end.php?ipv4b=AUTO&user_id=$username&pass=$password&tunnel_id=$tunnelid"
+					local url="http://ipv4.tunnelbroker.net/ipv4_end.php?ip=AUTO&apikey=$username&pass=$password&tid=$tunnelid"
 					local try=0
 					local max=3