From 74cff9fb39ea35de3e35d2e39ebb51ada5fcf75a Mon Sep 17 00:00:00 2001 From: Open vSwitch CI Date: Apr 08 2022 20:36:30 +0000 Subject: Import openvswitch2.15-2.15.0-93 from Fast DataPath --- diff --git a/SOURCES/openvswitch-2.15.0.patch b/SOURCES/openvswitch-2.15.0.patch index 6c8c3e0..ed6625e 100644 --- a/SOURCES/openvswitch-2.15.0.patch +++ b/SOURCES/openvswitch-2.15.0.patch @@ -644,12 +644,16 @@ index 0000000000..cdded4f906 +.. _bcc : https://github.com/iovisor/bcc +.. _Trace Compass : https://www.eclipse.org/tracecompass/ diff --git a/NEWS b/NEWS -index bc901efdb1..164575b25c 100644 +index bc901efdb1..479b379f44 100644 --- a/NEWS +++ b/NEWS -@@ -1,3 +1,48 @@ -+v2.15.4 - xx xxx xxxx +@@ -1,3 +1,52 @@ ++v2.15.5 - xx xxx xxxx +--------------------- ++ ++v2.15.4 - 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., @@ -738,7 +742,7 @@ index 435685c93d..cbaee636b4 100644 AC_ARG_ENABLE( [sparse], diff --git a/configure.ac b/configure.ac -index fd82d7d270..ccfbc06639 100644 +index fd82d7d270..63d06b9ae1 100644 --- a/configure.ac +++ b/configure.ac @@ -13,7 +13,7 @@ @@ -746,7 +750,7 @@ index fd82d7d270..ccfbc06639 100644 AC_PREREQ(2.63) -AC_INIT(openvswitch, 2.15.0, bugs@openvswitch.org) -+AC_INIT(openvswitch, 2.15.4, bugs@openvswitch.org) ++AC_INIT(openvswitch, 2.15.5, bugs@openvswitch.org) AC_CONFIG_SRCDIR([datapath/datapath.c]) AC_CONFIG_MACRO_DIR([m4]) AC_CONFIG_AUX_DIR([build-aux]) @@ -1183,15 +1187,21 @@ index 4cce92f66c..bc18c56b81 100644 #define nf_conntrack_in rpl_nf_conntrack_in #endif /* HAVE_NF_CONNTRACK_IN_TAKES_NF_HOOK_STATE */ diff --git a/debian/changelog b/debian/changelog -index 1f2b7a3668..83eec24109 100644 +index 1f2b7a3668..8c67fbe4b2 100644 --- a/debian/changelog +++ b/debian/changelog -@@ -1,3 +1,27 @@ +@@ -1,3 +1,33 @@ ++openvswitch (2.15.5-1) unstable; urgency=low ++ [ Open vSwitch team ] ++ * New upstream version ++ ++ -- Open vSwitch team Fri, 08 Apr 2022 14:57:41 +0200 ++ +openvswitch (2.15.4-1) unstable; urgency=low + [ Open vSwitch team ] + * New upstream version + -+ -- Open vSwitch team Fri, 17 Dec 2021 22:13:44 +0100 ++ -- Open vSwitch team Fri, 08 Apr 2022 14:57:41 +0200 + +openvswitch (2.15.3-1) unstable; urgency=low + [ Open vSwitch team ] diff --git a/SPECS/openvswitch2.15.spec b/SPECS/openvswitch2.15.spec index d56f8cc..2f2b429 100644 --- a/SPECS/openvswitch2.15.spec +++ b/SPECS/openvswitch2.15.spec @@ -57,7 +57,7 @@ Summary: Open vSwitch Group: System Environment/Daemons daemon/database/utilities URL: http://www.openvswitch.org/ Version: 2.15.0 -Release: 92%{?dist} +Release: 93%{?dist} # Nearly all of openvswitch is ASL 2.0. The bugtool is LGPLv2+, and the # lib/sflow*.[ch] files are SISSL @@ -702,6 +702,13 @@ exit 0 %endif %changelog +* Fri Apr 08 2022 Open vSwitch CI - 2.15.0-93 +- Merging upstream branch-2.15 [RH git: c8842bbbf9] + Commit list: + 27a2daad0e Prepare for 2.15.5. + c281f01dd3 Set release date for 2.15.4. + + * Fri Apr 08 2022 Open vSwitch CI - 2.15.0-92 - Merging upstream branch-2.15 [RH git: 74dde447f6] Commit list: