From 59370da71ee19d7f7d578c70d6b11435777a4d9244fe02e7028ad697e7c5aeac Mon Sep 17 00:00:00 2001
From: Aleksa Sarai <asarai@suse.com>
Date: Tue, 20 Jul 2021 09:34:05 +0000
Subject: [PATCH] Accepting request 907280 from home:cyphar:docker

- Update to containerd v1.4.8, to fix CVE-2021-32760. bsc#1188282
- Remove upstreamed patches:
  - bsc1188282-use-chmod-path-for-checking-symlink.patch

OBS-URL: https://build.opensuse.org/request/show/907280
OBS-URL: https://build.opensuse.org/package/show/Virtualization:containers/containerd?expand=0&rev=120
---
 _service                             |  4 ++--
 containerd-1.4.4_05f951a3781f.tar.xz |  3 ---
 containerd-1.4.8_7eba5930496d.tar.xz |  3 +++
 containerd.changes                   | 15 +++++++++++++++
 containerd.spec                      |  6 +++---
 5 files changed, 23 insertions(+), 8 deletions(-)
 delete mode 100644 containerd-1.4.4_05f951a3781f.tar.xz
 create mode 100644 containerd-1.4.8_7eba5930496d.tar.xz

diff --git a/_service b/_service
index 717ce62..6fe07a9 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.4_%h</param>
-    <param name="revision">v1.4.4</param>
+    <param name="versionformat">1.4.8_%h</param>
+    <param name="revision">v1.4.8</param>
     <param name="exclude">.git</param>
   </service>
   <service name="recompress" mode="disabled">
diff --git a/containerd-1.4.4_05f951a3781f.tar.xz b/containerd-1.4.4_05f951a3781f.tar.xz
deleted file mode 100644
index 066aabd..0000000
--- a/containerd-1.4.4_05f951a3781f.tar.xz
+++ /dev/null
@@ -1,3 +0,0 @@
-version https://git-lfs.github.com/spec/v1
-oid sha256:791077e6b1da244e66cd8af3416fc9fba8c331202b3839f624ee9447d226bc5c
-size 3597032
diff --git a/containerd-1.4.8_7eba5930496d.tar.xz b/containerd-1.4.8_7eba5930496d.tar.xz
new file mode 100644
index 0000000..70b3b73
--- /dev/null
+++ b/containerd-1.4.8_7eba5930496d.tar.xz
@@ -0,0 +1,3 @@
+version https://git-lfs.github.com/spec/v1
+oid sha256:75e9f06dd9efae2819f4a6aa4d2a725e98e28ad42111f5ebf7a489473de7c109
+size 3693892
diff --git a/containerd.changes b/containerd.changes
index 18dee03..dad15fe 100644
--- a/containerd.changes
+++ b/containerd.changes
@@ -1,3 +1,18 @@
+-------------------------------------------------------------------
+Tue Jul 20 09:30:30 UTC 2021 - Aleksa Sarai <asarai@suse.com>
+
+- Update to containerd v1.4.8, to fix CVE-2021-32760. bsc#1188282
+- Remove upstreamed patches:
+  - bsc1188282-use-chmod-path-for-checking-symlink.patch
+
+-------------------------------------------------------------------
+Wed Jul 14 10:23:38 UTC 2021 - Aleksa Sarai <asarai@suse.com>
+
+[ This patch was only released in SLES and Leap. ]
+
+- Add patch for GHSA-c72p-9xmj-rx3w. CVE-2021-32760 bsc#1188282
+  + bsc1188282-use-chmod-path-for-checking-symlink.patch
+
 -------------------------------------------------------------------
 Fri Apr 16 05:25:40 UTC 2021 - Aleksa Sarai <asarai@suse.com>
 
diff --git a/containerd.spec b/containerd.spec
index 0f0d710..942a200 100644
--- a/containerd.spec
+++ b/containerd.spec
@@ -23,11 +23,11 @@
 %endif
 
 # MANUAL: Update the git_version.
-%define git_version 05f951a3781f4f2c1911b05e61c160e9c30eaa8e
-%define git_short   05f951a3781f
+%define git_version 7eba5930496d9bbe375fdf71603e610ad737d2b2
+%define git_short   7eba5930496d
 
 Name:           containerd
-Version:        1.4.4
+Version:        1.4.8
 Release:        0
 Summary:        Standalone OCI Container Daemon
 License:        Apache-2.0