From 9794151c2869e02a6d2e13e307aff203deffd737 Mon Sep 17 00:00:00 2001
From: David Woodhouse <dwmw2@infradead.org>
Date: Thu, 14 May 2020 16:54:13 +0100
Subject: [PATCH] 8.10

---
 .gitignore       |  2 ++
 openconnect.spec | 10 ++++++----
 sources          |  4 ++--
 3 files changed, 10 insertions(+), 6 deletions(-)

diff --git a/.gitignore b/.gitignore
index 9acf876..e46177a 100644
--- a/.gitignore
+++ b/.gitignore
@@ -67,3 +67,5 @@ openconnect-2.25.tar.gz
 /openconnect-8.08.tar.gz.asc
 /openconnect-8.09.tar.gz
 /openconnect-8.09.tar.gz.asc
+/openconnect-8.10.tar.gz
+/openconnect-8.10.tar.gz.asc
diff --git a/openconnect.spec b/openconnect.spec
index 8c7ade6..e4b60f4 100644
--- a/openconnect.spec
+++ b/openconnect.spec
@@ -39,8 +39,8 @@
 %{!?_pkgdocdir: %global _pkgdocdir %{_docdir}/%{name}-%{version}}
 
 Name:		openconnect
-Version:	8.09
-Release:	2%{?relsuffix}%{?dist}
+Version:	8.10
+Release:	1%{?relsuffix}%{?dist}
 Summary:	Open client for Cisco AnyConnect VPN, Juniper Network Connect/Pulse, PAN GlobalProtect
 
 License:	LGPLv2+
@@ -51,7 +51,6 @@ Source1:	ftp://ftp.infradead.org/pub/openconnect/openconnect-%{version}%{?gitsuf
 %endif
 Source2:	gpgkey-BE07D9FD54809AB2C4B0FF5F63762CDA67E2F359.asc
 Source3:	macros.gpg
-Patch1:         0001-Fix-path-to-openconnect-in-bash-completion.patch
 
 BuildRequires:	pkgconfig(libxml-2.0) pkgconfig(libpcsclite) krb5-devel gnupg2
 BuildRequires:	autoconf automake libtool gettext pkgconfig(liblz4)
@@ -146,7 +145,7 @@ make VERBOSE=1 check
 %{_sbindir}/openconnect
 %{_libexecdir}/openconnect/
 %{_mandir}/man8/*
-%{_sysconfdir}/bash_completion.d
+%{_datadir}/bash-completion/completions/openconnect
 %doc TODO COPYING.LGPL
 %doc %{_pkgdocdir}
 
@@ -156,6 +155,9 @@ make VERBOSE=1 check
 %{_libdir}/pkgconfig/openconnect.pc
 
 %changelog
+* Thu May 14 2020 David Woodhouse <dwmw2@infradead.orG> - 8.10-1
+- Update to 8.10 release (CVE-2020-12823)
+
 * Sat May 2 2020 David Woodhouse <dwmw2@infradead.org> - 8.09-2
 - Fix path to openconnect in bash completion script
 
diff --git a/sources b/sources
index 0147d44..a925138 100644
--- a/sources
+++ b/sources
@@ -1,2 +1,2 @@
-SHA512 (openconnect-8.09.tar.gz) = f6890f5bce4b36b162e4590bce8a61d65fc0ae803d62a3dd408fbb13e96ce41b6443740132808491093032545aea919f9076e34bc11160c503c5e3c46457e7bd
-SHA512 (openconnect-8.09.tar.gz.asc) = 36370444e7ed76993fb2be127d92f8c9f5cf8960ae312ccd59437e8f76abd1ba3c70394e8c7cdfd25f29c84470466ac22dee8393f3532696a650f53bce4d611b
+SHA512 (openconnect-8.10.tar.gz) = a36a106cf5c637602fc5bd3cd12df8f6dfe55217c1aae93c66ca33208507f3f8cda15e3a46d75615c7fcea1859d1a04017a07674ad0246876154467305477356
+SHA512 (openconnect-8.10.tar.gz.asc) = 90c71a939fb4ed42ebdd44bfcdd03481b350975348726f935de2d8456f478b7c3dd16361351dad806d9f6d64bbab8a18edd56e3918a1c046724421e3e1c4441e