From 20b5f4d7fdb5baaf6e22cd9b54d5db3e72def0d6 Mon Sep 17 00:00:00 2001
From: Mikhail Zabaluev <mikhail.zabaluev@gmail.com>
Date: Sun, 23 Feb 2020 00:52:02 +0200
Subject: [PATCH] Patch to declare a global variable with extern (#1800117)

---
 strongswan-5.8.2-extern-global.patch | 11 +++++++++++
 strongswan.spec                      |  7 ++++++-
 2 files changed, 17 insertions(+), 1 deletion(-)
 create mode 100644 strongswan-5.8.2-extern-global.patch

diff --git a/strongswan-5.8.2-extern-global.patch b/strongswan-5.8.2-extern-global.patch
new file mode 100644
index 0000000..279d8cf
--- /dev/null
+++ b/strongswan-5.8.2-extern-global.patch
@@ -0,0 +1,11 @@
+--- strongswan-5.8.2/src/swanctl/swanctl.h.orig	2020-02-23 00:35:39.051000000 +0200
++++ strongswan-5.8.2/src/swanctl/swanctl.h	2020-02-23 00:35:51.930355656 +0200
+@@ -30,7 +30,7 @@
+ /**
+  * Base directory for credentials and config
+  */
+-char *swanctl_dir;
++extern char *swanctl_dir;
+ 
+ /**
+  * Configuration file for connections, etc.
diff --git a/strongswan.spec b/strongswan.spec
index 58c6ebe..d4d4f63 100644
--- a/strongswan.spec
+++ b/strongswan.spec
@@ -3,7 +3,7 @@
 
 Name:           strongswan
 Version:        5.8.2
-Release:        4%{?dist}
+Release:        5%{?dist}
 Summary:        An OpenSource IPsec-based VPN and TNC solution
 License:        GPLv2+
 URL:            http://www.strongswan.org/
@@ -11,6 +11,7 @@ Source0:        http://download.strongswan.org/%{name}-%{version}%{?prerelease}.
 Source1:	tmpfiles-strongswan.conf
 Patch1:         strongswan-5.6.0-uintptr_t.patch
 Patch3:         strongswan-5.6.2-CVE-2018-5388.patch
+Patch4:         strongswan-5.8.2-extern-global.patch
 
 # only needed for pre-release versions
 #BuildRequires:  autoconf automake
@@ -81,6 +82,7 @@ PT-TLS to support TNC over TLS.
 %setup -q -n %{name}-%{version}%{?prerelease}
 %patch1 -p1
 %patch3 -p1
+%patch4 -p1
 
 %build
 # only for snapshots
@@ -270,6 +272,9 @@ install -D -m 0644 %{SOURCE1} %{buildroot}/%{_tmpfilesdir}/strongswan.conf
 %{_libexecdir}/strongswan/charon-nm
 
 %changelog
+* Sat Feb 22 2020 Mikhail Zabaluev <mikhail.zabaluev@gmail.com> - 5.8.2-5
+- Patch to declare a global variable with extern (#1800117)
+
 * Mon Feb 10 2020 Paul Wouters <pwouters@redhat.com> - 5.8.2-4
 - use tmpfile to ensure rundir is present