Sync from SUSE:SLFO:Main openvswitch revision c41376e8675efc51e86e864611342e14

This commit is contained in:
2025-03-24 17:26:14 +01:00
parent b7b4495689
commit 76658517d7
7 changed files with 53 additions and 33 deletions

View File

@@ -8,16 +8,18 @@ time being.
Updated 2023-02-26 for version 3.1.0
diff --git a/rhel/usr_lib_systemd_system_openvswitch-ipsec.service b/rhel/usr_lib_systemd_system_openvswitch-ipsec.service
index 92dad44f9..ec86874cb 100644
---
rhel/usr_lib_systemd_system_openvswitch-ipsec.service | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
--- a/rhel/usr_lib_systemd_system_openvswitch-ipsec.service
+++ b/rhel/usr_lib_systemd_system_openvswitch-ipsec.service
@@ -7,7 +7,7 @@ After=openvswitch.service
Type=forking
PIDFile=/run/openvswitch/ovs-monitor-ipsec.pid
ExecStart=/usr/share/openvswitch/scripts/ovs-ctl \
- --ike-daemon=libreswan start-ovs-ipsec
+ --ike-daemon=strongswan start-ovs-ipsec
@@ -10,7 +10,7 @@
EnvironmentFile=/etc/openvswitch/default.conf
EnvironmentFile=-/etc/sysconfig/openvswitch
ExecStart=/usr/share/openvswitch/scripts/ovs-ctl --no-monitor \
- --ike-daemon=libreswan start-ovs-ipsec $OPTIONS
+ --ike-daemon=strongswan start-ovs-ipsec $OPTIONS
ExecStop=/usr/share/openvswitch/scripts/ovs-ctl stop-ovs-ipsec
[Install]

BIN
openvswitch-3.3.2.tar.gz (Stored with Git LFS)

Binary file not shown.

BIN
openvswitch-3.5.0.tar.gz (Stored with Git LFS) Normal file

Binary file not shown.

View File

@@ -1,3 +1,13 @@
-------------------------------------------------------------------
Fri Mar 21 11:00:00 UTC 2025 - Clemens Famulla-Conrad <cfamullaconrad@suse.com>
- Update OVN to 25.03.0 for a list of changes, check
https://github.com/ovn-org/ovn/blob/v25.03.0/NEWS (jsc#PED-11228)
- Update openvswitch to 3.5.0 for a list of changes, check
https://www.openvswitch.org/releases/NEWS-3.5.0.txt (jsc#PED-11228)
- Rename "python3-ovs" to "python3-openvswitch" for distro consistency
- Update patch file 0001-Use-strongswan-for-openvswitch-ipsec-service.patch
-------------------------------------------------------------------
Mon Jan 27 12:52:52 UTC 2025 - Clemens Famulla-Conrad <cfamullaconrad@suse.com>

View File

