From 6cac7c0b560ba8a8e3e52225a6795cf67a9dfabee6c3dd1d452f6ebbc8ef20e2 Mon Sep 17 00:00:00 2001 From: Danish Prakash Date: Tue, 19 Dec 2023 10:34:55 +0000 Subject: [PATCH] Accepting request 1133975 from home:dancermak:branches:devel:microos New upstream release 2.1.10 OBS-URL: https://build.opensuse.org/request/show/1133975 OBS-URL: https://build.opensuse.org/package/show/devel:microos/conmon?expand=0&rev=24 --- _service | 2 +- conmon-2.1.10.tar.xz | 3 +++ conmon-2.1.9.tar.xz | 3 --- conmon.changes | 9 ++++++++ conmon.spec | 3 +-- fix-incorrect-free-in-conn_sock.patch | 31 --------------------------- 6 files changed, 14 insertions(+), 37 deletions(-) create mode 100644 conmon-2.1.10.tar.xz delete mode 100644 conmon-2.1.9.tar.xz delete mode 100644 fix-incorrect-free-in-conn_sock.patch diff --git a/_service b/_service index 518240e..8e48dc4 100644 --- a/_service +++ b/_service @@ -4,7 +4,7 @@ git @PARENT_TAG@ [v]?([^\+]+)(.*) -v2.1.9 +v2.1.10 disable diff --git a/conmon-2.1.10.tar.xz b/conmon-2.1.10.tar.xz new file mode 100644 index 0000000..2f33a2a --- /dev/null +++ b/conmon-2.1.10.tar.xz @@ -0,0 +1,3 @@ +version https://git-lfs.github.com/spec/v1 +oid sha256:9c5ad5a0435954ecc4cece23842a4280dfc297f4bfffcd9377eb70e06cfe89ea +size 103284 diff --git a/conmon-2.1.9.tar.xz b/conmon-2.1.9.tar.xz deleted file mode 100644 index 0bcab21..0000000 --- a/conmon-2.1.9.tar.xz +++ /dev/null @@ -1,3 +0,0 @@ -version https://git-lfs.github.com/spec/v1 -oid sha256:01adf76b2d4b96b99b21faaa300808aa61a34db20f4f634fd4deb63fc9799145 -size 103136 diff --git a/conmon.changes b/conmon.changes index 084f4bb..62bf0bf 100644 --- a/conmon.changes +++ b/conmon.changes @@ -1,3 +1,12 @@ +------------------------------------------------------------------- +Tue Dec 19 08:01:08 UTC 2023 - Dan Čermák + +- New upstream release 2.1.10 + + Bug fixes: + * Fix incorrect free in conn_sock (removes fix-incorrect-free-in-conn_sock.patch) + * logging: Respect log-size-max immediately after open + ------------------------------------------------------------------- Mon Dec 18 09:02:52 UTC 2023 - Dan Čermák diff --git a/conmon.spec b/conmon.spec index b7895e7..3eb3f37 100644 --- a/conmon.spec +++ b/conmon.spec @@ -17,14 +17,13 @@ Name: conmon -Version: 2.1.9 +Version: 2.1.10 Release: 0 Summary: An OCI container runtime monitor License: Apache-2.0 Group: System/Management URL: https://github.com/containers/conmon Source0: %{name}-%{version}.tar.xz -Patch0: https://github.com/containers/conmon/pull/476.patch#./fix-incorrect-free-in-conn_sock.patch BuildRequires: pkgconfig BuildRequires: golang(API) >= 1.20 BuildRequires: pkgconfig(glib-2.0) diff --git a/fix-incorrect-free-in-conn_sock.patch b/fix-incorrect-free-in-conn_sock.patch deleted file mode 100644 index b414942..0000000 --- a/fix-incorrect-free-in-conn_sock.patch +++ /dev/null @@ -1,31 +0,0 @@ -From 8557c117bcab03e3c16e40ffb7bd450d697f72c7 Mon Sep 17 00:00:00 2001 -From: Dominique Martinet -Date: Fri, 15 Dec 2023 12:44:03 +0900 -Subject: [PATCH] Fix incorrect free in conn_sock - -Earlier commit freed socket_parent_dir()'s result which is correct in -the case it returns a path from g_build_filename, but when it returns -opt_bundle_path the string should not be freed. - -Make the function always return an allocated string that can be freed - -Fixes: #475 -Fixes: fad6bac8e65f ("fix some issues flagged by SAST scan") -Signed-off-by: Dominique Martinet ---- - src/conn_sock.c | 2 +- - 1 file changed, 1 insertion(+), 1 deletion(-) - -diff --git a/src/conn_sock.c b/src/conn_sock.c -index 62a02266..3b854e33 100644 ---- a/src/conn_sock.c -+++ b/src/conn_sock.c -@@ -314,7 +314,7 @@ char *socket_parent_dir(gboolean use_full_attach_path, size_t desired_len) - { - /* if we're to use the full path, ignore the socket path and only use the bundle_path */ - if (use_full_attach_path) -- return opt_bundle_path; -+ return strdup(opt_bundle_path); - - char *base_path = g_build_filename(opt_socket_path, opt_cuuid, NULL); -