From ffa9169b28ea88439c82d7fb988f97e6789ae8aa Mon Sep 17 00:00:00 2001 From: Open vSwitch CI Date: Apr 08 2022 19:36:03 +0000 Subject: Import openvswitch2.13-2.13.0-175 from Fast DataPath --- diff --git a/SOURCES/openvswitch-2.13.0.patch b/SOURCES/openvswitch-2.13.0.patch index 71211d3..3e8bc5c 100644 --- a/SOURCES/openvswitch-2.13.0.patch +++ b/SOURCES/openvswitch-2.13.0.patch @@ -1441,12 +1441,16 @@ index b279303d18..b3b56cd50e 100644 boot.sh \ poc/builders/Vagrantfile \ diff --git a/NEWS b/NEWS -index dab94e924d..2c06098ed7 100644 +index dab94e924d..5728a9c653 100644 --- a/NEWS +++ b/NEWS -@@ -1,3 +1,78 @@ -+v2.13.7 - xx xxx xxxx +@@ -1,3 +1,82 @@ ++v2.13.8 - xx xxx xxxx +--------------------- ++ ++v2.13.7 - 08 Apr 2022 ++--------------------- ++ - Bug fixes + - libopenvswitch API change: + * To fix the Undefined Behavior issue causing the compiler to incorrectly + optimize important parts of code, container iteration macros (e.g., @@ -1523,7 +1527,7 @@ index dab94e924d..2c06098ed7 100644 v2.13.0 - 14 Feb 2020 --------------------- - OVN: -@@ -43,6 +118,9 @@ v2.13.0 - 14 Feb 2020 +@@ -43,6 +122,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". @@ -1533,7 +1537,7 @@ index dab94e924d..2c06098ed7 100644 v2.12.0 - 03 Sep 2019 --------------------- -@@ -117,9 +195,6 @@ v2.12.0 - 03 Sep 2019 +@@ -117,9 +199,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. @@ -1707,7 +1711,7 @@ index f6b88ca2d0..9429702db9 100755 manpages=`cd $distdir && echo *` diff --git a/configure.ac b/configure.ac -index 92b52f6712..cb88e03e89 100644 +index 92b52f6712..a80cb544ae 100644 --- a/configure.ac +++ b/configure.ac @@ -13,7 +13,7 @@ @@ -1715,7 +1719,7 @@ index 92b52f6712..cb88e03e89 100644 AC_PREREQ(2.63) -AC_INIT(openvswitch, 2.13.0, bugs@openvswitch.org) -+AC_INIT(openvswitch, 2.13.7, bugs@openvswitch.org) ++AC_INIT(openvswitch, 2.13.8, bugs@openvswitch.org) AC_CONFIG_SRCDIR([datapath/datapath.c]) AC_CONFIG_MACRO_DIR([m4]) AC_CONFIG_AUX_DIR([build-aux]) @@ -2610,15 +2614,21 @@ index 23118e8b63..05ccfb9288 100644 *saddr = fl6.saddr; if (use_cache) diff --git a/debian/changelog b/debian/changelog -index 8e075bc98b..f1cc9b2f7e 100644 +index 8e075bc98b..0b519febe0 100644 --- a/debian/changelog +++ b/debian/changelog -@@ -1,3 +1,45 @@ +@@ -1,3 +1,51 @@ ++openvswitch (2.13.8-1) unstable; urgency=low ++ [ Open vSwitch team ] ++ * New upstream version ++ ++ -- Open vSwitch team Fri, 08 Apr 2022 14:57:21 +0200 ++ +openvswitch (2.13.7-1) unstable; urgency=low + [ Open vSwitch team ] + * New upstream version + -+ -- Open vSwitch team Fri, 17 Dec 2021 22:13:28 +0100 ++ -- Open vSwitch team Fri, 08 Apr 2022 14:57:21 +0200 + +openvswitch (2.13.6-1) unstable; urgency=low + [ Open vSwitch team ] diff --git a/SPECS/openvswitch2.13.spec b/SPECS/openvswitch2.13.spec index a23f382..8066e84 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: 174%{?commit0:.%{date}git%{shortcommit0}}%{?commit1:dpdk%{shortcommit1}}%{?dist} +Release: 175%{?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,13 @@ exit 0 %endif %changelog +* Fri Apr 08 2022 Open vSwitch CI - 2.13.0-175 +- Merging upstream branch-2.13 [RH git: a1e511ab9f] + Commit list: + 7c7e874649 Prepare for 2.13.8. + 3512f8f56a Set release date for 2.13.7. + + * Fri Apr 08 2022 Open vSwitch CI - 2.13.0-174 - Merging upstream branch-2.13 [RH git: 2dcca06045] Commit list: