From 5e7d7434cdfe36b7fe1e222e54af13b8b1d3334f Mon Sep 17 00:00:00 2001
From: Open vSwitch CI <ovs-team@redhat.com>
Date: Mar 12 2025 17:57:43 +0000
Subject: Import openvswitch3.5-3.5.0-9 from Fast DataPath


---

diff --git a/SOURCES/openvswitch-3.5.0.patch b/SOURCES/openvswitch-3.5.0.patch
index f9324d6..ada46cf 100644
--- a/SOURCES/openvswitch-3.5.0.patch
+++ b/SOURCES/openvswitch-3.5.0.patch
@@ -1,3 +1,41 @@
+diff --git a/.ci/linux-prepare.sh b/.ci/linux-prepare.sh
+index 5f8a1db6af..51e5a7e7dd 100755
+--- a/.ci/linux-prepare.sh
++++ b/.ci/linux-prepare.sh
+@@ -12,10 +12,11 @@ fi
+ #
+ # Disabling sqlite support because sindex build fails and we don't
+ # really need this utility being installed.
+-git clone git://git.kernel.org/pub/scm/devel/sparse/sparse.git
+-cd sparse
+-make -j4 HAVE_SQLITE= install
+-cd ..
++if test -d sparse; then
++    pushd sparse
++    make -j4 HAVE_SQLITE= install
++    popd
++fi
+ 
+ # Installing wheel separately because it may be needed to build some
+ # of the packages during dependency backtracking and pip >= 22.0 will
+diff --git a/.github/workflows/build-and-test.yml b/.github/workflows/build-and-test.yml
+index d90b9273a6..cea15fbb52 100644
+--- a/.github/workflows/build-and-test.yml
++++ b/.github/workflows/build-and-test.yml
+@@ -306,6 +306,13 @@ jobs:
+       if:   matrix.m32 != ''
+       run:  sudo apt install -y gcc-multilib
+ 
++    - name: checkout sparse
++      uses: actions/checkout@v4
++      # Official mirror of the git.kernel.org/pub/scm/devel/sparse/sparse.git.
++      with:
++        repository: lucvoo/sparse
++        path: sparse
++
+     - name: prepare
+       run:  ./.ci/linux-prepare.sh
+ 
 diff --git a/NEWS b/NEWS
 index 2e5356c5cd..c670cf8f35 100644
 --- a/NEWS
diff --git a/SPECS/openvswitch3.5.spec b/SPECS/openvswitch3.5.spec
index 602afec..9d0b502 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: 8%{?dist}
+Release: 9%{?dist}
 
 # Nearly all of openvswitch is ASL 2.0.  The bugtool is LGPLv2+, and the
 # lib/sflow*.[ch] files are SISSL
@@ -788,6 +788,12 @@ exit 0
 %endif
 
 %changelog
+* Wed Mar 12 2025 Open vSwitch CI <ovs-ci@redhat.com> - 3.5.0-9
+- Merging upstream branch-3.5 [RH git: 9249932a8b]
+    Commit list:
+    d7536101fd github: Get sparse from the official GitHub mirror.
+
+
 * Fri Feb 28 2025 Open vSwitch CI <ovs-ci@redhat.com> - 3.5.0-8
 - Merging upstream branch-3.5 [RH git: 0f95f97bff]
     Commit list: