From 3e30d80e9f195db5fe1006e1ede8807beecc27e94fbb23a8c4da17fbcbb90b8e Mon Sep 17 00:00:00 2001 From: Aleksa Sarai Date: Mon, 4 Dec 2023 08:46:44 +0000 Subject: [PATCH] Accepting request 1130672 from home:cyphar:docker - Update to containerd v1.7.10. Upstream release notes: - Rebase patches: * 0001-BUILD-SLE12-revert-btrfs-depend-on-kernel-UAPI-inste.patch OBS-URL: https://build.opensuse.org/request/show/1130672 OBS-URL: https://build.opensuse.org/package/show/Virtualization:containers/containerd?expand=0&rev=163 --- ...-revert-btrfs-depend-on-kernel-UAPI-inste.patch | 14 +++++++------- _service | 4 ++-- containerd-1.7.10_4e1fe7492b9d.tar.xz | 3 +++ containerd-1.7.8_8e4b0bde8667.tar.xz | 3 --- containerd.changes | 8 ++++++++ containerd.spec | 6 +++--- 6 files changed, 23 insertions(+), 15 deletions(-) create mode 100644 containerd-1.7.10_4e1fe7492b9d.tar.xz delete mode 100644 containerd-1.7.8_8e4b0bde8667.tar.xz 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 0665d4a..9aad47a 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 c6a136e30370e2b94e6373b9c22f6ec3d0d9a738 Mon Sep 17 00:00:00 2001 +From 4c4982da6ba4822ce8ea33a8054fac51465b0c7c Mon Sep 17 00:00:00 2001 From: Aleksa Sarai Date: Tue, 28 Nov 2023 22:54:03 +1100 Subject: [PATCH] BUILD: SLE12: revert "btrfs: depend on kernel UAPI instead of @@ -143,11 +143,11 @@ 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 9bafb7ba5944..532d2d63f104 100644 +index 8fa8e5afc0d5..a0c927917263 100644 --- a/go.mod +++ b/go.mod @@ -9,7 +9,7 @@ require ( - github.com/Microsoft/hcsshim v0.11.1 + github.com/Microsoft/hcsshim v0.11.4 github.com/container-orchestrated-devices/container-device-interface v0.5.4 github.com/containerd/aufs v1.0.0 - github.com/containerd/btrfs/v2 v2.0.0 @@ -156,7 +156,7 @@ index 9bafb7ba5944..532d2d63f104 100644 github.com/containerd/console v1.0.3 github.com/containerd/continuity v0.4.2 diff --git a/go.sum b/go.sum -index 00dae8b4104a..0e90a8e8855c 100644 +index cd0adb193879..21693007e7bc 100644 --- a/go.sum +++ b/go.sum @@ -187,9 +187,8 @@ github.com/containerd/aufs v1.0.0 h1:2oeJiwX5HstO7shSrPZjrohJZLzK36wvpdmzDRkL/LY @@ -3129,10 +3129,10 @@ index 904be42ffdce..000000000000 - return -} diff --git a/vendor/modules.txt b/vendor/modules.txt -index d38e3a52bf83..3a9043e2b3fd 100644 +index fd5a3491d305..764f922ba25c 100644 --- a/vendor/modules.txt +++ b/vendor/modules.txt -@@ -88,9 +88,9 @@ github.com/container-orchestrated-devices/container-device-interface/specs-go +@@ -87,9 +87,9 @@ github.com/container-orchestrated-devices/container-device-interface/specs-go ## explicit; go 1.13 github.com/containerd/aufs github.com/containerd/aufs/plugin @@ -3145,7 +3145,7 @@ index d38e3a52bf83..3a9043e2b3fd 100644 # github.com/containerd/cgroups v1.1.0 ## explicit; go 1.17 github.com/containerd/cgroups/stats/v1 -@@ -529,7 +529,6 @@ golang.org/x/sync/errgroup +@@ -530,7 +530,6 @@ golang.org/x/sync/errgroup golang.org/x/sync/semaphore # golang.org/x/sys v0.13.0 ## explicit; go 1.17 diff --git a/_service b/_service index fa81a3a..9d993d1 100644 --- a/_service +++ b/_service @@ -3,8 +3,8 @@ https://github.com/containerd/containerd.git git containerd - 1.7.8_%h - v1.7.8 + 1.7.10_%h + v1.7.10 .git diff --git a/containerd-1.7.10_4e1fe7492b9d.tar.xz b/containerd-1.7.10_4e1fe7492b9d.tar.xz new file mode 100644 index 0000000..ca7552e --- /dev/null +++ b/containerd-1.7.10_4e1fe7492b9d.tar.xz @@ -0,0 +1,3 @@ +version https://git-lfs.github.com/spec/v1 +oid sha256:41ce46238e0f01bce504d94cac6ed995b6899673d28346426e4d71ad6ddf1be5 +size 5982548 diff --git a/containerd-1.7.8_8e4b0bde8667.tar.xz b/containerd-1.7.8_8e4b0bde8667.tar.xz deleted file mode 100644 index 9adcf1e..0000000 --- a/containerd-1.7.8_8e4b0bde8667.tar.xz +++ /dev/null @@ -1,3 +0,0 @@ -version https://git-lfs.github.com/spec/v1 -oid sha256:d95530d2a410706e66ca08c11291b1f4302e23071121fcf1e45abc66cdb8e67e -size 5949696 diff --git a/containerd.changes b/containerd.changes index 99343c9..5f374d1 100644 --- a/containerd.changes +++ b/containerd.changes @@ -1,3 +1,11 @@ +------------------------------------------------------------------- +Mon Dec 4 08:44:40 UTC 2023 - Aleksa Sarai + +- Update to containerd v1.7.10. Upstream release notes: + +- Rebase patches: + * 0001-BUILD-SLE12-revert-btrfs-depend-on-kernel-UAPI-inste.patch + ------------------------------------------------------------------- Fri Oct 27 21:13:23 UTC 2023 - Aleksa Sarai diff --git a/containerd.spec b/containerd.spec index 7054a72..bf94992 100644 --- a/containerd.spec +++ b/containerd.spec @@ -23,14 +23,14 @@ %endif # MANUAL: Update the git_version. -%define git_version 8e4b0bde866788eec76735cc77c4720144248fb7 -%define git_short 8e4b0bde8667 +%define git_version 4e1fe7492b9df85914c389d1f15a3ceedbb280ac +%define git_short 4e1fe7492b9d %global provider_prefix github.com/containerd/containerd %global import_path %{provider_prefix} Name: containerd -Version: 1.7.8 +Version: 1.7.10 Release: 0 Summary: Standalone OCI Container Daemon License: Apache-2.0