From 6da27f220a738b3bfdd74af3e7022208e292e95a Mon Sep 17 00:00:00 2001
From: Open vSwitch CI <ovs-team@redhat.com>
Date: Feb 27 2025 20:37:55 +0000
Subject: Import openvswitch3.3-3.3.4-98 from Fast DataPath


---

diff --git a/SOURCES/openvswitch-3.3.0.patch b/SOURCES/openvswitch-3.3.0.patch
index cf6fbb5..73c8fd8 100644
--- a/SOURCES/openvswitch-3.3.0.patch
+++ b/SOURCES/openvswitch-3.3.0.patch
@@ -823,12 +823,16 @@ index 94f488d183..23c3417a70 100644
  	  touch $@
  endif
 diff --git a/NEWS b/NEWS
-index 8888fb3ec5..55643a5bc7 100644
+index 8888fb3ec5..352f1a24a4 100644
 --- a/NEWS
 +++ b/NEWS
-@@ -1,3 +1,34 @@
-+v3.3.4 - xx xxx xxxx
+@@ -1,3 +1,38 @@
++v3.3.5 - xx xxx xxxx
 +--------------------
++
++v3.3.4 - 27 Feb 2025
++--------------------
++   - Bug fixes
 +   - The limit on the number of fields for address prefix tracking in flow
 +     tables increased from 3 to 4.  For example, it is now possible to
 +     specify both IPv4 and IPv6 address fields at the same time:
@@ -886,7 +890,7 @@ index f1ba046c23..1ace70c92a 100644
  dnl
  dnl (We use this as a proxy for checking whether we're building on FreeBSD
 diff --git a/configure.ac b/configure.ac
-index 05afbb9cc8..e1e8e337c3 100644
+index 05afbb9cc8..f3d6a3e534 100644
 --- a/configure.ac
 +++ b/configure.ac
 @@ -13,7 +13,7 @@
@@ -894,7 +898,7 @@ index 05afbb9cc8..e1e8e337c3 100644
  
  AC_PREREQ(2.63)
 -AC_INIT(openvswitch, 3.3.0, bugs@openvswitch.org)
-+AC_INIT(openvswitch, 3.3.4, bugs@openvswitch.org)
++AC_INIT(openvswitch, 3.3.5, bugs@openvswitch.org)
  AC_CONFIG_SRCDIR([vswitchd/ovs-vswitchd.c])
  AC_CONFIG_MACRO_DIR([m4])
  AC_CONFIG_AUX_DIR([build-aux])
@@ -920,15 +924,21 @@ index 7b2afafae1..18be99bfac 100644
  	debian/source/format \
  	debian/source/lintian-overrides \
 diff --git a/debian/changelog b/debian/changelog
-index 2049ddaa26..14d0e95e8a 100644
+index 2049ddaa26..b77514ac4c 100644
 --- a/debian/changelog
 +++ b/debian/changelog
-@@ -1,3 +1,27 @@
+@@ -1,3 +1,33 @@
++openvswitch (3.3.5-1) unstable; urgency=low
++   [ Open vSwitch team ]
++   * New upstream version
++
++ -- Open vSwitch team <dev@openvswitch.org>  Thu, 27 Feb 2025 14:57:49 +0100
++
 +openvswitch (3.3.4-1) unstable; urgency=low
 +   [ Open vSwitch team ]
 +   * New upstream version
 +
-+ -- Open vSwitch team <dev@openvswitch.org>  Fri, 15 Nov 2024 14:34:05 +0100
++ -- Open vSwitch team <dev@openvswitch.org>  Thu, 27 Feb 2025 14:57:49 +0100
 +
 +openvswitch (3.3.3-1) unstable; urgency=low
 +   [ Open vSwitch team ]
diff --git a/SPECS/openvswitch3.3.spec b/SPECS/openvswitch3.3.spec
index 250d133..7f7d6ee 100644
--- a/SPECS/openvswitch3.3.spec
+++ b/SPECS/openvswitch3.3.spec
@@ -56,8 +56,8 @@ Name: %{pkgname}
 Summary: Open vSwitch
 Group: System Environment/Daemons daemon/database/utilities
 URL: http://www.openvswitch.org/
-Version: 3.3.3
-Release: 97%{?dist}
+Version: 3.3.4
+Release: 98%{?dist}
 
 # Nearly all of openvswitch is ASL 2.0.  The bugtool is LGPLv2+, and the
 # lib/sflow*.[ch] files are SISSL
@@ -786,6 +786,13 @@ exit 0
 %endif
 
 %changelog
+* Thu Feb 27 2025 Open vSwitch CI <ovs-ci@redhat.com> - 3.3.0-98
+- Merging upstream branch-3.3 [RH git: 5c6d415158]
+    Commit list:
+    40ca47f71b Prepare for 3.3.5.
+    b20d978c47 Set release date for 3.3.4.
+
+
 * Wed Feb 26 2025 Open vSwitch CI <ovs-ci@redhat.com> - 3.3.0-97
 - Merging upstream branch-3.3 [RH git: a678b830a7]
     Commit list: