containerd: update to v2.3.1

We refresh a patch for context, and also pickup the following changes:

    f588bc6fb contrib/checkpoint: increase timeouts to 30s
    58af96519 Prepare release notes for v2.3.1
    8f0b3ca83 Update api to v1.11.1
    da7aef299 Prepare release notes for api/v1.11.1
    5282d4e09 Wire task address and version fields
    e44f5f9ec protos: include task API address to CreateTaskRequest
    4d80a31bf seccomp: Block AF_ALG in default socket policy
    2ed0d97b6 seccomp: Document socket rule scope and socketcall limitation
    2be0710b8 overlay: disable "rebase" capability when running in UserNS
    3a88fdde0 server: tolerate failed gRPC plugins when starting listeners
    1d601271a fix: close boltdb on metadata and mount plugin close
    3b199c22b Update Go to 1.26.3
    a05ae7885 oci: return explicit error for out-of-range USER values
    d666d2e42 Refactor transfer unpack configuration setup
    ccc3bd7b9 Fix optional transfer differ setup

Signed-off-by: Bruce Ashfield <bruce.ashfield@gmail.com>

2 files changed, 8 insertions, 8 deletions

diff --git a/recipes-containers/containerd/containerd/0001-Makefile-allow-GO_BUILD_FLAGS-to-be-externally-speci.patch b/recipes-containers/containerd/containerd/0001-Makefile-allow-GO_BUILD_FLAGS-to-be-externally-speci.patch
index 63498a86..219759a8 100644
--- a/recipes-containers/containerd/containerd/0001-Makefile-allow-GO_BUILD_FLAGS-to-be-externally-speci.patch
+++ b/recipes-containers/containerd/containerd/0001-Makefile-allow-GO_BUILD_FLAGS-to-be-externally-speci.patch
@@ -19,12 +19,12 @@ Signed-off-by: Bruce Ashfield <bruce.ashfield@gmail.com>
  Makefile | 3 ++-
  1 file changed, 2 insertions(+), 1 deletion(-)
 
-Index: containerd/Makefile
+Index: v2/Makefile
 ===================================================================
---- containerd.orig/Makefile
-+++ containerd/Makefile
-@@ -129,7 +129,8 @@
- GOPATHS=$(shell $(GO) env GOPATH | tr ":" "\n" | tr ";" "\n")
+--- v2.orig/Makefile
++++ v2/Makefile
+@@ -133,7 +133,8 @@ endif
+ GOPATHS := $(shell $(GO) env GOPATH | tr ":" "\n" | tr ";" "\n")
  
  TESTFLAGS_RACE=
 -GO_BUILD_FLAGS ?=
diff --git a/recipes-containers/containerd/containerd_git.bb b/recipes-containers/containerd/containerd_git.bb
index 51d7c2e2..0a6e2221 100644
--- a/recipes-containers/containerd/containerd_git.bb
+++ b/recipes-containers/containerd/containerd_git.bb
@@ -5,8 +5,8 @@ DESCRIPTION = "containerd is a daemon to control runC, built for performance and
                support as well as checkpoint and restore for cloning and live migration of containers."
 
 
-SRCREV = "5957d3334bcaeddc2bd8e665f53cee318c298a2c"
-SRC_URI = "git://github.com/containerd/containerd;branch=release/2.2;protocol=https;destsuffix=git/src/github.com/containerd/containerd/v2 \
+SRCREV = "fcede2e9607c091e27778340a90a9f9668ec86b0"
+SRC_URI = "git://github.com/containerd/containerd;branch=release/2.3;protocol=https;destsuffix=git/src/github.com/containerd/containerd/v2 \
            file://0001-Makefile-allow-GO_BUILD_FLAGS-to-be-externally-speci.patch \
            file://0001-build-don-t-use-gcflags-to-define-trimpath.patch \
            file://cni-containerd-net.conflist \
@@ -16,7 +16,7 @@ SRC_URI = "git://github.com/containerd/containerd;branch=release/2.2;protocol=ht
 LICENSE = "Apache-2.0"
 LIC_FILES_CHKSUM = "file://LICENSE;md5=1269f40c0d099c21a871163984590d89"
 
-CONTAINERD_VERSION = "2.2.2"
+CONTAINERD_VERSION = "2.3.1"
 
 # EXTRA_OEMAKE += "GODEBUG=1"