From bc31502757dd5e4f2357da7b26fc8465a709c187 Mon Sep 17 00:00:00 2001
From: Open vSwitch CI <ovs-team@redhat.com>
Date: Apr 08 2022 16:06:53 +0000
Subject: Import openvswitch2.13-2.13.0-174 from Fast DataPath


---

diff --git a/SOURCES/openvswitch-2.13.0.patch b/SOURCES/openvswitch-2.13.0.patch
index da3233c..71211d3 100644
--- a/SOURCES/openvswitch-2.13.0.patch
+++ b/SOURCES/openvswitch-2.13.0.patch
@@ -1441,12 +1441,23 @@ index b279303d18..b3b56cd50e 100644
  	boot.sh \
  	poc/builders/Vagrantfile \
 diff --git a/NEWS b/NEWS
-index dab94e924d..34cb511769 100644
+index dab94e924d..2c06098ed7 100644
 --- a/NEWS
 +++ b/NEWS
-@@ -1,3 +1,67 @@
+@@ -1,3 +1,78 @@
 +v2.13.7 - xx xxx xxxx
 +---------------------
++   - libopenvswitch API change:
++     * To fix the Undefined Behavior issue causing the compiler to incorrectly
++       optimize important parts of code, container iteration macros (e.g.,
++       LIST_FOR_EACH) have been re-implemented in a UB-safe way.
++     * Backwards compatibility has mostly been preserved, however the
++       user-provided pointer is now set to NULL after the loop (unless it
++       exited via "break;")
++     * Users of libopenvswitch will need to double-check the use of such loop
++       macros before compiling with a new version.
++     * Since the change is limited to the definitions within the headers, the
++       ABI is not affected.
 +
 +v2.13.6 - 17 Dec 2021
 +---------------------
@@ -1512,7 +1523,7 @@ index dab94e924d..34cb511769 100644
  v2.13.0 - 14 Feb 2020
  ---------------------
     - OVN:
-@@ -43,6 +107,9 @@ v2.13.0 - 14 Feb 2020
+@@ -43,6 +118,9 @@ v2.13.0 - 14 Feb 2020
     - 'ovs-appctl dpctl/dump-flows' can now show offloaded=partial for
       partially offloaded flows, dp:dpdk for fully offloaded by dpdk, and
       type filter supports new filters: "dpdk" and "partially-offloaded".
@@ -1522,7 +1533,7 @@ index dab94e924d..34cb511769 100644
  
  v2.12.0 - 03 Sep 2019
  ---------------------
-@@ -117,9 +184,6 @@ v2.12.0 - 03 Sep 2019
+@@ -117,9 +195,6 @@ v2.12.0 - 03 Sep 2019
       * Add support for conntrack zone-based timeout policy.
     - 'ovs-dpctl dump-flows' is no longer suitable for dumping offloaded flows.
       'ovs-appctl dpctl/dump-flows' should be used instead.
diff --git a/SPECS/openvswitch2.13.spec b/SPECS/openvswitch2.13.spec
index 1b39335..a23f382 100644
--- a/SPECS/openvswitch2.13.spec
+++ b/SPECS/openvswitch2.13.spec
@@ -59,7 +59,7 @@ Summary: Open vSwitch
 Group: System Environment/Daemons daemon/database/utilities
 URL: http://www.openvswitch.org/
 Version: 2.13.0
-Release: 173%{?commit0:.%{date}git%{shortcommit0}}%{?commit1:dpdk%{shortcommit1}}%{?dist}
+Release: 174%{?commit0:.%{date}git%{shortcommit0}}%{?commit1:dpdk%{shortcommit1}}%{?dist}
 
 # Nearly all of openvswitch is ASL 2.0.  The bugtool is LGPLv2+, and the
 # lib/sflow*.[ch] files are SISSL
@@ -715,6 +715,12 @@ exit 0
 %endif
 
 %changelog
+* Fri Apr 08 2022 Open vSwitch CI <ovs-ci@redhat.com> - 2.13.0-174
+- Merging upstream branch-2.13 [RH git: 2dcca06045]
+    Commit list:
+    6f351968df NEWS: Highlight libopenvswitch API change caused by UB fixes.
+
+
 * Wed Apr 06 2022 Open vSwitch CI <ovs-ci@redhat.com> - 2.13.0-173
 - Merging upstream branch-2.13 [RH git: 25feb85087]
     Commit list: