Accepting request 923375 from home:cyphar:docker

Docker 20.10.9 update.

OBS-URL: https://build.opensuse.org/request/show/923375
OBS-URL: https://build.opensuse.org/package/show/Virtualization:containers/containerd?expand=0&rev=122

_service

@@ -3,8 +3,8 @@
     <param name="url">https://github.com/containerd/containerd.git</param>
     <param name="scm">git</param>
     <param name="filename">containerd</param>
-    <param name="versionformat">1.4.8_%h</param>
-    <param name="revision">v1.4.8</param>
+    <param name="versionformat">1.4.11_%h</param>
+    <param name="revision">v1.4.11</param>
     <param name="exclude">.git</param>
   </service>
   <service name="recompress" mode="disabled">

containerd-1.4.11_5b46e404f6b9.tar.xz

@@ -0,0 +1,3 @@
+version https://git-lfs.github.com/spec/v1
+oid sha256:7fc630f65ea032045f2b8e09449163f4f75bb6aaefa17ababeee3a5007a99227
+size 3698480

containerd-1.4.8_7eba5930496d.tar.xz

@@ -1,3 +0,0 @@
-version https://git-lfs.github.com/spec/v1
-oid sha256:75e9f06dd9efae2819f4a6aa4d2a725e98e28ad42111f5ebf7a489473de7c109
-size 3693892

containerd.changes

@@ -1,3 +1,9 @@
+-------------------------------------------------------------------
+Wed Oct  6 02:54:49 UTC 2021 - Aleksa Sarai <asarai@suse.com>
+
+- Update to containerd v1.4.11, to fix CVE-2021-41103. bsc#1191355
+- Switch to Go 1.16.x compiler, in line with upstream.
+
 -------------------------------------------------------------------
 Tue Jul 20 09:30:30 UTC 2021 - Aleksa Sarai <asarai@suse.com>
 

containerd.spec

@@ -23,11 +23,11 @@
 %endif
 
 # MANUAL: Update the git_version.
-%define git_version 7eba5930496d9bbe375fdf71603e610ad737d2b2
-%define git_short   7eba5930496d
+%define git_version 5b46e404f6b9f661a205e28d59c982d3634148f8
+%define git_short   5b46e404f6b9
 
 Name:           containerd
-Version:        1.4.8
+Version:        1.4.11
 Release:        0
 Summary:        Standalone OCI Container Daemon
 License:        Apache-2.0
@@ -42,8 +42,8 @@ BuildRequires:  libbtrfs-devel >= 3.8
 BuildRequires:  libseccomp-devel >= 2.2
 BuildRequires:  pkg-config
 # Due to a limitation in openSUSE's Go packaging we cannot have a BuildRequires
-# for 'golang(API) >= 1.15' here, so just require 1.15 exactly. bsc#1172608
-BuildRequires:  go1.15
+# for 'golang(API) >= 1.16' here, so just require 1.16 exactly. bsc#1172608
+BuildRequires:  go1.16
 # We provide a git revision so that Docker can require it properly.
 Provides:       %{name}-git = %{git_version}
 # Currently runc is the only supported runtime for containerd. We pin the same