From 577f104763f060ade7e8299189208dccdf180349 Mon Sep 17 00:00:00 2001
From: Open vSwitch CI <ovs-team@redhat.com>
Date: Feb 06 2025 17:24:33 +0000
Subject: Import openvswitch3.3-3.3.0-85 from Fast DataPath


---

diff --git a/SOURCES/openvswitch-3.3.0.patch b/SOURCES/openvswitch-3.3.0.patch
index 9f60285..b500309 100644
--- a/SOURCES/openvswitch-3.3.0.patch
+++ b/SOURCES/openvswitch-3.3.0.patch
@@ -6281,9 +6281,18 @@ index 5043c71e22..a1424506b6 100644
  pyparsing
  pytest
 diff --git a/rhel/openvswitch-fedora.spec.in b/rhel/openvswitch-fedora.spec.in
-index 5d24ebcda8..650a274bee 100644
+index 5d24ebcda8..986e207974 100644
 --- a/rhel/openvswitch-fedora.spec.in
 +++ b/rhel/openvswitch-fedora.spec.in
+@@ -136,7 +136,7 @@ License: ASL 2.0
+ This provides shared library, libopenswitch.so and the openvswitch header
+ files needed to build an external application.
+ 
+-%if 0%{?rhel} > 7 || 0%{?fedora} > 28
++%if 0%{?rhel} > 7 || (0%{?fedora} > 28 && 0%{?fedora} < 41)
+ %package -n network-scripts-%{name}
+ Summary: Open vSwitch legacy network service support
+ License: ASL 2.0
 @@ -178,6 +178,7 @@ This package provides IPsec tunneling support for OVS tunnels.
          --disable-static \
          --enable-shared \
@@ -6292,6 +6301,24 @@ index 5d24ebcda8..650a274bee 100644
          PYTHON3=%{__python3}
  
  build-aux/dpdkstrip.py \
+@@ -415,7 +416,7 @@ fi
+ %exclude %{_libdir}/*.la
+ %exclude %{_libdir}/*.a
+ 
+-%if 0%{?rhel} > 7 || 0%{?fedora} > 28
++%if 0%{?rhel} > 7 || (0%{?fedora} > 28 && 0%{?fedora} < 41)
+ %files -n network-scripts-%{name}
+ %{_sysconfdir}/sysconfig/network-scripts/ifup-ovs
+ %{_sysconfdir}/sysconfig/network-scripts/ifdown-ovs
+@@ -442,7 +443,7 @@ fi
+ %{_unitdir}/ovs-vswitchd.service
+ %{_unitdir}/ovs-delete-transient-ports.service
+ %{_datadir}/openvswitch/scripts/openvswitch.init
+-%if ! (0%{?rhel} > 7 || 0%{?fedora} > 28)
++%if ! (0%{?rhel} > 7 || (0%{?fedora} > 28 && 0%{?fedora} < 41))
+ %{_sysconfdir}/sysconfig/network-scripts/ifup-ovs
+ %{_sysconfdir}/sysconfig/network-scripts/ifdown-ovs
+ %endif
 diff --git a/rhel/usr_lib_systemd_system_openvswitch-ipsec.service b/rhel/usr_lib_systemd_system_openvswitch-ipsec.service
 index 92dad44f93..a4bf475d0c 100644
 --- a/rhel/usr_lib_systemd_system_openvswitch-ipsec.service
diff --git a/SPECS/openvswitch3.3.spec b/SPECS/openvswitch3.3.spec
index 588dda8..b49d978 100644
--- a/SPECS/openvswitch3.3.spec
+++ b/SPECS/openvswitch3.3.spec
@@ -57,7 +57,7 @@ Summary: Open vSwitch
 Group: System Environment/Daemons daemon/database/utilities
 URL: http://www.openvswitch.org/
 Version: 3.3.0
-Release: 84%{?dist}
+Release: 85%{?dist}
 
 # Nearly all of openvswitch is ASL 2.0.  The bugtool is LGPLv2+, and the
 # lib/sflow*.[ch] files are SISSL
@@ -769,6 +769,12 @@ exit 0
 %endif
 
 %changelog
+* Thu Feb 06 2025 Open vSwitch CI <ovs-ci@redhat.com> - 3.3.0-85
+- Merging upstream branch-3.3 [RH git: abf6ee21d9]
+    Commit list:
+    d52bf2ce89 fedora: Don't generate network-scripts-openvswitch for ver > 40.
+
+
 * Fri Jan 31 2025 Kevin Traynor <ktraynor@redhat.com> - 3.3.0-84
 - redhat: update ovsci Jenkins URL [RH git: cd661790fe]
     Signed-off-by: Kevin Traynor <ktraynor@redhat.com>