From 5eb0638ce85c606c86209d1f65b21adeec0505d2 Mon Sep 17 00:00:00 2001
From: Open vSwitch CI <ovs-team@redhat.com>
Date: Jan 23 2025 22:57:29 +0000
Subject: Import openvswitch3.3-3.3.0-32 from Fast DataPath


---

diff --git a/SOURCES/openvswitch-3.3.0.patch b/SOURCES/openvswitch-3.3.0.patch
index a26204f..648b28e 100644
--- a/SOURCES/openvswitch-3.3.0.patch
+++ b/SOURCES/openvswitch-3.3.0.patch
@@ -6985,21 +6985,27 @@ index e305e7b9cd..033f548084 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 c22fb3c79c..3795ca7149 100644
+index c22fb3c79c..92fcf95d90 100644
 --- a/tests/ofproto-macros.at
 +++ b/tests/ofproto-macros.at
-@@ -169,6 +169,11 @@ strip_recirc() {
-         s/recirc_id=[[x0-9]]*/recirc_id=<recirc>/
-         s/recirc([[x0-9]]*)/recirc(<recirc>)/'
- }
+@@ -165,9 +165,14 @@ strip_eth () {
+ # 'recirc=<recirc_id>' respectively.  This should make output easier to
+ # compare.
+ strip_recirc() {
+-   sed 's/recirc_id([[x0-9]]*)/recirc_id(<recirc>)/
+-        s/recirc_id=[[x0-9]]*/recirc_id=<recirc>/
+-        s/recirc([[x0-9]]*)/recirc(<recirc>)/'
++   sed 's/recirc_id([[x0-9a-f]]*)/recirc_id(<recirc>)/
++        s/recirc_id=[[x0-9a-f]]*/recirc_id=<recirc>/
++        s/recirc([[x0-9a-f]]*)/recirc(<recirc>)/'
++}
 +
 +# Strips dp_hash from output.
 +strip_dp_hash() {
 +    sed 's/dp_hash([[0-9a-fx/]]*),//'
-+}
+ }
  m4_divert_pop([PREPARE_TESTS])
  
- m4_define([TESTABLE_LOG], [-vPATTERN:ANY:'%c|%p|%m'])
 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.3.spec b/SPECS/openvswitch3.3.spec
index b678ff5..173f5e5 100644
--- a/SPECS/openvswitch3.3.spec
+++ b/SPECS/openvswitch3.3.spec
@@ -57,7 +57,7 @@ Summary: Open vSwitch
 Group: System Environment/Daemons daemon/database/utilities
 URL: http://www.openvswitch.org/
 Version: 3.3.0
-Release: 31%{?dist}
+Release: 32%{?dist}
 
 # Nearly all of openvswitch is ASL 2.0.  The bugtool is LGPLv2+, and the
 # lib/sflow*.[ch] files are SISSL
@@ -769,6 +769,12 @@ exit 0
 %endif
 
 %changelog
+* Thu Jan 23 2025 Open vSwitch CI <ovs-ci@redhat.com> - 3.3.0-32
+- Merging upstream branch-3.3 [RH git: 717cfa2d7a]
+    Commit list:
+    f078a551f9 ofproto-macros.at: Fix hex matching in the strip_recird() macro.
+
+
 * Mon Jan 20 2025 Open vSwitch CI <ovs-ci@redhat.com> - 3.3.0-31
 - Merging upstream branch-3.3 [RH git: 8ab2507b03]
     Commit list: