diff --git a/SOURCES/openvswitch-2.13.0.patch b/SOURCES/openvswitch-2.13.0.patch index 9feca4c..23ca3c0 100644 --- a/SOURCES/openvswitch-2.13.0.patch +++ b/SOURCES/openvswitch-2.13.0.patch @@ -80701,6 +80701,18 @@ index 3e227d9e3b..ebd9ac9be5 100644 +int ct_dpif_get_features(struct dpif *dpif, enum ct_features *features); #endif /* CT_DPIF_H */ +diff --git a/lib/daemon-unix.c b/lib/daemon-unix.c +index 7e48630f0e..4e2874c22e 100644 +--- a/lib/daemon-unix.c ++++ b/lib/daemon-unix.c +@@ -285,6 +285,7 @@ fork_and_wait_for_startup(int *fdp, pid_t *child_pid) + VLOG_ERR("fork child died before signaling startup (%s)", + status_msg); + ret = -1; ++ free(status_msg); + } + } else if (retval < 0) { + VLOG_FATAL("waitpid failed (%s)", ovs_strerror(errno)); diff --git a/lib/dp-packet.h b/lib/dp-packet.h index 9f8991faad..dc8b773fe1 100644 --- a/lib/dp-packet.h diff --git a/SPECS/openvswitch2.13.spec b/SPECS/openvswitch2.13.spec index 876a615..effb36a 100644 --- a/SPECS/openvswitch2.13.spec +++ b/SPECS/openvswitch2.13.spec @@ -59,7 +59,7 @@ Summary: Open vSwitch Group: System Environment/Daemons daemon/database/utilities URL: http://www.openvswitch.org/ Version: 2.13.0 -Release: 118%{?commit0:.%{date}git%{shortcommit0}}%{?commit1:dpdk%{shortcommit1}}%{?dist} +Release: 119%{?commit0:.%{date}git%{shortcommit0}}%{?commit1:dpdk%{shortcommit1}}%{?dist} # Nearly all of openvswitch is ASL 2.0. The bugtool is LGPLv2+, and the # lib/sflow*.[ch] files are SISSL @@ -710,6 +710,10 @@ exit 0 %endif %changelog +* Mon Jul 26 2021 Open vSwitch CI - 2.13.0-119 +- Merging upstream branch-2.13 + [c2e53c31505b228aaa405be2bc36c25de4d9faeb] + * Wed Jul 21 2021 Open vSwitch CI - 2.13.0-118 - Merging upstream branch-2.13 [d613ce404a9f86e8ff209fe3b17c76a231258bdf]