diff --git a/change-the-name-of-the-ipsec-configuration-file.patch b/change-the-name-of-the-ipsec-configuration-file.patch new file mode 100644 index 0000000000000000000000000000000000000000..a53984ed3e515cedf850dbf04e9bf3a75e468aa6 --- /dev/null +++ b/change-the-name-of-the-ipsec-configuration-file.patch @@ -0,0 +1,38 @@ +From 7781a2a0cc9eecf1a19233515fc3f676005f3b12 Mon Sep 17 00:00:00 2001 +From: wu-leilei +Date: Tue, 14 Dec 2021 15:08:50 +0800 +Subject: [PATCH] change the name of the ipsec configuration file + +--- + ipsec/ovs-monitor-ipsec.in | 8 ++++---- + 1 file changed, 4 insertions(+), 4 deletions(-) + +diff --git a/ipsec/ovs-monitor-ipsec.in b/ipsec/ovs-monitor-ipsec.in +index 4710be0..9d4b6e9 100755 +--- a/ipsec/ovs-monitor-ipsec.in ++++ b/ipsec/ovs-monitor-ipsec.in +@@ -213,8 +213,8 @@ conn prevent_unencrypted_vxlan + def __init__(self, root_prefix): + self.CHARON_CONF = root_prefix + "/etc/strongswan.d/ovs.conf" + self.IPSEC = root_prefix + "/usr/sbin/ipsec" +- self.IPSEC_CONF = root_prefix + "/etc/ipsec.conf" +- self.IPSEC_SECRETS = root_prefix + "/etc/ipsec.secrets" ++ self.IPSEC_CONF = root_prefix + "/etc/openvswitch-ipsec.conf" ++ self.IPSEC_SECRETS = root_prefix + "/etc/openvswitch-ipsec.secrets" + self.conf_file = None + self.secrets_file = None + +@@ -433,8 +433,8 @@ conn prevent_unencrypted_vxlan + + def __init__(self, libreswan_root_prefix): + self.IPSEC = libreswan_root_prefix + "/usr/sbin/ipsec" +- self.IPSEC_CONF = libreswan_root_prefix + "/etc/ipsec.conf" +- self.IPSEC_SECRETS = libreswan_root_prefix + "/etc/ipsec.secrets" ++ self.IPSEC_CONF = libreswan_root_prefix + "/etc/openvswitch-ipsec.conf" ++ self.IPSEC_SECRETS = libreswan_root_prefix + "/etc/openvswitch-ipsec.secrets" + self.conf_file = None + self.secrets_file = None + +-- +2.23.0 + diff --git a/openvswitch.spec b/openvswitch.spec index 805c9e63a1461e2b682d3dd457e893345f072a57..8342976c0330cdd65a73d0f0f0186f7bd264f67c 100644 --- a/openvswitch.spec +++ b/openvswitch.spec @@ -3,7 +3,7 @@ Summary: Production Quality, Multilayer Open Virtual Switch URL: http://www.openvswitch.org/ Version: 2.12.0 License: ASL 2.0 and ISC -Release: 15 +Release: 16 Source: https://www.openvswitch.org/releases/openvswitch-%{version}.tar.gz Buildroot: /tmp/openvswitch-rpm Patch0000: 0000-openvswitch-add-stack-protector-strong.patch @@ -14,7 +14,8 @@ Patch0004: CVE-2020-27827.patch Patch0005: CVE-2015-8011.patch Patch0006: backport-CVE-2021-36980.patch Patch0007: 0002-fix-DPDK-compiling-error.patch -Patch0008: 0001-specifies-the-ovs-module-path.patch +Patch0008: specifies-the-ovs-module-path.patch +Patch0009: change-the-name-of-the-ipsec-configuration-file.patch Requires: %{name}-help Requires: logrotate hostname python >= 2.7 python2-six selinux-policy-targeted libsepol >= 3.1 @@ -527,6 +528,9 @@ exit 0 %{_unitdir}/ovn-controller-vtep.service %changelog +* Wed Dec 15 2021 wulei - 2.12.0-16 +- Fix the problem that openvswitch-ipsec.service causes ipsec.service to fail to start + * Thu Dec 02 2021 wulei - 2.12.0-15 - Rectify the failure to start openvswitch-ipesc and ovn-controller-vtep services diff --git a/0001-specifies-the-ovs-module-path.patch b/specifies-the-ovs-module-path.patch similarity index 100% rename from 0001-specifies-the-ovs-module-path.patch rename to specifies-the-ovs-module-path.patch