From 10d51ae601e90c30239597aee9dae366b24bbf4e Mon Sep 17 00:00:00 2001
From: Open vSwitch CI <ovs-team@redhat.com>
Date: Aug 15 2024 19:42:24 +0000
Subject: Import openvswitch3.4-3.4.0-0.8 from Fast DataPath


---

diff --git a/SOURCES/openvswitch-3.4.0.patch b/SOURCES/openvswitch-3.4.0.patch
index 4a36ebb..985dd16 100644
--- a/SOURCES/openvswitch-3.4.0.patch
+++ b/SOURCES/openvswitch-3.4.0.patch
@@ -1,3 +1,62 @@
+diff --git a/Documentation/faq/releases.rst b/Documentation/faq/releases.rst
+index 9fbee90edc..7c32d7acfc 100644
+--- a/Documentation/faq/releases.rst
++++ b/Documentation/faq/releases.rst
+@@ -32,7 +32,7 @@ Q: What does it mean for an Open vSwitch release to be LTS (long-term support)?
+     If a significant bug is identified in an LTS release, we will provide an
+     updated release that includes the fix.  Releases that are not LTS may not
+     be fixed and may just be supplanted by the next major release.  The current
+-    LTS release is 2.17.x.
++    LTS release is 3.3.x.
+ 
+     For more information on the Open vSwitch release process, refer to
+     :doc:`/internals/release-process`.
+diff --git a/NEWS b/NEWS
+index 5290696a86..5a1010d931 100644
+--- a/NEWS
++++ b/NEWS
+@@ -1,4 +1,7 @@
+-v3.4.0 - xx xxx xxxx
++v3.4.1 - xx xxx xxxx
++--------------------
++
++v3.4.0 - 15 Aug 2024
+ --------------------
+    - Option '--mlockall' now only locks memory pages on fault, if possible.
+      This also makes it compatible with vHost Post-copy Live Migration.
+diff --git a/configure.ac b/configure.ac
+index 3e39120af8..f5d9648f0d 100644
+--- a/configure.ac
++++ b/configure.ac
+@@ -13,7 +13,7 @@
+ # limitations under the License.
+ 
+ AC_PREREQ(2.63)
+-AC_INIT(openvswitch, 3.4.0, bugs@openvswitch.org)
++AC_INIT(openvswitch, 3.4.1, bugs@openvswitch.org)
+ AC_CONFIG_SRCDIR([vswitchd/ovs-vswitchd.c])
+ AC_CONFIG_MACRO_DIR([m4])
+ AC_CONFIG_AUX_DIR([build-aux])
+diff --git a/debian/changelog b/debian/changelog
+index 929b8ecf43..c5396cc09c 100644
+--- a/debian/changelog
++++ b/debian/changelog
+@@ -1,8 +1,14 @@
++openvswitch (3.4.1-1) unstable; urgency=low
++   [ Open vSwitch team ]
++   * New upstream version
++
++ -- Open vSwitch team <dev@openvswitch.org>  Thu, 15 Aug 2024 14:59:36 +0200
++
+ openvswitch (3.4.0-1) unstable; urgency=low
+ 
+    * New upstream version
+ 
+- -- Open vSwitch team <dev@openvswitch.org>  Mon, 15 Jul 2024 13:00:00 +0100
++ -- Open vSwitch team <dev@openvswitch.org>  Thu, 15 Aug 2024 14:59:36 +0200
+ 
+ openvswitch (3.3.0-1) unstable; urgency=low
+ 
 diff --git a/lib/dp-packet.h b/lib/dp-packet.h
 index a75b1c5cdb..e816b9f20b 100644
 --- a/lib/dp-packet.h
diff --git a/SPECS/openvswitch3.4.spec b/SPECS/openvswitch3.4.spec
index 39566f3..ca18e68 100644
--- a/SPECS/openvswitch3.4.spec
+++ b/SPECS/openvswitch3.4.spec
@@ -57,7 +57,7 @@ Summary: Open vSwitch
 Group: System Environment/Daemons daemon/database/utilities
 URL: http://www.openvswitch.org/
 Version: 3.4.0
-Release: 0.7%{?dist}
+Release: 0.8%{?dist}
 
 # Nearly all of openvswitch is ASL 2.0.  The bugtool is LGPLv2+, and the
 # lib/sflow*.[ch] files are SISSL
@@ -770,6 +770,14 @@ exit 0
 %endif
 
 %changelog
+* Thu Aug 15 2024 Open vSwitch CI <ovs-ci@redhat.com> - 3.4.0-8
+- Merging upstream branch-3.4 [RH git: 461ce32d27]
+    Commit list:
+    c45794afb4 Prepare for 3.4.1.
+    c598c05c85 Set release date for 3.4.0.
+    a71dd64a2e releases: Mark 3.3 as a new LTS release.
+
+
 * Thu Aug 15 2024 Open vSwitch CI <ovs-ci@redhat.com> - 3.4.0-7
 - Merging upstream branch-3.4 [RH git: 7871fb73f3]
     Commit list: