Fix tini flags parsing by backporting moby/moby#28454

app-emulation/docker/Manifest

@@ -1,3 +1,4 @@
+AUX 1.13-tini-flags-28454.patch 1812 SHA256 79e749b11ce52f0d16383c580e606a791d26274f9cd73f9358c48e44b86b483a SHA512 3d421b9e5d6a2622c6bbd0a9228d9e0f054e3eb5296fd1ba9d1be76e250605844ba1c93a4c43bc4e687049287cc686f0456b1ebe6f11994f5c6b80816774d12d WHIRLPOOL 797bcce00528cd06c120fa57d4fad9e4b144eb8495c40d87697d46855b26a1c9f465d6791176a7e5579db4acd8d033cfaf7892d10387a34dc6355eed2037f230
 AUX 7179-add-audit_write-cap.patch 901 SHA256 a776377cf2aae6f832eda127153817b9bd8564295a02a4ffe1cc75a13b3f4828 SHA512 59c6859e3e843c44650706d359cded1fce42033c13e9c332abd28f8d6434bc4396559ec7d204a5da78535b388546797b2edb03dd765a25f346db33a925d2a734 WHIRLPOOL 6ceecfda3af9de7e31c03716a65c91d228b2ec99cf76e0e8dfdebc59c73ce1ca82b0880259f50566b935c48551b2897c817b72fd002c8ebd550aec5630bdbfb6
 AUX docker-containerd.patch 855 SHA256 70b2d4238212735c248dfbaf1b555c29c480ab616fc2ebc73bc7a950c16d9edd SHA512 c45bdda0bb22d7a2e3bc07382ffc34527960d716e5929920583bff41789143a859dd8afede8c9c54ce2a7e4976fbc32b7c73ac4638fab5755aaef39b59e40257 WHIRLPOOL 367fea2ab20035a99c06ce2fb158784d24227ebb2a038eabea5cbecfde35a55dce6e8bf909811eed2da73b63bf977216e7c1255eedd67aed4285acd3197debc8
 AUX docker-r2.confd 581 SHA256 94e1c07b09701f3b0b1c4f6f917206da3b32f8d7e961c3850c4391ebd59df0b4 SHA512 5838270ff9ce7b9a562b2449ba5f4ad72db956dd03f6a1b006c8019ff43fea1c4ae1e2a4818fb092b6096cff6bd9ce539b05b7940412c55b3bb3e30c356da944 WHIRLPOOL a8e3759b6c86855afa7e784d50a7926fc888d50ec03dc2d9dcd70c3f2dd11caf6670196d91f383cab1d603f32a968bed4b3a0668ec1a38d41dc1142ec92235cc
@@ -192,7 +193,7 @@ EBUILD docker-1.12.4_rc1.ebuild 8094 SHA256 cc6e535a0eff1d803fd8e73ea377e6400586
 EBUILD docker-1.12.5.ebuild 8095 SHA256 f0b9f204997030bfe25508102f8467ca15b2af32b8e128ed53973e8c1cc3b7d4 SHA512 69776bc2519e196daceaa78c365e9f02752d56ab83fcf04771f9de825a112ebf5313efba8210038aa4c2a19c84b07977f687c969f1cfbdf4c0e5aa05927ffc5b WHIRLPOOL 77169c4168e5b9a2af50fa4c7e6999ebf8d30c01a01de19ecb4bd2c17d4cf68b6facea56310fdbc624bb906f854998db03796fa390b8d2c0ee9bcc551a7acd10
 EBUILD docker-1.12.5_rc1.ebuild 8095 SHA256 a3ca897ea8b546db00b2329e3a68bd186a688a2112214d1e85b48206146a01e2 SHA512 c4f64ef205bca4f9a06f08519a90036f361f78565310e0c2d22f2f1c1d646516fb254be8b597fe679817a2f6839558fd1d106c95c50e152ec3ac71f032e18684 WHIRLPOOL e56e996e7873e594725495826051938eea5f7c68cb7642d2090b3fa389c7ddefed90ebfbc5ff2d2ffb2872371cb90fc548f04d6647cc76c515346b6aad9a9637
 EBUILD docker-1.12.6.ebuild 8095 SHA256 a7459fccf0e7226f32b5de990e12d3b32a2ffe4c38aea89901edd4c174de3e86 SHA512 3b0e8a4eb6ee8019df75ba1739db5024145181ace3d364fd34ca9623c196573500daa04192ce1b34cfdaf522f429048435628dee3d7a963ebeed6c98b4ed3202 WHIRLPOOL 038d7d9036e6b4ce2975f6825885fa917747dd635843138ef1c3570cafe80b33d1a15f131bd9b44ea2c99b57b7ee587b43c3a551d754e87e55ae4efba259d491
