From db820bfe94e8ecd1937738723b84e6a9e51a3075 Mon Sep 17 00:00:00 2001
From: Open vSwitch CI <ovs-team@redhat.com>
Date: Mar 02 2021 21:03:33 +0000
Subject: Import openvswitch2.11-2.11.3-77 from Fast DataPath


---

diff --git a/SOURCES/openvswitch-2.11.3.patch b/SOURCES/openvswitch-2.11.3.patch
index 9872a3d..c14b7ce 100644
--- a/SOURCES/openvswitch-2.11.3.patch
+++ b/SOURCES/openvswitch-2.11.3.patch
@@ -14904,6 +14904,22 @@ index a36ab45e7c..0000000000
 -#endif
 -
 -#endif /* RTE_FLOW_H_ */
+diff --git a/ipsec/ovs-monitor-ipsec.in b/ipsec/ovs-monitor-ipsec.in
+index 4710be039a..534a5043fa 100755
+--- a/ipsec/ovs-monitor-ipsec.in
++++ b/ipsec/ovs-monitor-ipsec.in
+@@ -617,7 +617,10 @@ conn prevent_unencrypted_vxlan
+                 continue
+ 
+             conn = m.group(1)
+-            m = re.match(r"(.*)(-in-\d+|-out-\d+|-\d+)", conn)
++            m = re.match(r"(.*)(-in-\d+|-out-\d+)", conn)
++            if not m:
++                # GRE connections have format <iface>-<ver>
++                m = re.match(r"(.*)(-\d+)", conn)
+             if not m:
+                 continue
+ 
 diff --git a/lib/automake.mk b/lib/automake.mk
 index b1ff495ff1..49fbb1deaf 100644
 --- a/lib/automake.mk
diff --git a/SPECS/openvswitch2.11.spec b/SPECS/openvswitch2.11.spec
index e0b0ffc..dacc80d 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: 76%{?dist}
+Release: 77%{?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
+* Thu Jan 07 2021 Open vSwitch CI <ovs-team@redhat.com> - 2.11.3-77
+- Merging upstream branch-2.11
+  [10478e38029da25e549bf899dde41a6eb948d523]
+
 * Thu Dec 24 2020 Open vSwitch CI <ovs-team@redhat.com> - 2.11.3-76
 - Merging upstream branch-2.11
   [aa80d76b094b7eea8cd651a62ce251f77f179c25]