Update app-emulation/docker-9999

3 files changed, 50 insertions, 20 deletions

diff --git a/app-emulation/docker/Manifest b/app-emulation/docker/Manifest
index 23dad66f..964697bb 100644
--- a/app-emulation/docker/Manifest
+++ b/app-emulation/docker/Manifest
@@ -1,3 +1,4 @@
+AUX docker-containerd.patch 855 SHA256 70b2d4238212735c248dfbaf1b555c29c480ab616fc2ebc73bc7a950c16d9edd SHA512 c45bdda0bb22d7a2e3bc07382ffc34527960d716e5929920583bff41789143a859dd8afede8c9c54ce2a7e4976fbc32b7c73ac4638fab5755aaef39b59e40257 WHIRLPOOL 367fea2ab20035a99c06ce2fb158784d24227ebb2a038eabea5cbecfde35a55dce6e8bf909811eed2da73b63bf977216e7c1255eedd67aed4285acd3197debc8
 AUX docker-r2.confd 585 SHA256 bcd95faaa42bc6a9dfe2e53147e4ac323419ecb7b5cc29de66514f060821db61 SHA512 1114b7e5e428e45aea16ec96aa4019f511f6eacc9d5a60009047d26114844fd78c4b8091cd956f10d81024f1ebb51978a9006057f6710e217d85bcc47305a60e WHIRLPOOL 8f3d206d9064c5588948435b31f89eba996d943f04eda592202736e0b3bd9bea3c9aefc95af8bc87e8eda7bbb5b2242772d2d764641c98386efb19b16ea11c9c
 AUX docker-r2.initd 1771 SHA256 f1f6a684e54916b96e49b425bbc9a089e4290cfcac337e338870a22c776ce1a4 SHA512 9949c69ff1fc63247782ce248b81873ec5e333481a6c611e3ea763b9bfd56907994fb7a12e651dcb8f8253c31c43a669a3add556614ba9b1c3bd37171ea06112 WHIRLPOOL 4ea6e95c9cc455f22001f98102179fd9fdebfc4b560211c9dffafb4c69c08e2743b0c5fc151ef9a77d46a64e78ed5e7c5e0e491606df6db0400a51ed5a8a76e3
 AUX docker-r3.confd 360 SHA256 6f92adfea90eb5c3f275840d5f1a06b7d780b8a58c2e635321c61d09299f6299 SHA512 243750b816f8e4c6fd6954814d7c03f592dc3bd32c50bf955642016be964ac38692c2360b67a6f08e8c4875700fa42498452e9fb27415e6f588f45079fccc5ea WHIRLPOOL cc139f94ebea33caee35c8c06da860ccfa7850618b41761b9a6754d80805516213a6ea68457db506ca90a7750beedb28cad91f9d7f5807964e1e9b54651279e1
@@ -12,4 +13,4 @@ EBUILD docker-0.11.1.ebuild 5555 SHA256 68a0a3cf7cb6538698f3d48f72cec34913847677
 EBUILD docker-1.0.0.ebuild 5622 SHA256 a75ff4862df2bb08b364220264918404cb6b93504e5013361f40afaa65a193f2 SHA512 4431f72668c3377c81563a9bd29fff4e99fe5b5f9f2fff4e0be5a0e35f153f3af183ce7427f7c8244dd6b3d6ac3656ba816f99dcac89a7a706679f1cb3c6f1d0 WHIRLPOOL d3a74078cbb8f2d5e24319addf35a13eb2874e3b01bc2b1d6602b8ac46203188dba0b065ff4ee719480891c044a0e2aa63e1ca9ce4e35832d3985e6e66683c39
 EBUILD docker-1.10.3.ebuild 8251 SHA256 2b1aa8b750675e742e03e9542f48a746f750346ce47d10a03af2270b32b8b073 SHA512 ace7c30ddbae4c83a5411e648cd0008edc7431e6d45b5f8dee8916cd38a0b013ccf427c1e7ec308984f368508505032082d0b6b205f04cfaee7412463cc7641a WHIRLPOOL 21e7041aaf35c9bd0316abafe00c52e8d35065259839dfd2fcbd8213a69f94c8ac2f81d756bbe39fbb5a91f2b2b8525b707333a96a9c8f5d8080a7ef86d196d3
 EBUILD docker-1.7.1.ebuild 7527 SHA256 9653e8bc1f6a3829910ea200d3245c41c5f1a2e98403401d2666c8c61abf7371 SHA512 110af8901e95f74fa711d7672c5d7948c754ba588594b330eb0de29685d338b3ef9b442ceb0a64cdbeb47c137b34fa5c7feb1e64fa0ab9397966d0cb9b8faf06 WHIRLPOOL 9b0ec6ef70d32665de9773e216b390639c453955e69d502dbf090c7ccb908e532c2c04aab51280e3ea2a5a54802cc32b97f0ce44f72ae84f903e11f67832d6fe
