From 1da7b728b7760427385ae3bbbd1c5254d868bf3a Mon Sep 17 00:00:00 2001 From: David Michael Date: Thu, 21 Feb 2019 17:49:58 +0000 Subject: [PATCH] app-emulation/docker: Bump 18.06.2 to 18.06.3 --- .../third_party/coreos-overlay/app-emulation/docker/Manifest | 2 +- .../docker/{docker-18.06.2.ebuild => docker-18.06.3.ebuild} | 0 .../coreos-overlay/app-emulation/docker/docker-9999.ebuild | 4 ++-- ...unt-labels.patch => docker-18.06.3-fix-mount-labels.patch} | 0 .../app-emulation/{docker-18.06.2 => docker-18.06.3} | 4 ++-- .../metadata/md5-cache/app-emulation/docker-9999 | 2 +- 6 files changed, 6 insertions(+), 6 deletions(-) rename sdk_container/src/third_party/coreos-overlay/app-emulation/docker/{docker-18.06.2.ebuild => docker-18.06.3.ebuild} (100%) rename sdk_container/src/third_party/coreos-overlay/app-emulation/docker/files/{docker-18.06.2-fix-mount-labels.patch => docker-18.06.3-fix-mount-labels.patch} (100%) rename sdk_container/src/third_party/coreos-overlay/metadata/md5-cache/app-emulation/{docker-18.06.2 => docker-18.06.3} (93%) diff --git a/sdk_container/src/third_party/coreos-overlay/app-emulation/docker/Manifest b/sdk_container/src/third_party/coreos-overlay/app-emulation/docker/Manifest index 31e6e0d319..0621c7576f 100644 --- a/sdk_container/src/third_party/coreos-overlay/app-emulation/docker/Manifest +++ b/sdk_container/src/third_party/coreos-overlay/app-emulation/docker/Manifest @@ -1 +1 @@ -DIST docker-18.06.2.tar.gz 13675733 BLAKE2B 1b0852851a9c0412d7098b114f8ff62a7fc624f1bd77ba72629009c5b2afbbbacd79f93cdb4287bdb5a58c9b09ff76c9fb5b9ea40933686b62c78ebdc61d1a1b SHA512 78ab030555501071eee47964894798847d7a60ac826479215a2d0a74c75bac88ad212b7f5ab0f29444407456a3914c263c04a1398dc895586026440f203b50a4 +DIST docker-18.06.3.tar.gz 13672165 BLAKE2B f0f0e78ddfba7fdbc0b28fb3c4f1c1dfb4c6e17124dcf1f6c1515cb4daa9add79589b30ab72a850ce05aef725e23738e6fe9a2124d890ab258179f5736d6ca9c SHA512 ae3afecc2e48f567dd3c2723aff8f035f0f61810b9e2d6c1106da638fbe1f1d081277b71295bc0e26651f35d3bc5e647c6ecf142556b06a2645e54899fe7d17a diff --git a/sdk_container/src/third_party/coreos-overlay/app-emulation/docker/docker-18.06.2.ebuild b/sdk_container/src/third_party/coreos-overlay/app-emulation/docker/docker-18.06.3.ebuild similarity index 100% rename from sdk_container/src/third_party/coreos-overlay/app-emulation/docker/docker-18.06.2.ebuild rename to sdk_container/src/third_party/coreos-overlay/app-emulation/docker/docker-18.06.3.ebuild diff --git a/sdk_container/src/third_party/coreos-overlay/app-emulation/docker/docker-9999.ebuild b/sdk_container/src/third_party/coreos-overlay/app-emulation/docker/docker-9999.ebuild index d824723118..582598e626 100644 --- a/sdk_container/src/third_party/coreos-overlay/app-emulation/docker/docker-9999.ebuild +++ b/sdk_container/src/third_party/coreos-overlay/app-emulation/docker/docker-9999.ebuild @@ -19,7 +19,7 @@ else else MY_PV="$PV-ce" fi - DOCKER_GITCOMMIT="6d37f41" + DOCKER_GITCOMMIT="d7080c1" SRC_URI="https://${COREOS_GO_PACKAGE}/archive/v${MY_PV}.tar.gz -> ${P}.tar.gz" KEYWORDS="amd64 arm64" [ "$DOCKER_GITCOMMIT" ] || die "DOCKER_GITCOMMIT must be added manually for each bump!" @@ -250,7 +250,7 @@ src_compile() { pushd components/cli || die - # Imitating https://github.com/docker/docker-ce/blob/v18.06.2-ce/components/cli/scripts/build/.variables#L7 + # Imitating https://github.com/docker/docker-ce/blob/v18.06.3-ce/components/cli/scripts/build/.variables#L7 CLI_BUILDTIME="$(date -d "@${DOCKER_BUILD_DATE}" --utc --rfc-3339 ns 2> /dev/null | sed -e 's/ /T/')" # build cli emake \ diff --git a/sdk_container/src/third_party/coreos-overlay/app-emulation/docker/files/docker-18.06.2-fix-mount-labels.patch b/sdk_container/src/third_party/coreos-overlay/app-emulation/docker/files/docker-18.06.3-fix-mount-labels.patch similarity index 100% rename from sdk_container/src/third_party/coreos-overlay/app-emulation/docker/files/docker-18.06.2-fix-mount-labels.patch rename to sdk_container/src/third_party/coreos-overlay/app-emulation/docker/files/docker-18.06.3-fix-mount-labels.patch diff --git a/sdk_container/src/third_party/coreos-overlay/metadata/md5-cache/app-emulation/docker-18.06.2 b/sdk_container/src/third_party/coreos-overlay/metadata/md5-cache/app-emulation/docker-18.06.3 similarity index 93% rename from sdk_container/src/third_party/coreos-overlay/metadata/md5-cache/app-emulation/docker-18.06.2 rename to sdk_container/src/third_party/coreos-overlay/metadata/md5-cache/app-emulation/docker-18.06.3 index 14a62976af..cd60d9166c 100644 --- a/sdk_container/src/third_party/coreos-overlay/metadata/md5-cache/app-emulation/docker-18.06.2 +++ b/sdk_container/src/third_party/coreos-overlay/metadata/md5-cache/app-emulation/docker-18.06.3 @@ -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.2-ce.tar.gz -> docker-18.06.2.tar.gz +SRC_URI=https://github.com/docker/docker-ce/archive/v18.06.3-ce.tar.gz -> docker-18.06.3.tar.gz _eclasses_=bash-completion-r1 47a7402d95930413ce25ba8d857339bb coreos-go-depend cec6567f1c69a9b3e529a49eedaeed55 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_=c3a5af7398c78c523941960cf21044c0 +_md5_=a5f40219652669e44312b0e05fa45b1f diff --git a/sdk_container/src/third_party/coreos-overlay/metadata/md5-cache/app-emulation/docker-9999 b/sdk_container/src/third_party/coreos-overlay/metadata/md5-cache/app-emulation/docker-9999 index 7df91cbc94..d1433e6a99 100644 --- a/sdk_container/src/third_party/coreos-overlay/metadata/md5-cache/app-emulation/docker-9999 +++ b/sdk_container/src/third_party/coreos-overlay/metadata/md5-cache/app-emulation/docker-9999 @@ -11,4 +11,4 @@ REQUIRED_USE=go_version_go1_10 RESTRICT=installsources strip SLOT=0 _eclasses_=bash-completion-r1 47a7402d95930413ce25ba8d857339bb coreos-go-depend cec6567f1c69a9b3e529a49eedaeed55 coreos-go-utils 67004337b6f831adc5f1ff107ee2f157 desktop b1d22ac8bdd4679ab79c71aca235009d eapi7-ver 756b3f27d8e46131d5cf3c51bd876446 epatch a1bf4756dba418a7238f3be0cb010c54 estack 43ddf5aaffa7a8d0482df54d25a66a1f eutils 6e6c2737b59a4b982de6fb3ecefd87f8 flag-o-matic 55aaa148741116aa54ad0d80e361818e git-r3 0d4635eeb5a96cd5315597a47eba25c9 linux-info 953c3b1c472dcadbf62098a9301327f2 ltprune 08f9e1d9ee0af8f5d9a7854efbcd8c0e multilib b2f01ad412baf81650c23fcf0975fa33 preserve-libs ef207dc62baddfddfd39a164d9797648 systemd 71fd8d2065d102753fb9e4d20eaf3e9f toolchain-funcs f164325a2cdb5b3ea39311d483988861 udev 7752f306eec7b286d00bdb47b763e7ac user 8bc2845510e2109af75e3eeac607ec81 vcs-clean 2a0f74a496fa2b1552c4f3398258b7bf -_md5_=c3a5af7398c78c523941960cf21044c0 +_md5_=a5f40219652669e44312b0e05fa45b1f