Make sure to package all the ipsec.d cert directories. bump release

This commit is contained in:
Giovanni Mariani 2020-04-13 14:10:16 +02:00
parent c46ceca227
commit ea5708dc16
2 changed files with 18 additions and 9 deletions

View file

@ -1,5 +1,5 @@
# For /etc/strongswan, /etc/strongswan/ipsec.d and the dirs # We marked /etc/strongswan, /etc/strongswan/ipsec.d and the dirs
# below the latter, actually we marked them as "0700". # below the latter as "0700".
# The build process marked /etc/strongswan/swanctl and the dirs # The build process marked /etc/strongswan/swanctl and the dirs
# below as "0750": perhaps also this is OK... # below as "0750": perhaps also this is OK...
addFilter("E: non-standard-dir-perm") addFilter("E: non-standard-dir-perm")

View file

@ -9,7 +9,7 @@
Summary: IPSEC implementation Summary: IPSEC implementation
Name: strongswan Name: strongswan
Version: 5.8.4 Version: 5.8.4
Release: 2 Release: 3
License: GPLv2+ License: GPLv2+
Group: System/Servers Group: System/Servers
Url: https://www.strongswan.org/ Url: https://www.strongswan.org/
@ -62,7 +62,15 @@ on a freeswan enabled kernel.
%config(noreplace) %{_sysconfdir}/%{name}/ipsec.conf %config(noreplace) %{_sysconfdir}/%{name}/ipsec.conf
%config(noreplace) %{_sysconfdir}/%{name}/ipsec.secrets %config(noreplace) %{_sysconfdir}/%{name}/ipsec.secrets
%config(noreplace) %{_sysconfdir}/%{name}/%{name}.conf %config(noreplace) %{_sysconfdir}/%{name}/%{name}.conf
%dir %{_sysconfdir}/%{name}/ipsec.d %dir %{_sysconfdir}/%{name}/ipsec.d/
%dir %{_sysconfdir}/%{name}/ipsec.d/aacerts
%dir %{_sysconfdir}/%{name}/ipsec.d/acerts
%dir %{_sysconfdir}/%{name}/ipsec.d/certs
%dir %{_sysconfdir}/%{name}/ipsec.d/cacerts
%dir %{_sysconfdir}/%{name}/ipsec.d/crls
%dir %{_sysconfdir}/%{name}/ipsec.d/ocspcerts
%dir %{_sysconfdir}/%{name}/ipsec.d/private
%dir %{_sysconfdir}/%{name}/ipsec.d/reqs
%dir %{_sysconfdir}/%{name}/%{name}.d %dir %{_sysconfdir}/%{name}/%{name}.d
%config(noreplace) %{_sysconfdir}/%{name}/%{name}.d/aikgen.conf %config(noreplace) %{_sysconfdir}/%{name}/%{name}.d/aikgen.conf
%config(noreplace) %{_sysconfdir}/%{name}/%{name}.d/attest.conf %config(noreplace) %{_sysconfdir}/%{name}/%{name}.d/attest.conf
@ -127,15 +135,18 @@ on a freeswan enabled kernel.
%{_mandir}/man8/%{name}_swanctl.8.* %{_mandir}/man8/%{name}_swanctl.8.*
%post %post
%systemd_post %{name}.service # FIXME: New releases changed the way of starting the daemon;
# the old way (using ipsec) is now in %%{name}-starter.service:
# use it until we are sure that swanctl config is OK.
#systemd_post %%{name}.service
%systemd_post %{name}-starter.service %systemd_post %{name}-starter.service
%preun %preun
%systemd_preun %{name}.service #systemd_preun %%{name}.service
%systemd_preun %{name}-starter.service %systemd_preun %{name}-starter.service
%postun %postun
%systemd_postun_with_restart %{name}.service #systemd_postun_with_restart %%{name}.service
%systemd_postun_with_restart %{name}-starter.service %systemd_postun_with_restart %{name}-starter.service
#---------------------------------------------------------------------------- #----------------------------------------------------------------------------
@ -395,8 +406,6 @@ automake --add-missing --copy
%make %make
sed -i 's/\t/ /' src/starter/ipsec.conf
%install %install
%makeinstall_std %makeinstall_std