Updated to 5.8.4

Patch4 has been applied upstream
This commit is contained in:
Mikhail Zabaluev
2020-04-12 11:24:37 +03:00
parent 20b5f4d7fd
commit 66c97839f3
4 changed files with 8 additions and 19 deletions

4
.gitignore vendored
View File

@@ -1,3 +1 @@
/strongswan-5.7.2.tar.bz2
/strongswan-5.8.1.tar.bz2
/strongswan-5.8.2.tar.bz2
/strongswan-5.8.4.tar.bz2

View File

@@ -1 +1 @@
SHA512 (strongswan-5.8.2.tar.bz2) = 423e7924acfe8a03ad7d4359ae9086fd516798fcf5eb948a27b52ea719f4d8954b83ea30ce94191ea1647616611df8a1215cb4d5c7ec48676624df6c41853e1d
SHA512 (strongswan-5.8.4.tar.bz2) = 15e866b0d6cc4ea94f17856b519d926ae08c15d3b62f675f62685d0722ca8fa26b46afb1ad1c866e9d5f347d77a747f57d0c6d7f6bd57762f37d7798f9e28103

View File

@@ -1,11 +0,0 @@
--- 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

@@ -2,8 +2,8 @@
#%%define prerelease dr1
Name: strongswan
Version: 5.8.2
Release: 5%{?dist}
Version: 5.8.4
Release: 1%{?dist}
Summary: An OpenSource IPsec-based VPN and TNC solution
License: GPLv2+
URL: http://www.strongswan.org/
@@ -11,7 +11,6 @@ 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
@@ -82,7 +81,6 @@ PT-TLS to support TNC over TLS.
%setup -q -n %{name}-%{version}%{?prerelease}
%patch1 -p1
%patch3 -p1
%patch4 -p1
%build
# only for snapshots
@@ -272,6 +270,10 @@ install -D -m 0644 %{SOURCE1} %{buildroot}/%{_tmpfilesdir}/strongswan.conf
%{_libexecdir}/strongswan/charon-nm
%changelog
* Sun Apr 12 2020 Mikhail Zabaluev <mikhail.zabaluev@gmail.com> - 5.8.4-1
- Updated to 5.8.4
- Patch4 has been applied upstream
* Sat Feb 22 2020 Mikhail Zabaluev <mikhail.zabaluev@gmail.com> - 5.8.2-5
- Patch to declare a global variable with extern (#1800117)