From b0a2506f4afa9ae42cba3b69495325667bc8a640080109761b706c4d0547487d Mon Sep 17 00:00:00 2001
From: Aleksa Sarai <asarai@suse.com>
Date: Wed, 29 Mar 2023 05:16:01 +0000
Subject: [PATCH 1/2] Accepting request 1075087 from home:cyphar:docker

- Update to containerd v1.6.19 for Docker v23.0.2-ce. CVE-2023-25153
  CVE-2023-25173. Upstream release notes:
  <https://github.com/containerd/containerd/releases/tag/v1.6.19>

OBS-URL: https://build.opensuse.org/request/show/1075087
OBS-URL: https://build.opensuse.org/package/show/Virtualization:containers/containerd?expand=0&rev=146
---
 _service                              | 4 ++--
 containerd-1.6.16_31aa4358a368.tar.xz | 3 ---
 containerd-1.6.19_1e1ea6e986c6.tar.xz | 3 +++
 containerd.changes                    | 9 ++++++++-
 containerd.spec                       | 6 +++---
 5 files changed, 16 insertions(+), 9 deletions(-)
 delete mode 100644 containerd-1.6.16_31aa4358a368.tar.xz
 create mode 100644 containerd-1.6.19_1e1ea6e986c6.tar.xz

diff --git a/_service b/_service
index c3d4cc4..806f5bd 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.16_%h</param>
-    <param name="revision">v1.6.16</param>
+    <param name="versionformat">1.6.19_%h</param>
+    <param name="revision">v1.6.19</param>
     <param name="exclude">.git</param>
   </service>
   <service name="recompress" mode="disabled">
diff --git a/containerd-1.6.16_31aa4358a368.tar.xz b/containerd-1.6.16_31aa4358a368.tar.xz
deleted file mode 100644
index 49e4bf7..0000000
--- a/containerd-1.6.16_31aa4358a368.tar.xz
+++ /dev/null
@@ -1,3 +0,0 @@
-version https://git-lfs.github.com/spec/v1
-oid sha256:a569d344f2319beac356f45850a88cc439bf7c684ccacdd0f6665b32632b22d6
-size 5204392
diff --git a/containerd-1.6.19_1e1ea6e986c6.tar.xz b/containerd-1.6.19_1e1ea6e986c6.tar.xz
new file mode 100644
index 0000000..00df9e2
--- /dev/null
+++ b/containerd-1.6.19_1e1ea6e986c6.tar.xz
@@ -0,0 +1,3 @@
+version https://git-lfs.github.com/spec/v1
+oid sha256:961c683ab7b6a1bf300410003fdecd7aea0fa6702a9793dbf3dc3d82702cac37
+size 5204288
diff --git a/containerd.changes b/containerd.changes
index b3ccdbb..c6c8f65 100644
--- a/containerd.changes
+++ b/containerd.changes
@@ -1,3 +1,10 @@
+-------------------------------------------------------------------
+Wed Mar 29 04:53:24 UTC 2023 - Aleksa Sarai <asarai@suse.com>
+
+- Update to containerd v1.6.19 for Docker v23.0.2-ce. CVE-2023-25153
+  CVE-2023-25173. Upstream release notes:
+  <https://github.com/containerd/containerd/releases/tag/v1.6.19>
+
 -------------------------------------------------------------------
 Wed Mar  1 05:29:46 UTC 2023 - Aleksa Sarai <asarai@suse.com>
 
@@ -6,7 +13,7 @@ Wed Mar  1 05:29:46 UTC 2023 - Aleksa Sarai <asarai@suse.com>
 -------------------------------------------------------------------
 Thu Feb  9 01:58:07 UTC 2023 - Aleksa Sarai <asarai@suse.com>
 
-- Update to containerd v1.6.16 for Docker v23.0.0-ce. Upstream release notes:
+- Update to containerd v1.6.16 for Docker v23.0.1-ce. Upstream release notes:
   <https://github.com/containerd/containerd/releases/tag/v1.6.16>
 
 -------------------------------------------------------------------
diff --git a/containerd.spec b/containerd.spec
index 00a9abf..108a97d 100644
--- a/containerd.spec
+++ b/containerd.spec
@@ -23,14 +23,14 @@
 %endif
 
 # MANUAL: Update the git_version.
-%define git_version 31aa4358a36870b21a992d3ad2bef29e1d693bec
-%define git_short   31aa4358a368
+%define git_version 1e1ea6e986c6c86565bc33d52e34b81b3e2bc71f
+%define git_short   1e1ea6e986c6
 
 %global provider_prefix github.com/containerd/containerd
 %global import_path %{provider_prefix}
 
 Name:           containerd
-Version:        1.6.16
+Version:        1.6.19
 Release:        0
 Summary:        Standalone OCI Container Daemon
 License:        Apache-2.0

From 30fa51087a33435942b331ac213d9125534228d2e62258a9b39a5f6f2c34e5ed Mon Sep 17 00:00:00 2001
From: Aleksa Sarai <asarai@suse.com>
Date: Wed, 29 Mar 2023 13:06:34 +0000
Subject: [PATCH 2/2] Accepting request 1075226 from home:cyphar:docker

Add bsc references for CVEs.
   - CVE-2023-25153 bsc#1208423
   - CVE-2023-25173 bsc#1208426

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

diff --git a/containerd.changes b/containerd.changes
index c6c8f65..32704e9 100644
--- a/containerd.changes
+++ b/containerd.changes
@@ -1,10 +1,13 @@
 -------------------------------------------------------------------
 Wed Mar 29 04:53:24 UTC 2023 - Aleksa Sarai <asarai@suse.com>
 
-- Update to containerd v1.6.19 for Docker v23.0.2-ce. CVE-2023-25153
-  CVE-2023-25173. Upstream release notes:
+- Update to containerd v1.6.19 for Docker v23.0.2-ce. Upstream release notes:
   <https://github.com/containerd/containerd/releases/tag/v1.6.19>
 
+  Includes fixes for:
+   - CVE-2023-25153 bsc#1208423
+   - CVE-2023-25173 bsc#1208426
+
 -------------------------------------------------------------------
 Wed Mar  1 05:29:46 UTC 2023 - Aleksa Sarai <asarai@suse.com>