diff --git a/SOURCES/openvswitch-3.4.0.patch b/SOURCES/openvswitch-3.4.0.patch index a05f8b3..2bbd0bb 100644 --- a/SOURCES/openvswitch-3.4.0.patch +++ b/SOURCES/openvswitch-3.4.0.patch @@ -2905,6 +2905,23 @@ index 42fb66de68..8f9eab0d26 100644 + +OVS_VSWITCHD_STOP(["/failed to flow_del (No such file or directory)/d"]) AT_CLEANUP +diff --git a/tests/ofproto-macros.at b/tests/ofproto-macros.at +index c27d96177b..a3d941a320 100644 +--- a/tests/ofproto-macros.at ++++ b/tests/ofproto-macros.at +@@ -171,9 +171,9 @@ strip_eth () { + # 'recirc=' respectively. This should make output easier to + # compare. + strip_recirc() { +- sed 's/recirc_id([[x0-9]]*)/recirc_id()/ +- s/recirc_id=[[x0-9]]*/recirc_id=/ +- s/recirc([[x0-9]]*)/recirc()/' ++ sed 's/recirc_id([[x0-9a-f]]*)/recirc_id()/ ++ s/recirc_id=[[x0-9a-f]]*/recirc_id=/ ++ s/recirc([[x0-9a-f]]*)/recirc()/' + } + + # Strips dp_hash from output. diff --git a/tests/ovs-macros.at b/tests/ovs-macros.at index 06c9785554..738cda2e46 100644 --- a/tests/ovs-macros.at diff --git a/SPECS/openvswitch3.4.spec b/SPECS/openvswitch3.4.spec index 17f3093..8c4492d 100644 --- a/SPECS/openvswitch3.4.spec +++ b/SPECS/openvswitch3.4.spec @@ -57,7 +57,7 @@ Summary: Open vSwitch Group: System Environment/Daemons daemon/database/utilities URL: http://www.openvswitch.org/ Version: 3.4.0 -Release: 37%{?dist} +Release: 38%{?dist} # Nearly all of openvswitch is ASL 2.0. The bugtool is LGPLv2+, and the # lib/sflow*.[ch] files are SISSL @@ -770,6 +770,12 @@ exit 0 %endif %changelog +* Thu Jan 23 2025 Open vSwitch CI - 3.4.0-38 +- Merging upstream branch-3.4 [RH git: 04a798dd77] + Commit list: + 9e07a69bbb ofproto-macros.at: Fix hex matching in the strip_recird() macro. + + * Mon Jan 20 2025 Open vSwitch CI - 3.4.0-37 - Merging upstream branch-3.4 [RH git: 83fc0be6e7] Commit list: