conmon: fix segfault, correct a typo and update description

Signed-off-by: Oskari Rauta <oskari.rauta@gmail.com>
(cherry picked from commit 463227f70cc75579a93a59c09cb6b372c48c13cc)

diff --git a/utils/conmon/Makefile b/utils/conmon/Makefile
index ad1bd26c82bd31e2f66d7045a7555cf0a0db76c1..198ce2e826c1d01550cc6d05343eb2e425b37458 100644 (file)
--- a/utils/conmon/Makefile
+++ b/utils/conmon/Makefile
@@ -21,13 +21,17 @@ include ../../devel/meson/meson.mk
 define Package/conmon
   SECTION:=utils
   CATEGORY:=Utilities
-  TITLE:=Podmon conmon
+  TITLE:=Podman conmon
   URL:=https://podman.io
   DEPENDS:=+glib2 $(INTL_DEPENDS) $(ICONV_DEPENDS)
 endef
 
 define Package/conmon/description
-  Podman: A tool for managing OCI containers and pods
+  An OCI container runtime monitor.
+
+  Conmon is a monitoring program and communication tool between
+  a container manager (like Podman or CRI-O) and an OCI runtime
+  (like runc or crun) for a single container.
 endef
 
 define Package/conmon/install

diff --git a/utils/conmon/patches/100-fix-null-socket-connection-list.patch b/utils/conmon/patches/100-fix-null-socket-connection-list.patch
new file mode 100644 (file)
index 0000000..886e13a
--- /dev/null
+++ b/utils/conmon/patches/100-fix-null-socket-connection-list.patch
@@ -0,0 +1,22 @@
+--- a/src/conn_sock.c
++++ b/src/conn_sock.c
+@@ -465,6 +465,9 @@ static void init_remote_sock(struct remo
+ 
+ static void close_sock(gpointer data, G_GNUC_UNUSED gpointer user_data)
+ {
++      if (data == NULL)
++              return;
++
+       struct remote_sock_s *sock = (struct remote_sock_s *)data;
+ 
+       close(sock->fd);
+@@ -473,5 +476,9 @@ static void close_sock(gpointer data, G_
+ 
+ void close_all_readers()
+ {
++
++      if (local_mainfd_stdin.readers == NULL)
++              return;
++
+       g_ptr_array_foreach(local_mainfd_stdin.readers, close_sock, NULL);
+ }