From c2d8db4eb4ad8a3fa52e9d29581807ba2b25800a Mon Sep 17 00:00:00 2001
From: Nikos Mavrogiannopoulos <nmav@redhat.com>
Date: Fri, 22 May 2020 08:37:33 +0200
Subject: [PATCH] updated to 8.10

---
 .gitignore       |  2 ++
 openconnect.spec | 14 +++++++++-----
 sources          |  4 ++--
 3 files changed, 13 insertions(+), 7 deletions(-)

diff --git a/.gitignore b/.gitignore
index 49f0e4c..01976be 100644
--- a/.gitignore
+++ b/.gitignore
@@ -2,3 +2,5 @@
 /openconnect-8.04.tar.gz.asc
 /openconnect-8.05.tar.gz
 /openconnect-8.05.tar.gz.asc
+/openconnect-8.10.tar.gz
+/openconnect-8.10.tar.gz.asc
diff --git a/openconnect.spec b/openconnect.spec
index 4dbb525..85480e6 100644
--- a/openconnect.spec
+++ b/openconnect.spec
@@ -29,8 +29,8 @@
 %define use_softhsm 1
 %endif
 
-# Fedora has tss2-sys from F29 onwards
-%if 0%{?fedora} >= 29
+# Fedora has tss2-sys from F29 onwards, and RHEL from 8 onwards
+%if 0%{?fedora} >= 29 || 0%{?rhel} >= 8
 %define use_tss2_esys 1
 %else
 %define use_tss2_esys 0
@@ -39,7 +39,7 @@
 %{!?_pkgdocdir: %global _pkgdocdir %{_docdir}/%{name}-%{version}}
 
 Name:		openconnect
-Version:	8.05
+Version:	8.10
 Release:	1%{?relsuffix}%{?dist}
 Summary:	Open client for Cisco AnyConnect VPN, Juniper Network Connect/Pulse, PAN GlobalProtect
 
@@ -52,7 +52,6 @@ Source1:	ftp://ftp.infradead.org/pub/openconnect/openconnect-%{version}%{?gitsuf
 Source2:	gpgkey-BE07D9FD54809AB2C4B0FF5F63762CDA67E2F359.asc
 Source3:	macros.gpg
 
-
 BuildRequires:	pkgconfig(libxml-2.0) pkgconfig(libpcsclite) krb5-devel gnupg2
 BuildRequires:	autoconf automake libtool gettext pkgconfig(liblz4)
 BuildRequires:	pkgconfig(uid_wrapper) pkgconfig(socket_wrapper)
@@ -113,13 +112,14 @@ for NetworkManager etc.
 %gpg_verify
 %endif
 
-%autosetup -n openconnect-%{version}%{?gitsuffix}
+%autosetup -n openconnect-%{version}%{?gitsuffix} -p1
 
 %build
 %configure	--with-vpnc-script=/etc/vpnc/vpnc-script \
 		--disable-dsa-tests \
 %if %{use_gnutls}
 		--with-default-gnutls-priority="@OPENCONNECT,SYSTEM" \
+		--without-gnutls-version-check \
 %else
 		--with-openssl --without-openssl-version-check \
 %endif
@@ -145,6 +145,7 @@ make VERBOSE=1 check
 %{_sbindir}/openconnect
 %{_libexecdir}/openconnect/
 %{_mandir}/man8/*
+%{_datadir}/bash-completion/completions/openconnect
 %doc TODO COPYING.LGPL
 %doc %{_pkgdocdir}
 
@@ -154,6 +155,9 @@ make VERBOSE=1 check
 %{_libdir}/pkgconfig/openconnect.pc
 
 %changelog
+* Fri May 22 2020 Nikos Mavrogiannopoulos <nmav@redhat.com> - 8.10-1
+- Update to 8.10 release (CVE-2020-12823)
+
 * Thu Sep 12 2019 David Woodhouse <dwmw2@infradead.org> - 8.05-1
 - Update to 8.05 release (CVE-2019-16239)
 
diff --git a/sources b/sources
index 78c7246..a925138 100644
--- a/sources
+++ b/sources
@@ -1,2 +1,2 @@
-SHA512 (openconnect-8.05.tar.gz) = 3ac9f1fa5a87b06d45c316897c69470264f2fde7525b5b3ef1352041dd0c8ae5eaf5dd325de1bdcf1e5b82e688fec9c36d531da1b75ac3f49896d4186d83aa15
-SHA512 (openconnect-8.05.tar.gz.asc) = a8b292c74919749739d004501a9e2f27bc4e1e100e005e56eca5e54fac17dd6ad3036a72effbcb836a548657dcad05fc120c72a07dd50076624be9ff652ee7e0
+SHA512 (openconnect-8.10.tar.gz) = a36a106cf5c637602fc5bd3cd12df8f6dfe55217c1aae93c66ca33208507f3f8cda15e3a46d75615c7fcea1859d1a04017a07674ad0246876154467305477356
+SHA512 (openconnect-8.10.tar.gz.asc) = 90c71a939fb4ed42ebdd44bfcdd03481b350975348726f935de2d8456f478b7c3dd16361351dad806d9f6d64bbab8a18edd56e3918a1c046724421e3e1c4441e