From 772700a641065f9755330d44f25b95da9e8f8a716704112f2062af93a0b3f801 Mon Sep 17 00:00:00 2001
From: Aleksa Sarai <asarai@suse.com>
Date: Thu, 8 Dec 2022 01:34:10 +0000
Subject: [PATCH] Accepting request 1041293 from home:cyphar:docker

- Update to containerd v1.6.12 to fix CVE-2022-23471. Upstream release notes:
  <https://github.com/containerd/containerd/releases/tag/v1.6.11>

OBS-URL: https://build.opensuse.org/request/show/1041293
OBS-URL: https://build.opensuse.org/package/show/Virtualization:containers/containerd?expand=0&rev=140
---
 _service                              |  4 ++--
 containerd-1.6.12_a05d175400b1.tar.xz |  3 +++
 containerd-1.6.9_1c90a4424897.tar.xz  |  3 ---
 containerd.changes                    | 12 ++++++++++++
 containerd.spec                       |  6 +++---
 5 files changed, 20 insertions(+), 8 deletions(-)
 create mode 100644 containerd-1.6.12_a05d175400b1.tar.xz
 delete mode 100644 containerd-1.6.9_1c90a4424897.tar.xz

diff --git a/_service b/_service
index 85564bf..8804828 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.9_%h</param>
-    <param name="revision">v1.6.9</param>
+    <param name="versionformat">1.6.12_%h</param>
+    <param name="revision">v1.6.12</param>
     <param name="exclude">.git</param>
   </service>
   <service name="recompress" mode="disabled">
diff --git a/containerd-1.6.12_a05d175400b1.tar.xz b/containerd-1.6.12_a05d175400b1.tar.xz
new file mode 100644
index 0000000..c8f6d06
--- /dev/null
+++ b/containerd-1.6.12_a05d175400b1.tar.xz
@@ -0,0 +1,3 @@
+version https://git-lfs.github.com/spec/v1
+oid sha256:25d5c4298633d12b19cf74f9848acfaf3cc7e8ffb616c8ab88a1000da008fb76
+size 5203784
diff --git a/containerd-1.6.9_1c90a4424897.tar.xz b/containerd-1.6.9_1c90a4424897.tar.xz
deleted file mode 100644
index cbca67e..0000000
--- a/containerd-1.6.9_1c90a4424897.tar.xz
+++ /dev/null
@@ -1,3 +0,0 @@
-version https://git-lfs.github.com/spec/v1
-oid sha256:f01121a1e92efcc8ebe9d2c3a4afad61383c71e9ac919d39f14c2abdc261ca4c
-size 5200004
diff --git a/containerd.changes b/containerd.changes
index 512ac7e..7d8ec2f 100644
--- a/containerd.changes
+++ b/containerd.changes
@@ -1,3 +1,15 @@
+-------------------------------------------------------------------
+Thu Dec  8 01:28:48 UTC 2022 - Aleksa Sarai <asarai@suse.com>
+
+- Update to containerd v1.6.12 to fix CVE-2022-23471. Upstream release notes:
+  <https://github.com/containerd/containerd/releases/tag/v1.6.11>
+
+-------------------------------------------------------------------
+Tue Dec  6 22:41:50 UTC 2022 - Aleksa Sarai <asarai@suse.com>
+
+- Update to containerd v1.6.11. Upstream release notes:
+  <https://github.com/containerd/containerd/releases/tag/v1.6.11>
+
 -------------------------------------------------------------------
 Tue Dec  6 04:48:06 UTC 2022 - Aleksa Sarai <asarai@suse.com>
 
diff --git a/containerd.spec b/containerd.spec
index 1b4329f..3349838 100644
--- a/containerd.spec
+++ b/containerd.spec
@@ -23,14 +23,14 @@
 %endif
 
 # MANUAL: Update the git_version.
-%define git_version 1c90a442489720eec95342e1789ee8a5e1b9536f
-%define git_short   1c90a4424897
+%define git_version a05d175400b1145e5e6a735a6710579d181e7fb0
+%define git_short   a05d175400b1
 
 %global provider_prefix github.com/containerd/containerd
 %global import_path %{provider_prefix}
 
 Name:           containerd
-Version:        1.6.9
+Version:        1.6.12
 Release:        0
 Summary:        Standalone OCI Container Daemon
 License:        Apache-2.0