diff --git a/0001-containerd-add-blot-symbol-to-support-loong64.patch b/0001-containerd-add-blot-symbol-to-support-loong64.patch deleted file mode 100644 index 5c5d5faf056d8196912c58a33cd93fb683e7d406..0000000000000000000000000000000000000000 --- a/0001-containerd-add-blot-symbol-to-support-loong64.patch +++ /dev/null @@ -1,31 +0,0 @@ -From ede7f7ed58d034507643a98aeca453dba0f497fb Mon Sep 17 00:00:00 2001 -From: build -Date: Thu, 5 Jan 2023 12:37:27 +0000 -Subject: [PATCH] containerd add blot symbol to support loong64 - ---- - vendor/go.etcd.io/bbolt/bolt_loong64.go | 13 +++++++++++++ - 1 file changed, 13 insertions(+) - create mode 100644 vendor/go.etcd.io/bbolt/bolt_loong64.go - -diff --git a/vendor/go.etcd.io/bbolt/bolt_loong64.go b/vendor/go.etcd.io/bbolt/bolt_loong64.go -new file mode 100644 -index 0000000..bb402fb ---- /dev/null -+++ b/vendor/go.etcd.io/bbolt/bolt_loong64.go -@@ -0,0 +1,13 @@ -+// +build loong64 -+ -+package bbolt -+ -+// maxMapSize represents the largest mmap size supported by Bolt. -+const maxMapSize = 0x8000000000 // 512GB -+ -+// maxAllocSize is the size used when creating array pointers. -+const maxAllocSize = 0x7FFFFFFF -+ -+// Are unaligned load/stores broken on this arch? -+var brokenUnaligned = false -+ --- -2.33.0 diff --git a/containerd.spec b/containerd.spec index ba40d2a958a3200e96e28e62d64980757222d0d8..c893afcc3d08f9d7886ca517df93f5d952fe207a 100644 --- a/containerd.spec +++ b/containerd.spec @@ -1,11 +1,11 @@ -%define anolis_release 5 +%define anolis_release 1 %bcond_without check %global goipath github.com/containerd/containerd Name: containerd -Version: 1.6.20 +Version: 1.6.38 Release: %{anolis_release}%{?dist} Summary: Open and reliable container runtime License: ASL 2.0 @@ -13,7 +13,6 @@ URL: https://github.com/containerd/containerd Source0: https://github.com/containerd/containerd/archive/refs/tags/v%{version}.tar.gz Source1: containerd.service Source2: containerd.toml -Patch001: 0001-containerd-add-blot-symbol-to-support-loong64.patch BuildRequires: btrfs-progs-devel systemd-rpm-macros go-md2man Requires: runc @@ -41,7 +40,6 @@ The %{name}-doc package contains documentation files for %{name}. %goprep -k # Used only for generation: rm -rf cmd/protoc-gen-gogoctrd -%patch001 -p1 %build export LDFLAGS="-X %{goipath}/version.Version=%{version} " @@ -102,6 +100,10 @@ install -D -p -m 0644 %{S:2} %{buildroot}%{_sysconfdir}/containerd/config.toml %doc code-of-conduct.md BUILDING.md %changelog +* Thu Jul 10 2025 mgb01105731 - 1.6.38-1 +- Update to 1.6.38 to fix CVE-2024-40635 +- Delete patch as the content already exists + * Wed Sep 13 2023 Wenlong Zhang - 1.6.20-5 - add loong64 support for containerd diff --git a/v1.6.20.tar.gz b/v1.6.38.tar.gz similarity index 51% rename from v1.6.20.tar.gz rename to v1.6.38.tar.gz index 984389bcf845974244211d78dd4295676d051f84..2f969b69c09b61dacea6b9d61d4a420e4bb4f75a 100644 Binary files a/v1.6.20.tar.gz and b/v1.6.38.tar.gz differ