-EBUILD docker-9999.ebuild 7623 SHA256 c9158d16bebaa4114083a119c0c5d1931b2f5706bea4b72db293a560afc6ec5b SHA512 abcdff3a5d1a0e55b914d526872f556881e55505848f9de7c7dbd0ff71bceaaf5db7f90127fa59eb4bd9af7c48b161e6334e8fc342e81333bc1146749aa389e5 WHIRLPOOL 3fc2f61d4904bfef6936c4ddec7f4e8244695cf276234a9a0ba647c9cc85e4ef671b377c3ea7e260b8ee59b8353eea64be84b5fa2fac0843d7d34866942a0f7b
+EBUILD docker-9999.ebuild 7835 SHA256 554d120880156f32304aa894ec809a1357b1bf4454874c7345f22c89010e7b5f SHA512 ab82d30abded77e6f8110a53462c7b456a0ddfa973fdd419670675f16b3e6019f98340381eaa7201aa5d01c3c93a3db699bd9a1a9528b545d2999c8990a560cf WHIRLPOOL 5980b5b5d8bf4b97596ee5ab430bab912d7d05f9e4a65cd9733bf6946b7b1421fada5bfc5d68c0de2f78e3d550a6be19e0a114da732d8d4ed0734b877e275885
diff --git a/app-emulation/docker/docker-9999.ebuild b/app-emulation/docker/docker-9999.ebuild
index e97f7ce0..3ee0335d 100644
--- a/app-emulation/docker/docker-9999.ebuild
+++ b/app-emulation/docker/docker-9999.ebuild
@@ -1,6 +1,6 @@
-# Copyright 1999-2015 Gentoo Foundation
+# Copyright 1999-2016 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Id: 02a19fec8092c08bf642b55ed532799f5ace6e19 $
+# $Id: eabd8d83dbbc9d065b04c4633f30373d99c726cf $
 
 EAPI=5
 
@@ -10,23 +10,23 @@ if [[ ${PV} = *9999* ]]; then
 	# Docker cannot be fetched via "go get", thanks to autogenerated code
 	EGIT_REPO_URI="https://${EGO_PN}.git"
 	EGIT_CHECKOUT_DIR="${WORKDIR}/${P}/src/${EGO_PN}"
-	inherit git-r3
+	inherit golang-base git-r3
 else
 	MY_PV="${PV/_/-}"
-	DOCKER_GITCOMMIT="d12ea79"
+	DOCKER_GITCOMMIT="4dc5990"
 	EGIT_COMMIT="v${MY_PV}"
 	SRC_URI="https://${EGO_PN}/archive/${EGIT_COMMIT}.tar.gz -> ${P}.tar.gz"
 	KEYWORDS="~amd64"
 	[ "$DOCKER_GITCOMMIT" ] || die "DOCKER_GITCOMMIT must be added manually for each bump!"
 	inherit golang-vcs-snapshot
 fi
-inherit bash-completion-r1 eutils linux-info multilib systemd udev user
+inherit bash-completion-r1 linux-info multilib systemd udev user
 
 DESCRIPTION="Docker complements kernel namespacing with a high-level API which operates at the process level"
 HOMEPAGE="https://dockerproject.org"
 LICENSE="Apache-2.0"
 SLOT="0"
-IUSE="apparmor aufs btrfs +contrib +device-mapper doc experimental lxc overlay systemd udev vim-syntax zsh-completion"
+IUSE="apparmor aufs btrfs +contrib +device-mapper doc experimental overlay seccomp systemd udev vim-syntax zsh-completion"
 
 # https://github.com/docker/docker/blob/master/project/PACKAGERS.md#build-dependencies
 CDEPEND="
@@ -34,6 +34,9 @@ CDEPEND="
 	device-mapper? (
 		>=sys-fs/lvm2-2.02.89[thin]
 	)
+	seccomp? (
+		>=sys-libs/libseccomp-2.2.1[static-libs]
+	)
 "
 
 DEPEND="
@@ -60,9 +63,8 @@ RDEPEND="
 	>=dev-vcs/git-1.7
 	>=app-arch/xz-utils-4.9
 
