From 0fab60b5a66a459b1f33e17a7e7c44a07030b3a9 Mon Sep 17 00:00:00 2001
From: Open vSwitch CI <ovs-team@redhat.com>
Date: Dec 13 2024 15:30:56 +0000
Subject: Import openvswitch3.4-3.4.0-27 from Fast DataPath


---

diff --git a/SOURCES/openvswitch-3.4.0.patch b/SOURCES/openvswitch-3.4.0.patch
index 5bfbdb7..ddc0ac2 100644
--- a/SOURCES/openvswitch-3.4.0.patch
+++ b/SOURCES/openvswitch-3.4.0.patch
@@ -391,6 +391,23 @@ index eb0813b97f..e8471aa466 100644
  - netcat. Several common implementations are known to work.
  
  - curl. Version 7.47.0 is known to work. Earlier versions should also work.
+diff --git a/Documentation/intro/install/rhel.rst b/Documentation/intro/install/rhel.rst
+index e442fca0c0..36ab1341c2 100644
+--- a/Documentation/intro/install/rhel.rst
++++ b/Documentation/intro/install/rhel.rst
+@@ -93,10 +93,8 @@ If python3-sphinx package is not available in your version of RHEL, you can
+ install it via pip with 'pip install sphinx'.
+ 
+ Open vSwitch requires python 3.6 or newer which is not available in older
+-distributions. In the case of RHEL 6.x and its derivatives, one option is
+-to install python34 from `EPEL`_.
+-
+-.. _EPEL: https://fedoraproject.org/wiki/EPEL
++distributions.  For those, one option is to build and install required version
++from source.
+ 
+ .. _rhel-bootstrapping:
+ 
 diff --git a/Documentation/ref/ovs-appctl.8.rst b/Documentation/ref/ovs-appctl.8.rst
 index 7054cf559e..e7c8b96d49 100644
 --- a/Documentation/ref/ovs-appctl.8.rst
@@ -1983,6 +2000,19 @@ index e9603432d2..4b1c262eaa 100644
              return EPROTO;
          }
      }
+diff --git a/m4/openvswitch.m4 b/m4/openvswitch.m4
+index 47aa9da16a..46ed38f4ca 100644
+--- a/m4/openvswitch.m4
++++ b/m4/openvswitch.m4
+@@ -390,7 +390,7 @@ AC_DEFUN([OVS_CHECK_PYTHON3],
+             IFS=$ovs_save_IFS
+             test -z "$dir" && dir=.
+             if test -x "$dir"/"$binary" && "$dir"/"$binary" -c 'import sys
+-if sys.hexversion >= 0x03040000 and sys.hexversion < 0x04000000:
++if sys.hexversion >= 0x03060000 and sys.hexversion < 0x04000000:
+     sys.exit(0)
+ else:
+     sys.exit(1)'; then
 diff --git a/ofproto/bond.c b/ofproto/bond.c
 index c31869a4c7..45a36fabb9 100644
 --- a/ofproto/bond.c
diff --git a/SPECS/openvswitch3.4.spec b/SPECS/openvswitch3.4.spec
index ed6b602..cc3033f 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: 26%{?dist}
+Release: 27%{?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
+* Fri Dec 13 2024 Open vSwitch CI <ovs-ci@redhat.com> - 3.4.0-27
+- Merging upstream branch-3.4 [RH git: 9cfbb9a33d]
+    Commit list:
+    5346c14b9f m4: Fix check for Python 3.6 version.
+
+
 * Fri Dec 13 2024 Open vSwitch CI <ovs-ci@redhat.com> - 3.4.0-26
 - Merging upstream branch-3.4 [RH git: 4f020a4eb1]
     Commit list: