gentoo resync : 17.05.2018

5 files changed, 106 insertions, 6 deletions

diff --git a/app-emulation/containerd/Manifest b/app-emulation/containerd/Manifest
index 05c17c749a55..587a70ebbfa0 100644
--- a/app-emulation/containerd/Manifest
+++ b/app-emulation/containerd/Manifest
@@ -1,10 +1,12 @@
+AUX containerd-1.0.3_p20180223-remove-c-constant-redefinitions.patch 1494 BLAKE2B ac48bd7835011bd3cad719bf2d0bdf6457bb6271989e1e7159ea5c3049e332cea6f5649f39d89820c724a03d50044ea3177fd48b23f5ea67f8518b9f011bd0c5 SHA512 7e6f499eb27372a068909c823884a788f7bab7f0852ec2b67c2a2d475f9dae15dedad130d548b6986978c3b85a4c5e2ba12ee37e529d18461be82546d5e2a638
 DIST containerd-1.0.1.tar.gz 3766659 BLAKE2B 36c96a9e3cba22578daff31e46d9a876095e9de7e20e1e84a41076d9936f30a5681e41187a90f9a01884fd02086fa3c9a6ee29c8261401988a1cfa2026952431 SHA512 351c0e298ba6a9a14df2f367df23049a8a833eb18238e3d41cf0066feb2e0b8f2aa7b25fb4484a1b5c95bccf5cba3a8076a5bcfe25602b5368e7cf2a20872160
-DIST containerd-1.0.2.tar.gz 3772144 BLAKE2B 7549f47d1f0ff0244d7dedd41aabb76d2c2fc4942f8da3cf45fe0ca7b808b3aed4e39e0338d30ccc63cf37db3e59412442d43d272d3b073823e210a24d4d991a SHA512 d6b8eeaa942e1dccb21feb0723bb1ee29c878992c0f7128038c967580b4c6a1b4110371aa60962a331627d869d027a20ca47e6c625aedf68cac5d532d7f7094a
 DIST containerd-1.0.3.tar.gz 3776722 BLAKE2B 31e9f2e56b23d09341e4cdd546198233517893e1596c9aefd084044f04b1e1831219343142eef09159a5698720fa307e3ec1dbb86304e071a9d8e1f8f8436519 SHA512 31aa462f357a77434033ae4bff2e453ce849cbd91e4981383be3c7cdea77ea1f57081c4f8121d15c151145defc2003348fe23b26a11568b38780fa2fb9cf114c
+DIST containerd-1.0.3_p20180223.tar.gz 5029605 BLAKE2B bd3f74ad70c7de9a73397e401e49459d1724376434265dddddd51cf09ccd940ecf63dacf0dc7270175d99e473c224ab238c0c29b0e03d41ddf9295ef37b90586 SHA512 a4999c1eb16c40178e3ee63f4001d4826d2dc6f353f768fbfdc6b7e0962d0f4431014fdedc712f36aee1e05554fecf1917ac48c1e25818b6c80a423ed7edddd9
 DIST containerd-1.1.0.tar.gz 5095823 BLAKE2B 1eca83add164ed79abc58bfe424da9f34b54d247ad147ec0f4ae20154cabefe147fe9b03ce2eab04c88c240f00995eec5b0f24c0e064640738517b81e3e7aa3d SHA512 34e687c6ef270370160465ee9b8fe6b59780543907917b668db7867da67fd47c8465f57ba4268387f776d0f392f8dad533c206d6577bab36480aff4392775d42
 EBUILD containerd-1.0.1.ebuild 1238 BLAKE2B 58cebf0f2ec0958892599bbbe2f518e42cf6d98a91880c1393bbff38d51958b918ccd838d92e7a39bda493b1b4c52d1ecfa02ffb2dbb9ba46b165acf47abe1a7 SHA512 3e3013ed0bec752ddff0bc524cb6c003b8c41db036201f9212bff1a298abf4486c64b7d65e3fd1e9d972e53b2c18d1d87f5f9db12d28ef9bca7f4c4981b6ce3d
