Patch to declare a global variable with extern (#1800117)

This commit is contained in:
Mikhail Zabaluev
2020-02-23 00:52:02 +02:00
parent d2e288f585
commit 20b5f4d7fd
2 changed files with 17 additions and 1 deletions

View File

@@ -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.

View File

@@ -3,7 +3,7 @@
Name: strongswan Name: strongswan
Version: 5.8.2 Version: 5.8.2
Release: 4%{?dist} Release: 5%{?dist}
Summary: An OpenSource IPsec-based VPN and TNC solution Summary: An OpenSource IPsec-based VPN and TNC solution
License: GPLv2+ License: GPLv2+
URL: http://www.strongswan.org/ URL: http://www.strongswan.org/
@@ -11,6 +11,7 @@ Source0: http://download.strongswan.org/%{name}-%{version}%{?prerelease}.
Source1: tmpfiles-strongswan.conf Source1: tmpfiles-strongswan.conf
Patch1: strongswan-5.6.0-uintptr_t.patch Patch1: strongswan-5.6.0-uintptr_t.patch
Patch3: strongswan-5.6.2-CVE-2018-5388.patch Patch3: strongswan-5.6.2-CVE-2018-5388.patch
Patch4: strongswan-5.8.2-extern-global.patch
# only needed for pre-release versions # only needed for pre-release versions
#BuildRequires: autoconf automake #BuildRequires: autoconf automake
@@ -81,6 +82,7 @@ PT-TLS to support TNC over TLS.
%setup -q -n %{name}-%{version}%{?prerelease} %setup -q -n %{name}-%{version}%{?prerelease}
%patch1 -p1 %patch1 -p1
%patch3 -p1 %patch3 -p1
%patch4 -p1
%build %build
# only for snapshots # only for snapshots
@@ -270,6 +272,9 @@ install -D -m 0644 %{SOURCE1} %{buildroot}/%{_tmpfilesdir}/strongswan.conf
%{_libexecdir}/strongswan/charon-nm %{_libexecdir}/strongswan/charon-nm
%changelog %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 * Mon Feb 10 2020 Paul Wouters <pwouters@redhat.com> - 5.8.2-4
- use tmpfile to ensure rundir is present - use tmpfile to ensure rundir is present