Accepting request 1117566 from home:cyphar:docker

- Update to containerd v1.7.7. Upstream release notes:
  <https://github.com/containerd/containerd/releases/tag/v1.7.7>
- Add patch to fix build on SLE-12:
  + 0001-BUILD-SLE12-revert-btrfs-depend-on-kernel-UAPI-inste.patch

OBS-URL: https://build.opensuse.org/request/show/1117566
OBS-URL: https://build.opensuse.org/package/show/Virtualization:containers/containerd?expand=0&rev=157

_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.7.6_%h</param>
-    <param name="revision">v1.7.6</param>
+    <param name="versionformat">1.7.7_%h</param>
+    <param name="revision">v1.7.7</param>
     <param name="exclude">.git</param>
   </service>
   <service name="recompress" mode="manual">

containerd-1.7.6_091922f03c27.tar.xz

@@ -1,3 +0,0 @@
-version https://git-lfs.github.com/spec/v1
-oid sha256:54eefc4b7aff77b7c101bfd7b1e6b9638858e5200476cc35715937c23f833bd7
-size 5876420

containerd-1.7.7_8c087663b023.tar.xz

@@ -0,0 +1,3 @@
+version https://git-lfs.github.com/spec/v1
+oid sha256:ac03f38077c33e3cb5708d2164b3e829b1704a55447e255f6ad667db239483be
+size 5934052

containerd.changes

@@ -1,3 +1,11 @@
+-------------------------------------------------------------------
+Fri Oct 13 05:33:18 UTC 2023 - Aleksa Sarai <asarai@suse.com>
+
+- Update to containerd v1.7.7. Upstream release notes:
+  <https://github.com/containerd/containerd/releases/tag/v1.7.7>
+- Add patch to fix build on SLE-12:
+  + 0001-BUILD-SLE12-revert-btrfs-depend-on-kernel-UAPI-inste.patch
+
 -------------------------------------------------------------------
 Thu Sep 14 04:27:07 UTC 2023 - Aleksa Sarai <asarai@suse.com>
 

containerd.spec

@@ -23,14 +23,14 @@
 %endif
 
 # MANUAL: Update the git_version.
-%define git_version 091922f03c2762540fd057fba91260237ff86acb
-%define git_short   091922f03c27
+%define git_version 8c087663b0233f6e6e2f4515cee61d49f14746a8
+%define git_short   8c087663b023
 
 %global provider_prefix github.com/containerd/containerd
 %global import_path %{provider_prefix}
 
 Name:           containerd
-Version:        1.7.6
+Version:        1.7.7
 Release:        0
 Summary:        Standalone OCI Container Daemon
 License:        Apache-2.0
@@ -39,6 +39,8 @@ URL:            https://containerd.tools
 Source:         %{name}-%{version}_%{git_short}.tar.xz
 Source1:        %{name}-rpmlintrc
 Source2:        %{name}.service
+# UPSTREAM: Revert <https://github.com/containerd/containerd/pull/7933> to fix build on SLE-12.
+Patch1:         0001-BUILD-SLE12-revert-btrfs-depend-on-kernel-UAPI-inste.patch
 BuildRequires:  fdupes
 BuildRequires:  glibc-devel-static
 BuildRequires:  go >= 1.19
@@ -94,6 +96,9 @@ reference the following Go import paths: github.com/containerd/containerd
 
 %prep
 %setup -q -n %{name}-%{version}_%{git_short}
+%if 0%{?sle_version} == 120000
+%patch1 -p1
+%endif
 
 %build
 %goprep %{import_path}