[backfire] 6in4: merge r28475

git-svn-id: svn://svn.openwrt.org/openwrt/branches/backfire@28476 3c298f89-4303-0410-b956-a3cf2f4a3e73

diff --git a/package/6in4/Makefile b/package/6in4/Makefile
index 65b10542e695e6501a7fc589dec1dd23246c1985..2bfc325a1cceffb8cc64293946a3f8e77bb36ad4 100644 (file)
--- 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 9df993498a1f6ae5fad21e37687d50ff90674473..3d9def448e9fdba4c2c58580f4467ba123b0ada1 100644 (file)
--- 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