From 8649e476dfc3919f8c1e7107a416b6b1483d9c6c Mon Sep 17 00:00:00 2001
From: Open vSwitch CI <ovs-team@redhat.com>
Date: Feb 12 2025 23:06:18 +0000
Subject: Import openvswitch3.5-3.5.0-0.21 from Fast DataPath


---

diff --git a/SOURCES/openvswitch-3.5.0.patch b/SOURCES/openvswitch-3.5.0.patch
index 2d2c22d..ba68ada 100644
--- a/SOURCES/openvswitch-3.5.0.patch
+++ b/SOURCES/openvswitch-3.5.0.patch
@@ -1946,6 +1946,19 @@ index 4cc7001a5b..e59ff17ade 100644
      }
      /* Note that we have matched on packet_type! */
      wc->masks.packet_type = OVS_BE32_MAX;
+diff --git a/ovsdb/ovsdb-server.c b/ovsdb/ovsdb-server.c
+index fbc7ad5efe..aa2e27d844 100644
+--- a/ovsdb/ovsdb-server.c
++++ b/ovsdb/ovsdb-server.c
+@@ -504,7 +504,7 @@ add_database_config(struct shash *db_conf, const char *opt,
+ 
+     conf = shash_replace_nocopy(db_conf, filename, conf);
+     if (conf) {
+-        VLOG_WARN("Duplicate database configuration: %s", filename);
++        VLOG_WARN("Duplicate database configuration: %s", opt);
+         db_config_destroy(conf);
+     }
+ }
 diff --git a/python/ovs/flowviz/odp/graph.py b/python/ovs/flowviz/odp/graph.py
 index 4d1fb7493c..c9734efece 100644
 --- a/python/ovs/flowviz/odp/graph.py
diff --git a/SPECS/openvswitch3.5.spec b/SPECS/openvswitch3.5.spec
index 53f35a7..e79a74a 100644
--- a/SPECS/openvswitch3.5.spec
+++ b/SPECS/openvswitch3.5.spec
@@ -57,7 +57,7 @@ Summary: Open vSwitch
 Group: System Environment/Daemons daemon/database/utilities
 URL: http://www.openvswitch.org/
 Version: 3.5.0
-Release: 0.20%{?dist}
+Release: 0.21%{?dist}
 
 # Nearly all of openvswitch is ASL 2.0.  The bugtool is LGPLv2+, and the
 # lib/sflow*.[ch] files are SISSL
@@ -773,6 +773,12 @@ exit 0
 %endif
 
 %changelog
+* Wed Feb 12 2025 Open vSwitch CI <ovs-ci@redhat.com> - 3.5.0-0.21
+- Merging upstream branch-3.5 [RH git: 75d39efae4]
+    Commit list:
+    cae90a3d77 ovsdb-server: Do not use filename after free. (FDP-1118)
+
+
 * Mon Feb 10 2025 Open vSwitch CI <ovs-ci@redhat.com> - 3.5.0-0.20
 - Merging upstream branch-3.5 [RH git: 737be846fb]
     Commit list: