From 1d70ed12fbf0a8941fb8300a5b79e5a44709b567b7c2819428a9c94d9d52e5e3 Mon Sep 17 00:00:00 2001
From: Aleksa Sarai <asarai@suse.com>
Date: Thu, 14 Apr 2022 05:09:43 +0000
Subject: [PATCH 1/2] Accepting request 970021 from home:cyphar:docker

- Update to containerd v1.5.11 to fix CVE-2022-24769. bsc#1197517

OBS-URL: https://build.opensuse.org/request/show/970021
OBS-URL: https://build.opensuse.org/package/show/Virtualization:containers/containerd?expand=0&rev=129
---
 _service                              | 4 ++--
 containerd-1.4.13_9cc61520f4cd.tar.xz | 3 ---
 containerd-1.5.11_3df54a852345.tar.xz | 3 +++
 containerd.changes                    | 5 +++++
 containerd.spec                       | 6 +++---
 5 files changed, 13 insertions(+), 8 deletions(-)
 delete mode 100644 containerd-1.4.13_9cc61520f4cd.tar.xz
 create mode 100644 containerd-1.5.11_3df54a852345.tar.xz

diff --git a/_service b/_service
index 19a3c57..f774943 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.4.13_%h</param>
-    <param name="revision">v1.4.13</param>
+    <param name="versionformat">1.5.11_%h</param>
+    <param name="revision">v1.5.11</param>
     <param name="exclude">.git</param>
   </service>
   <service name="recompress" mode="disabled">
diff --git a/containerd-1.4.13_9cc61520f4cd.tar.xz b/containerd-1.4.13_9cc61520f4cd.tar.xz
deleted file mode 100644
index dec3e6f..0000000
--- a/containerd-1.4.13_9cc61520f4cd.tar.xz
+++ /dev/null
@@ -1,3 +0,0 @@
-version https://git-lfs.github.com/spec/v1
-oid sha256:45961e5d73503ec886730ab4465f9d382ff1bd8778a7ab4c13842928277b785f
-size 3697968
diff --git a/containerd-1.5.11_3df54a852345.tar.xz b/containerd-1.5.11_3df54a852345.tar.xz
new file mode 100644
index 0000000..f00ddd1
--- /dev/null
+++ b/containerd-1.5.11_3df54a852345.tar.xz
@@ -0,0 +1,3 @@
+version https://git-lfs.github.com/spec/v1
+oid sha256:9c336dd3501a9a81e24d3385b84a946bc252e6379929e372bac58c31d757d688
+size 4439804
diff --git a/containerd.changes b/containerd.changes
index a3cd836..74dbb5e 100644
--- a/containerd.changes
+++ b/containerd.changes
@@ -1,3 +1,8 @@
+-------------------------------------------------------------------
+Thu Apr 14 04:15:16 UTC 2022 - Aleksa Sarai <asarai@suse.com>
+
+- Update to containerd v1.5.11 to fix CVE-2022-24769. bsc#1197517
+
 -------------------------------------------------------------------
 Thu Mar  3 07:24:10 UTC 2022 - Aleksa Sarai <asarai@suse.com>
 
diff --git a/containerd.spec b/containerd.spec
index db5a89c..a468291 100644
--- a/containerd.spec
+++ b/containerd.spec
@@ -23,11 +23,11 @@
 %endif
 
 # MANUAL: Update the git_version.
-%define git_version 9cc61520f4cd876b86e77edfeb88fbcd536d1f9d
-%define git_short   9cc61520f4cd
+%define git_version 3df54a852345ae127d1fa3092b95168e4a88e2f8
+%define git_short   3df54a852345
 
 Name:           containerd
-Version:        1.4.13
+Version:        1.5.11
 Release:        0
 Summary:        Standalone OCI Container Daemon
 License:        Apache-2.0

From ebe410d794825a075c8da3e0dba0031fa5a86e9c89cddbad35ea59381c5b576d Mon Sep 17 00:00:00 2001
From: Aleksa Sarai <asarai@suse.com>
Date: Thu, 14 Apr 2022 06:06:25 +0000
Subject: [PATCH 2/2] Accepting request 970048 from home:cyphar:docker

Clean up changelog to match SLES.

OBS-URL: https://build.opensuse.org/request/show/970048
OBS-URL: https://build.opensuse.org/package/show/Virtualization:containers/containerd?expand=0&rev=130
---
 containerd.changes | 14 ++++++++++++--
 1 file changed, 12 insertions(+), 2 deletions(-)

diff --git a/containerd.changes b/containerd.changes
index 74dbb5e..4b27a73 100644
--- a/containerd.changes
+++ b/containerd.changes
@@ -7,12 +7,22 @@ Thu Apr 14 04:15:16 UTC 2022 - Aleksa Sarai <asarai@suse.com>
 Thu Mar  3 07:24:10 UTC 2022 - Aleksa Sarai <asarai@suse.com>
 
 - Update to containerd v1.4.13 to fix CVE-2022-23648. bsc#1196441
+- Remove upstreamed patch:
+  - CVE-2022-23648.patch
+
+-------------------------------------------------------------------
+Wed Mar  2 12:48:05 UTC 2022 - Aleksa Sarai <asarai@suse.com>
+
+[ This patch was only released in SLES and Leap. ]
+
+- Add patch for CVE-2022-23648. bsc#1196441
+  + CVE-2022-23648.patch
 
 -------------------------------------------------------------------
 Fri Nov 19 00:01:23 UTC 2021 - Aleksa Sarai <asarai@suse.com>
 
-- Update to containerd v1.4.12 for Docker 20.10.11-ce.
-  bsc#1192814 CVE-2021-41190
+- Update to containerd v1.4.12 for Docker 20.10.11-ce. bsc#1192814
+  bsc#1193273 CVE-2021-41190
 
 -------------------------------------------------------------------
 Wed Oct  6 02:54:49 UTC 2021 - Aleksa Sarai <asarai@suse.com>