pool/conmon
SHA256
2
0
Fork 1
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Accepting request 1133975 from home:dancermak:branches:devel:microos

Browse Source 
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
This commit is contained in:
Danish Prakash 2023-12-19 10:34:55 +00:00 committed by Git OBS Bridge
parent 2be36a56e6
commit 6cac7c0b56
6 changed files with 14 additions and 37 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
_service
View File

@ -4,7 +4,7 @@
<param name="scm">git</param>
<param name="versionformat">@PARENT_TAG@</param>
<param name="versionrewrite-pattern">[v]?([^\+]+)(.*)</param>
<param name="revision">v2.1.9</param>
<param name="revision">v2.1.10</param>
<param name="changesgenerate">disable</param>
</service>
<service name="recompress" mode="manual">

BIN
conmon-2.1.10.tar.xz (Stored with Git LFS) Normal file
View File

Binary file not shown.

3
conmon-2.1.9.tar.xz
View File

@ -1,3 +0,0 @@
version https://git-lfs.github.com/spec/v1
oid sha256:01adf76b2d4b96b99b21faaa300808aa61a34db20f4f634fd4deb63fc9799145
size 103136

9
conmon.changes
View File

@ -1,3 +1,12 @@
-------------------------------------------------------------------
Tue Dec 19 08:01:08 UTC 2023 - Dan Čermák <dcermak@suse.com>
- 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 <dcermak@suse.com>

3
conmon.spec
View File

@ -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)

31
fix-incorrect-free-in-conn_sock.patch
View File

@ -1,31 +0,0 @@
From 8557c117bcab03e3c16e40ffb7bd450d697f72c7 Mon Sep 17 00:00:00 2001
From: Dominique Martinet <dominique.martinet@atmark-techno.com>
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 <dominique.martinet@atmark-techno.com>
---
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);