From c46367cc109e7c29ff80d28d6cb11d1fee1cc300 Mon Sep 17 00:00:00 2001
From: Open vSwitch CI <ovs-team@redhat.com>
Date: Mar 03 2021 15:42:29 +0000
Subject: Import openvswitch2.11-2.11.3-81 from Fast DataPath


---

diff --git a/SOURCES/openvswitch-2.11.3.patch b/SOURCES/openvswitch-2.11.3.patch
index 7b8d7c2..9793b45 100644
--- a/SOURCES/openvswitch-2.11.3.patch
+++ b/SOURCES/openvswitch-2.11.3.patch
@@ -20109,6 +20109,19 @@ index c15be4b3e5..73aa993da3 100644
  
  if SSL:
      # Register SSL only if the OpenSSL module is available
+diff --git a/python/setup.py b/python/setup.py
+index b52657df3a..2cff74eec8 100644
+--- a/python/setup.py
++++ b/python/setup.py
+@@ -82,7 +82,7 @@ setup_args = dict(
+     ext_modules=[setuptools.Extension("ovs._json", sources=["ovs/_json.c"],
+                                       libraries=['openvswitch'])],
+     cmdclass={'build_ext': try_build_ext},
+-    install_requires=['sortedcontainers'],
++    install_requires=['six', 'sortedcontainers'],
+ )
+ 
+ try:
 diff --git a/rhel/openvswitch-fedora.spec.in b/rhel/openvswitch-fedora.spec.in
 index 4ece47a54d..ba862e25e1 100644
 --- a/rhel/openvswitch-fedora.spec.in
diff --git a/SPECS/openvswitch2.11.spec b/SPECS/openvswitch2.11.spec
index 3e3450b..354943f 100644
--- a/SPECS/openvswitch2.11.spec
+++ b/SPECS/openvswitch2.11.spec
@@ -66,7 +66,7 @@ Summary: Open vSwitch
 Group: System Environment/Daemons daemon/database/utilities
 URL: http://www.openvswitch.org/
 Version: 2.11.3
-Release: 80%{?dist}
+Release: 81%{?dist}
 
 # Nearly all of openvswitch is ASL 2.0.  The bugtool is LGPLv2+, and the
 # lib/sflow*.[ch] files are SISSL
@@ -745,6 +745,10 @@ exit 0
 
 
 %changelog
+* Tue Feb 02 2021 Open vSwitch CI <ovs-team@redhat.com> - 2.11.3-81
+- Merging upstream branch-2.11
+  [a6fede58cbbb901bfa9fae88d59f088b005368b5]
+
 * Thu Jan 21 2021 Open vSwitch CI <ovs-team@redhat.com> - 2.11.3-80
 - Merging upstream branch-2.11
   [b8354bd06233b96923cc18f7b8d769f0164d89c3]