diff options
| author | V3n3RiX <venerix@koprulu.sector> | 2023-03-14 18:19:08 +0000 |
|---|---|---|
| committer | V3n3RiX <venerix@koprulu.sector> | 2023-03-14 18:19:08 +0000 |
| commit | 9ecdcfa46d8257a208dac1edc65aea2ccf11a799 (patch) | |
| tree | b279d7ba5ed35fb11619b62e48c61254e46ed4a8 /app-containers/docker | |
| parent | a18f8581f716592db51c45679c46e319db13ca29 (diff) | |
gentoo auto-resync : 14:03:2023 - 18:19:08
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 | 37 |
2 files changed, 30 insertions, 9 deletions
diff --git a/app-containers/docker/Manifest b/app-containers/docker/Manifest index 536398a51c57..2ae93e303f14 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 7770 BLAKE2B f0ec7c92b0b4fa64ddedec18b744dd59be095b8dac91b47ca9635c370359698d690aff6e9b4b16fb7faa95f7373457a23610c7443d3e5fe2d7fff149e9fd28c6 SHA512 14879e807d3e8fe0032f80b526bdd8a1bd7088e407fa22ee78481aaf227a4ad15742443a409717d2575a655b042a95d1f4913e40d977e0ed3194d8e757a97405 +EBUILD docker-23.0.1.ebuild 8011 BLAKE2B e066cfba46931e7d10e46888ac2ef00520075cb0772080b9e9e88c0b11c84f5e6e87b89d0fff43cb460ed5bedd4b1e4226c62d2afb7f34c4bee37cd35233f4c5 SHA512 09995cb632a5bf93cfc6d8a64cba3071f602ec2a43b20f7a6db5c1c8e1bbe67dfca01e010e4aec9d71f2eacff621e71f5a9068a7774309280f0785359877059b 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 d592dae8135b..227d05ce400b 100644 --- a/app-containers/docker/docker-23.0.1.ebuild +++ b/app-containers/docker/docker-23.0.1.ebuild @@ -114,9 +114,14 @@ pkg_setup() { CONFIG_CHECK+=" ~CGROUP_PIDS - ~MEMCG_SWAP " + if kernel_is lt 6 1; then + CONFIG_CHECK+=" + ~MEMCG_SWAP + " + fi + if kernel_is le 5 8; then CONFIG_CHECK+=" ~MEMCG_SWAP_ENABLED @@ -124,10 +129,16 @@ pkg_setup() { fi CONFIG_CHECK+=" - ~!LEGACY_VSYSCALL_NATIVE - ~LEGACY_VSYSCALL_EMULATE - ~!LEGACY_VSYSCALL_NONE - " + ~!LEGACY_VSYSCALL_NATIVE + " + if kernel_is lt 5 19; then + CONFIG_CHECK+=" + ~LEGACY_VSYSCALL_EMULATE + " + fi + CONFIG_CHECK+=" + ~!LEGACY_VSYSCALL_NONE + " WARNING_LEGACY_SYSCALL_NONE="CONFIG_LEGACY_VSYSCALL_NONE enabled: \ Containers with <=glibc-2.13 will not work" @@ -155,9 +166,19 @@ pkg_setup() { ~IP_VS_PROTO_TCP ~IP_VS_PROTO_UDP ~IP_VS_RR - ~SECURITY_SELINUX - ~SECURITY_APPARMOR - " + " + + if use selinux; then + CONFIG_CHECK+=" + ~SECURITY_SELINUX + " + fi + + if use apparmor; then + CONFIG_CHECK+=" + ~SECURITY_APPARMOR + " + fi # if ! is_set EXT4_USE_FOR_EXT2; then # check_flags EXT3_FS EXT3_FS_XATTR EXT3_FS_POSIX_ACL EXT3_FS_SECURITY |