[packages] ddns-scripts: fix escaping of option values (closes: #5327)

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

diff --git a/net/ddns-scripts/Makefile b/net/ddns-scripts/Makefile
index 97c3d96..444e931 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:=3
+PKG_RELEASE:=4
 
 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 62d4886..ed0396d 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
@@ -250,7 +250,8 @@ do
                do
                        replace_name=$(echo "\[$option_var\]" | tr 'a-z' 'A-Z')
                        replace_value=$(eval echo "\$$option_var")
-                       final_url=$(echo $final_url | sed s/"$replace_name"/"$replace_value"/g )
+                       replace_value=$(echo $replace_value | sed -f /usr/lib/ddns/url_escape.sed)
+                       final_url=$(echo $final_url | sed s^"$replace_name"^"$replace_value"^g )
                done    
                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
new file mode 100644 (file)
index 0000000..eb7011b
--- /dev/null
+++ b/net/ddns-scripts/files/usr/lib/ddns/url_escape.sed
@@ -0,0 +1,23 @@
+# sed url escaping
+s: :%20:g
+s:<:%3C:g
+s:>:%3E:g
+s:#:%23:g
+s:%:%25:g
+s:{:%7B:g
+s:}:%7D:g
+s:|:%7C:g
+s:\\:%5C:g
+s:\^:%5E:g
+s:~:%7E:g
+s:\[:%5B:g
+s:\]:%5D:g
+s:`:%60:g
+s:;:%3B:g
+s:/:%2F:g
+s:?:%3F:g
+s^:^%3A^g
+s:@:%40:g
+s:=:%3D:g
+s:&:%26:g
+s:\$:%24:g