@@ -18,14 +18,14 @@
%define skip_python2 1
%define ovs_lname libopenvswitch-3_3-0
%define ovn_lname libovn-24_03-0
%define ovs_version 3.3.2
%define ovn_version 24.03.5
%define ovs_lname libopenvswitch-3_5-0
%define ovn_lname libovn-25_03-0
%define ovs_version 3.5.0
%define ovn_version 25.03.0
%define ovs_dir ovs-%{ovs_version}
%define ovn_dir ovn-%{ovn_version}
%define rpmstate %{_rundir}/openvswitch-rpm-state-
%define _dpdkv 23.11.1
%define _dpdkv 24.11
%define name_tag ${nil}
#Compat macro for new _fillupdir macro introduced in Nov 2017
%if ! %{defined _fillupdir}
@@ -145,6 +145,12 @@ BuildRequires: libnuma-devel
BuildRequires: libpcap-devel
BuildRequires: rdma-core-devel
%endif
# ovs-flowviz depends on python3-openvswitch and other python3 modules
Requires: python3-openvswitch = %{version}-%{release}
Requires: python3-click
Requires: python3-netaddr
Requires: python3-pyparsing
Requires: python3-rich
%description
Open vSwitch is a multilayer virtual network Ethernet switch. It is
@@ -172,7 +178,7 @@ License: Apache-2.0
Group: System/Libraries
%if %{with dpdk}
Requires: dpdk >= %{_dpdkv}
Requires: libdpdk-24 >= %{_dpdkv}
Requires: libdpdk-25 >= %{_dpdkv}
%endif
%description -n %{ovs_lname}
@@ -193,7 +199,7 @@ License: Apache-2.0
Group: Development/Libraries/C and C++
Requires: %{ovs_lname} = %{version}
# Required for ovsdb-ildc
Requires: python3-ovs = %{version}
Requires: python3-openvswitch = %{version}
Provides: %{name}-dpdk-devel = %{version}
Obsoletes: %{name}-dpdk-devel < 2.7.0
@@ -223,7 +229,7 @@ Group: Productivity/Networking/System
Requires: %{name} = %{version}
Requires: %{name}-switch = %{version}
# Since openvswitch/scripts/ovs-vtep requires various ovs python modules.
Requires: python3-ovs = %{version}
Requires: python3-openvswitch = %{version}-%{release}
Provides: %{name}-dpdk-vtep = %{version}
Obsoletes: %{name}-dpdk-vtep < 2.7.0
@@ -239,23 +245,23 @@ License: Apache-2.0
Group: Productivity/Networking/System
Requires: %{name} = %{version}
Requires: /usr/sbin/ipsec
Requires: python3-ovs = %{version}
Requires: python3-openvswitch = %{version}-%{release}
Requires: strongswan
%description ipsec
This package provides IPsec tunneling support for OVS tunnels.
%package -n python3-ovs
%package -n python3-%{name}
Summary: Python3 bindings for Open vSwitch
License: Apache-2.0
Group: Productivity/Networking/System
Requires: %{ovs_lname} = %{version}
Requires: python3
Requires: python3-sortedcontainers
Provides: python3-%{name} = %{version}
Obsoletes: python3-%{name} < 2.10.1
Provides: python3-ovs = %{version}-%{release}
Obsoletes: python3-ovs < %{version}-%{release}
%description -n python3-ovs
%description -n python3-%{name}
This package contains the Python3 bindings for Open vSwitch database.
%package test
@@ -265,7 +271,7 @@ Group: Productivity/Networking/System
Requires: %{name} = %{version}
Requires: python3
Requires: python3-Twisted
Requires: python3-ovs = %{version}
Requires: python3-openvswitch = %{version}-%{release}
Provides: python3-%{name}-test = %{version}
Obsoletes: python3-%{name}-test < 2.13.0
@@ -363,7 +369,7 @@ Group: Productivity/Networking/System
URL: http://ovn.org/
Requires: %{name} = %{ovs_version}
Requires: ovn = %{ovn_version}
Requires: python3-openvswitch = %{ovs_version}
Requires: python3-openvswitch = %{ovs_version}-%{release}
# openvswitch-ovn has been split into openvswitch-ovn-{central,common,docker,host,vtep}
Provides: %{name}-dpdk-ovn:%{_bindir}/ovn-docker-overlay-driver
Provides: %{name}-ovn-docker = %{ovn_version}
@@ -664,13 +670,13 @@ cp -a %{buildroot}%{_datadir}/openvswitch/python/ovstest \
# Python subpackage
# Build on a temporary directory.
mkdir python3-ovs && pushd $_
mkdir python3-openvswitch && pushd $_
# Some build files are in sources while others are generated directly on
# buildroot as part of make_install (dirs.py). Copy them first.
cp -an ../%{ovs_dir}/python/* $(pwd)/
rm -rf %{buildroot}%{_datadir}/openvswitch/python
export LDFLAGS="${LDFLAGS} -L %{buildroot}%{_libdir}"
export CPPFLAGS="-I ../../include"
export CPPFLAGS="-I ../%{ovs_dir}/include"
%if 0%{?suse_version}
# SLES
@@ -1117,6 +1123,7 @@ fi
%{_bindir}/ovs-docker
%{_bindir}/ovs-dpctl
%{_bindir}/ovs-dpctl-top
%{_bindir}/ovs-flowviz
%{_bindir}/ovs-ofctl
%{_bindir}/ovs-parse-backtrace
%{_bindir}/ovs-vsctl
@@ -1153,6 +1160,7 @@ fi
%{_mandir}/man8/ovs-ctl.8%{?ext_man}
%{_mandir}/man8/ovs-dpctl-top.8%{?ext_man}
%{_mandir}/man8/ovs-dpctl.8%{?ext_man}
%{_mandir}/man8/ovs-flowviz.8%{?ext_man}
%{_mandir}/man8/ovs-kmod-ctl.8%{?ext_man}
%{_mandir}/man8/ovs-ofctl.8%{?ext_man}
%{_mandir}/man8/ovs-parse-backtrace.8%{?ext_man}
@@ -1216,7 +1224,7 @@ fi
%{_sbindir}/rcopenvswitch-ipsec
%{_unitdir}/openvswitch-ipsec.service
%files -n python3-ovs
%files -n python3-%{name}
%{python3_sitearch}/ovs/
%{python3_sitearch}/ovs-*.egg-info

BIN
ovn-24.03.5.tar.gz (Stored with Git LFS)

Binary file not shown.

BIN
ovn-25.03.0.tar.gz (Stored with Git LFS) Normal file

Binary file not shown.