From 7f5207d908a0ebb3d180bf767c5f5762f2015f8a3eb58f5828af948931370272 Mon Sep 17 00:00:00 2001
From: Richard Brown <rbrown@suse.com>
Date: Wed, 29 Jun 2022 10:39:58 +0000
Subject: [PATCH] Accepting request 985705 from
 home:iDesmI:branches:devel:microos

- Update to version 2.1.2:
  * add log-global-size-max option to limit the total output conmon processes (CVE-2022-1708 boo#1200285)
  * journald: print tag and name if both are specified
  * drop some logs to debug level

OBS-URL: https://build.opensuse.org/request/show/985705
OBS-URL: https://build.opensuse.org/package/show/devel:microos/conmon?expand=0&rev=3
---
 _service            | 2 +-
 conmon-2.1.0.tar.xz | 3 ---
 conmon-2.1.2.tar.xz | 3 +++
 conmon.changes      | 8 ++++++++
 conmon.spec         | 6 +++---
 5 files changed, 15 insertions(+), 7 deletions(-)
 delete mode 100644 conmon-2.1.0.tar.xz
 create mode 100644 conmon-2.1.2.tar.xz

diff --git a/_service b/_service
index e2742c2..8998a71 100644
--- a/_service
+++ b/_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.0</param>
+<param name="revision">v2.1.2</param>
 <param name="changesgenerate">disable</param>
 </service>
 <service name="recompress" mode="disabled">
diff --git a/conmon-2.1.0.tar.xz b/conmon-2.1.0.tar.xz
deleted file mode 100644
index e744ec1..0000000
--- a/conmon-2.1.0.tar.xz
+++ /dev/null
@@ -1,3 +0,0 @@
-version https://git-lfs.github.com/spec/v1
-oid sha256:44006a97ceed73b8aa0fb2e1375d8ef38ef13300b81923f73fd3cf7244069d18
-size 139144
diff --git a/conmon-2.1.2.tar.xz b/conmon-2.1.2.tar.xz
new file mode 100644
index 0000000..7812e67
--- /dev/null
+++ b/conmon-2.1.2.tar.xz
@@ -0,0 +1,3 @@
+version https://git-lfs.github.com/spec/v1
+oid sha256:9ac9d7d9f088895c87e365240d72cff27ab557fd2d62e776d32c1e66abe4445c
+size 139304
diff --git a/conmon.changes b/conmon.changes
index a3ce512..408d576 100644
--- a/conmon.changes
+++ b/conmon.changes
@@ -1,3 +1,11 @@
+-------------------------------------------------------------------
+Wed Jun 29 06:05:57 UTC 2022 - Enrico Belleri <idesmi@protonmail.com>
+
+- Update to version 2.1.2:
+  * add log-global-size-max option to limit the total output conmon processes (CVE-2022-1708 boo#1200285)
+  * journald: print tag and name if both are specified
+  * drop some logs to debug level
+
 -------------------------------------------------------------------
 Thu May  5 15:46:07 UTC 2022 - Ferdinand Thiessen <rpm@fthiessen.de>
 
diff --git a/conmon.spec b/conmon.spec
index 767d3a1..d945686 100644
--- a/conmon.spec
+++ b/conmon.spec
@@ -17,16 +17,16 @@
 
 
 Name:           conmon
-Version:        2.1.0
+Version:        2.1.2
 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
-BuildRequires:  glib2-devel
-BuildRequires:  pkgconfig
 BuildRequires:  golang(API) >= 1.16
+BuildRequires:  pkgconfig
+BuildRequires:  pkgconfig(glib-2.0)
 BuildRequires:  pkgconfig(libseccomp)
 BuildRequires:  pkgconfig(libsystemd)