From 71e9fbe7d78650831ebe15c649d326eb66b946b7 Mon Sep 17 00:00:00 2001 From: wk333 <13474090681@163.com> Date: Fri, 19 May 2023 09:40:16 +0800 Subject: [PATCH] Fix /usr/sbin/ipsec conflicts with libreswan (cherry picked from commit 5cdf2585a41a97f7cb153b4c452c5047611ea9af) --- strongswan.spec | 9 ++++++--- 1 file changed, 6 insertions(+), 3 deletions(-) diff --git a/strongswan.spec b/strongswan.spec index 2180664..5f3f29a 100644 --- a/strongswan.spec +++ b/strongswan.spec @@ -1,6 +1,6 @@ Name: strongswan Version: 5.9.7 -Release: 3 +Release: 4 Summary: An OpenSource IPsec-based VPN and TNC solution License: GPLv2+ URL: http://www.strongswan.org/ @@ -69,7 +69,7 @@ PT-TLS to support TNC over TLS. autoreconf -i %configure --bindir=%{_libexecdir}/strongswan --sysconfdir=%{_sysconfdir}/strongswan \ --with-ipsecdir=%{_libexecdir}/strongswan --with-ipseclibdir=%{_libdir}/strongswan \ - --with-ipsec-script=ipsec --with-fips-mode=2 \ + --with-ipsec-script=strongswan --with-fips-mode=2 \ --disable-static \ --enable-tss-trousers --enable-nm --enable-systemd --enable-openssl --enable-unity \ --enable-ctr --enable-ccm --enable-gcm --enable-chapoly --enable-md4 --enable-gcrypt \ @@ -147,7 +147,7 @@ echo "%{_libdir}/strongswan" > %{buildroot}/etc/ld.so.conf.d/%{name}-%{_arch}.co %{_unitdir}/strongswan-starter.service %{_sbindir}/charon-cmd %{_sbindir}/charon-systemd -%{_sbindir}/ipsec +%{_sbindir}/strongswan %{_sbindir}/swanctl %{_libdir}/strongswan/*.so.* %exclude %{_libdir}/strongswan/libimcv.so.* @@ -193,6 +193,9 @@ echo "%{_libdir}/strongswan" > %{buildroot}/etc/ld.so.conf.d/%{name}-%{_arch}.co %{_libexecdir}/strongswan/charon-nm %changelog +* Fri May 19 2023 wangkai <13474090681@163.com> - 5.9.7-4 +- Fix /usr/sbin/ipsec conflicts with libreswan + * Tue Nov 29 2022 wangkai - 5.9.7-3 - Add Requires strongswan-sqlite,strongswan-tnc-imcvs and strongswan-libipsec -- Gitee