add upstream patch to fix ipv6 only setups

f38
Dennis Gilmore 9 years ago
parent 41bba739cd
commit e04c2c7bc3

@ -0,0 +1,33 @@
From 430f8bcab5c0e10881f7dcdc07a15803ebf31607 Mon Sep 17 00:00:00 2001
From: David Woodhouse <David.Woodhouse@intel.com>
Date: Thu, 26 Nov 2015 08:02:34 +0000
Subject: [PATCH] Fix IPv6-only connectivity
Commit a5dd38ec8 ("Assign Address-IP6 field to netmask instead of address")
broke IPv6-only configurations, because we only check for ip_info.addr
and ip_info.addr6 being NULL. We need to allow the connection to continue
when ip_info.netmask6 is non-NULL too.
Reported-by: Dennis Gilmore <dennis@ausil.us>
Signed-off-by: David Woodhouse <David.Woodhouse@intel.com>
---
cstp.c | 3 ++-
1 file changed, 2 insertions(+), 1 deletion(-)
diff --git a/cstp.c b/cstp.c
index 4aad2c1..b9408c7 100644
--- a/cstp.c
+++ b/cstp.c
@@ -494,7 +494,8 @@ static int start_cstp_connection(struct openconnect_info *vpninfo)
}
vpninfo->ip_info.mtu = mtu;
- if (!vpninfo->ip_info.addr && !vpninfo->ip_info.addr6) {
+ if (!vpninfo->ip_info.addr && !vpninfo->ip_info.addr6 &&
+ !vpninfo->ip_info.netmask6) {
vpn_progress(vpninfo, PRG_ERR,
_("No IP address received. Aborting\n"));
return -EINVAL;
--
1.9.3

@ -21,7 +21,7 @@
Name: openconnect
Version: 7.06
Release: 3%{?relsuffix}%{?dist}
Release: 4%{?relsuffix}%{?dist}
Summary: Open client for Cisco AnyConnect VPN
Group: Applications/Internet
@ -30,6 +30,7 @@ URL: http://www.infradead.org/openconnect.html
Source0: ftp://ftp.infradead.org/pub/openconnect/openconnect-%{version}%{?gitsuffix}.tar.gz
Patch1: openconnect-7.05-override-default-prio-string.patch
Patch2: openconnect-7.05-ensure-dtls-ciphers-match-the-allowed.patch
Patch3: fix-ipv6-only.patch
BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
@ -75,6 +76,7 @@ for NetworkManager etc.
%patch1 -p1 -b .prio
%patch2 -p1 -b .ciphers
%patch3 -p1 -b .ipv6
%build
autoreconf -fvi
@ -115,6 +117,9 @@ rm -rf $RPM_BUILD_ROOT
%{_libdir}/pkgconfig/openconnect.pc
%changelog
* Tue Feb 02 2016 Dennis Gilmore <dennis@ausil.us> - 7.06-4
- add upstream patch to fix ipv6 only setups
* Thu Oct 29 2015 Peter Robinson <pbrobinson@fedoraproject.org> 7.06-3
- Fix FTBFS by including packaged docs

Loading…
Cancel
Save