From 4ad3a4b8935893a7b305e09c87c56008b3ca9b53f451bd6baabb6ea63a2b90c2 Mon Sep 17 00:00:00 2001
From: Aleksa Sarai <asarai@suse.com>
Date: Wed, 22 May 2024 19:51:46 +0000
Subject: [PATCH] Accepting request 1175940 from home:cyphar:docker

Update containerd v1.7.17, and add missing CVE references.
- CVE-2023-45288 bsc#1221400
- GHSA-jq35-85cj-fj4p bsc#1224323

OBS-URL: https://build.opensuse.org/request/show/1175940
OBS-URL: https://build.opensuse.org/package/show/Virtualization:containers/containerd?expand=0&rev=175
---
 _service                               |  6 +++---
 containerd-1.7.15_926c9586.obscpio     |  3 ---
 containerd-1.7.17_3a4de459a689.obscpio |  3 +++
 containerd.changes                     | 11 +++++++++++
 containerd.obsinfo                     |  6 +++---
 containerd.spec                        |  6 +++---
 6 files changed, 23 insertions(+), 12 deletions(-)
 delete mode 100644 containerd-1.7.15_926c9586.obscpio
 create mode 100644 containerd-1.7.17_3a4de459a689.obscpio

diff --git a/_service b/_service
index a3b9ed0..7e0e404 100644
--- a/_service
+++ b/_service
@@ -3,11 +3,11 @@
     <param name="url">https://github.com/containerd/containerd.git</param>
     <param name="scm">git</param>
     <param name="filename">containerd</param>
-    <param name="versionformat">1.7.15_%h</param>
-    <param name="revision">v1.7.15</param>
+    <param name="versionformat">1.7.17_%h</param>
+    <param name="revision">v1.7.17</param>
     <param name="exclude">.git</param>
   </service>
-  
+
   <service mode="buildtime" name="tar" />
   <service mode="buildtime" name="recompress">
     <param name="file">*.tar</param>
diff --git a/containerd-1.7.15_926c9586.obscpio b/containerd-1.7.15_926c9586.obscpio
deleted file mode 100644
index 74d13b4..0000000
--- a/containerd-1.7.15_926c9586.obscpio
+++ /dev/null
@@ -1,3 +0,0 @@
-version https://git-lfs.github.com/spec/v1
-oid sha256:e754984125ba0bcca511ad458e79b8dc941ee18bdfa9ce8f1e3ec25505e9f194
-size 50414093
diff --git a/containerd-1.7.17_3a4de459a689.obscpio b/containerd-1.7.17_3a4de459a689.obscpio
new file mode 100644
index 0000000..62518a6
--- /dev/null
+++ b/containerd-1.7.17_3a4de459a689.obscpio
@@ -0,0 +1,3 @@
+version https://git-lfs.github.com/spec/v1
+oid sha256:7b376a2339a0751ec75a7e7a9f8607f563a07cb7c93c09cf9badfda5fa64600e
+size 50037773
diff --git a/containerd.changes b/containerd.changes
index dce3482..52679a3 100644
--- a/containerd.changes
+++ b/containerd.changes
@@ -1,3 +1,13 @@
+-------------------------------------------------------------------
+Wed May 22 19:31:04 UTC 2024 - Aleksa Sarai <asarai@suse.com>
+
+- Update to containerd v1.7.17. Upstream release notes:
+  <https://github.com/containerd/containerd/releases/tag/v1.7.17>
+
+- Update to containerd v1.7.16. Upstream release notes:
+  <https://github.com/containerd/containerd/releases/tag/v1.7.16>
+  CVE-2023-45288 bsc#1221400
+
 -------------------------------------------------------------------
 Sun Apr 21 15:57:05 UTC 2024 - Eyad Issa <eyadlorenzo@gmail.com>
 
@@ -21,6 +31,7 @@ Sun Apr 21 15:57:05 UTC 2024 - Eyad Issa <eyadlorenzo@gmail.com>
 
 - Update to containerd v1.7.11. Upstream release notes:
   <https://github.com/containerd/containerd/releases/tag/v1.7.11>
+  GHSA-jq35-85cj-fj4p bsc#1224323
 
 -------------------------------------------------------------------
 Mon Feb 26 11:04:13 UTC 2024 - Dominique Leuenberger <dimstar@opensuse.org>
diff --git a/containerd.obsinfo b/containerd.obsinfo
index bfcddd1..ac91bf2 100644
--- a/containerd.obsinfo
+++ b/containerd.obsinfo
@@ -1,4 +1,4 @@
 name: containerd
-version: 1.7.15_926c9586
-mtime: 1712336502
-commit: 926c9586fe4a6236699318391cd44976a98e31f1
+version: 1.7.17_3a4de459a689
+mtime: 1715895967
+commit: 3a4de459a68952ffb703bbe7f2290861a75b6b67
diff --git a/containerd.spec b/containerd.spec
index d30c684..acb8ee5 100644
--- a/containerd.spec
+++ b/containerd.spec
@@ -23,14 +23,14 @@
 %endif
 
 # MANUAL: Update the git_version.
-%define git_version 926c9586fe4a6236699318391cd44976a98e31f1
-%define git_short   926c9586
+%define git_version 3a4de459a68952ffb703bbe7f2290861a75b6b67
+%define git_short   3a4de459a689
 
 %global provider_prefix github.com/containerd/containerd
 %global import_path %{provider_prefix}
 
 Name:           containerd
-Version:        1.7.15
+Version:        1.7.17
 Release:        0
 Summary:        Standalone OCI Container Daemon
 License:        Apache-2.0