Upgrade containerd2 to 2.1.6

[jykanase]

Merge Checklist

All boxes should be checked before merging the PR (just tick any boxes which don't apply to this PR)

• The toolchain has been rebuilt successfully (or no changes were made to it)
• The toolchain/worker package manifests are up-to-date
• Any updated packages successfully build (or no packages were changed)
• Packages depending on static components modified in this PR (Golang, *-static subpackages, etc.) have had their Release tag incremented.
• Package tests (%check section) have been verified with RUN_CHECK=y for existing SPEC files, or added to new SPEC files
• All package sources are available
• cgmanifest files are up-to-date and sorted (./cgmanifest.json, ./toolkit/scripts/toolchain/cgmanifest.json, .github/workflows/cgmanifest.json)
• LICENSE-MAP files are up-to-date (./LICENSES-AND-NOTICES/SPECS/data/licenses.json, ./LICENSES-AND-NOTICES/SPECS/LICENSES-MAP.md, ./LICENSES-AND-NOTICES/SPECS/LICENSE-EXCEPTIONS.PHOTON)
• All source files have up-to-date hashes in the *.signatures.json files
• sudo make go-tidy-all and sudo make go-test-coverage pass
• Documentation has been updated to match any changes to the build system
• Ready to merge

---

Summary

• Upgrade containerd2 to 2.1.6
• containerd2.signatures.json — Update source tarball hash
• cgmanifest.json — Update version and download URL
• multi-snapshotters-support.patch — Rebase for 2.1.6
• fix-credential-leak-in-cri-errors.patch — Modified to keep only patch 2/2 (not yet merged upstream)
• Removed 9 CVE patches now fixed upstream in 2.1.6:
  • CVE-2024-25621.patch
  • CVE-2024-40635.patch
  • CVE-2024-45338.patch
  • CVE-2025-22872.patch
  • CVE-2025-27144.patch
  • CVE-2025-47291.patch
  • CVE-2025-47911.patch
  • CVE-2025-58190.patch
  • CVE-2025-64329.patch

Change Log

• Removed 9 CVE patches now fixed upstream in 2.1.6

Does this affect the toolchain?

NO

Associated issues

• #xxxx

Links to CVEs

• https://nvd.nist.gov/vuln/detail/CVE-YYYY-XXXX

Test Methodology

• Buddy Build
• Local build

[Kanishk-Bansal]

fix the Release: 3%{?dist} to Release: 1%{?dist}

[Kanishk-Bansal]

make the patch numbers start from 0

[Kanishk-Bansal]

Full Build

[acortelyou]

lgtm, also: #16652

[Kanishk-Bansal]

Buddy Build

[Kanishk-Bansal]

Build

[cpuguy83]

This LGTM but I would recommend updating to 2.1.7 which just came out today.