From c976d3f9bd16254dcda71097424b334dcadbac80 Mon Sep 17 00:00:00 2001
From: Flatcar Buildbot <buildbot@flatcar-linux.org>
Date: Mon, 11 Nov 2024 07:04:40 +0000
Subject: [PATCH] app-containers/docker: Sync with Gentoo

It's from Gentoo commit 451103c2b42be976a005295aff6e1ca27674fa59.
---
 .../portage-stable/app-containers/docker/Manifest      |  2 +-
 .../{docker-27.2.1.ebuild => docker-27.3.1.ebuild}     | 10 +++-------
 2 files changed, 4 insertions(+), 8 deletions(-)
 rename sdk_container/src/third_party/portage-stable/app-containers/docker/{docker-27.2.1.ebuild => docker-27.3.1.ebuild} (96%)

diff --git a/sdk_container/src/third_party/portage-stable/app-containers/docker/Manifest b/sdk_container/src/third_party/portage-stable/app-containers/docker/Manifest
index 40aee69c3a..d3a27b56d0 100644
--- a/sdk_container/src/third_party/portage-stable/app-containers/docker/Manifest
+++ b/sdk_container/src/third_party/portage-stable/app-containers/docker/Manifest
@@ -1,3 +1,3 @@
 DIST docker-26.1.0.tar.gz 16390376 BLAKE2B 6703e9b153c430bc28aed2e7de7bada0203353d61f0a2ce3d49ddbd017eab196a685dd1ab1e719a6b287813eb5fa4f2c612e2cf1ab95789d6e79ebe5dac7ace3 SHA512 47b6b9af9947016884614b6bc25977e1db281da95c9b8b34c753c21c664a737a893f9fa65d92cbb897735aae3893567e106e6bababb5507e069b1e0981e48d50
 DIST docker-27.2.0.tar.gz 16689537 BLAKE2B faf0bae9f7da127d5b65b9989acd82dc726bc3f09ace502df151b9f03a84b6f1ec2a946d905263aaa7d2e7d7a3cd4ad1a09291dcfc6691e73cc9a8738f150d55 SHA512 97abaf56d2249c1514beacf17fc9096848b960846e064f1a9bd800a59762a1f1888b32e83b3e8289e23656496ca0293fea65931210d68faaa8a713aab6e48b65
-DIST docker-27.2.1.tar.gz 16769375 BLAKE2B a2a33d76702f5a208b22cbb12202f4fd69dfce79a6a8ed3c3fe0df161696c922ab764a1796cd265a0cba0737894daf759baf21ecff364f3caea5fd440831dcb9 SHA512 2ca29e53074c1ff7b527f709ae542daa2754cfc35c70ae92bd71b4c7d5d54cd6d373ab078c811900dc694347cb149387681f6cf26634c81651a8e91e31790de7
+DIST docker-27.3.1.tar.gz 16790553 BLAKE2B 64670eec5a957cb1a088047836fe5e906435f85a062178f52276bafa3df750207bfd02ebb8783e642a6817b2bfa9fb439e441d412e448eba0f3cf15869067d72 SHA512 0fddcc8314eed2e7b131af78f1fa01292cfc4fcb7fd0af94b79d5435349ab54a21b0a78cffbf29dd4c58747d8bcd1f47473cc5f5ab2596e133828b2e6540d172
diff --git a/sdk_container/src/third_party/portage-stable/app-containers/docker/docker-27.2.1.ebuild b/sdk_container/src/third_party/portage-stable/app-containers/docker/docker-27.3.1.ebuild
similarity index 96%
rename from sdk_container/src/third_party/portage-stable/app-containers/docker/docker-27.2.1.ebuild
rename to sdk_container/src/third_party/portage-stable/app-containers/docker/docker-27.3.1.ebuild
index 579cc705b7..3fe81a9b43 100644
--- a/sdk_container/src/third_party/portage-stable/app-containers/docker/docker-27.2.1.ebuild
+++ b/sdk_container/src/third_party/portage-stable/app-containers/docker/docker-27.3.1.ebuild
@@ -5,7 +5,7 @@ EAPI=7
 EGO_PN=github.com/docker/docker
 MY_PV=${PV/_/-}
 inherit golang-vcs-snapshot linux-info optfeature systemd udev
-GIT_COMMIT=8b539b8df24032dabeaaa099cf1d0535ef0286a3
+GIT_COMMIT=41ca978a0a5400cc24b274137efa9f25517fcc0b
 
 DESCRIPTION="The core functions you need to create Docker images and run Docker containers"
 HOMEPAGE="https://www.docker.com/"
@@ -33,8 +33,8 @@ RDEPEND="
 	sys-process/procps
 	>=dev-vcs/git-1.7
 	>=app-arch/xz-utils-4.9
-	>=app-containers/containerd-1.7.21[apparmor?,btrfs?,seccomp?]
-	>=app-containers/runc-1.1.13[apparmor?,seccomp?]
+	>=app-containers/containerd-1.7.22[apparmor?,btrfs?,seccomp?]
+	>=app-containers/runc-1.1.14[apparmor?,seccomp?]
 	!app-containers/docker-proxy
 	container-init? ( >=sys-process/tini-0.19.0[static] )
 	selinux? ( sec-policy/selinux-docker )
@@ -52,10 +52,6 @@ RESTRICT="installsources strip test"
 S="${WORKDIR}/${P}/src/${EGO_PN}"
 
 # https://bugs.gentoo.org/748984 https://github.com/etcd-io/etcd/pull/12552
-PATCHES=(
-	"${FILESDIR}/0001-Openrc-Depend-on-containerd-init-script.patch"
-)
-
 pkg_setup() {
 	# this is based on "contrib/check-config.sh" from upstream's sources
 	# required features.