-EBUILD containerd-1.0.2.ebuild 1239 BLAKE2B ddaeffc83657567642894a9d43322704364bbdaba0ee5081ca24cef78b007871b85b565e1743107c5aebfc0f8f6d2cc462e9ffd2ebf31b844bc1eccdcc74f060 SHA512 2739a6f4e78bc64e7dd579444caa0b5a34e88cd9f3c9ceec52f1479936124302bb1e745ab66e3e841521bd5ce9244d92811e475add00db695901e1d681b01b2a
-EBUILD containerd-1.0.3.ebuild 1239 BLAKE2B d7259c625404bb432bd75fa6a65146ae22a572cef59be1d81151ce835fde40674c7111027729ac62a6765b2d65bdf682cc7002c3af5c2ea6e0e4e3b2b5d8c5d5 SHA512 0e085fe0331c7222ab4f7dcd14fcf17502d0f9ccdc558afa87dd79fcff9c54736adcc971a1a703ee17dd6fbeef8cadf5efc9c0a4fb7c5ce5ef9e1bb922d5576c
+EBUILD containerd-1.0.3.ebuild 1238 BLAKE2B 57722c15880f5484d32e4ab7247210ff96588b1f66537c10cac26e08da553eb636995e0db4959847795542c8354ee1d6a32dfc074bb97ae6496f53aad72cca07 SHA512 55a5317e985b95878e31b2b28907bff8a10b35ae90cc3c83e24534f1d0f33aeccdf321b1bdf34ecc0450853218476015a546b6191817d7747567d573a80aa2cc
+EBUILD containerd-1.0.3_p20180223-r1.ebuild 1368 BLAKE2B 472563a4205f83ba1eb3ecf504a13d3cb345b2ea49e8771d6b7ff0922b9ebcd97c158ce2561118f2a1aa7fcd52cba4a0e8930accaaa04d9f279a923278fffa74 SHA512 cf767de8374244aa29e11d62103e4ea291363f09f8f1418c072c54bd454f6885bd3bc3fb5e9e8474e52d6312dba056ed0a87875b1a12d87f7cce49679bf9b231
+EBUILD containerd-1.0.3_p20180223.ebuild 1295 BLAKE2B a28e68ae6ecf614e04e2fdb2c0f820cd68af14bfd05fe8598b41c2a3797adfaaaafd265e2b20fe55c2956235637fd967888f5caee503266a5e494821edc4e993 SHA512 19fb14d614a3ad49ac1b41fc81e3b03c3fa7fddf0f4a8c27ec5d960c62e049d4d8abaf7bd085a90168993e6de55567615e30ae9a5f5960ee6c559111e0f6657b
 EBUILD containerd-1.1.0.ebuild 1289 BLAKE2B af1f7b19a91f90ece5ffa24f9282d0b7ebda179590b949c30d3d172b0c7829fb3e4d0a615a6d3fa94d548cdb1735ec0e38c8bd28d040dec272b9bc51cfffa733 SHA512 823c1d1dbf754d94f6143a173b893f837ac643eeae9510105699af3725a2b5d529cb9c98e5d1afdaab7c456e72a4d10440b9ccedea9537c21069bfefec3a2094
 EBUILD containerd-9999.ebuild 965 BLAKE2B b671ff0dd3c5b8c72f2d713c04926047a304b7eec201051b5051a4ce49550176683a934d0b03350d5302fdff242e8e11f31b3db0b3962b73bcac85a0ed1a116d SHA512 b2acd6bd1c237a1058cec02875877d82e2e8c568bf3143cca020c64e13a0649975e3adcdb68540216e8ce1bcdbc7141eda8476c1c01ee2ca313120eca2850012
 MISC metadata.xml 985 BLAKE2B fbef8e091234b75e89ef860f1b43114cfefa79ab65b434592bf4f8699ef1c95b6e126e7f848e401b9c1bb1d9c0ed67a86f0147169aaa3727bc26029d9f92d869 SHA512 d6ef315f79b599a8d47fda31e6e6a8c82e6dd52c3ca8339984ea72b43d6dd255d1b46fb7c566771231eba208796d3438b39cac22e0823430d9f59fafdef96147
