From 630c61b915929d50b0a91d6c538ec23bded561e8 Mon Sep 17 00:00:00 2001 From: David Michael Date: Tue, 12 Feb 2019 16:47:57 +0000 Subject: [PATCH] app-emulation/docker-runc: Bump the 18.06 snapshot to 18.06.2 --- .../coreos-overlay/app-emulation/docker-runc/Manifest | 4 ++-- ..._p19-r1.ebuild => docker-runc-1.0.0_rc5_p22.ebuild} | 10 ++++++---- ...runc-1.0.0_rc5_p19-r1 => docker-runc-1.0.0_rc5_p22} | 4 ++-- 3 files changed, 10 insertions(+), 8 deletions(-) rename sdk_container/src/third_party/coreos-overlay/app-emulation/docker-runc/{docker-runc-1.0.0_rc5_p19-r1.ebuild => docker-runc-1.0.0_rc5_p22.ebuild} (81%) rename sdk_container/src/third_party/coreos-overlay/metadata/md5-cache/app-emulation/{docker-runc-1.0.0_rc5_p19-r1 => docker-runc-1.0.0_rc5_p22} (85%) 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 ce795bcaf4..4747e0f6d9 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_rc2_p136.tar.gz 561705 SHA256 2954cb6b468b3806a08c45656acc2019035bc9994c2a9b4249cfde4d9b3a7c93 SHA512 6052b95042082c3345caf25d3646f47b82c151ff3aca2ca4510dbf72ee80056d8c4077f2a1b48a9f4178c41185835ff51461e52ad47969534ea6febf7cac74f1 WHIRLPOOL ede821987006a54e7a87f88d9a5104d4a4ecc05a614e111fefa669f5ae436c11004debfe919bec0808194f2d96442775718a0208a1a374a9dd56a896f7dd8640 -DIST docker-runc-1.0.0_rc5_p19.tar.gz 1185576 SHA256 994a3a0447fcbf7e37614b02aa5604d2d6b9fdb41e6870d8d3ff1138ed6e61ef SHA512 9a55bdb8e39830f46cceff48970b7688139927552e3d268b9ef4a6e640ffc3d95164b99c5b05d07d295bedc2ea22daf6062fd520df1548d78b1d481fd928f1e3 WHIRLPOOL 354a12c1758ee499c850e3e4efb3d8eacbbc54649dad11d2d259b28ff8220e47fd97f406dfa15d98f688e5dfe79c78452e451b5d50be745b57fe620acb24f98e +DIST docker-runc-1.0.0_rc2_p136.tar.gz 561705 BLAKE2B 4dd5dc689db1ac632bf10a5060f5681c7e44716caf8d3730683aad9df29c7b2628fa9e7253d86d87e9dfd7d27b545713154fa0f2984ca52908b16ab089be5646 SHA512 6052b95042082c3345caf25d3646f47b82c151ff3aca2ca4510dbf72ee80056d8c4077f2a1b48a9f4178c41185835ff51461e52ad47969534ea6febf7cac74f1 +DIST docker-runc-1.0.0_rc5_p22.tar.gz 1187716 BLAKE2B 008401c389b0db1aed63f7044ca51bb681d5498358eedac98b6103dd75d3c44ef9f9d3dcd60f01b7ecb5d4a5420efc8ed737acf95d62b439abb10ae0b50a7aa7 SHA512 4b45d5f899ece2c017e93bdb211436ccea84c14ac99f3104baa5728b188536d390036f0defd40dab9514a529e48f39d093cbcc15fa98012e70c8e4f560168f9f diff --git a/sdk_container/src/third_party/coreos-overlay/app-emulation/docker-runc/docker-runc-1.0.0_rc5_p19-r1.ebuild b/sdk_container/src/third_party/coreos-overlay/app-emulation/docker-runc/docker-runc-1.0.0_rc5_p22.ebuild similarity index 81% rename from sdk_container/src/third_party/coreos-overlay/app-emulation/docker-runc/docker-runc-1.0.0_rc5_p19-r1.ebuild rename to sdk_container/src/third_party/coreos-overlay/app-emulation/docker-runc/docker-runc-1.0.0_rc5_p22.ebuild index 2c591c656a..628326dbbf 100644 --- a/sdk_container/src/third_party/coreos-overlay/app-emulation/docker-runc/docker-runc-1.0.0_rc5_p19-r1.ebuild +++ b/sdk_container/src/third_party/coreos-overlay/app-emulation/docker-runc/docker-runc-1.0.0_rc5_p22.ebuild @@ -7,12 +7,14 @@ GITHUB_URI="github.com/opencontainers/runc" COREOS_GO_PACKAGE="${GITHUB_URI}" COREOS_GO_VERSION="go1.10" # the commit of runc that docker uses. -# see https://github.com/docker/docker-ce/blob/v18.06.1-ce/components/engine/hack/dockerfile/install/runc.installer#L4 +# see https://github.com/docker/docker-ce/blob/v18.06.2-ce/components/engine/hack/dockerfile/install/runc.installer#L5 # 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-rc5..${COMMIT_ID} | wc -l -COMMIT_ID="69663f0bd4b60df09991c08812a60108003fa340" +COMMIT_ID="a592beb5bc4c4092b1b1bac971afed27687340c5" +# This is the expected commit ID, which ignores the patch in the commit above. +RUNC_COMMIT="69663f0bd4b60df09991c08812a60108003fa340" inherit eutils flag-o-matic coreos-go vcs-snapshot @@ -43,7 +45,6 @@ src_unpack() { PATCHES=( "${FILESDIR}/0001-Delay-unshare-of-clone-newipc-for-selinux.patch" - "${FILESDIR}/0001-nsenter-clone-proc-self-exe-to-avoid-exposing-host-b.patch" ) src_compile() { @@ -61,7 +62,8 @@ src_compile() { ) GOPATH="${WORKDIR}/${P}" emake BUILDTAGS="${options[*]}" \ - COMMIT="${COMMIT_ID}" + VERSION=1.0.0-rc5+dev.docker-18.06 \ + COMMIT="${RUNC_COMMIT}" } src_install() { diff --git a/sdk_container/src/third_party/coreos-overlay/metadata/md5-cache/app-emulation/docker-runc-1.0.0_rc5_p19-r1 b/sdk_container/src/third_party/coreos-overlay/metadata/md5-cache/app-emulation/docker-runc-1.0.0_rc5_p22 similarity index 85% rename from sdk_container/src/third_party/coreos-overlay/metadata/md5-cache/app-emulation/docker-runc-1.0.0_rc5_p19-r1 rename to sdk_container/src/third_party/coreos-overlay/metadata/md5-cache/app-emulation/docker-runc-1.0.0_rc5_p22 index 3a0899a597..cbd4321d76 100644 --- a/sdk_container/src/third_party/coreos-overlay/metadata/md5-cache/app-emulation/docker-runc-1.0.0_rc5_p19-r1 +++ b/sdk_container/src/third_party/coreos-overlay/metadata/md5-cache/app-emulation/docker-runc-1.0.0_rc5_p22 @@ -10,6 +10,6 @@ RDEPEND=apparmor? ( sys-libs/libapparmor ) seccomp? ( sys-libs/libseccomp ) !app REQUIRED_USE=go_version_go1_10 RESTRICT=test SLOT=0 -SRC_URI=https://github.com/opencontainers/runc/archive/69663f0bd4b60df09991c08812a60108003fa340.tar.gz -> docker-runc-1.0.0_rc5_p19.tar.gz +SRC_URI=https://github.com/opencontainers/runc/archive/a592beb5bc4c4092b1b1bac971afed27687340c5.tar.gz -> docker-runc-1.0.0_rc5_p22.tar.gz _eclasses_=coreos-go e0b9bd13413783cf7a2859afc20534a2 coreos-go-depend cec6567f1c69a9b3e529a49eedaeed55 coreos-go-utils 67004337b6f831adc5f1ff107ee2f157 desktop b1d22ac8bdd4679ab79c71aca235009d epatch a1bf4756dba418a7238f3be0cb010c54 estack 43ddf5aaffa7a8d0482df54d25a66a1f eutils 6e6c2737b59a4b982de6fb3ecefd87f8 flag-o-matic 55aaa148741116aa54ad0d80e361818e ltprune 08f9e1d9ee0af8f5d9a7854efbcd8c0e multilib b2f01ad412baf81650c23fcf0975fa33 multiprocessing cac3169468f893670dac3e7cb940e045 preserve-libs ef207dc62baddfddfd39a164d9797648 toolchain-funcs f164325a2cdb5b3ea39311d483988861 vcs-clean 2a0f74a496fa2b1552c4f3398258b7bf vcs-snapshot b77011b62e2053c646ad720defe6d921 -_md5_=1d7b0d84b00b0380abbf9a5fc4261f1a +_md5_=21335b1e8685fad299934cc6bcc55f93