diff --git a/SOURCES/openvswitch-2.17.0.patch b/SOURCES/openvswitch-2.17.0.patch index 8e03dd8..ac1ba8d 100644 --- a/SOURCES/openvswitch-2.17.0.patch +++ b/SOURCES/openvswitch-2.17.0.patch @@ -50801,6 +50801,19 @@ index 33a1a92953..0103fb5396 100644 conn_key_hash(parent_key, ct->hash_basis), &ct->alg_expectation_refs) { if (!conn_key_cmp(&node->parent_key, parent_key)) { +diff --git a/lib/daemon-unix.c b/lib/daemon-unix.c +index 34d45b82a1..31db2d2c7c 100644 +--- a/lib/daemon-unix.c ++++ b/lib/daemon-unix.c +@@ -393,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..1afcc65adb 100644 --- a/lib/dns-resolve.c @@ -64835,6 +64848,18 @@ index f0fd042108..7d899fbbfd 100644 /* Check maximum x such that f(x) == n. */ check_ctz32(UINT32_MAX << n, n); +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 3f58e3e8fd..8c5af459e9 100644 --- a/tests/tunnel-push-pop-ipv6.at diff --git a/SPECS/openvswitch2.17.spec b/SPECS/openvswitch2.17.spec index 50d4a83..73fbb35 100644 --- a/SPECS/openvswitch2.17.spec +++ b/SPECS/openvswitch2.17.spec @@ -57,7 +57,7 @@ Summary: Open vSwitch Group: System Environment/Daemons daemon/database/utilities URL: http://www.openvswitch.org/ Version: 2.17.0 -Release: 55%{?dist} +Release: 56%{?dist} # Nearly all of openvswitch is ASL 2.0. The bugtool is LGPLv2+, and the # lib/sflow*.[ch] files are SISSL @@ -743,6 +743,13 @@ exit 0 %endif %changelog +* Fri Oct 07 2022 Open vSwitch CI - 2.17.0-56 +- Merging upstream branch-2.17 [RH git: c5c912ba61] + Commit list: + 09e22fec45 daemon-unix: Fix file descriptor leak when monitor restarts child. + 53df50db26 vconn: Allow ECONNREFUSED in refuse connection test. + + * Wed Oct 05 2022 Timothy Redaelli - 2.17.0-55 - redhat: get the NVR from spec file directly [RH git: f045ca9fb8] Fixes: 339efe77c4c7 ("pkgtool: keep %{?dist} before added bz string")