[packages] ddns-scripts:

	- urlencode exclamation marks (#7607)
	- support new token [HTTPAUTH] for unencoded username:password tuples

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

diff --git a/net/ddns-scripts/Makefile b/net/ddns-scripts/Makefile
index 930e60e..a0ba7d5 100644 (file)
--- a/net/ddns-scripts/Makefile
+++ b/net/ddns-scripts/Makefile
@@ -2,7 +2,7 @@ include $(TOPDIR)/rules.mk
 
 PKG_NAME:=ddns-scripts
 PKG_VERSION:=1.0.0
-PKG_RELEASE:=8
+PKG_RELEASE:=9
 
 PKG_BUILD_DIR := $(BUILD_DIR)/$(PKG_NAME)
 

diff --git a/net/ddns-scripts/files/usr/lib/ddns/dynamic_dns_updater.sh b/net/ddns-scripts/files/usr/lib/ddns/dynamic_dns_updater.sh
index b782432..6bdc9c0 100755 (executable)
--- a/net/ddns-scripts/files/usr/lib/ddns/dynamic_dns_updater.sh
+++ b/net/ddns-scripts/files/usr/lib/ddns/dynamic_dns_updater.sh
@@ -256,6 +256,7 @@ do
                                final_url=$(echo $final_url | sed s^"$replace_name"^"$replace_value"^g )
                        fi
                done
+               final_url=$(echo $final_url | sed s/"\[HTTPAUTH\]"/"$username${password:+$password}"/g )
                final_url=$(echo $final_url | sed s/"\[IP\]"/"$current_ip"/g )
 
 

diff --git a/net/ddns-scripts/files/usr/lib/ddns/url_escape.sed b/net/ddns-scripts/files/usr/lib/ddns/url_escape.sed
index eb7011b..feae98f 100644 (file)
--- a/net/ddns-scripts/files/usr/lib/ddns/url_escape.sed
+++ b/net/ddns-scripts/files/usr/lib/ddns/url_escape.sed
@@ -21,3 +21,5 @@ s:@:%40:g
 s:=:%3D:g
 s:&:%26:g
 s:\$:%24:g
+s:\!:%21:g
+