From 5faace08f839774ad247e298111378f79ad9db90 Mon Sep 17 00:00:00 2001
From: Open vSwitch CI <ovs-team@redhat.com>
Date: Sep 20 2024 13:19:53 +0000
Subject: Import openvswitch3.4-3.4.0-5 from Fast DataPath


---

diff --git a/SOURCES/openvswitch-3.4.0.patch b/SOURCES/openvswitch-3.4.0.patch
index ff62b55..f741614 100644
--- a/SOURCES/openvswitch-3.4.0.patch
+++ b/SOURCES/openvswitch-3.4.0.patch
@@ -502,6 +502,23 @@ index 9070ea051a..74ccaccdd2 100644
  ]])
  
  OVSDB_CHECK_IDL_PY([partial-set idl],
+diff --git a/tests/system-traffic.at b/tests/system-traffic.at
+index 202ff04922..fe27e52448 100644
+--- a/tests/system-traffic.at
++++ b/tests/system-traffic.at
+@@ -6991,6 +6991,12 @@ dnl Checks the implementation of conntrack with FTP ALGs in combination with
+ dnl NAT, using the provided flow table.
+ m4_define([CHECK_FTP_NAT],
+    [AT_SETUP([conntrack - FTP $1])
++    m4_if(m4_index([$1], [orig tuple]), -1, [], [
++      dnl XXX: 6.8.0-1014-azure #16~22.04.1-Ubuntu kernel in GitHub Actions
++      dnl contains a known conntrack bug, but doesn't have a fix for it:
++      dnl   a23ac973f67f ("openvswitch: get related ct labels from its master
++      dnl                  if it is not confirmed")
++      OVS_CHECK_GITHUB_ACTION()])
+     AT_SKIP_IF([test $HAVE_FTP = no])
+     AT_SKIP_IF([test $HAVE_LFTP = no])
+     CHECK_CONNTRACK()
 diff --git a/tests/test-ovsdb.c b/tests/test-ovsdb.c
 index 41c1525f45..710341b655 100644
 --- a/tests/test-ovsdb.c
diff --git a/SPECS/openvswitch3.4.spec b/SPECS/openvswitch3.4.spec
index 0994104..94ce7c4 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: 4%{?dist}
+Release: 5%{?dist}
 
 # Nearly all of openvswitch is ASL 2.0.  The bugtool is LGPLv2+, and the
 # lib/sflow*.[ch] files are SISSL
@@ -770,6 +770,12 @@ exit 0
 %endif
 
 %changelog
+* Fri Sep 20 2024 Open vSwitch CI <ovs-ci@redhat.com> - 3.4.0-5
+- Merging upstream branch-3.4 [RH git: 17b80cd265]
+    Commit list:
+    7d074979f3 github: Skip FTP SNAT orig tuple tests due to broken Ubuntu kernel.
+
+
 * Mon Sep 16 2024 Open vSwitch CI <ovs-ci@redhat.com> - 3.4.0-4
 - Merging upstream branch-3.4 [RH git: 743a772569]
     Commit list: