merge in master branch changes (5.8.4-2)

This commit is contained in:
Paul Wouters
2020-04-20 20:54:07 -04:00
parent 2145455b59
commit 68ceebaf2b
3 changed files with 11 additions and 8 deletions

4
.gitignore vendored
View File

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

View File

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

View File

@@ -2,8 +2,8 @@
#%%define prerelease dr1 #%%define prerelease dr1
Name: strongswan Name: strongswan
Version: 5.8.2 Version: 5.8.4
Release: 6%{?dist} Release: 2%{?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/
@@ -12,7 +12,6 @@ Source1: tmpfiles-strongswan.conf
Patch0: strongswan-5.8.4-runtime-dir.patch Patch0: strongswan-5.8.4-runtime-dir.patch
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
@@ -84,7 +83,6 @@ PT-TLS to support TNC over TLS.
%patch0 -p1 %patch0 -p1
%patch1 -p1 %patch1 -p1
%patch3 -p1 %patch3 -p1
%patch4 -p1
%build %build
# only for snapshots # only for snapshots
@@ -274,6 +272,13 @@ install -D -m 0644 %{SOURCE1} %{buildroot}/%{_tmpfilesdir}/strongswan.conf
%{_libexecdir}/strongswan/charon-nm %{_libexecdir}/strongswan/charon-nm
%changelog %changelog
* Sun Apr 12 2020 Mikhail Zabaluev <mikhail.zabaluev@gmail.com> - 5.8.4-2
- Patch0: Add RuntimeDirectory options to service files (#1789263)
* Sun Apr 12 2020 Mikhail Zabaluev <mikhail.zabaluev@gmail.com> - 5.8.4-1
- Updated to 5.8.4
- Patch4 has been applied upstream
* Sun Apr 12 2020 Mikhail Zabaluev <mikhail.zabaluev@gmail.com> - 5.8.2-6 * Sun Apr 12 2020 Mikhail Zabaluev <mikhail.zabaluev@gmail.com> - 5.8.2-6
- Patch0: Add RuntimeDirectory options to service files (#1789263) - Patch0: Add RuntimeDirectory options to service files (#1789263)