ddns-scripts: fix misuse of "local"

- fix misuse of "local" outside functions #2885
- update TLD_names.dat

Signed-off-by: Christian Schoenebeck <redacted>

diff --git a/net/ddns-scripts/Makefile b/net/ddns-scripts/Makefile
index aba89a4bc6dafaa3c81548d46717abfbafaeb7d9..0ebd2f6eb39d32f6f7aa73806696915daa93f43e 100755 (executable)
--- a/net/ddns-scripts/Makefile
+++ b/net/ddns-scripts/Makefile
@@ -9,7 +9,7 @@ include $(TOPDIR)/rules.mk
 PKG_NAME:=ddns-scripts
 # Version == major.minor.patch
 # increase on new functionality (minor) or patches (patch)
-PKG_VERSION:=2.7.2
+PKG_VERSION:=2.7.3
 # Release == build
 # increase on changes of services files or tld_names.dat
 PKG_RELEASE:=1

diff --git a/net/ddns-scripts/files/dynamic_dns_lucihelper.sh b/net/ddns-scripts/files/dynamic_dns_lucihelper.sh
index c723bca5b68471c7002682feb92d295e011255de..970b25bbb777782be7abd4f75bea788f2a0467a2 100755 (executable)
--- a/net/ddns-scripts/files/dynamic_dns_lucihelper.sh
+++ b/net/ddns-scripts/files/dynamic_dns_lucihelper.sh
@@ -27,7 +27,6 @@ use_logfile=0         # by default no logfile, can be changed here
 __RET=0
 case "$1" in
        get_registered_ip)
-               local IP
                lookup_host=$2                  # FQDN of host registered at DDNS
                use_ipv6=${3:-"0"}              # Use IPv6 - default IPv4
                force_ipversion=${4:-"0"}       # Force IP Version - default 0 - No
@@ -35,6 +34,7 @@ case "$1" in
                is_glue=${6:-"0"}               # Is glue record - default 0 - No
                dns_server=${7:-""}             # DNS server - default No DNS
                write_log 7 "-----> get_registered_ip IP"
+               IP=""
                get_registered_ip IP
                __RET=$?
                [ $__RET -ne 0 ] && IP=""
@@ -58,7 +58,6 @@ case "$1" in
                __RET=$?
                ;;
        get_local_ip)
-               local IP
                use_ipv6="$2"                   # Use IPv6
                ip_source="$3"                  # IP source
                ip_network="$4"                 # set if source = "network" otherwise "-"
@@ -76,6 +75,7 @@ case "$1" in
                        export https_proxy="http://$proxy"
                }
                # don't need IP only the return code
+               IP=""
                [ "$ip_source" = "web" -o  "$ip_source" = "script" ] && {
                        # we wait only 3 seconds for an
                        # answer from "web" or "script"

diff --git a/net/ddns-scripts/files/tld_names.dat b/net/ddns-scripts/files/tld_names.dat
index dcad58cf84e7e630b843b237b98b49c0e615eb22..e096ba745281814ffb6291e5871a681eadbadae6 100644 (file)
--- a/net/ddns-scripts/files/tld_names.dat
+++ b/net/ddns-scripts/files/tld_names.dat
@@ -11045,24 +11045,24 @@ zuerich
 cloudfront.net
 
 // Amazon Elastic Compute Cloud: https://aws.amazon.com/ec2/
-// Submitted by Luke Wells <lawells@amazon.com>
+// Submitted by Philip Allchin <pallchin@amazon.com>
+compute.amazonaws.com
 ap-northeast-1.compute.amazonaws.com
 ap-northeast-2.compute.amazonaws.com
 ap-southeast-1.compute.amazonaws.com
 ap-southeast-2.compute.amazonaws.com
-cn-north-1.compute.amazonaws.cn
-compute-1.amazonaws.com
-compute.amazonaws.cn
-compute.amazonaws.com
 eu-central-1.compute.amazonaws.com
 eu-west-1.compute.amazonaws.com
 sa-east-1.compute.amazonaws.com
-us-east-1.amazonaws.com
 us-gov-west-1.compute.amazonaws.com
 us-west-1.compute.amazonaws.com
 us-west-2.compute.amazonaws.com
+us-east-1.amazonaws.com
+compute-1.amazonaws.com
 z-1.compute-1.amazonaws.com
 z-2.compute-1.amazonaws.com
+compute.amazonaws.com.cn
+cn-north-1.compute.amazonaws.com.cn
 
 // Amazon Elastic Beanstalk : https://aws.amazon.com/elasticbeanstalk/
 // Submitted by Adam Stein <astein@amazon.com>