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


---

diff --git a/SOURCES/openvswitch-2.11.3.patch b/SOURCES/openvswitch-2.11.3.patch
index b454fd7..61f46ec 100644
--- a/SOURCES/openvswitch-2.11.3.patch
+++ b/SOURCES/openvswitch-2.11.3.patch
@@ -755,12 +755,18 @@ index ff1f94b484..4f9f1866c0 100644
  	boot.sh \
  	poc/builders/Vagrantfile \
 diff --git a/NEWS b/NEWS
-index f177d7efc1..b0d3022eb6 100644
+index f177d7efc1..531ce37d85 100644
 --- a/NEWS
 +++ b/NEWS
-@@ -1,3 +1,20 @@
-+v2.11.5 - xx xxx xxxx
+@@ -1,3 +1,26 @@
++v2.11.6 - xx xxx xxxx
 +---------------------
++
++v2.11.5 - 13 Jan 2021
++---------------------
++   - Bug fixes
++   - LLDP:
++     * Security fixes for CVE-2015-8011 and CVE-2020-27827.
 +   - OVSDB:
 +     * Fixed SHA-1 hash computation for databases larger than 512 MB.
 +   - DPDK:
@@ -862,7 +868,7 @@ index f15b1ff670..71813077c6 100644
    if cmp -s datapath/linux/kcompat.h.new \
              datapath/linux/kcompat.h >/dev/null 2>&1; then
 diff --git a/configure.ac b/configure.ac
-index 45ff8cb07e..deb5e1a083 100644
+index 45ff8cb07e..90f8e1f0d9 100644
 --- a/configure.ac
 +++ b/configure.ac
 @@ -13,7 +13,7 @@
@@ -870,7 +876,7 @@ index 45ff8cb07e..deb5e1a083 100644
  
  AC_PREREQ(2.63)
 -AC_INIT(openvswitch, 2.11.3, bugs@openvswitch.org)
-+AC_INIT(openvswitch, 2.11.5, bugs@openvswitch.org)
++AC_INIT(openvswitch, 2.11.6, bugs@openvswitch.org)
  AC_CONFIG_SRCDIR([datapath/datapath.c])
  AC_CONFIG_MACRO_DIR([m4])
  AC_CONFIG_AUX_DIR([build-aux])
@@ -1295,15 +1301,21 @@ index 9d77d98271..715388d838 100644
  {
  	struct inet6_skb_parm	h;
 diff --git a/debian/changelog b/debian/changelog
-index d08cfbfd91..851cca9cb6 100644
+index d08cfbfd91..f7af0ad68e 100644
 --- a/debian/changelog
 +++ b/debian/changelog
-@@ -1,3 +1,15 @@
+@@ -1,3 +1,21 @@
++openvswitch (2.11.6-1) unstable; urgency=low
++   [ Open vSwitch team ]
++   * New upstream version
++
++ -- Open vSwitch team <dev@openvswitch.org>  Wed, 13 Jan 2021 11:26:35 -0500
++
 +openvswitch (2.11.5-1) unstable; urgency=low
 +   [ Open vSwitch team ]
 +   * New upstream version
 +
-+ -- Open vSwitch team <dev@openvswitch.org>  Thu, 30 Jul 2020 00:25:16 +0200
++ -- Open vSwitch team <dev@openvswitch.org>  Wed, 13 Jan 2021 11:26:35 -0500
 +
 +openvswitch (2.11.4-1) unstable; urgency=low
 +   [ Open vSwitch team ]
diff --git a/SPECS/openvswitch2.11.spec b/SPECS/openvswitch2.11.spec
index 2f7f8b7..a0fc4bd 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: 78%{?dist}
+Release: 79%{?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 14 2021 Open vSwitch CI <ovs-team@redhat.com> - 2.11.3-79
+- Merging upstream branch-2.11
+  [f41ec7e05b34518090771eafc1ca17f297c5f520]
+
 * Wed Jan 13 2021 Open vSwitch CI <ovs-team@redhat.com> - 2.11.3-78
 - Merging upstream branch-2.11
   [68170d878c052468321f0a6a15b44c1f531abb4f]