diff --git a/SOURCES/openvswitch-3.5.0.patch b/SOURCES/openvswitch-3.5.0.patch index bff5dc0..8582036 100644 --- a/SOURCES/openvswitch-3.5.0.patch +++ b/SOURCES/openvswitch-3.5.0.patch @@ -1,3 +1,16 @@ +diff --git a/.github/workflows/build-and-test.yml b/.github/workflows/build-and-test.yml +index 724e3e2f0f..d90b9273a6 100644 +--- a/.github/workflows/build-and-test.yml ++++ b/.github/workflows/build-and-test.yml +@@ -610,7 +610,7 @@ jobs: + build-linux-rpm: + name: linux rpm fedora + runs-on: ubuntu-latest +- container: fedora:39 ++ container: fedora:41 + timeout-minutes: 30 + + strategy: diff --git a/AUTHORS.rst b/AUTHORS.rst index 05c2fb7046..8454641758 100644 --- a/AUTHORS.rst @@ -47,6 +60,59 @@ index 42b7172891..0f3cb4e496 100644 (https://git.kernel.org/pub/scm/devel/sparse/sparse.git/). - GNU make. +diff --git a/Documentation/ref/ovs-flowviz.8.rst b/Documentation/ref/ovs-flowviz.8.rst +index e8d84d995e..54adff498a 100644 +--- a/Documentation/ref/ovs-flowviz.8.rst ++++ b/Documentation/ref/ovs-flowviz.8.rst +@@ -52,7 +52,7 @@ them in one of the predefined *format*\ s. + Options + ======= + +-.. program: ovs-flowviz ++.. program:: ovs-flowviz + + .. option:: -h, --help + +@@ -151,6 +151,8 @@ option. + + Arguments: + ++.. program:: ovs-flowviz [datapath|openflow] console ++ + .. option:: -h, --heat-map + + Color of the packet and byte counters to reflect their relative size. +@@ -201,6 +203,8 @@ A logical block is a set of flows that have: + + Arguments: + ++.. program:: ovs-flowviz openflow logic ++ + .. option:: -s, --show-flows + + Show all the flows under each logical block. +@@ -277,6 +281,8 @@ same tree-like flow hierarchy that the ``tree`` format prints. + + Arguments: + ++.. program:: ovs-flowviz datapath console ++ + .. option:: -h, --html + + Print the graphviz format as an svg image alongside an interactive HTML +diff --git a/Documentation/ref/ovs-sim.1.rst b/Documentation/ref/ovs-sim.1.rst +index f59cd7af7a..60971de3c7 100644 +--- a/Documentation/ref/ovs-sim.1.rst ++++ b/Documentation/ref/ovs-sim.1.rst +@@ -58,7 +58,7 @@ such privileges. + Options + ======= + +-.. program: ovs-sim ++.. program:: ovs-sim + + *script* + Runs *script*, which should be a Bash script, within a subshell diff --git a/Documentation/topics/userspace-tso.rst b/Documentation/topics/userspace-tso.rst index ae08496bdd..ed4d36edd1 100644 --- a/Documentation/topics/userspace-tso.rst diff --git a/SPECS/openvswitch3.5.spec b/SPECS/openvswitch3.5.spec index 7316d81..ac912ae 100644 --- a/SPECS/openvswitch3.5.spec +++ b/SPECS/openvswitch3.5.spec @@ -57,7 +57,7 @@ Summary: Open vSwitch Group: System Environment/Daemons daemon/database/utilities URL: http://www.openvswitch.org/ Version: 3.5.0 -Release: 0.18%{?dist} +Release: 0.19%{?dist} # Nearly all of openvswitch is ASL 2.0. The bugtool is LGPLv2+, and the # lib/sflow*.[ch] files are SISSL @@ -773,6 +773,14 @@ exit 0 %endif %changelog +* Sat Feb 08 2025 Open vSwitch CI - 3.5.0-0.19 +- Merging upstream branch-3.5 [RH git: e5eef59658] + Commit list: + 8ceccbb404 github: Update fedora image to 41. + eab4db54ae documentation: Fix Sphinx program directive. + 1ccfc9882e documentation: Fix ovs-flowviz warnings on older Sphinx. + + * Thu Feb 06 2025 Open vSwitch CI - 3.5.0-0.18 - Merging upstream branch-3.5 [RH git: d3ea8eae53] Commit list: