Merge pull request #2128 from flatcar-linux/runc-1.1.4-main

Upgrade Runc in main from 1.1.3 to 1.1.4
flatcar-archive · Sep 7, 2022 · 0734660 · 0734660
2 parents 7a5771f + d5d50b7
commit 0734660
Show file tree

Hide file tree

Showing 5 changed files with 6 additions and 5 deletions.
diff --git a/app-emulation/containerd/containerd-9999.ebuild b/app-emulation/containerd/containerd-9999.ebuild
@@ -29,7 +29,7 @@ SLOT="0"
 IUSE="+btrfs hardened"
 
 DEPEND="btrfs? ( sys-fs/btrfs-progs )"
-RDEPEND="~app-emulation/docker-runc-1.1.3
+RDEPEND="~app-emulation/docker-runc-1.1.4
 	sys-libs/libseccomp"
 
 S=${WORKDIR}/${P}/src/${COREOS_GO_PACKAGE}

diff --git a/app-emulation/docker-runc/Manifest b/app-emulation/docker-runc/Manifest
@@ -1 +1 @@
-DIST docker-runc-1.1.3.tar.gz 2335948 BLAKE2B 2b14c203b2f1e5c68745076ac8829bef42a477715b07c3aedfd3385ea0996c736aedb026453af0f4869e8a88c16f68ca2b19a9e61d32443653e5d1e7c151f45d SHA512 5b73647884b95e1d05e3449232bc321649d05d5a670db8b838e04b6c57e6e461ec6151190a7edfba6df58f82461172e962a334834206cbf729a27f8447a7ac74
+DIST docker-runc-1.1.4.tar.gz 2337285 BLAKE2B b82beac54eb07cf0a657af910201fcff05579d7311bef9d07df1fc8b60fac2b9560b250366193f0f84319ced66bc3f1a1af1bb8a57233187e7ef77a7799b55e7 SHA512 c6665265369af843550181fe44217d0e4f5c3b019c47359bfe9db94dcbd1866c05756b09adea905437bbff8bcfd2b6b02185ca4e7f1d62ed3bf177118308e41a
diff --git a/...tion/docker-runc/docker-runc-1.1.3.ebuild → ...tion/docker-runc/docker-runc-1.1.4.ebuild b/...tion/docker-runc/docker-runc-1.1.3.ebuild → ...tion/docker-runc/docker-runc-1.1.4.ebuild
@@ -8,7 +8,7 @@ COREOS_GO_PACKAGE="${GITHUB_URI}"
 COREOS_GO_VERSION="go1.18"
 # the commit of runc that docker uses.
 # see https://github.com/docker/docker-ce/blob/v19.03.15/components/engine/hack/dockerfile/install/runc.installer#L4
-COMMIT_ID="f423b67d3b7f70290fb6610f0368ab245589a172"
+COMMIT_ID="81a44cf162f4409cc6ff656e2433b87321bf8a7a"
 
 inherit eutils flag-o-matic coreos-go vcs-snapshot
 
@@ -55,7 +55,7 @@ src_compile() {
 	)
 
 	GOPATH="${WORKDIR}/${P}" emake BUILDTAGS="${options[*]}" \
-		VERSION=1.1.3+dev.docker-20.10 \
+		VERSION=1.1.4+dev.docker-20.10 \
 		COMMIT="${COMMIT_ID}"
 }
 

diff --git a/app-torcx/docker/docker-20.10.ebuild b/app-torcx/docker/docker-20.10.ebuild
@@ -15,7 +15,7 @@ RDEPEND="
 	~app-emulation/docker-cli-20.10.17
 	~app-emulation/containerd-1.6.8
 	~app-emulation/docker-proxy-0.8.0_p20210525
-	~app-emulation/docker-runc-1.1.3
+	~app-emulation/docker-runc-1.1.4
 	=dev-libs/libltdl-2.4.7
 	~sys-process/tini-0.19.0
 "

diff --git a/changelog/updates/2022-09-01-runc-1.1.4-update.md b/changelog/updates/2022-09-01-runc-1.1.4-update.md
@@ -0,0 +1 @@
+- runc ([1.1.4](https://github.com/opencontainers/runc/releases/tag/v1.1.4))
Original file line number	Diff line number	Diff line change
		@@ -1 +1 @@
		DIST docker-runc-1.1.3.tar.gz 2335948 BLAKE2B 2b14c203b2f1e5c68745076ac8829bef42a477715b07c3aedfd3385ea0996c736aedb026453af0f4869e8a88c16f68ca2b19a9e61d32443653e5d1e7c151f45d SHA512 5b73647884b95e1d05e3449232bc321649d05d5a670db8b838e04b6c57e6e461ec6151190a7edfba6df58f82461172e962a334834206cbf729a27f8447a7ac74
		DIST docker-runc-1.1.4.tar.gz 2337285 BLAKE2B b82beac54eb07cf0a657af910201fcff05579d7311bef9d07df1fc8b60fac2b9560b250366193f0f84319ced66bc3f1a1af1bb8a57233187e7ef77a7799b55e7 SHA512 c6665265369af843550181fe44217d0e4f5c3b019c47359bfe9db94dcbd1866c05756b09adea905437bbff8bcfd2b6b02185ca4e7f1d62ed3bf177118308e41a
Original file line number	Diff line number	Diff line change
		@@ -0,0 +1 @@
		- runc ([1.1.4](https://github.com/opencontainers/runc/releases/tag/v1.1.4))