Merge pull request #24600 from Shulyaka/patch-1

ddns-scripts: Update knot resolver regexp
This commit is contained in:
Florian Eckert 2024-07-17 13:20:35 +02:00 committed by GitHub
commit 168aa87642
No known key found for this signature in database
GPG Key ID: B5690EEEBB952194
2 changed files with 5 additions and 2 deletions

View File

@ -8,7 +8,7 @@ include $(TOPDIR)/rules.mk
PKG_NAME:=ddns-scripts
PKG_VERSION:=2.8.2
PKG_RELEASE:=45
PKG_RELEASE:=46
PKG_LICENSE:=GPL-2.0

View File

@ -547,9 +547,12 @@ verify_host_port() {
return 2
}
# extract IP address
if [ -n "$BIND_HOST" -o -n "$KNOT_HOST" ]; then # use BIND host or Knot host if installed
if [ -n "$BIND_HOST" ]; then # use BIND host if installed
__IPV4="$(awk -F "address " '/has address/ {print $2; exit}' "$DATFILE")"
__IPV6="$(awk -F "address " '/has IPv6/ {print $2; exit}' "$DATFILE")"
elif [ -n "$KNOT_HOST" ]; then # use Knot host if installed
__IPV4="$(awk -F "address " '/has IPv4/ {print $2; exit}' "$DATFILE")"
__IPV6="$(awk -F "address " '/has IPv6/ {print $2; exit}' "$DATFILE")"
elif [ -n "$DRILL" ]; then # use drill if installed
__IPV4="$(awk '/^'"$__HOST"'/ {print $5}' "$DATFILE" | grep -m 1 -o "$IPV4_REGEX")"
__IPV6="$(awk '/^'"$__HOST"'/ {print $5}' "$DATFILE" | grep -m 1 -o "$IPV6_REGEX")"