diff --git a/0001-BUILD-SLE12-revert-btrfs-depend-on-kernel-UAPI-inste.patch b/0001-BUILD-SLE12-revert-btrfs-depend-on-kernel-UAPI-inste.patch index 7d84bcd..2733fa4 100644 --- a/0001-BUILD-SLE12-revert-btrfs-depend-on-kernel-UAPI-inste.patch +++ b/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 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 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 diff --git a/_service b/_service index 7274361..b088031 100644 --- a/_service +++ b/_service @@ -3,8 +3,8 @@ https://github.com/containerd/containerd.git git containerd - 1.7.22_%h - v1.7.22 + 1.7.23_%h + v1.7.23 .git diff --git a/containerd-1.7.22_7f7fdf5fed64.tar.xz b/containerd-1.7.22_7f7fdf5fed64.tar.xz deleted file mode 100644 index 0c8f0d4..0000000 --- a/containerd-1.7.22_7f7fdf5fed64.tar.xz +++ /dev/null @@ -1,3 +0,0 @@ -version https://git-lfs.github.com/spec/v1 -oid sha256:cc9f6b8de8f5331657cc3f65e9e31ee41e65828e5253139a34feb1f53fd0d367 -size 6082656 diff --git a/containerd-1.7.23_57f17b0a6295.tar.xz b/containerd-1.7.23_57f17b0a6295.tar.xz new file mode 100644 index 0000000..b29ebf3 --- /dev/null +++ b/containerd-1.7.23_57f17b0a6295.tar.xz @@ -0,0 +1,3 @@ +version https://git-lfs.github.com/spec/v1 +oid sha256:64ef900d24e92c7a0f2e3597ff869bbabfd983babb46e00efba23d45cc715804 +size 6084160 diff --git a/containerd.changes b/containerd.changes index 19407d6..5d2d2ae 100644 --- a/containerd.changes +++ b/containerd.changes @@ -1,3 +1,11 @@ +------------------------------------------------------------------- +Mon Oct 28 09:10:25 UTC 2024 - Aleksa Sarai + +- Update to containerd v1.7.23. Upstream release notes: + +- Rebase patches: + * 0001-BUILD-SLE12-revert-btrfs-depend-on-kernel-UAPI-inste.patch + ------------------------------------------------------------------- Wed Sep 11 08:58:49 UTC 2024 - Aleksa Sarai diff --git a/containerd.spec b/containerd.spec index 36328b5..8c26ee6 100644 --- a/containerd.spec +++ b/containerd.spec @@ -23,14 +23,14 @@ %endif # MANUAL: Update the git_version. -%define git_version 7f7fdf5fed64eb6a7caf99b3e12efcf9d60e311c -%define git_short 7f7fdf5fed64 +%define git_version 57f17b0a6295a39009d861b89e3b3b87b005ca27 +%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