-EBUILD docker-1.13.0.ebuild 8081 SHA256 32822e992352ac67946a54c582876be10c7f443615520c015aa6294017c61dc6 SHA512 c35c27c07b98df63aada095d6577f382d59326e21de66a3099b58ba6f167ce0d500ef80f9bbf99b0f6d024be0035861ea1e5835575ea91e82b7d9953d0769693 WHIRLPOOL aaa486a53cb3ec52b36879b52c7e732f51ca861851d4076f6fc427d67460642992a5e282f8b2d1060bebb556a12fee7dd2063b37b7d56522c4c44e5e05faad86
+EBUILD docker-1.13.0.ebuild 8159 SHA256 dae5973b08cc0e9fb5a3c95c0f79d3775a84e0280f5efcdad73eb9234d669c19 SHA512 9941c0d442aeee71013475131d1d3951db3fadb0bcd1aeffe3f69e4670824e3d393c87e8767e51fd166e04b8b1456c97253afcd68b7977413fbfc92fa75a3218 WHIRLPOOL 505d99631c5fec5adee30ba71f2ddeac74b4c1f995897bdf2bf9ca8655e4e3d08ca4f83ddcf6f29f38b4ea74ef97441a95e567a6f4fad7077841fc90ce398ca3
 EBUILD docker-1.13.0_rc1.ebuild 8081 SHA256 644111ed6c3e46c986567fe120fc3f7a761624051844b18dc7f687a7e57bf2d8 SHA512 b5d721d80faa705cdf8c1b2ffe886a2f34b54d57c984ee60f1d6f1997c8e12fbb3530c70be86f8bcbdc7bf211f59129f3ebca3041746cec5842ec10a15d57bc8 WHIRLPOOL 0fbc487447b64778827ebab05e1695e329ceba0ada3d2e857bbfbbced4bec8c87d684a81cd62cbc2da2e40da6e16410ca54e74dd5530b51ee14f71cb2c04a8be
 EBUILD docker-1.13.0_rc2.ebuild 8081 SHA256 db9244fb3f05c0b970f7fb9c8ced8fe85624e86bb18d6610f67a1e322f1c8594 SHA512 9d0d8edad514d5d75b6b5c83e818f3695e701c86e7f4e75e986723259498432ad7fc3b6c8bfaffbf91059af82caa52989ebfce856516a7584c88c6283ba9ee0d WHIRLPOOL b443583fe45f7d7848460a29567373c653841b59eee8744f8943b83d6827ea2f59e572bcac70a8dbca63cc22a674e71ecd495055e54791fa973e64517eaf4a2d
 EBUILD docker-1.13.0_rc3.ebuild 8081 SHA256 e6f5894a60b540c8565f97115aa00b52ff60d9bbbc9a61acefbda50ea1296f08 SHA512 f172ad6bd2812aafa0f37161e16bd20035f87c3781b12e3073f7a685a46670094a39e5ad0a27b9294f35d0ab359140489fad0e422e12e4c03c02d9c59a5e0f3a WHIRLPOOL 8323be4cbd1f279e53246f9f5ccbcff47390cdf801e86d9ed35ffabf31b83ec5d373b2d000f3c7ead4f65777891075436fca95a15504b100a5ce3512b535d442

app-emulation/docker/docker-1.13.0.ebuild

@@ -193,6 +193,11 @@ pkg_setup() {
 	enewgroup docker
 }
 
+src_prepare() {
+	epatch "${FILESDIR}/1.13-tini-flags-28454.patch"
+	default
+}
+
 src_compile() {
 	export GOPATH="${WORKDIR}/${P}:${PWD}/vendor"
 

app-emulation/docker/files/1.13-tini-flags-28454.patch

@@ -0,0 +1,44 @@
+From d7df7315971653e11bab124800a5938e7e5c6316 Mon Sep 17 00:00:00 2001
+From: =?UTF-8?q?Elan=20Ruusam=C3=A4e?= <[email protected]>
+Date: Wed, 16 Nov 2016 00:07:13 +0200
+Subject: [PATCH] do not require custom build of tini
+MIME-Version: 1.0
+Content-Type: text/plain; charset=UTF-8
+Content-Transfer-Encoding: 8bit
+
+https://github.com/krallin/tini/issues/55#issuecomment-260507562
+https://github.com/krallin/tini/issues/55#issuecomment-260538243
+https://github.com/docker/docker/pull/28037
+
+Signed-off-by: Elan Ruusamäe <[email protected]>
+---
+ daemon/oci_linux.go                 | 2 +-
+ hack/dockerfile/install-binaries.sh | 2 +-
+ 2 files changed, 2 insertions(+), 2 deletions(-)
+
+diff --git a/daemon/oci_linux.go b/daemon/oci_linux.go
+index 5a2158c..91c0f5e 100644
+--- a/daemon/oci_linux.go
++++ b/daemon/oci_linux.go
+@@ -593,7 +593,7 @@ func (daemon *Daemon) populateCommonSpec(s *specs.Spec, c *container.Container)
+ 	if c.HostConfig.PidMode.IsPrivate() {
+ 		if (c.HostConfig.Init != nil && *c.HostConfig.Init) ||
+ 			(c.HostConfig.Init == nil && daemon.configStore.Init) {
+-			s.Process.Args = append([]string{"/dev/init", c.Path}, c.Args...)
++			s.Process.Args = append([]string{"/dev/init", "--", c.Path}, c.Args...)
+ 			var path string
+ 			if daemon.configStore.InitPath == "" && c.HostConfig.InitPath == "" {
+ 				path, err = exec.LookPath(DefaultInitBinary)
+diff --git a/hack/dockerfile/install-binaries.sh b/hack/dockerfile/install-binaries.sh
+index bd4c63c..7c1984b 100755
+--- a/hack/dockerfile/install-binaries.sh
++++ b/hack/dockerfile/install-binaries.sh
+@@ -77,7 +77,7 @@ do
+ 			git clone https://github.com/krallin/tini.git "$GOPATH/tini"
+ 			cd "$GOPATH/tini"
+ 			git checkout -q "$TINI_COMMIT"
+-			cmake -DMINIMAL=ON .
++			cmake .
+ 			make tini-static
+ 			cp tini-static /usr/local/bin/docker-init
+ 			;;