diff --git a/fix-the-problem-that-openvswitch-ipsec.service-causes-ipsec.service-to-fail-to-start.patch b/fix-the-problem-that-openvswitch-ipsec.service-causes-ipsec.service-to-fail-to-start.patch deleted file mode 100644 index 8d272a32957189fcc4b96ea523264181cabd0f86..0000000000000000000000000000000000000000 --- a/fix-the-problem-that-openvswitch-ipsec.service-causes-ipsec.service-to-fail-to-start.patch +++ /dev/null @@ -1,24 +0,0 @@ -From 5e2e60e2f05195f506ea68fe17e72a2a6fe4bdbe Mon Sep 17 00:00:00 2001 -From: zhangpan -Date: Fri, 29 Mar 2024 15:26:47 +0800 -Subject: [PATCH] Fix the problem that openvswitch-ipsec.service causes ipsec.service to fail to start - ---- - ipsec/ovs-monitor-ipsec.in | 1 + - 1 file changed, 1 insertion(+) - -diff --git a/ipsec/ovs-monitor-ipsec.in b/ipsec/ovs-monitor-ipsec.in -index 7945162..c4f48e9 100755 ---- a/ipsec/ovs-monitor-ipsec.in -+++ b/ipsec/ovs-monitor-ipsec.in -@@ -389,6 +389,7 @@ class LibreSwanHelper(object): - """This class does LibreSwan specific configurations.""" - CONF_HEADER = """%s - config setup -+ nssdir=/etc/ipsec.d - uniqueids=yes - - conn %%default --- -2.27.0 - diff --git a/openvswitch.spec b/openvswitch.spec index 9a744d5401d541d2fb39298df1b71d978b3fd89d..21c75becdb3345d61893bf3236a07a273b1b1cc9 100644 --- a/openvswitch.spec +++ b/openvswitch.spec @@ -13,7 +13,7 @@ Name: openvswitch Summary: Open vSwitch daemon/database/utilities URL: https://www.openvswitch.org/ Version: 3.3.1 -Release: 1 +Release: 2 License: ASL 2.0 and LGPLv2+ and SISSL Source0: https://www.openvswitch.org/releases/%{name}-%{version}.tar.gz @@ -21,7 +21,6 @@ Source0: https://www.openvswitch.org/releases/%{name}-%{version}.tar.gz Patch0000: 0000-openvswitch-add-stack-protector-strong.patch Patch0002: 0002-Remove-unsupported-permission-names.patch Patch0003: fix-selinux-err.patch -Patch0004: fix-the-problem-that-openvswitch-ipsec.service-causes-ipsec.service-to-fail-to-start.patch BuildRequires: gcc gcc-c++ make @@ -451,6 +450,9 @@ fi %{_sysconfdir}/sysconfig/network-scripts/ifdown-ovs %changelog +* Wed Aug 13 2025 zhangpan - 3.3.1-2 +- fix error reported in openvswitch-ipsec.service startup log + * Thu Jul 04 2024 liweigang - 3.3.1-1 - update to version 3.3.1