diff --git a/SOURCES/openvswitch-2.15.0.patch b/SOURCES/openvswitch-2.15.0.patch index d4d3440..ea0c493 100644 --- a/SOURCES/openvswitch-2.15.0.patch +++ b/SOURCES/openvswitch-2.15.0.patch @@ -669,12 +669,16 @@ index 0000000000..cdded4f906 +.. _bcc : https://github.com/iovisor/bcc +.. _Trace Compass : https://www.eclipse.org/tracecompass/ diff --git a/NEWS b/NEWS -index bc901efdb1..1caf9b1e63 100644 +index bc901efdb1..5c68bf7b7d 100644 --- a/NEWS +++ b/NEWS -@@ -1,3 +1,72 @@ -+v2.15.6 - xx xxx xxxx +@@ -1,3 +1,76 @@ ++v2.15.7 - xx xxx xxxx +--------------------- ++ ++v2.15.6 - 07 Oct 2022 ++--------------------- ++ - Bug fixes + - DPDK: + * OVS validated with DPDK 20.11.6. + DPDK 20.11.6 requires a meson version of 0.48.1 or higher. @@ -787,7 +791,7 @@ index 435685c93d..cbaee636b4 100644 AC_ARG_ENABLE( [sparse], diff --git a/configure.ac b/configure.ac -index fd82d7d270..4a4c7f477a 100644 +index fd82d7d270..2691412c41 100644 --- a/configure.ac +++ b/configure.ac @@ -13,7 +13,7 @@ @@ -795,7 +799,7 @@ index fd82d7d270..4a4c7f477a 100644 AC_PREREQ(2.63) -AC_INIT(openvswitch, 2.15.0, bugs@openvswitch.org) -+AC_INIT(openvswitch, 2.15.6, bugs@openvswitch.org) ++AC_INIT(openvswitch, 2.15.7, bugs@openvswitch.org) AC_CONFIG_SRCDIR([datapath/datapath.c]) AC_CONFIG_MACRO_DIR([m4]) AC_CONFIG_AUX_DIR([build-aux]) @@ -1389,15 +1393,21 @@ index 4cce92f66c..bc18c56b81 100644 #define nf_conntrack_in rpl_nf_conntrack_in #endif /* HAVE_NF_CONNTRACK_IN_TAKES_NF_HOOK_STATE */ diff --git a/debian/changelog b/debian/changelog -index 1f2b7a3668..8ffbbd3114 100644 +index 1f2b7a3668..e503d30d92 100644 --- a/debian/changelog +++ b/debian/changelog -@@ -1,3 +1,39 @@ +@@ -1,3 +1,45 @@ ++openvswitch (2.15.7-1) unstable; urgency=low ++ [ Open vSwitch team ] ++ * New upstream version ++ ++ -- Open vSwitch team Fri, 07 Oct 2022 13:12:36 +0200 ++ +openvswitch (2.15.6-1) unstable; urgency=low + [ Open vSwitch team ] + * New upstream version + -+ -- Open vSwitch team Wed, 15 Jun 2022 12:03:31 +0200 ++ -- Open vSwitch team Fri, 07 Oct 2022 13:12:36 +0200 + +openvswitch (2.15.5-1) unstable; urgency=low + [ Open vSwitch team ] @@ -98889,7 +98899,7 @@ index 88f4c7e28c..b59cba962a 100644 #endif /* CT_DPIF_H */ diff --git a/lib/daemon-unix.c b/lib/daemon-unix.c -index ae59ecf2c2..34d45b82a1 100644 +index ae59ecf2c2..31db2d2c7c 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) @@ -98900,6 +98910,15 @@ index ae59ecf2c2..34d45b82a1 100644 } } else if (retval < 0) { VLOG_FATAL("waitpid failed (%s)", ovs_strerror(errno)); +@@ -392,6 +393,8 @@ monitor_daemon(pid_t daemon_pid) + } + + log_received_backtrace(daemonize_fd); ++ close(daemonize_fd); ++ daemonize_fd = -1; + + /* Throttle restarts to no more than once every 10 seconds. */ + if (time(NULL) < last_restart + 10) { diff --git a/lib/dns-resolve.c b/lib/dns-resolve.c index d344514343..8bcecb90ce 100644 --- a/lib/dns-resolve.c @@ -110981,6 +111000,18 @@ index f0ad9f9793..cea48eb527 100644 import errno import sys +diff --git a/tests/test-vconn.c b/tests/test-vconn.c +index fc8ce4a2c0..96c89bd4e6 100644 +--- a/tests/test-vconn.c ++++ b/tests/test-vconn.c +@@ -157,6 +157,7 @@ test_refuse_connection(struct ovs_cmdl_context *ctx) + error = vconn_connect_block(vconn, (TIMEOUT - 2) * 1000); + if (!strcmp(type, "tcp")) { + if (error != ECONNRESET && error != EPIPE && error != ETIMEDOUT ++ && error != ECONNREFUSED + #ifdef _WIN32 + && error != WSAECONNRESET + #endif diff --git a/tests/tunnel-push-pop-ipv6.at b/tests/tunnel-push-pop-ipv6.at index 59723e63b8..c7665a1aeb 100644 --- a/tests/tunnel-push-pop-ipv6.at diff --git a/SPECS/openvswitch2.15.spec b/SPECS/openvswitch2.15.spec index 973598e..9b828bd 100644 --- a/SPECS/openvswitch2.15.spec +++ b/SPECS/openvswitch2.15.spec @@ -57,7 +57,7 @@ Summary: Open vSwitch Group: System Environment/Daemons daemon/database/utilities URL: http://www.openvswitch.org/ Version: 2.15.0 -Release: 123%{?dist} +Release: 124%{?dist} # Nearly all of openvswitch is ASL 2.0. The bugtool is LGPLv2+, and the # lib/sflow*.[ch] files are SISSL @@ -702,6 +702,15 @@ exit 0 %endif %changelog +* Fri Oct 07 2022 Open vSwitch CI - 2.15.0-124 +- Merging upstream branch-2.15 [RH git: a5332540ff] + Commit list: + af45645e13 Prepare for 2.15.7. + 9b2e802075 Set release date for 2.15.6. + a8c92a2bbc daemon-unix: Fix file descriptor leak when monitor restarts child. + 917f72a4a8 vconn: Allow ECONNREFUSED in refuse connection test. + + * Mon Oct 03 2022 Open vSwitch CI - 2.15.0-123 - Merging upstream branch-2.15 [RH git: 73cc21866f] Commit list: