From 017b74d3597f035a98bcc659dcafb84231d5bfbc Mon Sep 17 00:00:00 2001 From: Daniel Gimpelevich Date: Sat, 9 Mar 2019 03:17:47 -0800 Subject: [PATCH] vpnc: fix IPv6-triggered inoperability When the server hostname resolved to both IPv4 and IPv6 addresses, connecting would fail with nothing in syslog. This corrects that oversight. Signed-off-by: Daniel Gimpelevich (cherry picked from ca56324 and PKG_MIRROR_HASH removal from 494ce71) --- net/vpnc/Makefile | 3 +-- net/vpnc/files/vpnc.sh | 2 +- 2 files changed, 2 insertions(+), 3 deletions(-) diff --git a/net/vpnc/Makefile b/net/vpnc/Makefile index 2941aecd5b..3734eff1e6 100644 --- a/net/vpnc/Makefile +++ b/net/vpnc/Makefile @@ -10,14 +10,13 @@ include $(TOPDIR)/rules.mk PKG_NAME:=vpnc PKG_REV:=550 PKG_VERSION:=0.5.3.r$(PKG_REV) -PKG_RELEASE:=6 +PKG_RELEASE:=7 PKG_SOURCE:=$(PKG_NAME)-$(PKG_VERSION).tar.gz PKG_SOURCE_URL:=http://svn.unix-ag.uni-kl.de/vpnc/trunk/ PKG_SOURCE_SUBDIR:=$(PKG_NAME)-$(PKG_VERSION) PKG_SOURCE_VERSION:=$(PKG_REV) PKG_SOURCE_PROTO:=svn -PKG_MIRROR_HASH:=f95e2ac4e7e55c06553e0fed016a908b0f2695cee988bc70c9994c03e2f588c4 PKG_MAINTAINER:=Daniel Gimpelevich PKG_LICENSE:=VARIOUS diff --git a/net/vpnc/files/vpnc.sh b/net/vpnc/files/vpnc.sh index bc3f912b36..d7980ca526 100755 --- a/net/vpnc/files/vpnc.sh +++ b/net/vpnc/files/vpnc.sh @@ -42,7 +42,7 @@ proto_vpnc_setup() { logger -t vpnc "initializing..." serv_addr= - for ip in $(resolveip -t 10 "$server"); do + for ip in $(resolveip -4t 10 "$server"); do ( proto_add_host_dependency "$config" "$ip" $interface ) serv_addr=1 done