- use tmpfile to ensure rundir is present

This commit is contained in:
Paul Wouters
2020-02-10 13:40:59 -05:00
parent 77923c7621
commit a7360fff44

View File

@@ -3,11 +3,12 @@
Name: strongswan Name: strongswan
Version: 5.8.2 Version: 5.8.2
Release: 2%{?dist} Release: 3%{?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/
Source0: http://download.strongswan.org/%{name}-%{version}%{?prerelease}.tar.bz2 Source0: http://download.strongswan.org/%{name}-%{version}%{?prerelease}.tar.bz2
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
@@ -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} install -d -m 700 %{buildroot}%{_sysconfdir}/strongswan/ipsec.d/${i}
done done
install -d -m 0700 %{buildroot}%{_rundir}/strongswan install -d -m 0700 %{buildroot}%{_rundir}/strongswan
install -D -m 0644 %{SOURCE1} %{buildroot}/%{_tmpfilesdir}/strongswan.conf
%post %post
%systemd_post %{name}.service %systemd_post %{name}.service
@@ -240,6 +242,7 @@ install -d -m 0700 %{buildroot}%{_rundir}/strongswan
%{_datadir}/strongswan/templates/config/ %{_datadir}/strongswan/templates/config/
%{_datadir}/strongswan/templates/database/ %{_datadir}/strongswan/templates/database/
%attr(0755,root,root) %dir %{_rundir}/strongswan %attr(0755,root,root) %dir %{_rundir}/strongswan
%attr(0644,root,root) %{_tmpfilesdir}/strongswan.conf
%files sqlite %files sqlite
%{_libdir}/strongswan/plugins/libstrongswan-sqlite.so %{_libdir}/strongswan/plugins/libstrongswan-sqlite.so
@@ -267,6 +270,9 @@ install -d -m 0700 %{buildroot}%{_rundir}/strongswan
%{_libexecdir}/strongswan/charon-nm %{_libexecdir}/strongswan/charon-nm
%changelog %changelog
* Mon Feb 10 2020 Paul Wouters <pwouters@redhat.com> - 5.8.2-3
- use tmpfile to ensure rundir is present
* Sat Dec 28 2019 Paul Wouters <pwouters@redhat.com> - 5.8.2-2 * Sat Dec 28 2019 Paul Wouters <pwouters@redhat.com> - 5.8.2-2
- Use /run/strongswan as rundir to support strongswans in namespaces - Use /run/strongswan as rundir to support strongswans in namespaces