Revert "openconnect: drop the dependency on resolveip"

Using resolveip is more robust and predictable than depending on nslookup and
awk.

This reverts commit 131ec7b3bd6895aa3f86f57169dd23c15f174fe2.

Signed-off-by: Rui Salvaterra <redacted>

diff --git a/net/openconnect/Makefile b/net/openconnect/Makefile
index 7b15490b47b3962afd55e8024aaeec7d1bad6f01..6bf724eeb6b35e06cd504d140f3c1fd555522e3b 100644 (file)
--- a/net/openconnect/Makefile
+++ b/net/openconnect/Makefile
@@ -35,7 +35,7 @@ endef
 define Package/openconnect
   SECTION:=net
   CATEGORY:=Network
-  DEPENDS:=+libxml2 +kmod-tun +vpnc-scripts +OPENCONNECT_OPENSSL:libopenssl +OPENCONNECT_OPENSSL:p11-kit +OPENCONNECT_OPENSSL:libp11 +OPENCONNECT_GNUTLS:libgnutls +OPENCONNECT_GNUTLS:libtasn1 +OPENCONNECT_STOKEN:libstoken $(ICONV_DEPENDS) $(INTL_DEPENDS)
+  DEPENDS:=+libxml2 +kmod-tun +resolveip +vpnc-scripts +OPENCONNECT_OPENSSL:libopenssl +OPENCONNECT_OPENSSL:p11-kit +OPENCONNECT_OPENSSL:libp11 +OPENCONNECT_GNUTLS:libgnutls +OPENCONNECT_GNUTLS:libtasn1 +OPENCONNECT_STOKEN:libstoken $(ICONV_DEPENDS) $(INTL_DEPENDS)
   TITLE:=OpenConnect VPN client (Cisco AnyConnect and Juniper/Pulse compatible)
   MAINTAINER:=Nikos Mavrogiannopoulos <n.mavrogiannopoulos@gmail.com>
   URL:=https://www.infradead.org/openconnect/

diff --git a/net/openconnect/files/openconnect.sh b/net/openconnect/files/openconnect.sh
index b794296c04db5ec90f0da549fd721c7c8d78bdef..1de3a8b25ecc2d0526b855f1c896556c65b432d9 100755 (executable)
--- a/net/openconnect/files/openconnect.sh
+++ b/net/openconnect/files/openconnect.sh
@@ -67,7 +67,7 @@ proto_openconnect_setup() {
        logger -t openconnect "initializing..."
 
        logger -t "openconnect" "adding host dependency for $server at $config"
-       for ip in $(nslookup "$server" | awk '/^Name:/ {getline; print $2;}'); do
+       for ip in $(resolveip -t 10 "$server"); do
                logger -t "openconnect" "adding host dependency for $ip at $config"
                proto_add_host_dependency "$config" "$ip" "$interface"
        done