diff --git a/SOURCES/openvswitch-3.3.0.patch b/SOURCES/openvswitch-3.3.0.patch index 1999ee6..c6cd9e2 100644 --- a/SOURCES/openvswitch-3.3.0.patch +++ b/SOURCES/openvswitch-3.3.0.patch @@ -5522,9 +5522,18 @@ index 41b986c0ac..f1eefd49cb 100755 sys.exit(0) diff --git a/ovsdb/ovsdb-server.c b/ovsdb/ovsdb-server.c -index b51fd42fe5..a876f8bcf7 100644 +index b51fd42fe5..86fa81c790 100644 --- a/ovsdb/ovsdb-server.c +++ b/ovsdb/ovsdb-server.c +@@ -503,7 +503,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); + } + } @@ -816,7 +816,8 @@ main(int argc, char *argv[]) /* ovsdb-server is usually a long-running process, in which case it * makes plenty of sense to log the version, but --run makes diff --git a/SPECS/openvswitch3.3.spec b/SPECS/openvswitch3.3.spec index b73b892..2f83690 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: 87%{?dist} +Release: 88%{?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 +* Wed Feb 12 2025 Open vSwitch CI - 3.3.0-88 +- Merging upstream branch-3.3 [RH git: 73792b38e7] + Commit list: + dc86b14e88 ovsdb-server: Do not use filename after free. (FDP-1118) + + * Mon Feb 10 2025 Open vSwitch CI - 3.3.0-87 - Merging upstream branch-3.3 [RH git: f8bd44389c] Commit list: