Tags: patch Attached is a debdiff that adds the upstream patch for bullseye.
-- Dan Nicholson | Endless OS Foundation
diff -Nru conmon-2.0.25+ds1/debian/changelog conmon-2.0.25+ds1/debian/changelog --- conmon-2.0.25+ds1/debian/changelog 2021-07-14 11:46:07.000000000 -0600 +++ conmon-2.0.25+ds1/debian/changelog 2022-06-29 09:35:38.000000000 -0600 @@ -1,3 +1,10 @@ +conmon (2.0.25+ds1-1.1+deb11u1) bullseye; urgency=medium + + * Backport upstream fix to not hang when forwarding container + stdout/stderr with lots of output. (Closes: #1014030) + + -- Dan Nicholson <d...@endlessos.org> Wed, 29 Jun 2022 09:35:38 -0600 + conmon (2.0.25+ds1-1.1) unstable; urgency=medium * Non-maintainer upload. diff -Nru conmon-2.0.25+ds1/debian/patches/0002-conn_sock-do-not-fail-on-EAGAIN.patch conmon-2.0.25+ds1/debian/patches/0002-conn_sock-do-not-fail-on-EAGAIN.patch --- conmon-2.0.25+ds1/debian/patches/0002-conn_sock-do-not-fail-on-EAGAIN.patch 1969-12-31 17:00:00.000000000 -0700 +++ conmon-2.0.25+ds1/debian/patches/0002-conn_sock-do-not-fail-on-EAGAIN.patch 2022-06-29 09:33:10.000000000 -0600 @@ -0,0 +1,37 @@ +From 2b873145a85a212f703c9c00db13717ab0204318 Mon Sep 17 00:00:00 2001 +From: Giuseppe Scrivano <gscri...@redhat.com> +Date: Tue, 2 Feb 2021 11:35:39 +0100 +Subject: [PATCH] conn_sock: do not fail on EAGAIN + +commit 6287bd884d9bf29e76ac877e0c7e6aad04bc24a4 introduced the +regression. + +writes to the attached sockets must be blocking, otherwise the +write_back_to_remote_consoles() shutdowns the socket when write fails +with EAGAIN. + +I've verified the original issue fixed with commit 62887bd is not +reintroduced with this patch. + +Closes: https://github.com/containers/conmon/issues/236 + +Signed-off-by: Giuseppe Scrivano <gscri...@redhat.com> +--- + src/conn_sock.c | 1 - + 1 file changed, 1 deletion(-) + +diff --git a/src/conn_sock.c b/src/conn_sock.c +index e569113..02aee70 100644 +--- a/src/conn_sock.c ++++ b/src/conn_sock.c +@@ -280,7 +280,6 @@ static gboolean attach_cb(int fd, G_GNUC_UNUSED GIOCondition condition, gpointer + pexit("Failed to allocate memory"); + } + init_remote_sock(remote_sock, srcsock); +- g_unix_set_fd_nonblocking(new_fd, TRUE, NULL); + remote_sock->fd = new_fd; + g_unix_fd_add(remote_sock->fd, G_IO_IN | G_IO_HUP | G_IO_ERR, remote_sock_cb, remote_sock); + g_ptr_array_add(remote_sock->dest->readers, remote_sock); +-- +2.30.2 + diff -Nru conmon-2.0.25+ds1/debian/patches/series conmon-2.0.25+ds1/debian/patches/series --- conmon-2.0.25+ds1/debian/patches/series 2021-07-14 11:46:07.000000000 -0600 +++ conmon-2.0.25+ds1/debian/patches/series 2022-06-29 09:33:10.000000000 -0600 @@ -1 +1,2 @@ 0001-Reset-OOM-score-back-to-0-for-container-runtime.patch +0002-conn_sock-do-not-fail-on-EAGAIN.patch