-	lxc? (
-		>=app-emulation/lxc-1.0.7
-	)
+	>=app-emulation/containerd-0.2.0
+	>=app-emulation/runc-0.1.0
 
 	apparmor? (
 		sys-libs/libapparmor[static-libs]
@@ -173,13 +175,14 @@ pkg_setup() {
 
 src_prepare() {
 	cd "src/${EGO_PN}" || die
+	epatch "${FILESDIR}/docker-containerd.patch"
 	# allow user patches (use sparingly - upstream won't support them)
 	epatch_user
 }
 
 src_compile() {
 	cd "src/${EGO_PN}" || die
-	export GOPATH="${WORKDIR}/${P}:${PWD}/vendor:$(get_golibdir_gopath)"
+	export GOPATH="${WORKDIR}/${P}:${PWD}/vendor"
 
 	# setup CFLAGS and LDFLAGS for separate build target
 	# see https://github.com/tianon/docker-overlay/pull/10
@@ -190,10 +193,11 @@ src_compile() {
 	[ "$DOCKER_GITCOMMIT" ] && export DOCKER_GITCOMMIT
 
 	if gcc-specs-pie; then
-		sed -i "s/EXTLDFLAGS_STATIC='/EXTLDFLAGS_STATIC='-fno-PIC /" hack/make.sh || die
+		sed -i "s/EXTLDFLAGS_STATIC='/&-fno-PIC /" hack/make.sh || die
 		grep -q -- '-fno-PIC' hack/make.sh || die 'hardened sed failed'
 
-		sed -i "s/LDFLAGS_STATIC_DOCKER='/LDFLAGS_STATIC_DOCKER='-extldflags -fno-PIC /" hack/make/dynbinary || die
+		sed  "s/LDFLAGS_STATIC_DOCKER='/&-extldflags -fno-PIC /" \
+			-i hack/make/dynbinary || die
 		grep -q -- '-fno-PIC' hack/make/dynbinary || die 'hardened sed failed'
 	fi
 
@@ -205,9 +209,11 @@ src_compile() {
 		fi
 	done
 
-	if use apparmor; then
-		DOCKER_BUILDTAGS+=' apparmor'
-	fi
+	for tag in apparmor seccomp; do
+		if use $tag; then
+			DOCKER_BUILDTAGS+=" $tag"
+		fi
+	done
 
 	# https://github.com/docker/docker/pull/13338
 	if use experimental; then
@@ -227,8 +233,8 @@ src_install() {
 	cd "src/${EGO_PN}" || die
 	VERSION="$(cat VERSION)"
 	newbin "bundles/$VERSION/dynbinary/docker-$VERSION" docker
-	exeinto /usr/libexec/docker
-	newexe "bundles/$VERSION/dynbinary/dockerinit-$VERSION" dockerinit
+	#exeinto /usr/libexec/docker
+	#newexe "bundles/$VERSION/dynbinary/dockerinit-$VERSION" dockerinit
 
 	newinitd contrib/init/openrc/docker.initd docker
 	newconfd contrib/init/openrc/docker.confd docker
@@ -255,8 +261,9 @@ src_install() {
 	fi
 
 	if use contrib; then
-		insinto "/usr/share/${PN}/contrib"
-		doins -r contrib/*
+		# note: intentionally not using "doins" so that we preserve +x bits
+		dodir "/usr/share/${PN}/contrib"
+		cp -R contrib/* "${ED}/usr/share/${PN}/contrib"
 	fi
 }
 
diff --git a/app-emulation/docker/files/docker-containerd.patch b/app-emulation/docker/files/docker-containerd.patch
new file mode 100644
index 00000000..c53e82ed
--- /dev/null
+++ b/app-emulation/docker/files/docker-containerd.patch
@@ -0,0 +1,22 @@
+diff --git a/libcontainerd/remote_linux.go b/libcontainerd/remote_linux.go
+index f0284ca..e44a1d1 100644
+--- a/libcontainerd/remote_linux.go
++++ b/libcontainerd/remote_linux.go
+@@ -27,7 +27,7 @@ const (
+ 	maxConnectionRetryCount   = 3
+ 	connectionRetryDelay      = 3 * time.Second
+ 	containerdShutdownTimeout = 15 * time.Second
+-	containerdBinary          = "docker-containerd"
++	containerdBinary          = "containerd"
+ 	containerdPidFilename     = "docker-containerd.pid"
+ 	containerdSockFilename    = "docker-containerd.sock"
+ 	eventTimestampFilename    = "event.ts"
+@@ -338,7 +338,7 @@ func (r *remote) runContainerdDaemon() error {
+ 	}
+ 
+ 	// Start a new instance
+-	args := []string{"-l", r.rpcAddr, "--runtime", "docker-runc"}
++	args := []string{"-l", r.rpcAddr, "--runtime", "runc"}
+ 	if r.debugLog {
+ 		args = append(args, "--debug", "true")
+ 	}