From 29770fcafe874ebfc7e2d4670e4bc54432b342a5 Mon Sep 17 00:00:00 2001
From: Open vSwitch CI <ovs-team@redhat.com>
Date: Oct 25 2023 19:08:25 +0000
Subject: Import openvswitch3.2-3.2.0-27 from Fast DataPath


---

diff --git a/SOURCES/openvswitch-3.2.0.patch b/SOURCES/openvswitch-3.2.0.patch
index 67549f8..0617d56 100644
--- a/SOURCES/openvswitch-3.2.0.patch
+++ b/SOURCES/openvswitch-3.2.0.patch
@@ -37,6 +37,36 @@ index 47d239f10..bc5494e86 100644
            - compiler:     gcc
              testsuite:    test
            - compiler:     clang
+diff --git a/.readthedocs.yaml b/.readthedocs.yaml
+new file mode 100644
+index 000000000..e481e64f1
+--- /dev/null
++++ b/.readthedocs.yaml
+@@ -0,0 +1,24 @@
++# .readthedocs.yaml
++# Read the Docs configuration file.
++# See https://docs.readthedocs.io/en/stable/config-file/v2.html for details.
++
++# Required.
++version: 2
++
++# Set the OS, Python version, etc.
++build:
++  os: ubuntu-22.04
++  tools:
++    python: "3.12"
++
++# Build documentation in the "Documentation/" directory with Sphinx.
++sphinx:
++  configuration: Documentation/conf.py
++
++# Build all formats: HTML, PDF, ePub.
++formats: all
++
++# Declare the Python requirements.
++python:
++  install:
++  - requirements: Documentation/requirements.txt
 diff --git a/Documentation/ref/ovs-actions.7.rst b/Documentation/ref/ovs-actions.7.rst
 index d13895655..36adcc5db 100644
 --- a/Documentation/ref/ovs-actions.7.rst
@@ -64,11 +94,27 @@ index d13895655..36adcc5db 100644
  
  The ``enqueue`` action
  ----------------------
+diff --git a/Documentation/requirements.txt b/Documentation/requirements.txt
+index 77130c6e0..77f44bd76 100644
+--- a/Documentation/requirements.txt
++++ b/Documentation/requirements.txt
+@@ -1,2 +1,2 @@
+-sphinx>=1.1,<2.0
++sphinx>=1.1
+ ovs_sphinx_theme>=1.0,<1.1
 diff --git a/Makefile.am b/Makefile.am
-index db341504d..439e2bf6d 100644
+index db341504d..94f488d18 100644
 --- a/Makefile.am
 +++ b/Makefile.am
-@@ -368,7 +368,7 @@ ALL_LOCAL += manpage-check
+@@ -84,6 +84,7 @@ EXTRA_DIST = \
+ 	.cirrus.yml \
+ 	.editorconfig \
+ 	.github/workflows/build-and-test.yml \
++	.readthedocs.yaml \
+ 	appveyor.yml \
+ 	boot.sh \
+ 	poc/builders/Vagrantfile \
+@@ -368,7 +369,7 @@ ALL_LOCAL += manpage-check
  manpage-check: $(man_MANS) $(dist_man_MANS) $(noinst_man_MANS)
  	@error=false; \
  	for manpage in $?; do \
@@ -77,7 +123,7 @@ index db341504d..439e2bf6d 100644
  	  if grep warning: $@.tmp; then error=:; fi; \
  	  rm -f $@.tmp; \
  	done; \
-@@ -415,7 +415,7 @@ endif
+@@ -415,7 +416,7 @@ endif
  CLEANFILES += flake8-check
  
  -include manpages.mk
diff --git a/SPECS/openvswitch3.2.spec b/SPECS/openvswitch3.2.spec
index 42eea73..86f53b7 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: 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
@@ -761,6 +761,12 @@ exit 0
 %endif
 
 %changelog
+* Wed Oct 25 2023 Open vSwitch CI <ovs-ci@redhat.com> - 3.2.0-27
+- Merging upstream branch-3.2 [RH git: cdbd4c8dfe]
+    Commit list:
+    9183518076 readthedocs: Add the configuration file.
+
+
 * Fri Oct 20 2023 Open vSwitch CI <ovs-ci@redhat.com> - 3.2.0-26
 - Merging upstream branch-3.2 [RH git: 7ed9e7e0ff]
     Commit list: