From 235887518bf91c6f6f9628abe241f13952c5091c Mon Sep 17 00:00:00 2001
From: Open vSwitch CI <ovs-team@redhat.com>
Date: Jul 04 2024 06:11:19 +0000
Subject: Import openvswitch3.3-3.3.0-37 from Fast DataPath


---

diff --git a/SOURCES/openvswitch-3.3.0.patch b/SOURCES/openvswitch-3.3.0.patch
index 19acb32..6accba3 100644
--- a/SOURCES/openvswitch-3.3.0.patch
+++ b/SOURCES/openvswitch-3.3.0.patch
@@ -35,18 +35,20 @@ index 5028bdc442..2a191b57fb 100755
  # Install python test dependencies
  pip3 install -r python/test_requirements.txt
 diff --git a/.cirrus.yml b/.cirrus.yml
-index d8a9722809..8db385f002 100644
+index d8a9722809..d73154a971 100644
 --- a/.cirrus.yml
 +++ b/.cirrus.yml
-@@ -2,7 +2,7 @@ freebsd_build_task:
+@@ -2,8 +2,8 @@ freebsd_build_task:
  
    freebsd_instance:
      matrix:
 -      image_family: freebsd-13-2-snap
+-      image_family: freebsd-14-0-snap
 +      image_family: freebsd-13-3-snap
-       image_family: freebsd-14-0-snap
++      image_family: freebsd-14-1-snap
      cpu: 4
      memory: 4G
+ 
 diff --git a/.github/workflows/build-and-test.yml b/.github/workflows/build-and-test.yml
 index fc75581486..4a012efd94 100644
 --- a/.github/workflows/build-and-test.yml
diff --git a/SPECS/openvswitch3.3.spec b/SPECS/openvswitch3.3.spec
index a23176a..1a2daa6 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: 36%{?dist}
+Release: 37%{?dist}
 
 # Nearly all of openvswitch is ASL 2.0.  The bugtool is LGPLv2+, and the
 # lib/sflow*.[ch] files are SISSL
@@ -767,6 +767,12 @@ exit 0
 %endif
 
 %changelog
+* Wed Jul 03 2024 Open vSwitch CI <ovs-ci@redhat.com> - 3.3.0-37
+- Merging upstream branch-3.3 [RH git: 59364717e8]
+    Commit list:
+    15cbfb19fa cirrus: Update to FreeBSD 14.1.
+
+
 * Wed Jul 03 2024 Open vSwitch CI <ovs-ci@redhat.com> - 3.3.0-36
 - Merging upstream branch-3.3 [RH git: eb0ad890f2]
     Commit list: