From f5bb7304c04e81320e5f8e52c69ee4491d931a2e9ea04332420c9a0611173a50 Mon Sep 17 00:00:00 2001
From: Richard Brown <rbrown@suse.com>
Date: Tue, 2 Mar 2021 11:26:23 +0000
Subject: [PATCH] Accepting request 875202 from devel:kubic

OBS-URL: https://build.opensuse.org/request/show/875202
OBS-URL: https://build.opensuse.org/package/show/openSUSE:Factory/conmon?expand=0&rev=19
---
 _service             |  2 +-
 _servicedata         |  2 +-
 conmon-2.0.22.tar.xz |  3 ---
 conmon-2.0.26.tar.xz |  3 +++
 conmon.changes       | 17 +++++++++++++++++
 conmon.spec          |  4 ++--
 6 files changed, 24 insertions(+), 7 deletions(-)
 delete mode 100644 conmon-2.0.22.tar.xz
 create mode 100644 conmon-2.0.26.tar.xz

diff --git a/_service b/_service
index 2501555..952e4df 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.0.22</param>
+<param name="revision">v2.0.26</param>
 <param name="changesgenerate">enable</param>
 </service>
 <service name="recompress" mode="disabled">
diff --git a/_servicedata b/_servicedata
index ea53f30..b1bcf87 100644
--- a/_servicedata
+++ b/_servicedata
@@ -1,4 +1,4 @@
 <servicedata>
 <service name="tar_scm">
                 <param name="url">https://github.com/containers/conmon</param>
-              <param name="changesrevision">9c34a8663b85e479e0c083801e89a2b2835228ed</param></service></servicedata>
\ No newline at end of file
+              <param name="changesrevision">0e155c83aa739ef0a0540ec9f9d265f57f68038b</param></service></servicedata>
diff --git a/conmon-2.0.22.tar.xz b/conmon-2.0.22.tar.xz
deleted file mode 100644
index 539cfe6..0000000
--- a/conmon-2.0.22.tar.xz
+++ /dev/null
@@ -1,3 +0,0 @@
-version https://git-lfs.github.com/spec/v1
-oid sha256:8b0e58c54328a7752f6f0b43e2ad02d9352ea6d0d6c093f5e8bd9a68a53eb3d6
-size 87968
diff --git a/conmon-2.0.26.tar.xz b/conmon-2.0.26.tar.xz
new file mode 100644
index 0000000..2bce297
--- /dev/null
+++ b/conmon-2.0.26.tar.xz
@@ -0,0 +1,3 @@
+version https://git-lfs.github.com/spec/v1
+oid sha256:5664262e3c22d7e575301c267f8c10662c571de429ca5fbc49019d06c1fe8b61
+size 89016
diff --git a/conmon.changes b/conmon.changes
index 20a5049..f82673c 100644
--- a/conmon.changes
+++ b/conmon.changes
@@ -1,3 +1,20 @@
+-------------------------------------------------------------------
+Thu Feb 25 15:41:49 UTC 2021 - Alexandre Vicenzi <alexandre.vicenzi@suse.com>
+
+- Update to version 2.0.26:
+  * conn_sock: do not fail on EAGAIN
+  * fix segfault from a double freed pointer
+  * Fix a bug where conmon could never spawn a container, because
+    a disagreement between the caller and itself on where the attach
+    socket was.
+  * improve --full-attach to ignore the socket-dir directly. that
+    means callers don't need to specify a socket dir at all (and
+    can remove it)
+  * add full-attach option to allow callers to not truncate a very
+    long path for the attach socket
+  * close only opened FDs
+  * set locale to inherit environment
+
 -------------------------------------------------------------------
 Tue Jan 12 08:10:52 UTC 2021 - sgrunert@suse.com
 
diff --git a/conmon.spec b/conmon.spec
index 5cae1ed..322edb1 100644
--- a/conmon.spec
+++ b/conmon.spec
@@ -17,7 +17,7 @@
 
 
 Name:           conmon
-Version:        2.0.22
+Version:        2.0.26
 Release:        0
 Summary:        An OCI container runtime monitor
 License:        Apache-2.0
@@ -25,7 +25,7 @@ Group:          System/Management
 URL:            https://github.com/containers/conmon
 Source0:        %{name}-%{version}.tar.xz
 BuildRequires:  glib2-devel
-BuildRequires:  golang(API) >= 1.15
+BuildRequires:  golang(API) >= 1.16
 BuildRequires:  pkgconfig(libsystemd)
 
 %description