Accepting request 1218778 from Virtualization:containers

OBS-URL: https://build.opensuse.org/request/show/1218778
OBS-URL: https://build.opensuse.org/package/show/openSUSE:Factory/containerd?expand=0&rev=71

0001-BUILD-SLE12-revert-btrfs-depend-on-kernel-UAPI-inste.patch

@@ -1,4 +1,4 @@
-From 0d0424334da85c9192a29a4e108094f7c28bbab5 Mon Sep 17 00:00:00 2001
+From 449c95558de43373c3628ff58b2c368cad269444 Mon Sep 17 00:00:00 2001
 From: Aleksa Sarai <cyphar@cyphar.com>
 Date: Wed, 22 May 2024 12:58:32 -0700
 Subject: [PATCH] BUILD: SLE12: revert "btrfs: depend on kernel UAPI instead of
@@ -143,7 +143,7 @@ Signed-off-by: Aleksa Sarai <cyphar@cyphar.com>
  delete mode 100644 vendor/golang.org/x/sys/cpu/syscall_aix_ppc64_gc.go
 
 diff --git a/go.mod b/go.mod
-index a12092d07279..d9468814b976 100644
+index 5a4aa880122d..558b93bae554 100644
 --- a/go.mod
 +++ b/go.mod
 @@ -9,7 +9,7 @@ require (
@@ -156,7 +156,7 @@ index a12092d07279..d9468814b976 100644
  	github.com/containerd/console v1.0.3
  	github.com/containerd/containerd/api v1.7.19
 diff --git a/go.sum b/go.sum
-index 044d37b41889..d488196d9c00 100644
+index 3b1338998808..321006fb19c5 100644
 --- a/go.sum
 +++ b/go.sum
 @@ -133,8 +133,8 @@ github.com/containerd/aufs v0.0.0-20201003224125-76a6863f2989/go.mod h1:AkGGQs9N
@@ -3086,7 +3086,7 @@ index e8b6cdbe9a7c..000000000000
 -	return
 -}
 diff --git a/vendor/modules.txt b/vendor/modules.txt
-index 959f6dafa3f5..0cdfde1f1d5c 100644
+index 16ef26e49527..6137357d9831 100644
 --- a/vendor/modules.txt
 +++ b/vendor/modules.txt
 @@ -85,9 +85,9 @@ github.com/cilium/ebpf/link
@@ -3111,5 +3111,5 @@ index 959f6dafa3f5..0cdfde1f1d5c 100644
  golang.org/x/sys/unix
  golang.org/x/sys/windows
 -- 
-2.46.0
+2.47.0
 

_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.22_%h</param>
+    <param name="versionformat">1.7.23_%h</param>
-    <param name="revision">v1.7.22</param>
+    <param name="revision">v1.7.23</param>
     <param name="exclude">.git</param>
   </service>
   <service name="recompress" mode="manual">

containerd-1.7.22_7f7fdf5fed64.tar.xz

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

containerd-1.7.23_57f17b0a6295.tar.xz

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

containerd.changes

@@ -1,3 +1,11 @@
+-------------------------------------------------------------------
+Mon Oct 28 09:10:25 UTC 2024 - Aleksa Sarai <asarai@suse.com>
+
+- Update to containerd v1.7.23. Upstream release notes:
+  <https://github.com/containerd/containerd/releases/tag/v1.7.23>
+- Rebase patches:
+  * 0001-BUILD-SLE12-revert-btrfs-depend-on-kernel-UAPI-inste.patch
+
 -------------------------------------------------------------------
 Wed Sep 11 08:58:49 UTC 2024 - Aleksa Sarai <asarai@suse.com>
 

containerd.spec

@@ -23,14 +23,14 @@
 %endif
 
 # MANUAL: Update the git_version.
-%define git_version 7f7fdf5fed64eb6a7caf99b3e12efcf9d60e311c
+%define git_version 57f17b0a6295a39009d861b89e3b3b87b005ca27
-%define git_short   7f7fdf5fed64
+%define git_short   57f17b0a6295
 
 %global provider_prefix github.com/containerd/containerd
 %global import_path %{provider_prefix}
 
 Name:           containerd
-Version:        1.7.22
+Version:        1.7.23
 Release:        0
 Summary:        Standalone OCI Container Daemon
 License:        Apache-2.0