app-emulation: bump docker to 18.09.7

To be able to address the security issue [CVE-2018-15664](https://nvd.nist.gov/vuln/detail/CVE-2018-15664), upgrade docker to 18.09.7. Drop unnecessary ebuild files and patches.
flatcar-archive · Jul 5, 2019 · 18be386 · 18be386
1 parent 30f2e98
commit 18be386
Show file tree

Hide file tree

Showing 11 changed files with 6 additions and 62 deletions.
diff --git a/app-emulation/docker-runc/docker-runc-1.0.0_rc5_p22.ebuild b/app-emulation/docker-runc/docker-runc-1.0.0_rc5_p22.ebuild
@@ -61,7 +61,7 @@ src_compile() {
 	)
 
 	GOPATH="${WORKDIR}/${P}" emake BUILDTAGS="${options[*]}" \
-		VERSION=1.0.0-rc5+dev.docker-18.06 \
+		VERSION=1.0.0-rc5+dev.docker-18.09 \
 		COMMIT="${COMMIT_ID}"
 }
 

diff --git a/app-emulation/docker/Manifest b/app-emulation/docker/Manifest
@@ -1 +1 @@
-DIST docker-18.06.3.tar.gz 13672165 BLAKE2B f0f0e78ddfba7fdbc0b28fb3c4f1c1dfb4c6e17124dcf1f6c1515cb4daa9add79589b30ab72a850ce05aef725e23738e6fe9a2124d890ab258179f5736d6ca9c SHA512 ae3afecc2e48f567dd3c2723aff8f035f0f61810b9e2d6c1106da638fbe1f1d081277b71295bc0e26651f35d3bc5e647c6ecf142556b06a2645e54899fe7d17a
+DIST docker-18.09.7.tar.gz 15264213 BLAKE2B 5aa4be6d63271fd0b9a8ea480ed55a1dc312d479d7d387a35573963393b33da96086741dbb817aff765cceb81e309fd76122b3622dd91640a492a9f46c9dbd64 SHA512 7d06ab01673b5931a8dde1d2fcebf442d1a107c98c95cd8fe3b886c123b48470950601782fe0c83e7537a1e856069e79a096b9f4523fea7984fd3e773b243b66
diff --git a/app-emulation/docker/docker-18.06.3.ebuild b/app-emulation/docker/docker-18.06.3.ebuild
diff --git a/...emulation/docker/docker-18.06.1-r3.ebuild → app-emulation/docker/docker-18.09.7.ebuild b/...emulation/docker/docker-18.06.1-r3.ebuild → app-emulation/docker/docker-18.09.7.ebuild
diff --git a/app-emulation/docker/docker-9999.ebuild b/app-emulation/docker/docker-9999.ebuild
@@ -75,7 +75,6 @@ RESTRICT="installsources strip"
 S="${WORKDIR}/${P}/src/${COREOS_GO_PACKAGE}"
 
 ENGINE_PATCHES=(
-	"${FILESDIR}/${P}-fix-mount-labels.patch"
 )
 
 # see "contrib/check-config.sh" from upstream's sources

diff --git a/app-emulation/docker/files/docker-18.06.3-fix-mount-labels.patch b/app-emulation/docker/files/docker-18.06.3-fix-mount-labels.patch
diff --git a/app-torcx/docker/docker-18.06.ebuild → app-torcx/docker/docker-18.09.ebuild b/app-torcx/docker/docker-18.06.ebuild → app-torcx/docker/docker-18.09.ebuild
@@ -11,7 +11,7 @@ KEYWORDS="amd64 arm64"
 
 # Explicitly list all packages that will be built into the image.
 RDEPEND="
-	~app-emulation/docker-18.06.3-r3
+	~app-emulation/docker-18.09.7
 	~app-emulation/containerd-1.1.2-r3
 	~app-emulation/docker-proxy-0.8.0_p20180709
 	~app-emulation/docker-runc-1.0.0_rc5_p22

diff --git a/...x/docker/files/docker-18.06-manifest.json → ...x/docker/files/docker-18.09-manifest.json b/...x/docker/files/docker-18.06-manifest.json → ...x/docker/files/docker-18.09-manifest.json
diff --git a/metadata/md5-cache/app-emulation/docker-18.06.1-r3 b/metadata/md5-cache/app-emulation/docker-18.06.1-r3
diff --git a/...ta/md5-cache/app-emulation/docker-18.06.3 → ...ta/md5-cache/app-emulation/docker-18.09.7 b/...ta/md5-cache/app-emulation/docker-18.06.3 → ...ta/md5-cache/app-emulation/docker-18.09.7
@@ -10,6 +10,6 @@ RDEPEND=>=dev-db/sqlite-3.7.9:3 device-mapper? ( >=sys-fs/lvm2-2.02.89[thin] ) s
 REQUIRED_USE=go_version_go1_10
 RESTRICT=installsources strip
 SLOT=0
-SRC_URI=https://github.com/docker/docker-ce/archive/v18.06.3-ce.tar.gz -> docker-18.06.3.tar.gz
+SRC_URI=https://github.com/docker/docker-ce/archive/v18.09.7-ce.tar.gz -> docker-18.09.7.tar.gz
 _eclasses_=bash-completion-r1	47a7402d95930413ce25ba8d857339bb	coreos-go-depend	688230059f31df4bd9277464f10a6fa5	coreos-go-utils	67004337b6f831adc5f1ff107ee2f157	desktop	b1d22ac8bdd4679ab79c71aca235009d	eapi7-ver	756b3f27d8e46131d5cf3c51bd876446	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	6e6c2737b59a4b982de6fb3ecefd87f8	flag-o-matic	55aaa148741116aa54ad0d80e361818e	linux-info	953c3b1c472dcadbf62098a9301327f2	ltprune	08f9e1d9ee0af8f5d9a7854efbcd8c0e	multilib	b2f01ad412baf81650c23fcf0975fa33	preserve-libs	ef207dc62baddfddfd39a164d9797648	systemd	71fd8d2065d102753fb9e4d20eaf3e9f	toolchain-funcs	f164325a2cdb5b3ea39311d483988861	udev	7752f306eec7b286d00bdb47b763e7ac	user	8bc2845510e2109af75e3eeac607ec81	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	versionator	2352c3fc97241f6a02042773c8287748
 _md5_=a5f40219652669e44312b0e05fa45b1f
diff --git a/metadata/md5-cache/app-torcx/docker-18.06 → metadata/md5-cache/app-torcx/docker-18.09 b/metadata/md5-cache/app-torcx/docker-18.06 → metadata/md5-cache/app-torcx/docker-18.09
@@ -3,6 +3,6 @@ DESCRIPTION=Packages to be installed in a torcx image for Docker
 EAPI=2
 KEYWORDS=amd64 arm64
 LICENSE=GPL-2
-RDEPEND=~app-emulation/docker-18.06.3 ~app-emulation/containerd-1.1.2-r3 ~app-emulation/docker-proxy-0.8.0_p20180709 ~app-emulation/docker-runc-1.0.0_rc5_p22 =dev-libs/libltdl-2.4.6 =sys-process/tini-0.18.0
+RDEPEND=~app-emulation/docker-18.09.7 ~app-emulation/containerd-1.1.2-r3 ~app-emulation/docker-proxy-0.8.0_p20180709 ~app-emulation/docker-runc-1.0.0_rc5_p22 =dev-libs/libltdl-2.4.6 =sys-process/tini-0.13.2
 SLOT=0
-_md5_=984fbdaedb6fad322e2dcc925c5b32ce
+_md5_=3db2176202d29e476a0eac4c9c2b0d55