From 2ab669d0b94e58ae110f700bf456a2b6229dc771 Mon Sep 17 00:00:00 2001 From: Rui Salvaterra Date: Tue, 31 May 2022 10:47:01 +0100 Subject: [PATCH] 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 --- net/openconnect/Makefile | 2 +- net/openconnect/files/openconnect.sh | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/net/openconnect/Makefile b/net/openconnect/Makefile index 7b15490b47..6bf724eeb6 100644 --- 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 URL:=https://www.infradead.org/openconnect/ diff --git a/net/openconnect/files/openconnect.sh b/net/openconnect/files/openconnect.sh index b794296c04..1de3a8b25e 100755 --- 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 -- 2.30.2