diff --git a/0001-Use-strongswan-for-openvswitch-ipsec-service.patch b/0001-Use-strongswan-for-openvswitch-ipsec-service.patch index 604710f..7c1177d 100644 --- a/0001-Use-strongswan-for-openvswitch-ipsec-service.patch +++ b/0001-Use-strongswan-for-openvswitch-ipsec-service.patch @@ -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] diff --git a/openvswitch-3.3.2.tar.gz b/openvswitch-3.3.2.tar.gz deleted file mode 100644 index 1fe7069..0000000 --- a/openvswitch-3.3.2.tar.gz +++ /dev/null @@ -1,3 +0,0 @@ -version https://git-lfs.github.com/spec/v1 -oid sha256:5a1b1ed0b8922cd0e995c7aec87c1758b4e757207615f3c3bc96684cf49ce6f8 -size 9036826 diff --git a/openvswitch-3.5.0.tar.gz b/openvswitch-3.5.0.tar.gz new file mode 100644 index 0000000..4beb93b --- /dev/null +++ b/openvswitch-3.5.0.tar.gz @@ -0,0 +1,3 @@ +version https://git-lfs.github.com/spec/v1 +oid sha256:697e83387ee33c3a665fa9eb0075e728ff3f8686cd2d90a5304fb416bcd974e7 +size 9474471 diff --git a/openvswitch.changes b/openvswitch.changes index 8899466..0677ce4 100644 --- a/openvswitch.changes +++ b/openvswitch.changes @@ -1,3 +1,12 @@ +------------------------------------------------------------------- +Fri Feb 28 09:40:03 UTC 2025 - Clemens Famulla-Conrad + +- Update openvswitch to 3.5.0 for a list of changes, check + https://www.openvswitch.org/releases/NEWS-3.5.0.txt +- Update patch file 0001-Use-strongswan-for-openvswitch-ipsec-service.patch +- Update OVN to 24.09.02. For a list of changes, check + https://github.com/ovn-org/ovn/blob/v24.09.2/NEWS + ------------------------------------------------------------------- Mon Jan 27 12:52:52 UTC 2025 - Clemens Famulla-Conrad diff --git a/openvswitch.spec b/openvswitch.spec index d0a8061..08e8ec6 100644 --- a/openvswitch.spec +++ b/openvswitch.spec @@ -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-24_09-0 +%define ovs_version 3.5.0 +%define ovn_version 24.09.2 %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} @@ -172,7 +172,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} @@ -670,7 +670,7 @@ mkdir python3-ovs && pushd $_ 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 +1117,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 +1154,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} diff --git a/ovn-24.03.5.tar.gz b/ovn-24.03.5.tar.gz deleted file mode 100644 index 46e7452..0000000 --- a/ovn-24.03.5.tar.gz +++ /dev/null @@ -1,3 +0,0 @@ -version https://git-lfs.github.com/spec/v1 -oid sha256:f679577e4e33587e3a0ccae8693c56b3531ce7b3dc259d7dee2ec4f21ea732c6 -size 2024279 diff --git a/ovn-24.09.2.tar.gz b/ovn-24.09.2.tar.gz new file mode 100644 index 0000000..b6c15c4 --- /dev/null +++ b/ovn-24.09.2.tar.gz @@ -0,0 +1,3 @@ +version https://git-lfs.github.com/spec/v1 +oid sha256:43a9baa42521f16294f229f4b391734c1fc3c4aa840f3c370735149c758382e5 +size 2071324