diff --git a/app-emulation/containerd/containerd-1.0.3.ebuild b/app-emulation/containerd/containerd-1.0.3.ebuild
index e516515b3394..446548c25d77 100644
--- a/app-emulation/containerd/containerd-1.0.3.ebuild
+++ b/app-emulation/containerd/containerd-1.0.3.ebuild
@@ -13,7 +13,7 @@ else
 	EGIT_COMMIT="v${MY_PV}"
 	CONTAINERD_COMMIT="773c489"
 	SRC_URI="https://${EGO_PN}/archive/${EGIT_COMMIT}.tar.gz -> ${P}.tar.gz"
-	KEYWORDS="~amd64 ~arm ~ppc64"
+	KEYWORDS="amd64 ~arm ~ppc64"
 	inherit golang-vcs-snapshot
 fi
 
diff --git a/app-emulation/containerd/containerd-1.0.3_p20180223-r1.ebuild b/app-emulation/containerd/containerd-1.0.3_p20180223-r1.ebuild
new file mode 100644
index 000000000000..a25ff621428d
--- /dev/null
+++ b/app-emulation/containerd/containerd-1.0.3_p20180223-r1.ebuild
@@ -0,0 +1,58 @@
+# Copyright 1999-2018 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=6
+EGO_PN="github.com/containerd/${PN}"
+
+inherit toolchain-funcs
+
+if [[ ${PV} == *9999 ]]; then
+	inherit golang-vcs
+else
+	MY_PV="${PV/_rc/-rc.}"
+	EGIT_COMMIT="v${MY_PV}"
+	CONTAINERD_COMMIT="4ac4fd0b6a268fe6f38b2b2e32e40daa7e424fac"
+	SRC_URI="https://${EGO_PN}/archive/${CONTAINERD_COMMIT}.tar.gz -> ${P}.tar.gz"
+	KEYWORDS="~amd64 ~arm ~ppc64"
+	inherit golang-vcs-snapshot
+fi
+
+DESCRIPTION="A daemon to control runC"
+HOMEPAGE="https://containerd.tools"
+
+LICENSE="Apache-2.0"
+SLOT="0"
+IUSE="+btrfs hardened"
+
+DEPEND="btrfs? ( sys-fs/btrfs-progs )"
+RDEPEND="|| ( >=app-emulation/docker-runc-1.0.0_rc4
+	>=app-emulation/runc-1.0.0_rc4 )
+	sys-libs/libseccomp"
+
+S=${WORKDIR}/${P}/src/${EGO_PN}
+
+RESTRICT="test"
+
+PATCHES=(
+	"${FILESDIR}"/"${P}-remove-c-constant-redefinitions.patch"
+)
+
+src_prepare() {
+	default
+	if [[ ${PV} != *9999* ]]; then
+		sed -i -e "s/git describe --match.*$/echo ${PV})/"\
+			-e "s/git rev-parse HEAD.*$/echo $CONTAINERD_COMMIT)/"\
+			-e "s/-s -w//" \
+			Makefile || die
+	fi
+}
+
+src_compile() {
+	local options=( $(usex btrfs "" "no_btrfs") )
+	export GOPATH="${WORKDIR}/${P}" # ${PWD}/vendor
+	LDFLAGS=$(usex hardened '-extldflags -fno-PIC' '') emake BUILDTAGS="${options[@]}"
+}
+
+src_install() {
+	dobin bin/containerd{-shim,-stress,} bin/ctr
+}
diff --git a/app-emulation/containerd/containerd-1.0.2.ebuild b/app-emulation/containerd/containerd-1.0.3_p20180223.ebuild
index 0051a46346c7..9a8002153e05 100644
--- a/app-emulation/containerd/containerd-1.0.2.ebuild
+++ b/app-emulation/containerd/containerd-1.0.3_p20180223.ebuild
@@ -11,8 +11,8 @@ if [[ ${PV} == *9999 ]]; then
 else
 	MY_PV="${PV/_rc/-rc.}"
 	EGIT_COMMIT="v${MY_PV}"
