From b7ef7b2267a99129e290b37fc9778e768754daac0a1b71e2a38ef533d9a9e33e Mon Sep 17 00:00:00 2001
From: Aleksa Sarai <asarai@suse.com>
Date: Tue, 6 Dec 2022 12:00:00 +0000
Subject: [PATCH] Accepting request 1040630 from home:cyphar:docker

- Update to containerd v1.6.9 for Docker v20.10.21-ce. Also includes a fix for
  CVE-2022-27191. boo#1206065 bsc#1197284 Upstream release notes:
  <https://github.com/containerd/containerd/releases/tag/v1.6.9>

OBS-URL: https://build.opensuse.org/request/show/1040630
OBS-URL: https://build.opensuse.org/package/show/Virtualization:containers/containerd?expand=0&rev=138
---
 _service                             | 4 ++--
 containerd-1.6.6_10c12954828e.tar.xz | 3 ---
 containerd-1.6.9_1c90a4424897.tar.xz | 3 +++
 containerd.changes                   | 7 +++++++
 containerd.spec                      | 6 +++---
 5 files changed, 15 insertions(+), 8 deletions(-)
 delete mode 100644 containerd-1.6.6_10c12954828e.tar.xz
 create mode 100644 containerd-1.6.9_1c90a4424897.tar.xz

diff --git a/_service b/_service
index 9ecc82c..85564bf 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.6_%h</param>
-    <param name="revision">v1.6.6</param>
+    <param name="versionformat">1.6.9_%h</param>
+    <param name="revision">v1.6.9</param>
     <param name="exclude">.git</param>
   </service>
   <service name="recompress" mode="disabled">
diff --git a/containerd-1.6.6_10c12954828e.tar.xz b/containerd-1.6.6_10c12954828e.tar.xz
deleted file mode 100644
index c91e58c..0000000
--- a/containerd-1.6.6_10c12954828e.tar.xz
+++ /dev/null
@@ -1,3 +0,0 @@
-version https://git-lfs.github.com/spec/v1
-oid sha256:91a3145a069c223e7db9694c1c08f44457f15f9b6fc77a156d558587e01bcb0d
-size 5209856
diff --git a/containerd-1.6.9_1c90a4424897.tar.xz b/containerd-1.6.9_1c90a4424897.tar.xz
new file mode 100644
index 0000000..cbca67e
--- /dev/null
+++ b/containerd-1.6.9_1c90a4424897.tar.xz
@@ -0,0 +1,3 @@
+version https://git-lfs.github.com/spec/v1
+oid sha256:f01121a1e92efcc8ebe9d2c3a4afad61383c71e9ac919d39f14c2abdc261ca4c
+size 5200004
diff --git a/containerd.changes b/containerd.changes
index 76b9288..512ac7e 100644
--- a/containerd.changes
+++ b/containerd.changes
@@ -1,3 +1,10 @@
+-------------------------------------------------------------------
+Tue Dec  6 04:48:06 UTC 2022 - Aleksa Sarai <asarai@suse.com>
+
+- Update to containerd v1.6.9 for Docker v20.10.21-ce. Also includes a fix for
+  CVE-2022-27191. boo#1206065 bsc#1197284 Upstream release notes:
+  <https://github.com/containerd/containerd/releases/tag/v1.6.9>
+
 -------------------------------------------------------------------
 Tue Nov 29 16:01:11 UTC 2022 - Dirk Müller <dmueller@suse.com>
 
diff --git a/containerd.spec b/containerd.spec
index a2abcf8..1b4329f 100644
--- a/containerd.spec
+++ b/containerd.spec
@@ -23,14 +23,14 @@
 %endif
 
 # MANUAL: Update the git_version.
-%define git_version 10c12954828e7c7c9b6e0ea9b0c02b01407d3ae1
-%define git_short   10c12954828e
+%define git_version 1c90a442489720eec95342e1789ee8a5e1b9536f
+%define git_short   1c90a4424897
 
 %global provider_prefix github.com/containerd/containerd
 %global import_path %{provider_prefix}
 
 Name:           containerd
-Version:        1.6.6
+Version:        1.6.9
 Release:        0
 Summary:        Standalone OCI Container Daemon
 License:        Apache-2.0