From f2748b202efd5c5760b5adcbeacc4c8c9148cf94 Mon Sep 17 00:00:00 2001
From: Open vSwitch CI <ovs-team@redhat.com>
Date: Dec 13 2024 18:58:28 +0000
Subject: Import openvswitch3.2-3.2.0-113 from Fast DataPath


---

diff --git a/SOURCES/openvswitch-3.2.0.patch b/SOURCES/openvswitch-3.2.0.patch
index 9c143c2..990aaa0 100644
--- a/SOURCES/openvswitch-3.2.0.patch
+++ b/SOURCES/openvswitch-3.2.0.patch
@@ -382,6 +382,23 @@ index 19e360d47c..7eb3a5d370 100644
  
  - the python packages listed in "python/test_requirements.txt" (compatible
    with pip). If they are installed, the pytest-based Python unit tests will
+diff --git a/Documentation/intro/install/rhel.rst b/Documentation/intro/install/rhel.rst
+index f2151d8907..e9488e6801 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-actions.7.rst b/Documentation/ref/ovs-actions.7.rst
 index d138956556..36adcc5db2 100644
 --- a/Documentation/ref/ovs-actions.7.rst
@@ -5776,6 +5793,19 @@ index b2653142f3..38df70d927 100644
      free(log_file_name);
  
      /* Install new log file. */
+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 cfdf44f854..45a36fabb9 100644
 --- a/ofproto/bond.c
diff --git a/SPECS/openvswitch3.2.spec b/SPECS/openvswitch3.2.spec
index 2bf6118..b45c759 100644
--- a/SPECS/openvswitch3.2.spec
+++ b/SPECS/openvswitch3.2.spec
@@ -57,7 +57,7 @@ Summary: Open vSwitch
 Group: System Environment/Daemons daemon/database/utilities
 URL: http://www.openvswitch.org/
 Version: 3.2.0
-Release: 112%{?dist}
+Release: 113%{?dist}
 
 # Nearly all of openvswitch is ASL 2.0.  The bugtool is LGPLv2+, and the
 # lib/sflow*.[ch] files are SISSL
@@ -763,6 +763,12 @@ exit 0
 %endif
 
 %changelog
+* Fri Dec 13 2024 Open vSwitch CI <ovs-ci@redhat.com> - 3.2.0-113
+- Merging upstream branch-3.2 [RH git: cc730aaaef]
+    Commit list:
+    5871f321a8 m4: Fix check for Python 3.6 version.
+
+
 * Wed Dec 11 2024 Open vSwitch CI <ovs-ci@redhat.com> - 3.2.0-112
 - Merging upstream branch-3.2 [RH git: 658df78e7f]
     Commit list: