Upgrade moby-containerd to 1.6.1 (#2486)

Co-authored-by: Nicolas Guibourge <nicolasg@microsoft.com>

SPECS/moby-containerd/moby-containerd.signatures.json

@@ -2,6 +2,6 @@
  "Signatures": {
   "containerd.service": "2449216ee019ebfcb5756a5ab701558425c7d444bab05e82d6ddabe3e0b097ef",
   "containerd.toml": "167fb1035c983638e56f4a20bb8e6bfe1fd280c8ca9ee00a7c7358a5ca3be9f5",
-  "moby-containerd-1.6.0.rc.3.tar.gz": "d5f215fcdaf5902bc621d18e0971b3101fc43e095574fda69ab519a6e1d9abf4"
+  "moby-containerd-1.6.1.tar.gz": "4622540a1a362a009148fafeca2a6d35443da79c2d92263c7a52489779a52bc5"
  }
 }

SPECS/moby-containerd/moby-containerd.spec

@@ -1,11 +1,10 @@
 %global debug_package %{nil}
 %define upstream_name containerd
-%define upstream_rc 1.6.0-rc.3
-%define commit_hash a9f61ba2c84ac82ca7c4666454f757dda3f590be
+%define commit_hash 10f428dac7cec44c864e1b830a4623af27a9fc70
 
 Summary: Industry-standard container runtime
 Name: moby-%{upstream_name}
-Version: 1.6.0.rc.3
+Version: 1.6.1
 Release: 1%{?dist}
 License: ASL 2.0
 Group: Tools/Container
@@ -13,7 +12,7 @@ URL: https://www.containerd.io
 Vendor: Microsoft Corporation
 Distribution: Mariner
 
-Source0: https://github.com/containerd/containerd/archive/v%{upstream_rc}.tar.gz#/%{name}-%{version}.tar.gz
+Source0: https://github.com/containerd/containerd/archive/v%{version}.tar.gz#/%{name}-%{version}.tar.gz
 Source1: containerd.service
 Source2: containerd.toml
 Patch0:  Makefile.patch
@@ -47,7 +46,7 @@ containerd is designed to be embedded into a larger system, rather than being
 used directly by developers or end-users.
 
 %prep
-%autosetup -p1 -n %{upstream_name}-%{upstream_rc}
+%autosetup -p1 -n %{upstream_name}-%{version}
 
 %build
 export BUILDTAGS="-mod=vendor"
@@ -86,6 +85,8 @@ fi
 %config(noreplace) %{_sysconfdir}/containerd/config.toml
 
 %changelog
+* Mon Mar 14 2022 Nicolas Guibourge <nicolasg@microsoft.com> - 1.6.1-1
+- Update to version 1.6.1
 * Fri Jan 28 2022 Nicolas Guibourge <nicolasg@microsoft.com> - 1.6.0.rc.3-1
 - Update to version 1.6.0-rc.3
 - Use code from upstream instead of Azure fork.

cgmanifest.json

@@ -13493,8 +13493,8 @@
         "type": "other",
         "other": {
           "name": "moby-containerd",
-          "version": "1.6.0.rc.3",
-          "downloadUrl": "https://github.com/containerd/containerd/archive/v1.6.0-rc.3.tar.gz"
+          "version": "1.6.1",
+          "downloadUrl": "https://github.com/containerd/containerd/archive/v1.6.1.tar.gz"
         }
       }
     },