From be35b28014c442e5a058c3726a1cedfd81a31b8e Mon Sep 17 00:00:00 2001
From: Open vSwitch CI <ovs-team@redhat.com>
Date: Oct 23 2024 15:18:23 +0000
Subject: Import openvswitch3.4-3.4.0-10 from Fast DataPath


---

diff --git a/SOURCES/openvswitch-3.4.0.patch b/SOURCES/openvswitch-3.4.0.patch
index e32499c..155d2a2 100644
--- a/SOURCES/openvswitch-3.4.0.patch
+++ b/SOURCES/openvswitch-3.4.0.patch
@@ -211,6 +211,44 @@ index 7054cf559e..e7c8b96d49 100644
    of ``kern``, ``user``, ``mail``, ``daemon``, ``auth``, ``syslog``,
    ``lpr``, ``news``, ``uucp``, ``clock``, ``ftp``, ``ntp``, ``audit``,
    ``alert``, ``clock2``, ``local0``, ``local1``, ``local2``,
+diff --git a/NEWS b/NEWS
+index 944c95a8d7..5a1010d931 100644
+--- a/NEWS
++++ b/NEWS
+@@ -1,3 +1,6 @@
++v3.4.1 - xx xxx xxxx
++--------------------
++
+ v3.4.0 - 15 Aug 2024
+ --------------------
+    - Option '--mlockall' now only locks memory pages on fault, if possible.
+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 b9f9b404bf..c5396cc09c 100644
+--- a/debian/changelog
++++ b/debian/changelog
+@@ -1,3 +1,9 @@
++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
 diff --git a/lib/mcast-snooping.c b/lib/mcast-snooping.c
 index dc5164b41c..bf25e6f20a 100644
 --- a/lib/mcast-snooping.c
diff --git a/SPECS/openvswitch3.4.spec b/SPECS/openvswitch3.4.spec
index 5003161..7c3fd08 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: 9%{?dist}
+Release: 10%{?dist}
 
 # Nearly all of openvswitch is ASL 2.0.  The bugtool is LGPLv2+, and the
 # lib/sflow*.[ch] files are SISSL
@@ -770,6 +770,13 @@ exit 0
 %endif
 
 %changelog
+* Wed Oct 23 2024 Timothy Redaelli <tredaelli@redhat.com> - 3.4.0-10
+- Add OVS_SHA_REF to correctly point to v3.4.0 commit [RH git: 69a101f196]
+    This is needed since the current starting commit includes also
+    "Prepare for 3.4.1." and this breaks any commits that includes changes
+    on NEWS file
+
+
 * Mon Oct 07 2024 Open vSwitch CI <ovs-ci@redhat.com> - 3.4.0-9
 - Merging upstream branch-3.4 [RH git: fd0f5ba088]
     Commit list: