From 5d18dbfb8424eed301db2cbec1fad4c2eb7fc38e Mon Sep 17 00:00:00 2001
From: Niels Breet <niels.breet@jolla.com>
Date: Mon, 6 May 2019 14:01:36 +0300
Subject: [PATCH] [openconnect] Update to v8.02. Fixes JB#44444 [security]
 Fixes CVE-2018-20319 "passwords found in memory"

---
 .gitmodules          | 2 +-
 rpm/openconnect.spec | 5 +++--
 upstream             | 2 +-
 3 files changed, 5 insertions(+), 4 deletions(-)

diff --git a/.gitmodules b/.gitmodules
index 0778aed..4019845 100644
--- a/.gitmodules
+++ b/.gitmodules
@@ -1,3 +1,3 @@
 [submodule "upstream"]
 	path = upstream
-	url = git://git.infradead.org/users/dwmw2/openconnect.git
+	url = https://git.sailfishos.org/mirror/openconnect.git
diff --git a/rpm/openconnect.spec b/rpm/openconnect.spec
index 3393b75..469cac9 100644
--- a/rpm/openconnect.spec
+++ b/rpm/openconnect.spec
@@ -2,7 +2,7 @@
 
 Name:       openconnect
 Summary:    Open client for Cisco AnyConnect VPN
-Version:    7.08
+Version:    8.02
 Release:    1
 Group:      Applications/Internet
 License:    LGPLv2+
@@ -53,9 +53,9 @@ make %{?_smp_mflags}
 rm -rf %{buildroot}
 %make_install
 rm -rf %{buildroot}%{_datadir}/openconnect
+rm -f %{buildroot}%/%{_libexecdir}/openconnect/tncc-wrapper.py
 
 mkdir -p %{buildroot}%{_docdir}/%{name}-%{version}
-install -m0644 AUTHORS %{buildroot}%{_docdir}/%{name}-%{version}
 
 %find_lang %{name}
 
@@ -68,6 +68,7 @@ install -m0644 AUTHORS %{buildroot}%{_docdir}/%{name}-%{version}
 %license COPYING.LGPL
 %{_libdir}/libopenconnect.so.*
 %{_sbindir}/openconnect
+%{_libexecdir}/openconnect/
 
 %files devel
 %defattr(-,root,root,-)
diff --git a/upstream b/upstream
index 9697bea..6487ee8 160000
--- a/upstream
+++ b/upstream
@@ -1 +1 @@
-Subproject commit 9697bea0e50952cab57063238b43a7099e498cbb
+Subproject commit 6487ee8763e1b6345718684909aca970befbc49d