Merge remote-tracking branch 'github/master' into iaguis/update-flatc…

…ar-master
flatcar-archive · Apr 12, 2019 · 91b4248 · 91b4248
2 parents 5c9217f + b190986
commit 91b4248
Show file tree

Hide file tree

Showing 268 changed files with 3,737 additions and 4,856 deletions.
diff --git a/...n/etcd-wrapper/etcd-wrapper-3.3.10.ebuild → ...n/etcd-wrapper/etcd-wrapper-3.3.12.ebuild b/...n/etcd-wrapper/etcd-wrapper-3.3.10.ebuild → ...n/etcd-wrapper/etcd-wrapper-3.3.12.ebuild
diff --git a/...nel-wrapper/flannel-wrapper-0.10.0.ebuild → ...nel-wrapper/flannel-wrapper-0.11.0.ebuild b/...nel-wrapper/flannel-wrapper-0.10.0.ebuild → ...nel-wrapper/flannel-wrapper-0.11.0.ebuild
diff --git a/app-admin/toolbox/toolbox-0.0.0-r12.ebuild → app-admin/toolbox/toolbox-0.0.0-r13.ebuild b/app-admin/toolbox/toolbox-0.0.0-r12.ebuild → app-admin/toolbox/toolbox-0.0.0-r13.ebuild
diff --git a/app-admin/toolbox/toolbox-9999.ebuild b/app-admin/toolbox/toolbox-9999.ebuild
@@ -9,7 +9,7 @@ CROS_WORKON_REPO="git://github.com"
 if [[ "${PV}" == 9999 ]]; then
 	KEYWORDS="~amd64 ~arm64"
 else
-	CROS_WORKON_COMMIT="a609ce1eb395ffba68c016b786c2b1bc92b5673d"
+	CROS_WORKON_COMMIT="c31d8ec584628ae6dc870195b27658f904c4ebee"
 	KEYWORDS="amd64 arm64"
 fi
 

diff --git a/app-emulation/containerd/containerd-0.2.6.ebuild b/app-emulation/containerd/containerd-0.2.6.ebuild
@@ -21,7 +21,7 @@ SLOT="0"
 IUSE="hardened +seccomp"
 
 DEPEND=""
-RDEPEND=">=app-emulation/docker-runc-1.0.0_rc2
+RDEPEND="~app-emulation/docker-runc-1.0.0_rc2
 	seccomp? ( sys-libs/libseccomp )"
 
 S=${WORKDIR}/${P}/src/${COREOS_GO_PACKAGE}

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.0.0_rc5_p19
+RDEPEND="~app-emulation/docker-runc-1.0.0_rc5_p22
 	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,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/...er-runc/docker-runc-1.0.0_rc2_p136.ebuild → ...runc/docker-runc-1.0.0_rc2_p136-r1.ebuild b/...er-runc/docker-runc-1.0.0_rc2_p136.ebuild → ...runc/docker-runc-1.0.0_rc2_p136-r1.ebuild
@@ -44,6 +44,7 @@ src_unpack() {
 
 PATCHES=(
 	"${FILESDIR}/${PN}-1.0.0_rc2-mount-propagation.patch"
+	"${FILESDIR}/0001-nsenter-clone-proc-self-exe-to-avoid-exposing-host-b.patch"
 )
 
 src_compile() {

diff --git a/...ker-runc/docker-runc-1.0.0_rc5_p19.ebuild → ...ker-runc/docker-runc-1.0.0_rc5_p22.ebuild b/...ker-runc/docker-runc-1.0.0_rc5_p19.ebuild → ...ker-runc/docker-runc-1.0.0_rc5_p22.ebuild
@@ -7,12 +7,12 @@ 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.3-ce/components/engine/hack/dockerfile/install/runc.installer#L4
 # 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"
 
 inherit eutils flag-o-matic coreos-go vcs-snapshot
 
@@ -60,6 +60,7 @@ src_compile() {
 	)
 
 	GOPATH="${WORKDIR}/${P}" emake BUILDTAGS="${options[*]}" \
+		VERSION=1.0.0-rc5+dev.docker-18.06 \
 		COMMIT="${COMMIT_ID}"
 }