From a7360fff44b3d2076e8433e9f7b2a57c14040098 Mon Sep 17 00:00:00 2001 From: Paul Wouters Date: Mon, 10 Feb 2020 13:40:59 -0500 Subject: [PATCH 1/2] - use tmpfile to ensure rundir is present --- strongswan.spec | 8 +++++++- 1 file changed, 7 insertions(+), 1 deletion(-) diff --git a/strongswan.spec b/strongswan.spec index 8412c02..a3e6a45 100644 --- a/strongswan.spec +++ b/strongswan.spec @@ -3,11 +3,12 @@ Name: strongswan Version: 5.8.2 -Release: 2%{?dist} +Release: 3%{?dist} Summary: An OpenSource IPsec-based VPN and TNC solution License: GPLv2+ URL: http://www.strongswan.org/ Source0: http://download.strongswan.org/%{name}-%{version}%{?prerelease}.tar.bz2 +Source1: tmpfiles-strongswan.conf Patch1: strongswan-5.6.0-uintptr_t.patch Patch3: strongswan-5.6.2-CVE-2018-5388.patch @@ -198,6 +199,7 @@ for i in aacerts acerts certs cacerts crls ocspcerts private reqs; do install -d -m 700 %{buildroot}%{_sysconfdir}/strongswan/ipsec.d/${i} done install -d -m 0700 %{buildroot}%{_rundir}/strongswan +install -D -m 0644 %{SOURCE1} %{buildroot}/%{_tmpfilesdir}/strongswan.conf %post %systemd_post %{name}.service @@ -240,6 +242,7 @@ install -d -m 0700 %{buildroot}%{_rundir}/strongswan %{_datadir}/strongswan/templates/config/ %{_datadir}/strongswan/templates/database/ %attr(0755,root,root) %dir %{_rundir}/strongswan +%attr(0644,root,root) %{_tmpfilesdir}/strongswan.conf %files sqlite %{_libdir}/strongswan/plugins/libstrongswan-sqlite.so @@ -267,6 +270,9 @@ install -d -m 0700 %{buildroot}%{_rundir}/strongswan %{_libexecdir}/strongswan/charon-nm %changelog +* Mon Feb 10 2020 Paul Wouters - 5.8.2-3 +- use tmpfile to ensure rundir is present + * Sat Dec 28 2019 Paul Wouters - 5.8.2-2 - Use /run/strongswan as rundir to support strongswans in namespaces From 0ab6394034a0f7b463f412da421958bbef1d0c86 Mon Sep 17 00:00:00 2001 From: Paul Wouters Date: Mon, 10 Feb 2020 13:42:46 -0500 Subject: [PATCH 2/2] added tmpfiles-strongswan.conf --- tmpfiles-strongswan.conf | 1 + 1 file changed, 1 insertion(+) create mode 100644 tmpfiles-strongswan.conf diff --git a/tmpfiles-strongswan.conf b/tmpfiles-strongswan.conf new file mode 100644 index 0000000..e228ac9 --- /dev/null +++ b/tmpfiles-strongswan.conf @@ -0,0 +1 @@ +D /run/strongswan 0755 root root -