-	CONTAINERD_COMMIT="cfd0439"
-	SRC_URI="https://${EGO_PN}/archive/${EGIT_COMMIT}.tar.gz -> ${P}.tar.gz"
+	CONTAINERD_COMMIT="4ac4fd0b6a268fe6f38b2b2e32e40daa7e424fac"
+	SRC_URI="https://${EGO_PN}/archive/${CONTAINERD_COMMIT}.tar.gz -> ${P}.tar.gz"
 	KEYWORDS="~amd64 ~arm ~ppc64"
 	inherit golang-vcs-snapshot
 fi
@@ -31,6 +31,8 @@ RDEPEND="|| ( >=app-emulation/docker-runc-1.0.0_rc4
 
 S=${WORKDIR}/${P}/src/${EGO_PN}
 
+RESTRICT="test"
+
 src_prepare() {
 	default
 	if [[ ${PV} != *9999* ]]; then
diff --git a/app-emulation/containerd/files/containerd-1.0.3_p20180223-remove-c-constant-redefinitions.patch b/app-emulation/containerd/files/containerd-1.0.3_p20180223-remove-c-constant-redefinitions.patch
new file mode 100644
index 000000000000..f08fab6e592d
--- /dev/null
+++ b/app-emulation/containerd/files/containerd-1.0.3_p20180223-remove-c-constant-redefinitions.patch
@@ -0,0 +1,38 @@
+From 9686d822284aa8fc9d4d136cc01314f5bf455cba Mon Sep 17 00:00:00 2001
+From: Stephen J Day <stephen.day@docker.com>
+Date: Fri, 2 Mar 2018 13:23:31 -0800
+Subject: [PATCH] btrfs: remove C constant redefinitions
+
+Signed-off-by: Stephen J Day <stephen.day@docker.com>
+---
+ btrfs.go | 10 +++-------
+ 1 file changed, 3 insertions(+), 7 deletions(-)
+
+diff --git a/vendor/github.com/containerd/btrfs/btrfs.go b/vendor/github.com/containerd/btrfs/btrfs.go
+index 1deab47..efdf528 100644
+--- a/vendor/github.com/containerd/btrfs/btrfs.go
++++ b/vendor/github.com/containerd/btrfs/btrfs.go
+@@ -7,10 +7,6 @@ import "sort"
+ #include <btrfs/ioctl.h>
+ #include "btrfs.h"
+ 
+-// Required because Go has struct casting rules for negative numbers
+-const __u64 u64_BTRFS_LAST_FREE_OBJECTID = (__u64)BTRFS_LAST_FREE_OBJECTID;
+-const __u64 negative_one = (__u64)-1;
+-
+ static char* get_name_btrfs_ioctl_vol_args_v2(struct btrfs_ioctl_vol_args_v2* btrfs_struct) {
+ 	return btrfs_struct->name;
+ }
+@@ -100,9 +96,9 @@ func subvolMap(path string) (map[uint64]*Info, error) {
+ 	args.key.min_type = C.BTRFS_ROOT_ITEM_KEY
+ 	args.key.max_type = C.BTRFS_ROOT_BACKREF_KEY
+ 	args.key.min_objectid = C.BTRFS_FS_TREE_OBJECTID
+-	args.key.max_objectid = C.u64_BTRFS_LAST_FREE_OBJECTID
+-	args.key.max_offset = C.negative_one
+-	args.key.max_transid = C.negative_one
++	args.key.max_objectid = C.BTRFS_LAST_FREE_OBJECTID
++	args.key.max_offset = ^C.__u64(0)
++	args.key.max_transid = ^C.__u64(0)
+ 
+ 	subvolsByID := make(map[uint64]*Info)
+