From 06b6e84d5cbfae237e80622c3b9a2b6c9a5a9cec Mon Sep 17 00:00:00 2001 From: Flatcar Buildbot Date: Thu, 5 Aug 2021 07:56:14 +0000 Subject: [PATCH] app-emulation: Upgrade Runc 1.0.0 to 1.0.1 --- .../app-emulation/containerd/containerd-9999.ebuild | 2 +- .../coreos-overlay/app-emulation/docker-runc/Manifest | 2 +- .../{docker-runc-1.0.0.ebuild => docker-runc-1.0.1.ebuild} | 6 +++--- .../coreos-overlay/app-emulation/docker/docker-9999.ebuild | 2 +- .../coreos-overlay/app-torcx/docker/docker-19.03.ebuild | 2 +- 5 files changed, 7 insertions(+), 7 deletions(-) rename sdk_container/src/third_party/coreos-overlay/app-emulation/docker-runc/{docker-runc-1.0.0.ebuild => docker-runc-1.0.1.ebuild} (92%) diff --git a/sdk_container/src/third_party/coreos-overlay/app-emulation/containerd/containerd-9999.ebuild b/sdk_container/src/third_party/coreos-overlay/app-emulation/containerd/containerd-9999.ebuild index b7195f79be..2c7f0e80a6 100644 --- a/sdk_container/src/third_party/coreos-overlay/app-emulation/containerd/containerd-9999.ebuild +++ b/sdk_container/src/third_party/coreos-overlay/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.0.0 +RDEPEND="~app-emulation/docker-runc-1.0.1 sys-libs/libseccomp" S=${WORKDIR}/${P}/src/${COREOS_GO_PACKAGE} diff --git a/sdk_container/src/third_party/coreos-overlay/app-emulation/docker-runc/Manifest b/sdk_container/src/third_party/coreos-overlay/app-emulation/docker-runc/Manifest index d4e667d65a..402961379e 100644 --- a/sdk_container/src/third_party/coreos-overlay/app-emulation/docker-runc/Manifest +++ b/sdk_container/src/third_party/coreos-overlay/app-emulation/docker-runc/Manifest @@ -1,2 +1,2 @@ -DIST docker-runc-1.0.0.tar.gz 2368557 BLAKE2B 9dfbae7b08adbc861878db6bc021ed67c81e5456a16bb40ad73b45523052dfa5f8132662f4c682e3b68f1d40236d86e0ba569f939af3d328f5ffc66b8fb38ae7 SHA512 a467979b8366ef0bb27588831b7f2eb097603162ef22050549be2f5a51fe6e924561ea9617800d68cb9bb577132a5f95f4fc4eafd7215e0550c8094bc0d2370d DIST docker-runc-1.0.0_rc2_p136.tar.gz 561705 BLAKE2B 4dd5dc689db1ac632bf10a5060f5681c7e44716caf8d3730683aad9df29c7b2628fa9e7253d86d87e9dfd7d27b545713154fa0f2984ca52908b16ab089be5646 SHA512 6052b95042082c3345caf25d3646f47b82c151ff3aca2ca4510dbf72ee80056d8c4077f2a1b48a9f4178c41185835ff51461e52ad47969534ea6febf7cac74f1 +DIST docker-runc-1.0.1.tar.gz 2374642 BLAKE2B 1346add899bf74ad05c6bf62e8580549b2ba0f7d5963c17537f4317652806c72161ab040690fc656c0e21a4f8edb9723d8590639e455471e0e16b4753f16d4fe SHA512 a37b35e46861c34b311d101a9942782664edab1bd32533a1e3d7d6f8a22f25aa1f021352101633622807e0beceba9227dac4d93ed6ab27d969cc8796efc2b808 diff --git a/sdk_container/src/third_party/coreos-overlay/app-emulation/docker-runc/docker-runc-1.0.0.ebuild b/sdk_container/src/third_party/coreos-overlay/app-emulation/docker-runc/docker-runc-1.0.1.ebuild similarity index 92% rename from sdk_container/src/third_party/coreos-overlay/app-emulation/docker-runc/docker-runc-1.0.0.ebuild rename to sdk_container/src/third_party/coreos-overlay/app-emulation/docker-runc/docker-runc-1.0.1.ebuild index d0b6222380..3c65487c68 100644 --- a/sdk_container/src/third_party/coreos-overlay/app-emulation/docker-runc/docker-runc-1.0.0.ebuild +++ b/sdk_container/src/third_party/coreos-overlay/app-emulation/docker-runc/docker-runc-1.0.1.ebuild @@ -11,8 +11,8 @@ COREOS_GO_VERSION="go1.13" # Update the patch number when this commit is changed (i.e. the _p in the ebuild). # The patch version is arbitrarily the number of commits since the tag version # specified in the ebuild name. For example: -# $ git log --oneline v1.0.0..${COMMIT_ID} | wc -l -COMMIT_ID="60cd6da6ef9fbf689682922617efff01c5f221c0" +# $ git log --oneline v1.0.1..${COMMIT_ID} | wc -l +COMMIT_ID="47e597c3eb2f002299eb9be6c8476194a92e9595" inherit eutils flag-o-matic coreos-go vcs-snapshot @@ -59,7 +59,7 @@ src_compile() { ) GOPATH="${WORKDIR}/${P}" emake BUILDTAGS="${options[*]}" \ - VERSION=1.0.0+dev.docker-19.03 \ + VERSION=1.0.1+dev.docker-19.03 \ COMMIT="${COMMIT_ID}" } diff --git a/sdk_container/src/third_party/coreos-overlay/app-emulation/docker/docker-9999.ebuild b/sdk_container/src/third_party/coreos-overlay/app-emulation/docker/docker-9999.ebuild index 63e0b5c4d8..f03a5471ed 100644 --- a/sdk_container/src/third_party/coreos-overlay/app-emulation/docker/docker-9999.ebuild +++ b/sdk_container/src/third_party/coreos-overlay/app-emulation/docker/docker-9999.ebuild @@ -65,7 +65,7 @@ RDEPEND=" >=app-arch/xz-utils-4.9 dev-libs/libltdl ~app-emulation/containerd-1.1.2 - ~app-emulation/docker-runc-1.0.0[apparmor?,seccomp?] + ~app-emulation/docker-runc-1.0.1[apparmor?,seccomp?] ~app-emulation/docker-proxy-0.8.0_p20180709 container-init? ( >=sys-process/tini-0.18.0 ) " diff --git a/sdk_container/src/third_party/coreos-overlay/app-torcx/docker/docker-19.03.ebuild b/sdk_container/src/third_party/coreos-overlay/app-torcx/docker/docker-19.03.ebuild index 28996bcacb..cbcfebb3db 100644 --- a/sdk_container/src/third_party/coreos-overlay/app-torcx/docker/docker-19.03.ebuild +++ b/sdk_container/src/third_party/coreos-overlay/app-torcx/docker/docker-19.03.ebuild @@ -14,7 +14,7 @@ RDEPEND=" ~app-emulation/docker-19.03.15 ~app-emulation/containerd-1.5.4 ~app-emulation/docker-proxy-0.8.0_p20180709 - ~app-emulation/docker-runc-1.0.0 + ~app-emulation/docker-runc-1.0.1 =dev-libs/libltdl-2.4.6 =sys-process/tini-0.18.0 "