From bb3867a21e8e3acb45478d3aa1e58af5358d2e0603b09000dae30855324cb940 Mon Sep 17 00:00:00 2001
From: Aleksa Sarai <asarai@suse.com>
Date: Fri, 21 Apr 2023 07:02:25 +0000
Subject: [PATCH] Accepting request 1081092 from home:cyphar:docker

- Update to containerd v1.6.20 for Docker v23.0.4-ce. Upstream release notes:
  <https://github.com/containerd/containerd/releases/tag/v1.6.20>

OBS-URL: https://build.opensuse.org/request/show/1081092
OBS-URL: https://build.opensuse.org/package/show/Virtualization:containers/containerd?expand=0&rev=149
---
 _service                              | 4 ++--
 containerd-1.6.19_1e1ea6e986c6.tar.xz | 3 ---
 containerd-1.6.20_2806fc105739.tar.xz | 3 +++
 containerd.changes                    | 6 ++++++
 containerd.spec                       | 6 +++---
 5 files changed, 14 insertions(+), 8 deletions(-)
 delete mode 100644 containerd-1.6.19_1e1ea6e986c6.tar.xz
 create mode 100644 containerd-1.6.20_2806fc105739.tar.xz

diff --git a/_service b/_service
index 806f5bd..4d56e99 100644
--- a/_service
+++ b/_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.6.19_%h</param>
-    <param name="revision">v1.6.19</param>
+    <param name="versionformat">1.6.20_%h</param>
+    <param name="revision">v1.6.20</param>
     <param name="exclude">.git</param>
   </service>
   <service name="recompress" mode="disabled">
diff --git a/containerd-1.6.19_1e1ea6e986c6.tar.xz b/containerd-1.6.19_1e1ea6e986c6.tar.xz
deleted file mode 100644
index 00df9e2..0000000
--- a/containerd-1.6.19_1e1ea6e986c6.tar.xz
+++ /dev/null
@@ -1,3 +0,0 @@
-version https://git-lfs.github.com/spec/v1
-oid sha256:961c683ab7b6a1bf300410003fdecd7aea0fa6702a9793dbf3dc3d82702cac37
-size 5204288
diff --git a/containerd-1.6.20_2806fc105739.tar.xz b/containerd-1.6.20_2806fc105739.tar.xz
new file mode 100644
index 0000000..58f639d
--- /dev/null
+++ b/containerd-1.6.20_2806fc105739.tar.xz
@@ -0,0 +1,3 @@
+version https://git-lfs.github.com/spec/v1
+oid sha256:a397b4b03b5c2377581e05b9a142b46b98fef20fcac3fdc8508b300ca1ee91bb
+size 5216580
diff --git a/containerd.changes b/containerd.changes
index 32704e9..0510a56 100644
--- a/containerd.changes
+++ b/containerd.changes
@@ -1,3 +1,9 @@
+-------------------------------------------------------------------
+Tue Apr 18 14:52:44 UTC 2023 - Aleksa Sarai <asarai@suse.com>
+
+- Update to containerd v1.6.20 for Docker v23.0.4-ce. Upstream release notes:
+  <https://github.com/containerd/containerd/releases/tag/v1.6.20>
+
 -------------------------------------------------------------------
 Wed Mar 29 04:53:24 UTC 2023 - Aleksa Sarai <asarai@suse.com>
 
diff --git a/containerd.spec b/containerd.spec
index 108a97d..de6bd9b 100644
--- a/containerd.spec
+++ b/containerd.spec
@@ -23,14 +23,14 @@
 %endif
 
 # MANUAL: Update the git_version.
-%define git_version 1e1ea6e986c6c86565bc33d52e34b81b3e2bc71f
-%define git_short   1e1ea6e986c6
+%define git_version 2806fc1057397dbaeefbea0e4e17bddfbd388f38
+%define git_short   2806fc105739
 
 %global provider_prefix github.com/containerd/containerd
 %global import_path %{provider_prefix}
 
 Name:           containerd
-Version:        1.6.19
+Version:        1.6.20
 Release:        0
 Summary:        Standalone OCI Container Daemon
 License:        Apache-2.0