Accepting request 688118 from Virtualization:containers

OBS-URL: https://build.opensuse.org/request/show/688118
OBS-URL: https://build.opensuse.org/package/show/openSUSE:Factory/containerd?expand=0&rev=30

_service

@@ -4,7 +4,7 @@
     <param name="scm">git</param>
     <param name="filename">containerd</param>
     <param name="versionformat">git.%h</param>
-    <param name="revision">v1.2.2</param>
+    <param name="revision">v1.2.4</param>
     <param name="exclude">.git</param>
   </service>
   <service name="recompress" mode="disabled">

containerd-git.9754871865f7.tar.xz

@@ -1,3 +0,0 @@
-version https://git-lfs.github.com/spec/v1
-oid sha256:27a3e7925faabba7e1b793067e1f7f79aed632c05a334cc528fa306a6ef6c14e
-size 2618852

containerd-git.e6b3f5632f50.tar.xz

@@ -0,0 +1,3 @@
+version https://git-lfs.github.com/spec/v1
+oid sha256:6aa1e606f2844d33c806eb7128d0ced462fb1263e64cebec3f6f07f2a111d3f3
+size 2721860

containerd.changes

@@ -1,8 +1,34 @@
+-------------------------------------------------------------------
+Thu Mar 21 14:30:03 UTC 2019 - Sascha Grunert <sgrunert@suse.com>
+
+- Update containerd to v1.2.4
+  * cri: Set /etc/hostname
+  * cri: Fix env performance issue
+  * runc updated to 6635b4f0c6af3810594d2770f662f34ddc15b40d to solve
+  * CVE-2019-5736
+  * cri updated to da0c016c830b2ea97fd1d737c49a568a816bf964
+  * Windows: NewDirectIOFromFIFOSet
+  * Changelogs from previous versions also included in this update:
+      https://github.com/containerd/containerd/releases/tag/v1.2.3
+
 -------------------------------------------------------------------
 Tue Feb  5 11:16:46 UTC 2019 - Aleksa Sarai <asarai@suse.com>
 
 - Update to containerd v1.2.2, which is required for Docker v18.09.1-ce.
   bsc#1124308
+  * Fix rare deadlock on FIFO creation with timeout
+  * Fix a bug that a container can't be stopped or inspected when its
+    corresponding image is deleted
+  * Fix a bug that the cri plugin handles containerd events outside of
+    k8s.io namespace
+  more changes at:
+  https://github.com/containerd/containerd/releases/tag/v1.2.2
+  Changelogs from previous versions also included in this update:
+    https://github.com/containerd/containerd/releases/tag/v1.2.1
+    https://github.com/containerd/containerd/releases/tag/v1.2.0
+    https://github.com/containerd/containerd/releases/tag/v1.1.4
+    https://github.com/containerd/containerd/releases/tag/v1.1.3
+  
 - Remove required_dockerrunc commit pinning, as it just lead to issues.
 - Remove upstreamed patches.
   - 0001-docs-man-rename-config.toml-5-to-be-more-descriptive.patch

containerd.spec

@@ -34,12 +34,12 @@
 %endif
 
 # MANUAL: Update the git_version.
-%define containerd_version 1.2.2
-%define git_version 9754871865f7fe2f4e74d43e2fc7ccd237edcbce
-%define git_short   9754871865f7
+%define containerd_version 1.2.4
+%define git_version e6b3f5632f50dbc4e9cb6288d911bf4f5e95b18e
+%define git_short   e6b3f5632f50
 
 Name:           %{realname}%{name_suffix}
-Version:        1.2.2
+Version:        %{containerd_version}
 Release:        0
 Summary:        Standalone OCI Container Daemon
 License:        Apache-2.0