Accepting request 1072139 from devel:microos

OBS-URL: https://build.opensuse.org/request/show/1072139
OBS-URL: https://build.opensuse.org/package/show/openSUSE:Factory/conmon?expand=0&rev=29

0001-Fix-tools-Makefile-with-GNU-make-4.4.patch

@@ -1,26 +0,0 @@
-From a549987698d105fab2b2bdddeed49b586f4d799d Mon Sep 17 00:00:00 2001
-From: Fabian Vogt <fvogt@suse.de>
-Date: Fri, 4 Nov 2022 15:29:59 +0100
-Subject: [PATCH] Fix tools/Makefile with GNU make 4.4
-
-Before GNU make 4.4, "export" variables were not actually exported to $(shell)
-commands, so the "export GO111MODULE=off" line had no effect. With
-make >= 4.4, this variable is now set in the environment of the "go build"
-command, which breaks it. Just remove the wrong variable assignment to have
-the same behavour as previously.
-
-Signed-off-by: Fabian Vogt <fvogt@suse.de>
----
- tools/Makefile | 2 --
- 1 file changed, 2 deletions(-)
-
-diff --git a/tools/Makefile b/tools/Makefile
-index 25783aef..0211016a 100644
---- a/tools/Makefile
-+++ b/tools/Makefile
-@@ -1,5 +1,3 @@
--export GO111MODULE=off
--
- GO := go
- 
- BUILDDIR := build

_service

@@ -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.5</param>
+<param name="revision">v2.1.7</param>
 <param name="changesgenerate">disable</param>
 </service>
 <service name="recompress" mode="disabled">

conmon-2.1.5.tar.xz

@@ -1,3 +0,0 @@
-version https://git-lfs.github.com/spec/v1
-oid sha256:68aacc02ef86e8eb96593e75f9bf3be703cbbe46173fec90d81f064a894c0de8
-size 140364

conmon-2.1.7.tar.xz

@@ -0,0 +1,3 @@
+version https://git-lfs.github.com/spec/v1
+oid sha256:9b56d661f151aae69b575b6b6bb35958df0bd9803c341fea98bcbd53c011d072
+size 137416

conmon.changes

@@ -1,3 +1,26 @@
+-------------------------------------------------------------------
+Wed Mar 15 14:36:27 UTC 2023 - Dan Čermák <dcermak@suse.com>
+
+- New upstream release 2.1.7
+2.1.7:
+
+### Bug Fixes
+Fix leaking symbolic links in the opt_socket_path directory
+cgroup: Stumble on if we can't set up oom handling
+
+2.1.6:
+
+### Bug Fixes
+  * Fix OOM watcher for cgroupv2 `oom_kill` events
+### Misc
+  * Use --detach instead of -d
+  * ctrl: drop fifo perms to 0660
+
+- Remove merged patch:
+  * 0001-Fix-tools-Makefile-with-GNU-make-4.4.patch
+
+- Bump go version to 1.19 (bsc#1209307)
+
 -------------------------------------------------------------------
 Wed Nov 23 14:43:15 UTC 2022 - Dan Čermák <dcermak@suse.com>
 

conmon.spec

@@ -17,17 +17,15 @@
 
 
 Name:           conmon
-Version:        2.1.5
+Version:        2.1.7
 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
-# https://github.com/containers/conmon/pull/364
-Patch1:         %{URL}/pull/364.patch#./0001-Fix-tools-Makefile-with-GNU-make-4.4.patch
 BuildRequires:  pkgconfig
-BuildRequires:  golang(API) = 1.18
+BuildRequires:  golang(API) = 1.19
 BuildRequires:  pkgconfig(glib-2.0)
 BuildRequires:  pkgconfig(libseccomp)
 BuildRequires:  pkgconfig(libsystemd)