From 359763c4ca69590679c2c216c8a514249a19f094 Mon Sep 17 00:00:00 2001 From: Open vSwitch CI Date: Oct 20 2023 19:30:42 +0000 Subject: Import openvswitch3.1-3.1.0-68 from Fast DataPath --- diff --git a/SOURCES/openvswitch-3.1.0.patch b/SOURCES/openvswitch-3.1.0.patch index f0dd9b9..63ce542 100644 --- a/SOURCES/openvswitch-3.1.0.patch +++ b/SOURCES/openvswitch-3.1.0.patch @@ -416,13 +416,17 @@ index e605187b8..eddb981ae 100644 @if cmp -s $(@F).tmp $@; then \ touch $@; \ diff --git a/NEWS b/NEWS -index 37a01dea5..8fbf7219d 100644 +index 37a01dea5..13229cb3a 100644 --- a/NEWS +++ b/NEWS -@@ -1,3 +1,16 @@ -+v3.1.3 - xx xxx xxxx +@@ -1,3 +1,20 @@ ++v3.1.4 - xx xxx xxxx +-------------------- + ++v3.1.3 - 17 Oct 2023 ++-------------------- ++ - Bug fixes ++ +v3.1.2 - 27 Jun 2023 +-------------------- + - Bug fixes @@ -597,7 +601,7 @@ index ee5553f45..3e937910b 100755 sys.exit(1) for line in s.splitlines(): diff --git a/configure.ac b/configure.ac -index 9bf896c01..f4fb551ae 100644 +index 9bf896c01..cd50adcb2 100644 --- a/configure.ac +++ b/configure.ac @@ -13,7 +13,7 @@ @@ -605,7 +609,7 @@ index 9bf896c01..f4fb551ae 100644 AC_PREREQ(2.63) -AC_INIT(openvswitch, 3.1.0, bugs@openvswitch.org) -+AC_INIT(openvswitch, 3.1.3, bugs@openvswitch.org) ++AC_INIT(openvswitch, 3.1.4, bugs@openvswitch.org) AC_CONFIG_SRCDIR([vswitchd/ovs-vswitchd.c]) AC_CONFIG_MACRO_DIR([m4]) AC_CONFIG_AUX_DIR([build-aux]) @@ -623,15 +627,21 @@ index 9bf896c01..f4fb551ae 100644 AC_PROG_CXX AC_PROG_CPP diff --git a/debian/changelog b/debian/changelog -index a5ad222c4..b2f60255c 100644 +index a5ad222c4..a47e46242 100644 --- a/debian/changelog +++ b/debian/changelog -@@ -1,3 +1,21 @@ +@@ -1,3 +1,27 @@ ++openvswitch (3.1.4-1) unstable; urgency=low ++ [ Open vSwitch team ] ++ * New upstream version ++ ++ -- Open vSwitch team Tue, 17 Oct 2023 13:02:17 +0200 ++ +openvswitch (3.1.3-1) unstable; urgency=low + [ Open vSwitch team ] + * New upstream version + -+ -- Open vSwitch team Tue, 27 Jun 2023 14:09:46 +0200 ++ -- Open vSwitch team Tue, 17 Oct 2023 13:02:17 +0200 + +openvswitch (3.1.2-1) unstable; urgency=low + [ Open vSwitch team ] @@ -1677,10 +1687,26 @@ index 0292f715e..fbbea4005 100644 __cpuid_count(leaf, 0, regs[EAX], regs[EBX], regs[ECX], regs[EDX]); return (regs[reg] & ((uint32_t) 1 << bit)) != 0; diff --git a/lib/db-ctl-base.c b/lib/db-ctl-base.c -index 134496ef3..5d2635946 100644 +index 134496ef3..3a8068b12 100644 --- a/lib/db-ctl-base.c +++ b/lib/db-ctl-base.c -@@ -1492,7 +1492,7 @@ cmd_add(struct ctl_context *ctx) +@@ -820,6 +820,7 @@ check_condition(const struct ovsdb_idl_table_class *table, + type.value.type = OVSDB_TYPE_VOID; + error = ovsdb_datum_from_string(&b, &type, value_string, symtab); + if (error) { ++ ovsdb_atom_destroy(&want_key, column->type.key.type); + goto out; + } + +@@ -1374,6 +1375,7 @@ set_column(const struct ovsdb_idl_table_class *table, + error = ovsdb_atom_from_string(&value, NULL, &column->type.value, + value_string, symtab); + if (error) { ++ ovsdb_atom_destroy(&key, column->type.key.type); + goto out; + } + +@@ -1492,7 +1494,7 @@ cmd_add(struct ctl_context *ctx) const struct ovsdb_idl_column *column; const struct ovsdb_idl_row *row; const struct ovsdb_type *type; @@ -1689,7 +1715,7 @@ index 134496ef3..5d2635946 100644 int i; ctx->error = get_table(table_name, &table); -@@ -1516,13 +1516,7 @@ cmd_add(struct ctl_context *ctx) +@@ -1516,13 +1518,7 @@ cmd_add(struct ctl_context *ctx) } type = &column->type; @@ -1704,7 +1730,7 @@ index 134496ef3..5d2635946 100644 for (i = 4; i < ctx->argc; i++) { struct ovsdb_type add_type; struct ovsdb_datum add; -@@ -1533,41 +1527,23 @@ cmd_add(struct ctl_context *ctx) +@@ -1533,41 +1529,23 @@ cmd_add(struct ctl_context *ctx) ctx->error = ovsdb_datum_from_string(&add, &add_type, ctx->argv[i], ctx->symtab); if (ctx->error) { diff --git a/SPECS/openvswitch3.1.spec b/SPECS/openvswitch3.1.spec index 09d2249..9afe71e 100644 --- a/SPECS/openvswitch3.1.spec +++ b/SPECS/openvswitch3.1.spec @@ -63,7 +63,7 @@ Summary: Open vSwitch Group: System Environment/Daemons daemon/database/utilities URL: http://www.openvswitch.org/ Version: 3.1.0 -Release: 66%{?dist} +Release: 68%{?dist} # Nearly all of openvswitch is ASL 2.0. The bugtool is LGPLv2+, and the # lib/sflow*.[ch] files are SISSL @@ -757,6 +757,19 @@ exit 0 %endif %changelog +* Wed Oct 18 2023 Open vSwitch CI - 3.1.0-68 +- Merging upstream branch-3.1 [RH git: 5862bfd2f9] + Commit list: + 1fa8722bf3 db-ctl-base: Fix memory leak of db commands. + + +* Tue Oct 17 2023 Open vSwitch CI - 3.1.0-67 +- Merging upstream branch-3.1 [RH git: 0a816aa465] + Commit list: + 086b269551 Prepare for 3.1.4. + e8f9125c96 Set release date for 3.1.3. + + * Thu Oct 12 2023 Timothy Redaelli - 3.1.0-66 - redhat: use rhpkg push instead of git push [RH git: 1ca7062440]