From b7b44956891bb369bf95ebabca2c5af4f54635a9bf5b773fcccb7267ee502bc8 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Adrian=20Schr=C3=B6ter?= <adrian@suse.de>
Date: Thu, 20 Feb 2025 09:58:14 +0100
Subject: [PATCH] Sync from SUSE:SLFO:Main openvswitch revision
 a07ae0a1dda8d857f0669725d53c3f95

---
 openvswitch-3.3.1.tar.gz |  3 ---
 openvswitch-3.3.2.tar.gz |  3 +++
 openvswitch.changes      | 17 +++++++++++++++++
 openvswitch.spec         |  9 +++++----
 ovn-24.03.3.tar.gz       |  3 ---
 ovn-24.03.5.tar.gz       |  3 +++
 6 files changed, 28 insertions(+), 10 deletions(-)
 delete mode 100644 openvswitch-3.3.1.tar.gz
 create mode 100644 openvswitch-3.3.2.tar.gz
 delete mode 100644 ovn-24.03.3.tar.gz
 create mode 100644 ovn-24.03.5.tar.gz

diff --git a/openvswitch-3.3.1.tar.gz b/openvswitch-3.3.1.tar.gz
deleted file mode 100644
index fd2a80a..0000000
--- a/openvswitch-3.3.1.tar.gz
+++ /dev/null
@@ -1,3 +0,0 @@
-version https://git-lfs.github.com/spec/v1
-oid sha256:a5f29fe0e7b2561fbe1b459d42ddbdec204dad53c5b9a936457b2b7338241282
-size 9034955
diff --git a/openvswitch-3.3.2.tar.gz b/openvswitch-3.3.2.tar.gz
new file mode 100644
index 0000000..1fe7069
--- /dev/null
+++ b/openvswitch-3.3.2.tar.gz
@@ -0,0 +1,3 @@
+version https://git-lfs.github.com/spec/v1
+oid sha256:5a1b1ed0b8922cd0e995c7aec87c1758b4e757207615f3c3bc96684cf49ce6f8
+size 9036826
diff --git a/openvswitch.changes b/openvswitch.changes
index 816fbc0..8899466 100644
--- a/openvswitch.changes
+++ b/openvswitch.changes
@@ -1,3 +1,20 @@
+-------------------------------------------------------------------
+Mon Jan 27 12:52:52 UTC 2025 - Clemens Famulla-Conrad <cfamullaconrad@suse.com>
+
+- Update openvswitch to 3.3.2. For a list of changes, check
+  https://github.com/openvswitch/ovs/blob/v3.3.2/NEWS
+- Update OVN to 24.03.5. For a list of changes, check
+  https://github.com/ovn-org/ovn/blob/v24.03.5/NEWS
+  - This update fix CVE-2025-0650 ovn: egress ACLs may be bypassed
+    via specially crafted UDP packet (bsc#1236353)
+
+-------------------------------------------------------------------
+Mon Dec 16 15:15:56 UTC 2024 - Dominique Leuenberger <dimstar@opensuse.org>
+
+- Add proper dependency on /usr/sbin/ipsec on openvswitch-ipsec:
+  without the binary present, the service crashes on startup
+  (boo#1234617).
+
 -------------------------------------------------------------------
 Wed Aug 28 05:18:36 UTC 2024 - Duraisankar P <Duraisankar.pitchumani@suse.com>
 
diff --git a/openvswitch.spec b/openvswitch.spec
index 6feeef4..d0a8061 100644
--- a/openvswitch.spec
+++ b/openvswitch.spec
@@ -1,7 +1,7 @@
 #
 # spec file for package openvswitch
 #
-# Copyright (c) 2024 SUSE LLC
+# Copyright (c) 2025 SUSE LLC
 #
 # All modifications and additions to the file contributed by third parties
 # remain the property of their copyright owners, unless otherwise agreed
@@ -20,8 +20,8 @@
 %define skip_python2 1
 %define ovs_lname libopenvswitch-3_3-0
 %define ovn_lname libovn-24_03-0
-%define ovs_version 3.3.1
-%define ovn_version 24.03.3
+%define ovs_version 3.3.2
+%define ovn_version 24.03.5
 %define ovs_dir ovs-%{ovs_version}
 %define ovn_dir ovn-%{ovn_version}
 %define rpmstate %{_rundir}/openvswitch-rpm-state-
@@ -80,8 +80,8 @@ Patch4:         install-ovsdb-tools.patch
 #OVN patches
 # PATCH-FIX-OPENSUSE: 0001-Run-ovn-as-openvswitch-openvswitch.patch
 Patch20:        0001-Run-ovn-as-openvswitch-openvswitch.patch
-BuildRequires:  autoconf
 BuildRequires:  %{python_module setuptools}
+BuildRequires:  autoconf
 BuildRequires:  automake
 BuildRequires:  fdupes
 BuildRequires:  graphviz
@@ -238,6 +238,7 @@ Summary:        Open vSwitch IPsec tunneling support
 License:        Apache-2.0
 Group:          Productivity/Networking/System
 Requires:       %{name} = %{version}
+Requires:       /usr/sbin/ipsec
 Requires:       python3-ovs = %{version}
 Requires:       strongswan
 
diff --git a/ovn-24.03.3.tar.gz b/ovn-24.03.3.tar.gz
deleted file mode 100644
index ea83b9e..0000000
--- a/ovn-24.03.3.tar.gz
+++ /dev/null
@@ -1,3 +0,0 @@
-version https://git-lfs.github.com/spec/v1
-oid sha256:0a23800f941c0755cf402d447f999aae8371b99e6e64a9bb6ec2e57d24f21348
-size 2010176
diff --git a/ovn-24.03.5.tar.gz b/ovn-24.03.5.tar.gz
new file mode 100644
index 0000000..46e7452
--- /dev/null
+++ b/ovn-24.03.5.tar.gz
@@ -0,0 +1,3 @@
+version https://git-lfs.github.com/spec/v1
+oid sha256:f679577e4e33587e3a0ccae8693c56b3531ce7b3dc259d7dee2ec4f21ea732c6
+size 2024279