diff --git a/0001-Fix-CVE-2023-25153.patch b/0001-Fix-CVE-2023-25153.patch deleted file mode 100644 index aa6abe00a55385618205c59127cc5fbaf2eb5b29..0000000000000000000000000000000000000000 --- a/0001-Fix-CVE-2023-25153.patch +++ /dev/null @@ -1,36 +0,0 @@ -From e1ec32e24f11bb3f003ef876e404777c1041349b Mon Sep 17 00:00:00 2001 -From: bwzhang -Date: Wed, 13 Mar 2024 15:03:38 +0800 -Subject: [PATCH] Fix CVE-2023-25153 - ---- - images/archive/importer.go | 12 +++++++----- - 1 file changed, 7 insertions(+), 5 deletions(-) - -diff --git a/images/archive/importer.go b/images/archive/importer.go -index c531049..8ba3206 100644 ---- a/images/archive/importer.go -+++ b/images/archive/importer.go -@@ -232,12 +232,14 @@ func ImportIndex(ctx context.Context, store content.Store, reader io.Reader, opt - return writeManifest(ctx, store, idx, ocispec.MediaTypeImageIndex) - } - -+const ( -+ kib = 1024 -+ mib = 1024 * kib -+ jsonLimit = 20 * mib -+) -+ - func onUntarJSON(r io.Reader, j interface{}) error { -- b, err := io.ReadAll(r) -- if err != nil { -- return err -- } -- return json.Unmarshal(b, j) -+ return json.NewDecoder(io.LimitReader(r, jsonLimit)).Decode(j) - } - - func onUntarBlob(ctx context.Context, r io.Reader, store content.Ingester, size int64, ref string) (digest.Digest, error) { --- -2.20.1 - diff --git a/bbolt-add-loong64-support.patch b/bbolt-add-loong64-support.patch deleted file mode 100644 index d614dbc582fcbeba5a24fa0bd8d4bf08d28d3538..0000000000000000000000000000000000000000 --- a/bbolt-add-loong64-support.patch +++ /dev/null @@ -1,28 +0,0 @@ -From 1dea428808d6a7bbc01c891649bad93adb012eb0 Mon Sep 17 00:00:00 2001 -From: Jingyun Hua -Date: Thu, 1 Jun 2023 06:52:55 +0000 -Subject: [PATCH] bbolt:add loong64 support - ---- - vendor/go.etcd.io/bbolt/bolt_loong64.go | 10 ++++++++++ - 1 file changed, 10 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..31c17c1 ---- /dev/null -+++ b/vendor/go.etcd.io/bbolt/bolt_loong64.go -@@ -0,0 +1,10 @@ -+//go:build loong64 -+// +build loong64 -+ -+package bbolt -+ -+// maxMapSize represents the largest mmap size supported by Bolt. -+const maxMapSize = 0xFFFFFFFFFFFF // 256TB -+ -+// maxAllocSize is the size used when creating array pointers. -+const maxAllocSize = 0x7FFFFFFF --- -2.33.0 diff --git a/k3s-containerd.spec b/k3s-containerd.spec index 6008e1cef690b02a1cf42907979b45cad6a4828b..ac866b86997b9166064ac461d798bac0b9777636 100644 --- a/k3s-containerd.spec +++ b/k3s-containerd.spec @@ -1,9 +1,9 @@ %global goipath github.com/k3s-io/containerd %global debug_package %{nil} %global version_suffix k3s1 -Version: 1.6.6 +Version: 1.7.11 Name: k3s-containerd -Release: 7 +Release: 8 Summary: An industry-standard container runtime License: Apache-2.0 URL: https://github.com/k3s-io/containerd @@ -11,9 +11,6 @@ Source0: https://github.com/k3s-io/containerd/archive/refs/tags/v%{versio #source1 from https://github.com/golang/sys version: v0.4.0 Source1: sys.tar.gz -Patch0: bbolt-add-loong64-support.patch -Patch0001: 0001-Fix-CVE-2023-25153.patch - BuildRequires: golang glibc-static make btrfs-progs-devel %description @@ -55,7 +52,7 @@ VERSIONFLAGS=" -X ${PKG_K8S_BASE}/version.gitTreeState=clean -X ${PKG_K8S_BASE}/version.buildDate=${buildDate} -X ${PKG_CRICTL}/version.Version=v1.24.0-k3s1 - -X ${PKG_CONTAINERD}/version.Version=v1.6.6-k3s1 + -X ${PKG_CONTAINERD}/version.Version=v1.7.11-k3s1 -X ${PKG_CONTAINERD}/version.Package=${PKG_K3S_CONTAINERD} -X ${PKG_CNI_PLUGINS}/pkg/buildversion.BuildVersion=v1.1.1-k3s1 " @@ -77,6 +74,12 @@ cp -rf %{_builddir}/containerd-%{version}-%{version_suffix}/. %{buildroot}%{_lib %changelog +* Tue Jun 24 2025 zhourenjian - 1.7.11-8 +- Type:bugfix +- CVE:NA +- SUG:NA +- DESC: upgrade k3s version to 1.7.11-k3s1 + * Wed Mar 13 2024 zhangbowei - 1.6.6-k3s1-7 - Type:bugfix - CVE:NA diff --git a/v1.6.6-k3s1.tar.gz b/v1.7.11-k3s1.tar.gz similarity index 52% rename from v1.6.6-k3s1.tar.gz rename to v1.7.11-k3s1.tar.gz index 42388c90dd7918097f214c693d41ebda4eed06dd..699e4315c96e1f7882111daefdcfd97631efdc59 100644 Binary files a/v1.6.6-k3s1.tar.gz and b/v1.7.11-k3s1.tar.gz differ