diff options
| author | V3n3RiX <venerix@koprulu.sector> | 2023-03-12 00:09:22 +0000 |
|---|---|---|
| committer | V3n3RiX <venerix@koprulu.sector> | 2023-03-12 00:09:22 +0000 |
| commit | 8fa69fdd0836c0b856dd0f9ef77d5fb25df844ec (patch) | |
| tree | 5b2388d462e1ce30c6c01d22c809fab8b5beee8f /app-containers/docker | |
| parent | 23650861e24563ddcf10919ab5b1912676c3ff0c (diff) | |
gentoo auto-resync : 12:03:2023 - 00:09:21
Diffstat (limited to 'app-containers/docker')
| -rw-r--r-- | app-containers/docker/Manifest | 2 | ||||
| -rw-r--r-- | app-containers/docker/docker-23.0.1.ebuild | 42 |
2 files changed, 7 insertions, 37 deletions
diff --git a/app-containers/docker/Manifest b/app-containers/docker/Manifest index 34a5cb5337c3..536398a51c57 100644 --- a/app-containers/docker/Manifest +++ b/app-containers/docker/Manifest @@ -3,5 +3,5 @@ AUX ppc64-buildmode.patch 916 BLAKE2B c28a2fcfed4812f44b664dc9b24e87f3999fcb9b79 DIST docker-20.10.22.tar.gz 11232083 BLAKE2B 89dea21be77beb00a5c7fde382f1621558c676c63a85cac9664ec04130b875db649b84433ef2d9a0ca9ee221bf38a46b3af85ad6bfe920cf22a15d0cac450b99 SHA512 81aec7faedced07718e3e228e999c4774fd293cedfacd272798a0057177ddca5322a701d0f644777a69b87140cd7a7194aa93a524507f202d050eb30b1a4142c DIST docker-23.0.1.tar.gz 13612828 BLAKE2B ad5ff3a3c722b21e7cb0f6bab52fd66f4c0df185699b057d081cd49ee56cec3eda18d94f4236f45e57c2190831945f67c81b90a136231d6dc067ddad69a01625 SHA512 135e312b76fbd61c425713c51b1b9622491d1d03264cd5100296fec6c00778bf7d9c2c7cb0522d0474753b797a6e87552b47dad7e05e44400561a833bc8616f0 EBUILD docker-20.10.22.ebuild 8058 BLAKE2B caa8ba3cabfe38c69273ce970c420d69561b73b5b3608a4c576cc151572f901c6a192131be12b1eb8a5bbd8ea114fc37d220eef1a78b68d783b93bed2f2de66c SHA512 966ff3f88054f4717548c88411cfd1415d4d6355a2ea3a4332a909e0b15b0dcb05074fd6d6b31ba8abeb0807b28561b26441d544801e0c4e00f4773184a80c79 -EBUILD docker-23.0.1.ebuild 8824 BLAKE2B 3dd09127743e2edc2be223ca53516d8a773afed55981f352e1cf09e07e165344348832643dc3d5a13ea8abbcb83c36f818140fdbafbaf599468ea596c62919d9 SHA512 18784c81cd79e1200a66cbaafd655a22427b295e2733fe643b166b2e3d319ed50b3102d1dd6f246accfe4d7ac5e74cede20d388bd2e1b826624ddcf4842d6737 +EBUILD docker-23.0.1.ebuild 7770 BLAKE2B f0ec7c92b0b4fa64ddedec18b744dd59be095b8dac91b47ca9635c370359698d690aff6e9b4b16fb7faa95f7373457a23610c7443d3e5fe2d7fff149e9fd28c6 SHA512 14879e807d3e8fe0032f80b526bdd8a1bd7088e407fa22ee78481aaf227a4ad15742443a409717d2575a655b042a95d1f4913e40d977e0ed3194d8e757a97405 MISC metadata.xml 1680 BLAKE2B 6c128f9ea99f1634e260b2f944b6560636d8501f93c3e208aff7ca8ee10199f520b187a063f9a8869130305bef8749ee1af10971658e04515e80907bc8a48be0 SHA512 913bed94f44d2093868999e8a1064c8443e4d1298b53ac065b0df0857809e93194f7650dfa1e49933022461f0adec956effff61f627838e1d0104e9d9004bf14 diff --git a/app-containers/docker/docker-23.0.1.ebuild b/app-containers/docker/docker-23.0.1.ebuild index e8c53f5f178b..d592dae8135b 100644 --- a/app-containers/docker/docker-23.0.1.ebuild +++ b/app-containers/docker/docker-23.0.1.ebuild @@ -14,8 +14,7 @@ SRC_URI="https://github.com/moby/moby/archive/v${MY_PV}.tar.gz -> ${P}.tar.gz" LICENSE="Apache-2.0" SLOT="0" KEYWORDS="~amd64 ~arm ~arm64 ~ppc64 ~riscv ~x86" -IUSE="apparmor aufs btrfs +container-init device-mapper hardened -overlay seccomp selinux" +IUSE="apparmor aufs btrfs +container-init device-mapper overlay seccomp selinux" DEPEND=" acct-group/docker @@ -125,12 +124,12 @@ pkg_setup() { fi CONFIG_CHECK+=" - ~!LEGASY_SYSCALL_NATIVE - ~LEGASY_SYSCALL_emulate - ~!LEGASY_SYSCALL_none + ~!LEGACY_VSYSCALL_NATIVE + ~LEGACY_VSYSCALL_EMULATE + ~!LEGACY_VSYSCALL_NONE " - WARNING_LEGASY_SYSCALL_NONE="CONFIG_LEGASY_SYSCALL_NONE enabled: \ - Containers with <=glibc 2.13 will not work" + WARNING_LEGACY_SYSCALL_NONE="CONFIG_LEGACY_VSYSCALL_NONE enabled: \ + Containers with <=glibc-2.13 will not work" if kernel_is le 4 5; then CONFIG_CHECK+=" @@ -253,14 +252,6 @@ src_compile() { fi done - if use hardened; then - sed -i "s/EXTLDFLAGS_STATIC='/&-fno-PIC /" hack/make.sh || die - grep -q -- '-fno-PIC' hack/make.sh || die 'hardened sed failed' - sed "s/LDFLAGS_STATIC_DOCKER='/&-extldflags -fno-PIC /" \ - -i hack/make/dynbinary-daemon || die - grep -q -- '-fno-PIC' hack/make/dynbinary-daemon || die 'hardened sed failed' - fi - # build daemon ./hack/make.sh dynbinary || die 'dynbinary failed' } @@ -320,27 +311,6 @@ pkg_postinst() { elog " Check https://docs.docker.com/storage/storagedriver/zfs-driver for more info" elog fi - - if use cli; then - ewarn "Starting with docker 20.10.2, docker has been split into" - ewarn "two packages upstream, so Gentoo has followed suit." - ewarn - ewarn "app-containers/docker contains the daemon and" - ewarn "app-containers/docker-cli contains the docker command." - ewarn - ewarn "docker currently installs docker-cli using the cli use flag." - ewarn - ewarn "This use flag is temporary, so you need to take the" - ewarn "following actions:" - ewarn - ewarn "First, disable the cli use flag for app-containers/docker" - ewarn - ewarn "Then, if you need docker-cli and docker on the same machine," - ewarn "run the following command:" - ewarn - ewarn "# emerge --noreplace docker-cli" - ewarn - fi } pkg_postrm() { |