From 0c100b7dd2b30e75b799d806df4ef899fd98e1ea Mon Sep 17 00:00:00 2001 From: V3n3RiX Date: Sat, 16 Apr 2022 13:07:24 +0100 Subject: gentoo resync : 16.04.2022 --- app-containers/Manifest.gz | Bin 6731 -> 6722 bytes app-containers/apptainer/Manifest | 2 +- app-containers/apptainer/apptainer-1.0.1.ebuild | 2 +- app-containers/buildah/Manifest | 8 +- app-containers/buildah/buildah-1.23.1-r1.ebuild | 51 ---- app-containers/buildah/buildah-1.24.2.ebuild | 51 ---- app-containers/buildah/buildah-1.24.3.ebuild | 51 ---- app-containers/buildah/buildah-1.25.1.ebuild | 2 +- app-containers/catatonit/Manifest | 2 +- app-containers/catatonit/catatonit-0.1.7.ebuild | 2 +- app-containers/containerd/Manifest | 6 +- app-containers/containerd/containerd-1.4.11.ebuild | 84 ------- app-containers/containerd/containerd-1.4.12.ebuild | 84 ------- app-containers/containerd/containerd-1.5.11.ebuild | 2 +- app-containers/containers-storage/Manifest | 6 - .../containers-storage-1.37.0.ebuild | 58 ----- .../containers-storage-1.38.0.ebuild | 58 ----- .../containers-storage-1.38.2.ebuild | 58 ----- app-containers/crun/Manifest | 12 +- app-containers/crun/crun-1.3.ebuild | 2 +- app-containers/crun/crun-1.4.2.ebuild | 2 +- app-containers/crun/crun-1.4.4.ebuild | 7 +- app-containers/docker-cli/Manifest | 4 +- .../docker-cli/docker-cli-20.10.14.ebuild | 8 +- .../docker-cli/docker-cli-20.10.9.ebuild | 66 ----- app-containers/docker-compose/Manifest | 3 + .../docker-compose/docker-compose-2.4.1.ebuild | 50 ++++ app-containers/docker/Manifest | 2 - app-containers/docker/docker-20.10.9.ebuild | 279 --------------------- app-containers/lxc/Manifest | 5 - .../lxc/files/lxc-4.0.11_p1-liburing-sync1.patch | 29 --- .../lxc/files/lxc-4.0.11_p1-liburing-sync2.patch | 28 --- app-containers/lxc/lxc-4.0.11_p1-r1.ebuild | 188 -------------- app-containers/lxd/Manifest | 5 - app-containers/lxd/files/lxd-4.0.7-no-werror.patch | 108 -------- ...d-4.0.8-btrfs-progs-5.14-safety-check-fix.patch | 75 ------ app-containers/lxd/lxd-4.0.8-r3.ebuild | 190 -------------- app-containers/podman/Manifest | 6 +- app-containers/podman/podman-3.4.4.ebuild | 165 ------------ app-containers/podman/podman-4.0.2.ebuild | 163 ------------ app-containers/podman/podman-4.0.3.ebuild | 5 +- app-containers/runc/Manifest | 4 +- app-containers/runc/runc-1.0.2-r1.ebuild | 80 ------ app-containers/runc/runc-1.1.1.ebuild | 3 +- app-containers/snapd/Manifest | 2 + app-containers/snapd/snapd-2.55.3.ebuild | 183 ++++++++++++++ 46 files changed, 271 insertions(+), 1930 deletions(-) delete mode 100644 app-containers/buildah/buildah-1.23.1-r1.ebuild delete mode 100644 app-containers/buildah/buildah-1.24.2.ebuild delete mode 100644 app-containers/buildah/buildah-1.24.3.ebuild delete mode 100644 app-containers/containerd/containerd-1.4.11.ebuild delete mode 100644 app-containers/containerd/containerd-1.4.12.ebuild delete mode 100644 app-containers/containers-storage/containers-storage-1.37.0.ebuild delete mode 100644 app-containers/containers-storage/containers-storage-1.38.0.ebuild delete mode 100644 app-containers/containers-storage/containers-storage-1.38.2.ebuild delete mode 100644 app-containers/docker-cli/docker-cli-20.10.9.ebuild create mode 100644 app-containers/docker-compose/docker-compose-2.4.1.ebuild delete mode 100644 app-containers/docker/docker-20.10.9.ebuild delete mode 100644 app-containers/lxc/files/lxc-4.0.11_p1-liburing-sync1.patch delete mode 100644 app-containers/lxc/files/lxc-4.0.11_p1-liburing-sync2.patch delete mode 100644 app-containers/lxc/lxc-4.0.11_p1-r1.ebuild delete mode 100644 app-containers/lxd/files/lxd-4.0.7-no-werror.patch delete mode 100644 app-containers/lxd/files/lxd-4.0.8-btrfs-progs-5.14-safety-check-fix.patch delete mode 100644 app-containers/lxd/lxd-4.0.8-r3.ebuild delete mode 100644 app-containers/podman/podman-3.4.4.ebuild delete mode 100644 app-containers/podman/podman-4.0.2.ebuild delete mode 100644 app-containers/runc/runc-1.0.2-r1.ebuild create mode 100644 app-containers/snapd/snapd-2.55.3.ebuild (limited to 'app-containers') diff --git a/app-containers/Manifest.gz b/app-containers/Manifest.gz index b7913b6a5bab..1cc4a5221acc 100644 Binary files a/app-containers/Manifest.gz and b/app-containers/Manifest.gz differ diff --git a/app-containers/apptainer/Manifest b/app-containers/apptainer/Manifest index 0869774018f4..074362f50ab4 100644 --- a/app-containers/apptainer/Manifest +++ b/app-containers/apptainer/Manifest @@ -1,3 +1,3 @@ DIST apptainer-1.0.1.tar.gz 11977965 BLAKE2B ba0187c82321583825210f418744add120b682af3f14ee6d8071b927cd884b7e58f67f891ccc53c0d7d98bd786a27abcc26b2bafe79ed723a2f4f38a8e1a344b SHA512 273e94a348be2eaf83cf14b4c72a571670a9fa5cd185a90a0f557ba58ea7eb90d3a0f4bdb749673b0009e2291dd994dc715223c38ce82f9fcd6bf142e7692363 -EBUILD apptainer-1.0.1.ebuild 1455 BLAKE2B 7597124c81907ce80b3bd59334355054de6c79f560c7a1e25d307cbebd4d7aaac38e98585d9071ab32717682683a401213f4f8c87b222a7a7e8cb4a59885af31 SHA512 3391d40fa87d3e162707e9e5b475d83a2b300ad659a4ea5e96d8ae7c64e610615eb8078c5e57b854809472b336b6175077fe941dc0ec8f3cecd25b97ffb4be51 +EBUILD apptainer-1.0.1.ebuild 1454 BLAKE2B f49832a2dc065bf0a245d627be5647e7e8f50a7ad1f2be2d5388f2c70c7195028de7bf690679e2a15a8fae7042c6d7ad5a5c31528e7b52e2421266c693ebbeff SHA512 9e8d484dc1ee64f9330375cc7a2862678f6edc06e8234f6b958c1d09b30d27238b199c8da2ddc3be942b395965e5df2bebd79c928c1de894cb39ab8fd7fb6a35 MISC metadata.xml 454 BLAKE2B 7891b6acae30424b8b6877166b856c1113a13e40ebec9051935df10a0650bf941f52d75bdb6a4258795e07b080082979469b8b8242d2ddd56c52f9c5b6759f0e SHA512 ef53c2dee45734f36403ab71549494f3c24707bc183353e4bd9c548a97b3ab5d7877f4fc9d311d9e86ab249cbdb379f0a1a211ee36afda99fd552f0a5cac30bb diff --git a/app-containers/apptainer/apptainer-1.0.1.ebuild b/app-containers/apptainer/apptainer-1.0.1.ebuild index 9f711a070ada..3dce15725ab8 100644 --- a/app-containers/apptainer/apptainer-1.0.1.ebuild +++ b/app-containers/apptainer/apptainer-1.0.1.ebuild @@ -11,7 +11,7 @@ SRC_URI="https://github.com/apptainer/${PN}/releases/download/v${PV}/${P}.tar.gz SLOT="0" LICENSE="BSD" -KEYWORDS="~amd64 ~riscv ~x86 ~amd64-linux ~x86-linux" +KEYWORDS="amd64 ~riscv ~x86 ~amd64-linux ~x86-linux" IUSE="examples +network +suid" # Do not complain about CFLAGS etc. since go projects do not use them. diff --git a/app-containers/buildah/Manifest b/app-containers/buildah/Manifest index 274d24122587..2f0d885c3889 100644 --- a/app-containers/buildah/Manifest +++ b/app-containers/buildah/Manifest @@ -1,9 +1,3 @@ -DIST buildah-1.23.1.tar.gz 11872323 BLAKE2B 6e4cffd11177bca6c3e86cd3372fc7bf295b23559b7478a679ea2bea022c149b5ea058224f0a156df1b9511905795c44ed5e988ec68ca834dd80d0c198543d5f SHA512 2ceb6df5adb671483557bb03937df583857d99c116be5d44aae533c155f560d5d454bebf25908ac02bb85e4c2ba31533adb99f0946ecc4f4830977c14f324b6f -DIST buildah-1.24.2.tar.gz 14184511 BLAKE2B ad9ee6f332a89038368d9a5d86198f1dfa9cf99a970e85ccf3b272294fc262c68c37004131971b0ec148e999e4d8f192f4955e71673f05188110407949eb3546 SHA512 dada2b65340386355aba3980c38d9be0f43d5c3f9316c6f8e713f299ee2b975e409c1b3a785daa52b59e688c3a9c9016c43d9b0a6443d4a9453aababc0a8afa0 -DIST buildah-1.24.3.tar.gz 14189867 BLAKE2B 18b6eaf0ba54c310c8b946e4763f3b930ff4e0bfd85333767b8baa3320df1f43937d4742404d11de51c6386a12521e3045770d1d19406c163accd9cccc500961 SHA512 74fa6073ddf6b641700f758435d4558fc2d61691172107572dfac3d723f986aa0faf7bb5b5d1e2bd6bed5d118cbed3c78b6faf96972770b304fa28fd363b4700 DIST buildah-1.25.1.tar.gz 14212065 BLAKE2B ec4f668654011f1b93745e1a1d575fdda0cd5f4d6f9f7f7b3106c24aa7d405951ecd645a54c2dd5a3ad2695069e66ad847bdb15f0e73a9c7efba2a7e283d4f58 SHA512 628f8095eb4488ae2be06a2a92de85dde4f3841e8ed9882132c119f27b0c93f26ba10f5dd259d63654b90539d762f6c1973d460f073c0b2450ac5d9582a6a68d -EBUILD buildah-1.23.1-r1.ebuild 1196 BLAKE2B afd094d8fbefb9622704992892b8b0050fddae3d01e44275cd26f4d927f5c146cc577f8c374d7594083445ba581f7ef557660160725a977276e96ce5ed2f9006 SHA512 bdb5a798fc980be7e8d0c464784b48279af59b80a19a878f7134bb5344c8c807e5e16032f39a6d236ac653039cbf001fe40f64c9f4d2c26ea6ed7fed4805a588 -EBUILD buildah-1.24.2.ebuild 1198 BLAKE2B feaf84c0d34c256dc99cf2e836bde1c49ec4f719ada774763f529f0102ee77d8fe672375ea8d974788bd29ccb06925125aa5a7d818dad827e42c3e501e2f1f92 SHA512 891c06d40cacf7ba614b8de98cb887de6a10d7955b78569f5b96dbfae9de99b3c46221b47933f3364ae1a70f110e6a8aed4f08a8137856785233f55ce6e5cf8f -EBUILD buildah-1.24.3.ebuild 1198 BLAKE2B 033bb57ef386ee7ca4cfc600eed3129edf00ede613da8bac92fcd428ebe02a36c286e83344e46f06352515ec591979015a605a06343521695d6f1089c6fec9d8 SHA512 63f6bf6c1a4da92404537bc6191deed663c29928105f39234f30d4f6816bbed355774c87fca055c03650c69ba38ba4a00702c1820552cf883b645b4af7d2ec15 -EBUILD buildah-1.25.1.ebuild 1198 BLAKE2B c44a8369b62c9ee4f24b86a295331092af25c967b01434b8cdabe90b9c1322f754997aabecf73f0b0ab9223eea94fd8f0c8cc0263a0c8ac749ab1b52bba61f78 SHA512 0be1bc3f2d94b644ab0c975f878649256915fc0ae14a0b980f13d035b9f103d6de0cb91d7b2fbe309156b96703c19365244f718bb76522b22720d69d3222ff91 +EBUILD buildah-1.25.1.ebuild 1196 BLAKE2B 3f0e2e2cb09af594cac29666ef4c9b1f3b7721659f6fff2ff29fa9ebc30f841cb2703d5fd3ce41b4dcc32a30841372ae3b3d36af791423bca05c4f70f2ce655a SHA512 ec2aa76c2ba6676d828534e2ceb7a5e12f800d44b382c35ca2bd76f24631084103ba6e94f519252d90bf4511e47ac0d341dfab3c2f5206781096e87203d51fe7 MISC metadata.xml 328 BLAKE2B 55d2d2b5cc972b7e6b6fb77d14e79e304adcbc7056ff351f5ee3cac6cf5f83b4ef2a10c70754d1d30a5ecd88e652abc07cddd8005c3767e7f709c0c5cb61d068 SHA512 7520f5745909da195d4bfdd750e4c716c461a3789adfde56dd9be46b91dfb789653d642c0958b5a2950eea220cc00143bfcd5db402fcc2578c8fe5f8ff69275f diff --git a/app-containers/buildah/buildah-1.23.1-r1.ebuild b/app-containers/buildah/buildah-1.23.1-r1.ebuild deleted file mode 100644 index 7d3899b67e1b..000000000000 --- a/app-containers/buildah/buildah-1.23.1-r1.ebuild +++ /dev/null @@ -1,51 +0,0 @@ -# Copyright 1999-2021 Gentoo Authors -# Distributed under the terms of the GNU General Public License v2 - -EAPI=7 -inherit bash-completion-r1 go-module -GIT_COMMIT=d9a41b85 - -DESCRIPTION="A tool that facilitates building OCI images" -HOMEPAGE="https://github.com/containers/buildah" -SRC_URI="https://github.com/containers/buildah/archive/v${PV}.tar.gz -> ${P}.tar.gz" - -LICENSE="Apache-2.0 BSD BSD-2 CC-BY-SA-4.0 ISC MIT MPL-2.0" -SLOT="0" -KEYWORDS="amd64 arm64" -IUSE="selinux" - -RDEPEND="app-crypt/gpgme:= - app-containers/skopeo - dev-libs/libgpg-error:= - dev-libs/libassuan:= - sys-apps/shadow:= - sys-fs/lvm2:= - sys-libs/libseccomp:= - selinux? ( sys-libs/libselinux:= )" -DEPEND="${RDEPEND}" - -RESTRICT+=" test" - -src_prepare() { - default - [[ -f selinux_tag.sh ]] || die - use selinux || { echo -e "#!/bin/sh\ntrue" > \ - selinux_tag.sh || die; } - sed -i -e 's/make -C/$(MAKE) -C/' Makefile || die 'sed failed' -} - -src_compile() { - emake GIT_COMMIT=${GIT_COMMIT} all -} - -src_install() { - dodoc CHANGELOG.md CONTRIBUTING.md README.md install.md troubleshooting.md - doman docs/*.1 - dodoc -r docs/tutorials - dobin bin/{${PN},imgtype} - dobashcomp contrib/completions/bash/buildah -} - -src_test() { - emake test-unit -} diff --git a/app-containers/buildah/buildah-1.24.2.ebuild b/app-containers/buildah/buildah-1.24.2.ebuild deleted file mode 100644 index 11751a5ccd2c..000000000000 --- a/app-containers/buildah/buildah-1.24.2.ebuild +++ /dev/null @@ -1,51 +0,0 @@ -# Copyright 1999-2022 Gentoo Authors -# Distributed under the terms of the GNU General Public License v2 - -EAPI=7 -inherit bash-completion-r1 go-module -GIT_COMMIT=ce608bce - -DESCRIPTION="A tool that facilitates building OCI images" -HOMEPAGE="https://github.com/containers/buildah" -SRC_URI="https://github.com/containers/buildah/archive/v${PV}.tar.gz -> ${P}.tar.gz" - -LICENSE="Apache-2.0 BSD BSD-2 CC-BY-SA-4.0 ISC MIT MPL-2.0" -SLOT="0" -KEYWORDS="~amd64 ~arm64" -IUSE="selinux" - -RDEPEND="app-crypt/gpgme:= - app-containers/skopeo - dev-libs/libgpg-error:= - dev-libs/libassuan:= - sys-apps/shadow:= - sys-fs/lvm2:= - sys-libs/libseccomp:= - selinux? ( sys-libs/libselinux:= )" -DEPEND="${RDEPEND}" - -RESTRICT+=" test" - -src_prepare() { - default - [[ -f selinux_tag.sh ]] || die - use selinux || { echo -e "#!/bin/sh\ntrue" > \ - selinux_tag.sh || die; } - sed -i -e 's/make -C/$(MAKE) -C/' Makefile || die 'sed failed' -} - -src_compile() { - emake GIT_COMMIT=${GIT_COMMIT} all -} - -src_install() { - dodoc CHANGELOG.md CONTRIBUTING.md README.md install.md troubleshooting.md - doman docs/*.1 - dodoc -r docs/tutorials - dobin bin/{${PN},imgtype} - dobashcomp contrib/completions/bash/buildah -} - -src_test() { - emake test-unit -} diff --git a/app-containers/buildah/buildah-1.24.3.ebuild b/app-containers/buildah/buildah-1.24.3.ebuild deleted file mode 100644 index 9f76a531fd27..000000000000 --- a/app-containers/buildah/buildah-1.24.3.ebuild +++ /dev/null @@ -1,51 +0,0 @@ -# Copyright 1999-2022 Gentoo Authors -# Distributed under the terms of the GNU General Public License v2 - -EAPI=7 -inherit bash-completion-r1 go-module -GIT_COMMIT=8a645e9a - -DESCRIPTION="A tool that facilitates building OCI images" -HOMEPAGE="https://github.com/containers/buildah" -SRC_URI="https://github.com/containers/buildah/archive/v${PV}.tar.gz -> ${P}.tar.gz" - -LICENSE="Apache-2.0 BSD BSD-2 CC-BY-SA-4.0 ISC MIT MPL-2.0" -SLOT="0" -KEYWORDS="~amd64 ~arm64" -IUSE="selinux" - -RDEPEND="app-crypt/gpgme:= - app-containers/skopeo - dev-libs/libgpg-error:= - dev-libs/libassuan:= - sys-apps/shadow:= - sys-fs/lvm2:= - sys-libs/libseccomp:= - selinux? ( sys-libs/libselinux:= )" -DEPEND="${RDEPEND}" - -RESTRICT+=" test" - -src_prepare() { - default - [[ -f selinux_tag.sh ]] || die - use selinux || { echo -e "#!/bin/sh\ntrue" > \ - selinux_tag.sh || die; } - sed -i -e 's/make -C/$(MAKE) -C/' Makefile || die 'sed failed' -} - -src_compile() { - emake GIT_COMMIT=${GIT_COMMIT} all -} - -src_install() { - dodoc CHANGELOG.md CONTRIBUTING.md README.md install.md troubleshooting.md - doman docs/*.1 - dodoc -r docs/tutorials - dobin bin/{${PN},imgtype} - dobashcomp contrib/completions/bash/buildah -} - -src_test() { - emake test-unit -} diff --git a/app-containers/buildah/buildah-1.25.1.ebuild b/app-containers/buildah/buildah-1.25.1.ebuild index 93faf334dd35..d84f33be7c3f 100644 --- a/app-containers/buildah/buildah-1.25.1.ebuild +++ b/app-containers/buildah/buildah-1.25.1.ebuild @@ -11,7 +11,7 @@ SRC_URI="https://github.com/containers/buildah/archive/v${PV}.tar.gz -> ${P}.tar LICENSE="Apache-2.0 BSD BSD-2 CC-BY-SA-4.0 ISC MIT MPL-2.0" SLOT="0" -KEYWORDS="~amd64 ~arm64" +KEYWORDS="amd64 arm64" IUSE="selinux" RDEPEND="app-crypt/gpgme:= diff --git a/app-containers/catatonit/Manifest b/app-containers/catatonit/Manifest index 2294bdc92f50..a72900b7bc78 100644 --- a/app-containers/catatonit/Manifest +++ b/app-containers/catatonit/Manifest @@ -1,4 +1,4 @@ DIST catatonit-0.1.7-automake.patch 965 BLAKE2B fd42082321b75210653657cadd09751aa70a1eabeea4abc0cbc06aa91c510cff70d4261759407426a198f1aa3a1826d9f3a255d18e0e22e2dad53eca6b76ee87 SHA512 62cb75e8dcff7348eb5fe9dfb57627659bb755ffdd6a29b6d4e486e2b4c92945fa7420410941523585102ac11b14c2a1700fb6fd3fd663e7f38c10863f82fa87 DIST catatonit-0.1.7.tar.gz 21720 BLAKE2B ab73198e55dd06d3d0af04e6eff17a2f1e70ab1c0f9ec35f68f9afe71ce8cd1bdc3320e9728a6d8036c2251fe95028e1aad0838d1c9f51e4cc70e482a1109c24 SHA512 7d3174c60e1c8bd1f4b95b7751ccbe01cac63265060f18914b53311f68f7b4c63c693604f348ccfac5db4a96939169f835fbbbd614803b18062053d94f7dca67 -EBUILD catatonit-0.1.7.ebuild 661 BLAKE2B 731d1df958c33cd404d4a59530e74df15b4ad639d8901bc7c78e9ea6df7045fb3cac453e35a6cd3d1d3f2cc799d040b3ac00b19895e7993c7f4c906929f08469 SHA512 80bac542591ecc15b89b5d18f0cdd980b29da030b5e16d57ce0803c8e69b69f25a9b27bee05d1616c752d1b215977e3a0255b80685daf1844fe3b7d5afe7f45a +EBUILD catatonit-0.1.7.ebuild 659 BLAKE2B b5214118ec95a4703f30802d0a665cd6cad7855d100880754bc346c2e4182c167088520127b676b45969c76eb2387f9089f9323fec982d72e026a31d41282069 SHA512 a27362f5a46bc11e06b7116d8776f9274de0bc4ee701851348581e1d52e04cd220bb8173f1a186f5683c22d3b738d32be3f1559d4c93c6c7a729b86a1ad8d69d MISC metadata.xml 302 BLAKE2B 25c8cfc1578a53cf585b81b225690f2b06a58cdec8fc6fdbbda943a9210924cb82a5552ace8e84edfd46a0ee186c71a273f318e53a201f6c46d7ea32577a8073 SHA512 1b504f841f32820714d82a565ceb2c1ebc43e484caf43d8d8a2b9e99d06bba1d9ae41bb2fc767f5512dbe3b09432a693b5a67767a40338e793009cf34c937a3d diff --git a/app-containers/catatonit/catatonit-0.1.7.ebuild b/app-containers/catatonit/catatonit-0.1.7.ebuild index bc3f9fc2be56..0da65b484e47 100644 --- a/app-containers/catatonit/catatonit-0.1.7.ebuild +++ b/app-containers/catatonit/catatonit-0.1.7.ebuild @@ -10,7 +10,7 @@ SRC_URI="https://github.com/openSUSE/${PN}/archive/v${PV}.tar.gz -> ${P}.tar.gz LICENSE="GPL-3+" SLOT="0" -KEYWORDS="~amd64 ~arm64 ~ppc64 ~riscv" +KEYWORDS="amd64 arm64 ~ppc64 ~riscv" PATCHES=("${DISTDIR}/${P}-automake.patch") diff --git a/app-containers/containerd/Manifest b/app-containers/containerd/Manifest index b48ad0799eee..286898dfd949 100644 --- a/app-containers/containerd/Manifest +++ b/app-containers/containerd/Manifest @@ -1,11 +1,7 @@ AUX containerd.initd 766 BLAKE2B 07b323c35f9cafa156969644ccab7c618baf60a82ad8037538ae23562c5663742a7453e00412eeafa72129a4806f3610f3f77865c7ebf3e58223a7286c9f712e SHA512 b70abb44d6bc0cdd8115104ef1fbb5099a270c29040351ceff738b9b6ff796a802f92dbbe2c49e04ae058043546bbe6a854e25044f5c07bea7bf6b6fc4f66018 -DIST containerd-1.4.11.tar.gz 6406769 BLAKE2B a4882223e2f71944a4d46fb0500a95248cfa33735447952f94c7d7350c2cb62b4911adc77f96559116cca462be02b7270185a0a3dfed5ce4c530465cca7e2078 SHA512 16aa6ae4209939754e122545b454d8b25027a3621464a4b4e0379480b35adf0efb318271f82cf2b959a62fffe531979c9bdfee9ac7d47d4b33269a6bafe2d070 -DIST containerd-1.4.12.tar.gz 6408402 BLAKE2B 559164a9d8680edea52040690da8e9b45777a39e471b1a7cc56ff4cf207cee7c83dc73969a8868db5d531f6e4e27cc7a975f073ffcf7f9c2768858b1a4001ddf SHA512 52dc4b0344eb4c6a6f1cc5690ff0c70ee052ef05c02300ed4a806458c40bb1970c26b374b0733b2c30a05c04a731d62a7c4206b1d768075d51c202912efd32b1 DIST containerd-1.5.11.tar.gz 7494477 BLAKE2B 2415e85694e5f4410c8cee7be08d1d304adfcdb95c4078f7a92c710a5a11a29ae011daa70fcfa72c2fabf5b48b7cac962b39121f18bb027931ef77214e86b1aa SHA512 6348f4ae7f9b473aac7d5e7325ca4539345d09f01b95383cec28f09d5e5b0b831e25fe305c3a15050f1e1959948ee8dcad788a1d6dd4780cf3077132d5617ef8 DIST containerd-1.6.2-deps.tar.xz 99095488 BLAKE2B a8ab5b2a506cb90cbadba9461d2737b1ac0bea672681e3f940d1dc76fdd2885d1ab287129a2aaa2fab64d19ba049eb7ecdffbafa6b08772430b94428a775a042 SHA512 2a96405c28a6ebaeae523ef36b4721f493332953880bfb7cecc4571b325557f2566141a62c0eb5c981045d498dd18ad18f8e7adfd9d5f17218a5d5d65760b855 DIST containerd-1.6.2.tar.gz 8617797 BLAKE2B aaf16dbbd071f4eab45bc94cc50643b33665b5c4a4155ef007b7a974e04660235b69e12d99e78c24b27c09d45c0eb6e9be3d688b41592a54497a0a4e5f577c86 SHA512 3ff280ae0cf5a45b0c21a42290c94bad30d46bf8a5bbcef1024e3c67fde3345a31b23a88cdbb6025d526c93e2a0899e9b341c9b8ccbba381983de3d8a39b1046 -EBUILD containerd-1.4.11.ebuild 1937 BLAKE2B 28d77a75c41972622bd514aebcd0771c3528fa0076834c97f83a7008b258b64785902b6a41d424599022e834a316e4366d89e5108b8d43f017c8769604efc6ee SHA512 e2799565ca0698c214f3a29adbdcdf001af3b7c39e7780838e8a8e7f9b155334a1f7e4ee7d0af61bb9650c2a6a135fa5bfdca1014f7947915b37f86c9aa2dca8 -EBUILD containerd-1.4.12.ebuild 1937 BLAKE2B 4177d3ab1f97f30217835d21421f6ad8c6dab38198e6559efdef57e9f8bef77e0a6719b2dc1182216bbb5b9bda1ef3484f9709bc0ca615edcf8f262fd1e1a856 SHA512 3f3dba551539a584a6d64b1a48e1a3cc892d0e060b734428e5d7c4d9f94e189b8c102f3e637ee07321f8ff637f9db7b93d4a61d87f4fcb6a7b1c47eaaf48ad3c -EBUILD containerd-1.5.11.ebuild 1906 BLAKE2B 235c2eb59257362b5bd90e5e089102ce567e3e13e13c94a5365727cff3e4d92efa7332614f120c798d40a65b38623618eef8cbe65c5cdd9588e8555e696758a3 SHA512 0e5dfe10c35d9d7b25110e4f51153bd0ea231b3ebdb10401af84114c5a76e2187ef1df62fccee168d235ad8a03cc8aec9031680e5699e7da6fe6545f32dea5f9 +EBUILD containerd-1.5.11.ebuild 1905 BLAKE2B 660c443a3de0f9c280ebc8bda5b049dc9803a35ea0d1fd6826338705f7d94b6d7f7bcaf987be92c458fa624a3b4aab6b19479aab90798f504ca7445f2c848821 SHA512 5c1f0c09f89743438924f2c012b9bce173844e4e5d3cfd9312eee576ee087ff01c532daabbe63502b9a39fd423825f198cf4f66c3c18a9786aadbb58d8ab45b7 EBUILD containerd-1.6.2.ebuild 1975 BLAKE2B 3ebbd30a63d3e4fc89491332ac27e0441a611d275746b5fe9dd0ba627ac57af9bf6d71d6ed2b1fbc7bbfa1bedc16fc329cbd9264eee14bd8803c313185b4930c SHA512 49e8aff2be3f9196047f7e502033048de00ea1a4dc8e53b033e0014d22a57755b0156ea21df7efdf307a26344ded7cd2bd1a6f439abce9dbf47b35eb9cb6d80e MISC metadata.xml 1144 BLAKE2B 960f8dd81a1e56c0d381355da41a845c2e9c12db0c8c546da1593a0499e4929b37610dff83943c388f8edc5878b9824e47ddac02ba129176a916054400e10e90 SHA512 904a5a11d7729ea6021aaf1b1d91ae3f7609c08b8c191d9f4c35c62914b0acf1ee45f3f7e0416711225809f129da4b4c76c934e6207026b69b0096f431820982 diff --git a/app-containers/containerd/containerd-1.4.11.ebuild b/app-containers/containerd/containerd-1.4.11.ebuild deleted file mode 100644 index 44e419c33326..000000000000 --- a/app-containers/containerd/containerd-1.4.11.ebuild +++ /dev/null @@ -1,84 +0,0 @@ -# Copyright 1999-2021 Gentoo Authors -# Distributed under the terms of the GNU General Public License v2 - -EAPI=7 - -CONTAINERD_COMMIT=5b46e404f6b9f661a205e28d59c982d3634148f8 -EGO_PN="github.com/containerd/${PN}" -inherit golang-vcs-snapshot - -DESCRIPTION="A daemon to control runC" -HOMEPAGE="https://containerd.io/" -SRC_URI="https://github.com/containerd/containerd/archive/v${PV}.tar.gz -> ${P}.tar.gz" - -LICENSE="Apache-2.0" -SLOT="0" -KEYWORDS="amd64 ~arm arm64 ppc64 ~x86" -IUSE="apparmor btrfs device-mapper +cri hardened +seccomp selinux test" - -DEPEND=" - btrfs? ( sys-fs/btrfs-progs ) - seccomp? ( sys-libs/libseccomp ) -" - -# recommended version of runc is found in script/setup/runc-version -RDEPEND=" - ${DEPEND} - ~app-containers/runc-1.0.2 -" - -BDEPEND=" - dev-go/go-md2man - virtual/pkgconfig - test? ( ${RDEPEND} ) -" - -# tests require root or docker -# upstream does not recommend stripping binary -RESTRICT+=" strip test" - -S="${WORKDIR}/${P}/src/${EGO_PN}" - -src_prepare() { - default - sed -i -e "s/git describe --match.*$/echo ${PV})/"\ - -e "s/git rev-parse HEAD.*$/echo ${CONTAINERD_COMMIT})/"\ - -e "s/-s -w//" \ - Makefile || die -} - -src_compile() { - local options=( - $(usev apparmor) - $(usex btrfs "" "no_btrfs") - $(usex cri "" "no_cri") - $(usex device-mapper "" "no_devmapper") - $(usev seccomp) - $(usev selinux) - ) - - myemakeargs=( - BUILDTAGS="${options[*]}" - LDFLAGS="$(usex hardened '-extldflags -fno-PIC' '')" - ) - - export GOPATH="${WORKDIR}/${P}" # ${PWD}/vendor - export GOFLAGS="-v -x -mod=vendor" - # race condition in man target https://bugs.gentoo.org/765100 - emake "${myemakeargs[@]}" man -j1 #nowarn - emake "${myemakeargs[@]}" all -} - -src_install() { - dobin bin/* - doman man/* - newinitd "${FILESDIR}"/${PN}.initd "${PN}" - keepdir /var/lib/containerd - - # we already installed manpages, remove markdown source - # before installing docs directory - rm -r docs/man || die - - local DOCS=( README.md PLUGINS.md docs/. ) - einstalldocs -} diff --git a/app-containers/containerd/containerd-1.4.12.ebuild b/app-containers/containerd/containerd-1.4.12.ebuild deleted file mode 100644 index 6f2f10d5cd92..000000000000 --- a/app-containers/containerd/containerd-1.4.12.ebuild +++ /dev/null @@ -1,84 +0,0 @@ -# Copyright 1999-2022 Gentoo Authors -# Distributed under the terms of the GNU General Public License v2 - -EAPI=7 - -CONTAINERD_COMMIT=7b11cfaabd73bb80907dd23182b9347b4245eb5d -EGO_PN="github.com/containerd/${PN}" -inherit golang-vcs-snapshot - -DESCRIPTION="A daemon to control runC" -HOMEPAGE="https://containerd.io/" -SRC_URI="https://github.com/containerd/containerd/archive/v${PV}.tar.gz -> ${P}.tar.gz" - -LICENSE="Apache-2.0" -SLOT="0" -KEYWORDS="amd64 ~arm arm64 ppc64 ~x86" -IUSE="apparmor btrfs device-mapper +cri hardened +seccomp selinux test" - -DEPEND=" - btrfs? ( sys-fs/btrfs-progs ) - seccomp? ( sys-libs/libseccomp ) -" - -# recommended version of runc is found in script/setup/runc-version -RDEPEND=" - ${DEPEND} - ~app-containers/runc-1.0.2 -" - -BDEPEND=" - dev-go/go-md2man - virtual/pkgconfig - test? ( ${RDEPEND} ) -" - -# tests require root or docker -# upstream does not recommend stripping binary -RESTRICT+=" strip test" - -S="${WORKDIR}/${P}/src/${EGO_PN}" - -src_prepare() { - default - sed -i -e "s/git describe --match.*$/echo ${PV})/"\ - -e "s/git rev-parse HEAD.*$/echo ${CONTAINERD_COMMIT})/"\ - -e "s/-s -w//" \ - Makefile || die -} - -src_compile() { - local options=( - $(usev apparmor) - $(usex btrfs "" "no_btrfs") - $(usex cri "" "no_cri") - $(usex device-mapper "" "no_devmapper") - $(usev seccomp) - $(usev selinux) - ) - - myemakeargs=( - BUILDTAGS="${options[*]}" - LDFLAGS="$(usex hardened '-extldflags -fno-PIC' '')" - ) - - export GOPATH="${WORKDIR}/${P}" # ${PWD}/vendor - export GOFLAGS="-v -x -mod=vendor" - # race condition in man target https://bugs.gentoo.org/765100 - emake "${myemakeargs[@]}" man -j1 #nowarn - emake "${myemakeargs[@]}" all -} - -src_install() { - dobin bin/* - doman man/* - newinitd "${FILESDIR}"/${PN}.initd "${PN}" - keepdir /var/lib/containerd - - # we already installed manpages, remove markdown source - # before installing docs directory - rm -r docs/man || die - - local DOCS=( README.md PLUGINS.md docs/. ) - einstalldocs -} diff --git a/app-containers/containerd/containerd-1.5.11.ebuild b/app-containers/containerd/containerd-1.5.11.ebuild index 0b8298363875..c848b75853ce 100644 --- a/app-containers/containerd/containerd-1.5.11.ebuild +++ b/app-containers/containerd/containerd-1.5.11.ebuild @@ -11,7 +11,7 @@ SRC_URI="https://github.com/containerd/containerd/archive/v${PV}.tar.gz -> ${P}. LICENSE="Apache-2.0" SLOT="0" -KEYWORDS="amd64 ~arm ~arm64 ppc64 ~riscv ~x86" +KEYWORDS="amd64 ~arm arm64 ppc64 ~riscv ~x86" IUSE="apparmor btrfs device-mapper +cri hardened +seccomp selinux test" DEPEND=" diff --git a/app-containers/containers-storage/Manifest b/app-containers/containers-storage/Manifest index c30149ac604e..22cfc76f695c 100644 --- a/app-containers/containers-storage/Manifest +++ b/app-containers/containers-storage/Manifest @@ -1,9 +1,3 @@ -DIST containers-storage-1.37.0.tar.gz 3557198 BLAKE2B ebe5c8e562149a9d007ac87d7fc615d29ad7decbfd6b1b8d919b14684a6341575d8f65080a808ba52674664d187a18bb47e88f10e1a02a2975898862873dadf9 SHA512 3a65a50946e1eed1c79ea77b65feb1c6c8cf58a0b7b81932acb8891b6daa25e007582eb7f70ef7e7f2a6d8262be5db7757ead2fe079e47c99114b47917d81084 -DIST containers-storage-1.38.0.tar.gz 3656468 BLAKE2B b33342dd6c55d69c3c71ce17ceeb4fd4c442291b700a9a601f9b273337bda70b9f353adbac55019d3ab0a20a8b142816255af106b77127f371ee0f80fbea488b SHA512 c9be760d088ac2bf1fa7ee7b6742c9f0f54b4878ae85059bbdb059b48eb5a2cf2c217b774944b23ff175d7126351d324ed96febb77c7a6b78b6cffb51f271f13 -DIST containers-storage-1.38.2.tar.gz 3657181 BLAKE2B 466641eb0c810da0e6b5fe9adc47eadbc66cedb57326903fe4cbf917b12d4e937131dcf4ff4d33d0b2372384f754f471fd532aac91809a5481d74be0ce6ffe05 SHA512 98caa95e4456e60ef676e4d9717e5f852cfa21ffe45980f63fab703bc7c369fdae14d33102dcb023908d250c3eba6f121c270203c3abd29fdfcb7e2768319c50 DIST containers-storage-1.39.0.tar.gz 3670784 BLAKE2B ad46a33fd51bb95385ed1572a30136bc117bd1d72adb2cbcde2d864fe4ac51dde02b45a8457366d84b889bfcfd62f74c249fc7b5505ca316da08bc03af5c866d SHA512 c3b59361755150adc4a13995a200879175ff1ddf402ce3191311b9e525995ccb73cb8e9c9bc485388cb7517783cd9f9e3a7916c03087dbd5d0be170198b1c861 -EBUILD containers-storage-1.37.0.ebuild 1460 BLAKE2B 384a8e1e2097ec8c18398a563494941821b75a889bdc23addb0912ba58ef9298ff3d5751bacd9db8d0a8154ee8911d4f2c4677cb80dce4e14c03ca3e5f207ae3 SHA512 8a54ea2230607cb424698397133443747cd6b1a687381f300083b618c621708165b53714a1a29bde52faa450b7384f6ba70d35c2bc381d715b07a4ff75bea9c9 -EBUILD containers-storage-1.38.0.ebuild 1460 BLAKE2B 1e82d14bc4a40bfeec0c09d26d5e987cdf208a66e9359186512b067d454154337c301573f852fbeafaa572641acb6109e5f069273e4689efbaf0262be216e736 SHA512 3debf8e12d4ef6349aa00ad4594494999cacaba6f784db5c7ea79da9c81f7ca783a9bd8bc62e5fc81bc4629cd6ff49c8ca304e8df3741cd93cf6660246828801 -EBUILD containers-storage-1.38.2.ebuild 1460 BLAKE2B 1e82d14bc4a40bfeec0c09d26d5e987cdf208a66e9359186512b067d454154337c301573f852fbeafaa572641acb6109e5f069273e4689efbaf0262be216e736 SHA512 3debf8e12d4ef6349aa00ad4594494999cacaba6f784db5c7ea79da9c81f7ca783a9bd8bc62e5fc81bc4629cd6ff49c8ca304e8df3741cd93cf6660246828801 EBUILD containers-storage-1.39.0.ebuild 1460 BLAKE2B 1e82d14bc4a40bfeec0c09d26d5e987cdf208a66e9359186512b067d454154337c301573f852fbeafaa572641acb6109e5f069273e4689efbaf0262be216e736 SHA512 3debf8e12d4ef6349aa00ad4594494999cacaba6f784db5c7ea79da9c81f7ca783a9bd8bc62e5fc81bc4629cd6ff49c8ca304e8df3741cd93cf6660246828801 MISC metadata.xml 604 BLAKE2B b132c7cf2a280a6c5fee5b37eb644c5644890b845a92165551a5466caf2fbfa07f7b63b1a387fee62467a7df4218e1e4c563fe70fc40209a4f2eae5b9c714b57 SHA512 21725a1c25a5912b26a56f1970b968ca686f55a27888e4a2948ea6d7a6b8f3d70f528e875d8d2271963ebebb6fee11c51f218045296dac21a1b86ba9b5481b28 diff --git a/app-containers/containers-storage/containers-storage-1.37.0.ebuild b/app-containers/containers-storage/containers-storage-1.37.0.ebuild deleted file mode 100644 index a55dd8c3f0fb..000000000000 --- a/app-containers/containers-storage/containers-storage-1.37.0.ebuild +++ /dev/null @@ -1,58 +0,0 @@ -# Copyright 1999-2021 Gentoo Authors -# Distributed under the terms of the GNU General Public License v2 - -EAPI=7 - -inherit go-module - -KEYWORDS="~amd64" -DESCRIPTION="containers/storage library" -HOMEPAGE="https://github.com/containers/storage" -LICENSE="Apache-2.0 BSD BSD-2 CC-BY-SA-4.0 ISC MIT" -SLOT="0" -IUSE="btrfs +device-mapper test" -SRC_URI="https://github.com/containers/storage/archive/v${PV}.tar.gz -> ${P}.tar.gz" -RDEPEND=" - btrfs? ( sys-fs/btrfs-progs ) - device-mapper? ( sys-fs/lvm2:= )" -DEPEND="${RDEPEND} - dev-go/go-md2man - test? ( - sys-fs/btrfs-progs - sys-fs/lvm2 - sys-apps/util-linux - )" -RESTRICT="test" - -S=${WORKDIR}/${P#containers-} - -src_prepare() { - default - - sed -e 's|: install\.tools|:|' -i Makefile || die - - [[ -f hack/btrfs_tag.sh ]] || die - use btrfs || { echo -e "#!/bin/sh\necho exclude_graphdriver_btrfs" > \ - "hack/btrfs_tag.sh" || die; } - - [[ -f hack/libdm_tag.sh ]] || die - use device-mapper || { echo -e "#!/bin/sh\necho btrfs_noversion exclude_graphdriver_devicemapper" > \ - "hack/libdm_tag.sh" || die; } -} - -src_compile() { - export -n GOCACHE GOPATH XDG_CACHE_HOME #678856 - emake GOMD2MAN=go-md2man FFJSON= containers-storage docs -} - -src_install() { - dobin "${PN}" - while read -r -d ''; do - mv "${REPLY}" "${REPLY%.1}" || die - done < <(find "${S}/docs" -name '*.[[:digit:]].1' -print0) - find "${S}/docs" -name '*.[[:digit:]]' -exec doman '{}' + || die -} - -src_test() { - env -u GOFLAGS unshare -m emake local-test-unit || die -} diff --git a/app-containers/containers-storage/containers-storage-1.38.0.ebuild b/app-containers/containers-storage/containers-storage-1.38.0.ebuild deleted file mode 100644 index c01863fdb218..000000000000 --- a/app-containers/containers-storage/containers-storage-1.38.0.ebuild +++ /dev/null @@ -1,58 +0,0 @@ -# Copyright 1999-2022 Gentoo Authors -# Distributed under the terms of the GNU General Public License v2 - -EAPI=7 - -inherit go-module - -KEYWORDS="~amd64" -DESCRIPTION="containers/storage library" -HOMEPAGE="https://github.com/containers/storage" -LICENSE="Apache-2.0 BSD BSD-2 CC-BY-SA-4.0 ISC MIT" -SLOT="0" -IUSE="btrfs +device-mapper test" -SRC_URI="https://github.com/containers/storage/archive/v${PV}.tar.gz -> ${P}.tar.gz" -RDEPEND=" - btrfs? ( sys-fs/btrfs-progs ) - device-mapper? ( sys-fs/lvm2:= )" -DEPEND="${RDEPEND} - dev-go/go-md2man - test? ( - sys-fs/btrfs-progs - sys-fs/lvm2 - sys-apps/util-linux - )" -RESTRICT="test" - -S=${WORKDIR}/${P#containers-} - -src_prepare() { - default - - sed -e 's|: install\.tools|:|' -i Makefile || die - - [[ -f hack/btrfs_tag.sh ]] || die - use btrfs || { echo -e "#!/bin/sh\necho exclude_graphdriver_btrfs" > \ - "hack/btrfs_tag.sh" || die; } - - [[ -f hack/libdm_tag.sh ]] || die - use device-mapper || { echo -e "#!/bin/sh\necho btrfs_noversion exclude_graphdriver_devicemapper" > \ - "hack/libdm_tag.sh" || die; } -} - -src_compile() { - export -n GOCACHE GOPATH XDG_CACHE_HOME #678856 - emake GOMD2MAN=go-md2man FFJSON= containers-storage docs -} - -src_install() { - dobin "${PN}" - while read -r -d ''; do - mv "${REPLY}" "${REPLY%.1}" || die - done < <(find "${S}/docs" -name '*.[[:digit:]].1' -print0) - find "${S}/docs" -name '*.[[:digit:]]' -exec doman '{}' + || die -} - -src_test() { - env -u GOFLAGS unshare -m emake local-test-unit || die -} diff --git a/app-containers/containers-storage/containers-storage-1.38.2.ebuild b/app-containers/containers-storage/containers-storage-1.38.2.ebuild deleted file mode 100644 index c01863fdb218..000000000000 --- a/app-containers/containers-storage/containers-storage-1.38.2.ebuild +++ /dev/null @@ -1,58 +0,0 @@ -# Copyright 1999-2022 Gentoo Authors -# Distributed under the terms of the GNU General Public License v2 - -EAPI=7 - -inherit go-module - -KEYWORDS="~amd64" -DESCRIPTION="containers/storage library" -HOMEPAGE="https://github.com/containers/storage" -LICENSE="Apache-2.0 BSD BSD-2 CC-BY-SA-4.0 ISC MIT" -SLOT="0" -IUSE="btrfs +device-mapper test" -SRC_URI="https://github.com/containers/storage/archive/v${PV}.tar.gz -> ${P}.tar.gz" -RDEPEND=" - btrfs? ( sys-fs/btrfs-progs ) - device-mapper? ( sys-fs/lvm2:= )" -DEPEND="${RDEPEND} - dev-go/go-md2man - test? ( - sys-fs/btrfs-progs - sys-fs/lvm2 - sys-apps/util-linux - )" -RESTRICT="test" - -S=${WORKDIR}/${P#containers-} - -src_prepare() { - default - - sed -e 's|: install\.tools|:|' -i Makefile || die - - [[ -f hack/btrfs_tag.sh ]] || die - use btrfs || { echo -e "#!/bin/sh\necho exclude_graphdriver_btrfs" > \ - "hack/btrfs_tag.sh" || die; } - - [[ -f hack/libdm_tag.sh ]] || die - use device-mapper || { echo -e "#!/bin/sh\necho btrfs_noversion exclude_graphdriver_devicemapper" > \ - "hack/libdm_tag.sh" || die; } -} - -src_compile() { - export -n GOCACHE GOPATH XDG_CACHE_HOME #678856 - emake GOMD2MAN=go-md2man FFJSON= containers-storage docs -} - -src_install() { - dobin "${PN}" - while read -r -d ''; do - mv "${REPLY}" "${REPLY%.1}" || die - done < <(find "${S}/docs" -name '*.[[:digit:]].1' -print0) - find "${S}/docs" -name '*.[[:digit:]]' -exec doman '{}' + || die -} - -src_test() { - env -u GOFLAGS unshare -m emake local-test-unit || die -} diff --git a/app-containers/crun/Manifest b/app-containers/crun/Manifest index 042380008249..d4885d6623e4 100644 --- a/app-containers/crun/Manifest +++ b/app-containers/crun/Manifest @@ -1,7 +1,7 @@ -DIST crun-1.3.tar.gz 1889283 BLAKE2B d7e7f676ca5db8322b9da2110c9a9e8eb11b13b5e9f1432ccc6ef12bf6ae7db3a28e3227fac86091589a215394ec577e91ccbffec532dabf44be746cb8a5d404 SHA512 9600bdacf5fd2defa542230b6e134920eb80e9d4c49598167b9d58887719765c174f1ac8559c0092dc1b5435274124e0b29c3d0830df86d1cfd690d67c746016 -DIST crun-1.4.2.tar.gz 1956517 BLAKE2B c5db3396902c33568c3f9a490c57f8781703018f228f07bb17b1ccaa5c2ab903eda76e50d46fa3be10e440e6a0c3f791744f05d7677c71e2510673077d0acbef SHA512 cc7b57ed945cb36a36cf2ceab57349f836a07164ef31e0cec8bbddc4451a5757e2a0b92bc553b8994a236d7869cfdf229a5dd5e5a0d7f139f8c2a8df5c151d3a -DIST crun-1.4.4.tar.gz 1962130 BLAKE2B 59681ba7af5735b46d27b568b2f9c36b72dd20d33d1eda4c77284eaeb3a771746e5be26fac28284039f857a4853c3c8decbc9a83bb62004e4ae2da79f1470d31 SHA512 fe64f56bf0f1ed9fed4df4926dd57b0966863208726ad00d8b96dfb9440833f6f88c4223875a6b01fe350456bc2c1021d14efa32795762037e394737daa4bde7 -EBUILD crun-1.3.ebuild 1374 BLAKE2B d057cdec5aeb2c9cbb3ad91b1dae0568f4d2845b8deba6e10e93ee1c9268dca8fa03cb132d6365643523cc3517a09116218625467600c7cf88fb7e55734e0447 SHA512 210b4788c820a25e60dd1845cc81b99c15120fd29b596136f90e4ca3ded1a3d5dc780bb7cdedfde299efd7e37c99395d9d67479dee72fad2b5dfba2a5e6ac3f8 -EBUILD crun-1.4.2.ebuild 1513 BLAKE2B 9a6858626d135a21d3fd967027e5bf44a1de361c4be1d2ba5766bf35d24d6d1c7d64f1979614ea66ed30231d410f5705f02a81b4e3434650ebd1f8059c61f6ae SHA512 7d168190fd1a775b85f13d9c136d246325f6526b0b61b57cd594e80262b6f128ecafdbafdceb0c84fb3586da7ae75788f7448950927b9ea643dce96458c77734 -EBUILD crun-1.4.4.ebuild 1573 BLAKE2B d39c0f6333486269f4e36da3e5f4cd03cf1e12cd99d5ba027e95ef3cbb39e785982ae887c6f7c05bdc4ad31bacc859161f1779a82ce258f0f4f2cfc932350670 SHA512 261a713ca595fedf3cdcb9e4c1e862920a5ea60ae06b64158ea563ebada30aac8741501cf3a3ef89954b124dca02e1f5ff729fccbd3eec800149e53aa49eefff +DIST crun-1.3.tar.xz 831108 BLAKE2B 37e8d0ba764ae77c870c68ea9cd93f1ea1c751eb2b6aa84481f81b22ec2eb5d9e518d4808bd1bca545c57d18c5c491372694009d6498652cce45fda8864e5835 SHA512 3b58ee65a41bc85ec31147053f00e9c2a2e5ee9a72381a65c19480cc24d80cad7c9f6e1a47b3e020facf0603c54e4d2640db187c5e66a7deb8b1ead7bc111ee6 +DIST crun-1.4.2.tar.xz 873636 BLAKE2B f8b3546b7c4aeb7077af8cf9e7ec0059259143da80a6a0d020dc9d702e03008b2b1c2a6a5cdd555b625abc1f2ed5a55786525919eda15dc241d1b8f2334e8689 SHA512 f97eedf84a61cc3753f528b75b24f95131e871f734c8e770b9bdc4e1d33668162e6bdc0c4676c0164900bc987490d3dbd0060c27046091f012ad178ef42fbdbf +DIST crun-1.4.4.tar.xz 877892 BLAKE2B 57e48c0a229db3f54212177cef3fdb3f59b4bb1d1cc865da956f026a35837d839489bd126f880d7a9ceb18f5cffbf0e32ac9ae59a4cd39c34e3aff5b32c0559a SHA512 1756dccf6509457a5dc114d43c4f4e99258a20c3437dfe06016d080989c5d3035f5735d62d18ab537b660ec36de04df369a2582745baf4ab680af367a19830fd +EBUILD crun-1.3.ebuild 1374 BLAKE2B 0b7c999382540caac2742ea72226824ecde615e40a2154a83f2e18ec6c8091e4109969519ca731f66cd539ccf3c0bed23b2277cf8b3488ccbd6b84e43b45a17b SHA512 2e74bbde388306980b1681c3735ce41dbe699dc618987d79167aa93efefd89978859cc53825bcebe6504d0bcb7100bb9fe1cf747fb1fbe8cf2623664e710acc9 +EBUILD crun-1.4.2.ebuild 1513 BLAKE2B 431aec7bd18867e22d81467384cc7c386c3fff02df9edd6b3a3e310d0493821ca592e8730296d2a1419f53eddc50fdbe678c7fb0322a4d1ef285be9193a62477 SHA512 3f23080558ecb746ae18c45a44eefff7f7d247f6af3c6bbd1ac273c07dbb086ced5729d548c6cbc51f552ceecc0f5207664f92432f4ff66bfb0bcb46678b8b96 +EBUILD crun-1.4.4.ebuild 1624 BLAKE2B cad4388c81fbf098a279b2d02c1dd845cf9b0862c8b20010b6fc5ea6a8c1aa86cc1b33169259e2923c9f95f8b08c25a3d653cd1a60ed71a40b63ee847a6bfcb1 SHA512 595d09e8af3760fcdeb02f1b0db7bac58d3c6726cf9ddb0dd08629789271acfd08f4b54eaa3c2e05d68c09db65c3fd453b95f56e9f6c78ecb1ffab18e04d78ae MISC metadata.xml 1300 BLAKE2B a0ae27420fca097e4e7b5e983de3b76fef43bf13887bd5fe903da14e20c2f0ebd2fc273dae74e32e28c2768b5f8d6e5e6c8b4c9f07ca6d47e41902621173a167 SHA512 1699a89a01de32b580bc74bc747430ef7b1a6284b2f459b4041b22de0efbebda45778803deb512a61806ed8e2998b141caefb7830acafc68d42ce4343b193dd6 diff --git a/app-containers/crun/crun-1.3.ebuild b/app-containers/crun/crun-1.3.ebuild index fb5ec251832d..0ad076a2251c 100644 --- a/app-containers/crun/crun-1.3.ebuild +++ b/app-containers/crun/crun-1.3.ebuild @@ -9,7 +9,7 @@ inherit python-any-r1 DESCRIPTION="A fast and low-memory footprint OCI Container Runtime fully written in C" HOMEPAGE="https://github.com/containers/crun" -SRC_URI="https://github.com/containers/${PN}/releases/download/${PV}/${P}.tar.gz" +SRC_URI="https://github.com/containers/${PN}/releases/download/${PV}/${P}.tar.xz" LICENSE="GPL-2+ LGPL-2.1+" SLOT="0" diff --git a/app-containers/crun/crun-1.4.2.ebuild b/app-containers/crun/crun-1.4.2.ebuild index 7c6b28ed5bef..3320edf85e4d 100644 --- a/app-containers/crun/crun-1.4.2.ebuild +++ b/app-containers/crun/crun-1.4.2.ebuild @@ -9,7 +9,7 @@ inherit python-any-r1 DESCRIPTION="A fast and low-memory footprint OCI Container Runtime fully written in C" HOMEPAGE="https://github.com/containers/crun" -SRC_URI="https://github.com/containers/${PN}/releases/download/${PV}/${P}.tar.gz" +SRC_URI="https://github.com/containers/${PN}/releases/download/${PV}/${P}.tar.xz" LICENSE="GPL-2+ LGPL-2.1+" SLOT="0" diff --git a/app-containers/crun/crun-1.4.4.ebuild b/app-containers/crun/crun-1.4.4.ebuild index ad09a9266459..67c59f247e94 100644 --- a/app-containers/crun/crun-1.4.4.ebuild +++ b/app-containers/crun/crun-1.4.4.ebuild @@ -9,12 +9,12 @@ inherit python-any-r1 DESCRIPTION="A fast and low-memory footprint OCI Container Runtime fully written in C" HOMEPAGE="https://github.com/containers/crun" -SRC_URI="https://github.com/containers/${PN}/releases/download/${PV}/${P}.tar.gz" +SRC_URI="https://github.com/containers/${PN}/releases/download/${PV}/${P}.tar.xz" LICENSE="GPL-2+ LGPL-2.1+" SLOT="0" KEYWORDS="amd64 ~arm arm64 ppc64 ~riscv" -IUSE="+bpf +caps criu +seccomp systemd static-libs" +IUSE="+bpf +caps criu +seccomp selinux systemd static-libs" DEPEND=" dev-libs/yajl:= @@ -24,7 +24,8 @@ DEPEND=" seccomp? ( sys-libs/libseccomp ) systemd? ( sys-apps/systemd:= ) " -RDEPEND="${DEPEND}" +RDEPEND="${DEPEND} + selinux? ( sec-policy/selinux-container )" BDEPEND=" ${PYTHON_DEPS} virtual/pkgconfig diff --git a/app-containers/docker-cli/Manifest b/app-containers/docker-cli/Manifest index 759819ed67ab..80b164895af2 100644 --- a/app-containers/docker-cli/Manifest +++ b/app-containers/docker-cli/Manifest @@ -1,7 +1,5 @@ DIST docker-cli-20.10.12.tar.gz 7527161 BLAKE2B 34a90f6df9f43507461307817e72cfb9e37f88d00e6fc50b8b16f3db9c573e54edc2eb2641ff4e091a2a73e936f8844011520efe5aaec37a9eb9880f5f81c51a SHA512 ac7c997f5751f2e34b9bcb9f026d3d0c2cd58c32a13e9255536b0eb0d7eabd81c42f2d608c0fe7725322b619f2360818b08379e847d598dd0bec570602ad224f DIST docker-cli-20.10.14.tar.gz 7508390 BLAKE2B b268a329450540c2e94eced7e7b7bb9387cd208c68bde82607fc56e1f0529d8ca35bb8c16839154443d950c21b0625a13aa8547d9f3053ed19645da683f14419 SHA512 f8b7f1040eccd404e39ec33bcef8bb8423636b0695af65f84c0612e77223844892d219f82cfbb99ccd5326e228f8af27be1870d90ebace77810ea5fce9f86e4a -DIST docker-cli-20.10.9.tar.gz 7525889 BLAKE2B 7b12f81ed98ed416fb00211b9e6d965ed3209fd83db17a98bef7fef0eb56b27f495093facb3d43e40ec651568a7d83dd484c014c998e046a57662087b1d7c2c6 SHA512 0a9bd36c139bb5e1cd4a975913aa5429ffce8c746d2104aa2a54d937c67073ddaa2a8a5e93d71d2d435459af58168de0e7e3a44fd452da535f3995738da206df EBUILD docker-cli-20.10.12.ebuild 1844 BLAKE2B 315897c0bb0930e2b3ac72ff73581700c66ed8130a26f5ac573e9820c56947e80f44b5478fdb8dab4013407acbc1c7706fc7fdef876d511dc3433cbaf6b96f9d SHA512 1e576548e6697d51cf7a681a97910dcd01d04073f18222e0d467d7c4f8100479bcb998d547da16cb574fb92db36d86c2e58ea512003015ce805b64cfc1a9373a -EBUILD docker-cli-20.10.14.ebuild 1839 BLAKE2B 6d4d63d6298beda0347a19966704611ca31044127dd31c34573412f1ebf7e28163ee116963b8e36792af6a5b02f93c65cb9eb6b05e3313b4ec27c8944ddf53ba SHA512 1380c16f11ace12965b46bfd364d6af701c54702274f81c952946b4e7f330b8a6f97cb74206717a03d3e251dee0cddfea6d3840c9d1f369bdb07088ca7851913 -EBUILD docker-cli-20.10.9.ebuild 1844 BLAKE2B 9ddff4c4d777c6c24ee2ee9df31060571d5dd278ca3040d46ea438f42c04b1735b5a869f8da93e7c25e0dd8e7f69f7eb7d1b6f2dd77e5167f155876f82118338 SHA512 6108bf8f8f7d14a3295a1fbbcefb3e0a40d550f208a953e6da296d7d8a304bf6d5f477b88c724ed158ccd3db959a1d54d7b2f16dd39a5faccde65541ff68c213 +EBUILD docker-cli-20.10.14.ebuild 1895 BLAKE2B ca302b1f195f6cb90bf16e3eb636110052d191e3d8833949dcca8af421cd87853d8d946340a88e5ed5b9aff2d6b5251b6ac372286ba58d08154fcc70306a6f2b SHA512 fc4a83b6a8531cb6272be1726b2ae139e045251848aa7237b81f27e3e343b6c0cc901541889c79248cd6f534acd66e07aa81d59952aa6c720870a9fb0ba43d32 MISC metadata.xml 614 BLAKE2B d20cedb6e07ab3d6907e022cbe7b1e3c2fe3462a1cdefd53fa7bc18a8431f2adeb16c406982d722910295524061bb2e08c0e1fdb625b0c05a21eaa4bdc272359 SHA512 922fbdb86e4456cb757d21bbca8b32b5dfc47e67264c3c31d4d0e3763579ce70346a1c1279544635b94573541e08c57fd5d999e9536917b3888d130bffd9127c diff --git a/app-containers/docker-cli/docker-cli-20.10.14.ebuild b/app-containers/docker-cli/docker-cli-20.10.14.ebuild index df9b9f0a7ea9..d33e9fceab08 100644 --- a/app-containers/docker-cli/docker-cli-20.10.14.ebuild +++ b/app-containers/docker-cli/docker-cli-20.10.14.ebuild @@ -1,5 +1,6 @@ # Copyright 1999-2022 Gentoo Authors -# Distributed under the terms of the GNU General Public Lic +# Distributed under the terms of the GNU General Public License v2 + EAPI=7 GIT_COMMIT=a224086349 EGO_PN="github.com/docker/cli" @@ -13,9 +14,10 @@ SRC_URI="https://github.com/docker/cli/archive/v${MY_PV}.tar.gz -> ${P}.tar.gz" LICENSE="Apache-2.0" SLOT="0" KEYWORDS="~amd64 ~arm ~arm64 ~ppc64 ~riscv ~x86" -IUSE="hardened" +IUSE="hardened selinux" -RDEPEND="!' - elog - - if use device-mapper; then - elog " Devicemapper storage driver has been deprecated" - elog " It will be removed in a future release" - elog - fi - - if use overlay; then - elog " Overlay storage driver/USEflag has been deprecated" - elog " in favor of overlay2 (enabled unconditionally)" - elog - fi - - if has_version sys-fs/zfs; then - elog " ZFS storage driver is available" - 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 -} diff --git a/app-containers/lxc/Manifest b/app-containers/lxc/Manifest index dedd93c2e506..76c41733a561 100644 --- a/app-containers/lxc/Manifest +++ b/app-containers/lxc/Manifest @@ -1,12 +1,7 @@ AUX lxc-2.0.5-omit-sysconfig.patch 259 BLAKE2B 977e151fbb8c9d98e89aaa5ee0426e64ab4286b4440af1582086a0ced8c6568efb470ccf68786da6ea52c82d1f4e81feac45bec411febc04fc31d108f05ccde2 SHA512 0aed9aca687accc6df79e97f48ab333043256e8ae68c8643f2b2452cc8013191238867d64ec71f7d399c59a43d3ba698b35d965090c5cb149b4f41302432e6e7 -AUX lxc-4.0.11_p1-liburing-sync1.patch 972 BLAKE2B 0384058169c0b601d4f3f86ebd368c35af86d5975c89972b7e78212e8b76525ea28065e81537d3dff09c270e556596465bdadf3808cda9b9ce5755d5a930193a SHA512 56806b85094f488815da3fcde33089dbfac59b62491b5ea11fbdb50b7fd585aee0458ec70a60b843074e8d0f6be12a3bbf4fc20a5d6756b893e61fa87187e9e7 -AUX lxc-4.0.11_p1-liburing-sync2.patch 923 BLAKE2B a366d3717730943b315fe7eb8a9f5e65e03634d7093b4406c1f1e2f64265fe55b407bea3849d3b098b5e92ad6d971cc42f545fbc01fcde48b57fd60c0b0e2940 SHA512 70a6d23309bfd1a38ced46eaad2b28ceac6f2a48e40f5b0bf5287334b4a9867a8d2d7bdf551127445cb6b8e92e46b8ed10fb1484a0117f5f98739a21c49b8451 AUX lxc.initd.8 3669 BLAKE2B 50d41e0923ba26b9653ca3b5b559dd0905e61ec81969e709650fe7f1b26a4dcdc17158b7e449d666e2103047d9f196e53df8beca15fffd529fa8e743de97bd82 SHA512 1182b53a65399746f6d6bced0df5c1fde09c1ede4a28bfe95b5ed0bbd969d6f6423f63021d4b6f1dc62c7b2703f6963c03d881291650bdf21cfcf8432586c1b4 AUX lxc_at.service.4.0.0 284 BLAKE2B 1adc76b9861f2499b7b703f7076782a258f9b21a3d1e32b69334f753faca9ecd8c6fb2a03baf04698e765f079e73ee683434d8c7c6d3b3082427a6af74ab33b1 SHA512 4c2f9846ca60bb78df7e652309900c0e788b45d569f268a9e5b98842518542b35fce253e2aedeb0eded3d37274390988ef887b01d1d37859ccddf6225286b4bb -DIST lxc-4.0.11.tar.gz 1543031 BLAKE2B 0309bbb96938e60e4cbe145fa0cc3c0a85d9154282a889d74167128b6166a280bb4d53df266990a529a98935ef2c12e8d2214e9a8f6cb293d47aa5808ebad82f SHA512 23287e468da8939334f4261bfcbb52eadcbe5806bd97896db38c84eb42f32143dc17bb8b9bb7f7f88584b72056553c9edc33ddb693a345ecf88f3177573fa9c0 -DIST lxc-4.0.11.tar.gz.asc 833 BLAKE2B 68804d1d5ad09e388541b3a95a98ca14202c513ea3544a7389a49f4e13ecffc17715bb023675134fd99047c727cffe09cbd0a89883054b82650ebd23366823a7 SHA512 49a54aaf018772db40e1dadc0a10e7d727a2b14b34c0a3c704fd3f7a12e60082abf4628cc0a489ee620ef2210c7542abbdb6d1432e4297ceef52cdd6b158a5f8 DIST lxc-4.0.12.tar.gz 1565070 BLAKE2B 819b5140b641dbc1ed6cf5f2840bb0ee6d3ab8c687f4f8064e42d347113bdf50fcbb653a6fb26598db0daab0c83ad88fe0d27fd2842fac9d7f5fef73656d7976 SHA512 04437d9c891cd3a22f756c42f05e97398772587175d65aff9d394f0f3e810efc5c1fe7077c39573de3ec259e0605bc2a7ea51093613b2cef908372ae338df19d DIST lxc-4.0.12.tar.gz.asc 833 BLAKE2B 2fca60b5ac267a893f70875ccdbe39db6b98b5fe51fe396692449e310b6e680e7b142380e193f5d8299f18e796ed2fd0e08cd186859069877fcca6bc26e44717 SHA512 4f2912879e6f3bf5fdbebb902cf16ca6b766b5720b817c4b4996e62098a1d282327d330ffd9768d45d69aeddb50184dc8485b0ef75b046449ce4c544cdc43c9b -EBUILD lxc-4.0.11_p1-r1.ebuild 5322 BLAKE2B 0f2a826ddd0f184a424f3992fa591cb754e9e391ec1b2217656ef322b31da0b257e77db4017ecca76c4c094c8acb3503cbf25f9c13c9773157a66d4476e5c5e8 SHA512 e704e03c6ba3e027db63b985a730af1f55af64fe30ffd9f024b3bd66ea828de99fe5c85d081b9f74f26a5a0e93a3a3f403a00c552a1ccdf7cf221859838c11fc EBUILD lxc-4.0.12.ebuild 5184 BLAKE2B 1c3a59f4bb1b43c66acae7de91014ea3aea152d3595e2e6431f30e56d99a2316b2c1d73bcb975371f84273b88282c22eda1691f798a4d3a373a3873596bfdb74 SHA512 a5435cfc04ead876fe7c3e7931307ebdd18057849e7cfd9e0b18073a5aff73e03e4f3b9f7cbf4efe608f4ba1502dde59195ebde8a6591c566cb2ac16ae1ba456 MISC metadata.xml 713 BLAKE2B 982d13dbe2adffcdb473804981effa8eabc89ca95dc2f39ae6ebdbdce0f786311333c8f9cbfe2105faf55dcbaf7a63a09b46e6b7c7987ba629f5e87de24a348c SHA512 4c9d018afe1967708c18747f504b98487f110b6a021cd97c94693fa4b39d892b148ad19ae64399396b34502ed6f598d7515418b69d0b22031776366a9f172f3b diff --git a/app-containers/lxc/files/lxc-4.0.11_p1-liburing-sync1.patch b/app-containers/lxc/files/lxc-4.0.11_p1-liburing-sync1.patch deleted file mode 100644 index cd497a755523..000000000000 --- a/app-containers/lxc/files/lxc-4.0.11_p1-liburing-sync1.patch +++ /dev/null @@ -1,29 +0,0 @@ -From aac3f106ff012e1d6835b20c250dcf09c364530c Mon Sep 17 00:00:00 2001 -From: Christian Brauner -Date: Thu, 28 Oct 2021 17:39:11 +0200 -Subject: [PATCH] mainloop: make sure that descr->ring is allocated - -This is future proofing more than anything else. - -Signed-off-by: Christian Brauner ---- - src/lxc/mainloop.c | 6 ++++-- - 1 file changed, 4 insertions(+), 2 deletions(-) - -diff --git a/src/lxc/mainloop.c b/src/lxc/mainloop.c -index 7c8f5d86af..17a4d55293 100644 ---- a/src/lxc/mainloop.c -+++ b/src/lxc/mainloop.c -@@ -515,8 +515,10 @@ void lxc_mainloop_close(struct lxc_async_descr *descr) - - if (descr->type == LXC_MAINLOOP_IO_URING) { - #if HAVE_LIBURING -- io_uring_queue_exit(descr->ring); -- munmap(descr->ring, sizeof(struct io_uring)); -+ if (descr->ring) { -+ io_uring_queue_exit(descr->ring); -+ munmap(descr->ring, sizeof(struct io_uring)); -+ } - #else - ERROR("Unsupported io_uring mainloop"); - #endif diff --git a/app-containers/lxc/files/lxc-4.0.11_p1-liburing-sync2.patch b/app-containers/lxc/files/lxc-4.0.11_p1-liburing-sync2.patch deleted file mode 100644 index 33b8554193d3..000000000000 --- a/app-containers/lxc/files/lxc-4.0.11_p1-liburing-sync2.patch +++ /dev/null @@ -1,28 +0,0 @@ -From a585382b972c25ee8489147d94918d001ef439a7 Mon Sep 17 00:00:00 2001 -From: Christian Brauner -Date: Thu, 28 Oct 2021 17:39:42 +0200 -Subject: [PATCH] start: check event loop type before closing fd - -Since this is a union we might otherwise stomp on io_uring mmap()ed -memory. - -Fixes: #4016 -Signed-off-by: Christian Brauner ---- - src/lxc/start.c | 3 ++- - 1 file changed, 2 insertions(+), 1 deletion(-) - -diff --git a/src/lxc/start.c b/src/lxc/start.c -index 8f7173ec8c..1a6046c7a4 100644 ---- a/src/lxc/start.c -+++ b/src/lxc/start.c -@@ -629,7 +629,8 @@ int lxc_poll(const char *name, struct lxc_handler *handler) - TRACE("Mainloop is ready"); - - ret = lxc_mainloop(&descr, -1); -- close_prot_errno_disarm(descr.epfd); -+ if (descr.type == LXC_MAINLOOP_EPOLL) -+ close_prot_errno_disarm(descr.epfd); - if (ret < 0 || !handler->init_died) - goto out_mainloop_console; - diff --git a/app-containers/lxc/lxc-4.0.11_p1-r1.ebuild b/app-containers/lxc/lxc-4.0.11_p1-r1.ebuild deleted file mode 100644 index 4e14a39d94fa..000000000000 --- a/app-containers/lxc/lxc-4.0.11_p1-r1.ebuild +++ /dev/null @@ -1,188 +0,0 @@ -# Copyright 1999-2021 Gentoo Authors -# Distributed under the terms of the GNU General Public License v2 - -EAPI=7 - -inherit autotools bash-completion-r1 linux-info flag-o-matic optfeature pam readme.gentoo-r1 systemd verify-sig - -DESCRIPTION="A userspace interface for the Linux kernel containment features" -HOMEPAGE="https://linuxcontainers.org/ https://github.com/lxc/lxc" -SRC_URI="https://linuxcontainers.org/downloads/lxc/${P/_p1}.tar.gz - verify-sig? ( https://linuxcontainers.org/downloads/lxc/${P/_p1}.tar.gz.asc )" - -KEYWORDS="amd64 ~arm ~arm64 ~ppc64 ~riscv x86" - -LICENSE="GPL-2 LGPL-2.1 LGPL-3" -SLOT="0" -IUSE="apparmor +caps doc io-uring man pam seccomp selinux +ssl +tools verify-sig" - -RDEPEND="acct-group/lxc - acct-user/lxc - app-misc/pax-utils - sys-apps/util-linux - sys-libs/libcap - virtual/awk - caps? ( sys-libs/libcap ) - io-uring? ( >=sys-libs/liburing-2:= ) - pam? ( sys-libs/pam ) - seccomp? ( sys-libs/libseccomp ) - selinux? ( sys-libs/libselinux ) - ssl? ( - dev-libs/openssl:0= - )" -DEPEND="${RDEPEND} - >=sys-kernel/linux-headers-4 - apparmor? ( sys-apps/apparmor )" -BDEPEND="virtual/pkgconfig - doc? ( app-doc/doxygen[dot] ) - man? ( app-text/docbook-sgml-utils ) - verify-sig? ( sec-keys/openpgp-keys-linuxcontainers )" - -CONFIG_CHECK="~!NETPRIO_CGROUP - ~CGROUPS - ~CGROUP_CPUACCT - ~CGROUP_DEVICE - ~CGROUP_FREEZER - - ~CGROUP_SCHED - ~CPUSETS - ~IPC_NS - ~MACVLAN - - ~MEMCG - ~NAMESPACES - ~NET_NS - ~PID_NS - - ~POSIX_MQUEUE - ~USER_NS - ~UTS_NS - ~VETH" - -ERROR_CGROUP_FREEZER="CONFIG_CGROUP_FREEZER: needed to freeze containers" -ERROR_MACVLAN="CONFIG_MACVLAN: needed for internal (inter-container) networking" -ERROR_MEMCG="CONFIG_MEMCG: needed for memory resource control in containers" -ERROR_NET_NS="CONFIG_NET_NS: needed for unshared network" -ERROR_POSIX_MQUEUE="CONFIG_POSIX_MQUEUE: needed for lxc-execute command" -ERROR_UTS_NS="CONFIG_UTS_NS: needed to unshare hostnames and uname info" -ERROR_VETH="CONFIG_VETH: needed for internal (host-to-container) networking" - -DOCS=( AUTHORS CONTRIBUTING MAINTAINERS NEWS README doc/FAQ.txt ) - -pkg_setup() { - linux-info_pkg_setup -} - -PATCHES=( - "${FILESDIR}"/${PN}-2.0.5-omit-sysconfig.patch # bug 558854 - "${FILESDIR}"/${P}-liburing-sync1.patch #820545 - "${FILESDIR}"/${P}-liburing-sync2.patch #820545 -) - -VERIFY_SIG_OPENPGP_KEY_PATH=${BROOT}/usr/share/openpgp-keys/linuxcontainers.asc - -S="${WORKDIR}/${PN}-${PV/_p1}" - -src_prepare() { - default - - export bashcompdir="/etc/bash_completion.d" - eautoreconf -} - -src_configure() { - append-flags -fno-strict-aliasing - - local myeconfargs=( - --bindir=/usr/bin - --localstatedir=/var - --sbindir=/usr/bin - - --with-config-path=/var/lib/lxc - --with-distro=gentoo - --with-init-script=systemd - --with-rootfs-path=/var/lib/lxc/rootfs - --with-runtime-path=/run - --with-systemdsystemunitdir=$(systemd_get_systemunitdir) - - --disable-coverity-build - --disable-dlog - --disable-fuzzers - --disable-mutex-debugging - --disable-no-undefined - --disable-rpath - --disable-sanitizers - --disable-tests - --disable-werror - - --enable-bash - --enable-commands - --enable-memfd-rexec - --enable-thread-safety - - $(use_enable apparmor) - $(use_enable caps capabilities) - $(use_enable doc api-docs) - $(use_enable doc examples) - $(use_enable io-uring liburing) - $(use_enable man doc) - $(use_enable pam) - $(use_enable seccomp) - $(use_enable selinux) - $(use_enable ssl openssl) - $(use_enable tools) - - $(use_with pam pamdir $(getpam_mod_dir)) - ) - - econf "${myeconfargs[@]}" -} - -src_install() { - default - - # The main bash-completion file will collide with lxd, need to relocate and update symlinks. - mkdir -p "${ED}"/$(get_bashcompdir) || die "Failed to create bashcompdir." - mv "${ED}"/etc/bash_completion.d/lxc "${ED}"/$(get_bashcompdir)/lxc-start || die "Failed to relocate lxc bash-completion file." - rm -r "${ED}"/etc/bash_completion.d || die "Failed to remove wrong bash_completion.d content." - - if use tools; then - bashcomp_alias lxc-start lxc-{attach,cgroup,copy,console,create,destroy,device,execute,freeze,info,monitor,snapshot,stop,unfreeze,usernsexec,wait} - else - bashcomp_alias lxc-start lxc-usernsexec - fi - - keepdir /etc/lxc /var/lib/lxc/rootfs /var/log/lxc - rmdir "${D}"/var/cache/lxc "${D}"/var/cache || die "rmdir failed" - - find "${D}" -name '*.la' -delete -o -name '*.a' -delete || die - - # Gentoo-specific additions! - newinitd "${FILESDIR}/lxc.initd.8" lxc - - # Remember to compare our systemd unit file with the upstream one - # config/init/systemd/lxc.service.in - systemd_newunit "${FILESDIR}"/lxc_at.service.4.0.0 "lxc@.service" - - DOC_CONTENTS=" - For openrc, there is an init script provided with the package. - You should only need to symlink /etc/init.d/lxc to - /etc/init.d/lxc.configname to start the container defined in - /etc/lxc/configname.conf. - - Correspondingly, for systemd a service file lxc@.service is installed. - Enable and start lxc@configname in order to start the container defined - in /etc/lxc/configname.conf." - DISABLE_AUTOFORMATTING=true - readme.gentoo_create_doc -} - -pkg_postinst() { - readme.gentoo_print_elog - - elog "Please run 'lxc-checkconfig' to see optional kernel features." - elog - optfeature "automatic template scripts" app-containers/lxc-templates - optfeature "Debian-based distribution container image support" dev-util/debootstrap - optfeature "snapshot & restore functionality" sys-process/criu -} diff --git a/app-containers/lxd/Manifest b/app-containers/lxd/Manifest index 9519fcf1694e..56126823385b 100644 --- a/app-containers/lxd/Manifest +++ b/app-containers/lxd/Manifest @@ -1,16 +1,11 @@ AUX lxd-4.0.0.confd 582 BLAKE2B 88ce8ec99eb50174bffea7d3b8bddc67b50fe6677d54df115c9069311b5fb59a72170a15988f50714740074f7ec4f2cd32fb47b6d8c52cf69b8c6fa332162a06 SHA512 96d922ae81677eebace3f8d2dff7f67d58701c40c09e2435677f9289cca89fe260c0d9526059d3772c3405a5b8ec52466bf7d7a920dcdd7551f1b3f01f2fc9c4 AUX lxd-4.0.0.initd 1221 BLAKE2B cdff6d900e09f85d9a4dc86b30f0d32b848689e209b79b48217e2f844a48fb358850cbc27db1aed7c1b957bbc19af2d76856fd65319a0a207cedfefbadf659cc SHA512 8b176036c1e5f2ffac4c94e781694fb637fa53666f10da1d5d2b3f1fc341f02003e5306dbd332edd9eeb6f7b08dffd9190c7f65361a40220f6f88d56e4c78a57 AUX lxd-4.0.0.socket 197 BLAKE2B 8c0d2dee71c14ee5f34b2bd0804adfa06ab3ae2a73bcf8d122184434c42b7f91f66fe610bddda93c458e0f171b505fe79a4f268d8243aabdf226f47e95027e71 SHA512 d70dc867b2e92b69928c83fc5feca4e387808adbc267b9fe4ecf0c8befdf3ca13366b229c6eefcb5667e51405fb0aa4e6bb8f59a0b5b5fb3895c46b4aaab0661 -AUX lxd-4.0.7-no-werror.patch 5387 BLAKE2B a13ef0b87a91aa5e44a3bc527c8d339249653139bbc35d78a1b0f0c1f3412b083f7016e634640dff1e3ab18099e5b56551c7fb2eb6b898f984cb2f9f90acafc2 SHA512 6abb81bc43cc82a2716cce8e68741d32db33d860a09fc21e5df781c298abf7e88fc5ccab1513e1d635c839a801e092c16d7e92eb0fe616a3b680db47153dcf0c AUX lxd-4.0.7-r1.service 497 BLAKE2B 90141dce8dbef52521c5f9c2924111904f8b0528e8555afb8a2eb8d9dc8b4c6b32b543a6ee3caf42dc0a90f20d35d40810a3f0828a88377e91424f7b00e589a8 SHA512 91fa16a9e9de2eda34c06ec66c144a43fe1cb23c99137cbd830ff9621c7362989404ca9906e4f53b3c10ba84c3cc950713cb69ed7a81bd66f07935312f8f75f8 -AUX lxd-4.0.8-btrfs-progs-5.14-safety-check-fix.patch 2184 BLAKE2B ee6b371694a594606b25ac6950032f3613be4da470c9b991bf30f0f1911b563844f20180009c7049f1e5ad461e83025f82764ae00777bc811e05b26a2b6690b8 SHA512 7d126f4c59007862dce8dd4273b1b335a6f29e1631012adb7f1486778179dc03a2e94aa3fed38b7ad075fd65bf2efb580800b9450dac21c088778d0cef32fcff AUX lxd-4.0.9-r1.service 612 BLAKE2B e44029b6f615afc0daf8abfccd7d2e472291d9b1f8530b64f5c9b7d96aeda605a0dd0ec9b74f0a79f68992a45607e4362a7c30c711b34ac106b9377610f97ad6 SHA512 68800d9952e865eeffe1c05ecf111c49e6b137c6f7af7c7b02daf180c3a794a670ddbe7140e97d187f1b9a803ca84e132303808ed8b6ae49760246c01d7c60d4 AUX lxd-4.0.9.initd 1333 BLAKE2B 72a27d38527b4f0dcca3b111ae0d112bd128cf83ff6261561c5a3bf1c619a2e36672b5eb06ff643660d3cee05a545991ed565be257a56452cbd498a202e1b197 SHA512 933a09e72dbf3bbab8e2148549b6bc08ac0caf2088bd44c3e378ac6041fa861845bfae351c83fcd0920655ceb29ea6ca8023163c52a2fb7499c9bf2958d4dc86 AUX lxd-containers-4.0.0.service 322 BLAKE2B a38cffd4b5809946abdac858564dcab2c2967c295d671df0d315d790df1849e25f0bc052e20cd0d9e4c23403289050b4538f5a52437ab8ae9ca3b40c6a9a1571 SHA512 a55f2c1a367c5c3c5eb6880e01893977de18c6e9463949236ee3247715fbf53641bbe1b69404362dd6cb6ba2a30ac6539fd362b21059e529dc4dac4ec5ca6718 -DIST lxd-4.0.8.tar.gz 8898153 BLAKE2B c02bea1019079f59fff5fbb2c3d3ebf13e01751fd1c18b9aa44a9306a8f631cb0c0a55f77eb17945e44c040dfdad5c790bb2c2e3ab165356e3900c3d6cccec0e SHA512 9bf5ee91438bc14e916410254979838a110d21d8329c0eaa0a5eecfd378039a3ac10291197d2f680dc12484866f21ef724618e88e6c02038e6d2484d33571dd6 -DIST lxd-4.0.8.tar.gz.asc 833 BLAKE2B 2073b113f34b2ab052e6e4f406016ac04631ec63269b79dd1e85ca5191aa73ed1f47f0e87f5155b6e5c6659138a182c4c403a66e20925cdb347f49e542e8139b SHA512 9b5f00f9d4a601e718ca91f623dd31e864963b7b8a9e9be6af8da2288b775c4fc8c60b0d6fcefa2a347d733d1e002a3714ac3dbfadf9a1188f9747e9682fe8b9 DIST lxd-4.0.9.tar.gz 9117078 BLAKE2B aa6689c1e958258484fba5c060765dd71d5406cb4375d3132cdc38633277e6c95322e8e3aed5e9dd251140c6868ec42470e797639dde4af42848e138f3b45ee2 SHA512 657949311753895f3941deaabae2d03092fc67490d2de78db48b296fdd3e9df4c5844467dd6913814426ca423a6ee1da9705bb1a2652ea99fe1356eb7da97ebb DIST lxd-4.0.9.tar.gz.asc 833 BLAKE2B 7cd0d3ab518d947ca3ea6dc804c6a59b592e4e568152c078fdd3c102420bcd94d2f0b2c335b8b4ecdb19dc3c9a10f665a1510903f395247da956717beaa172a3 SHA512 79a4111571ab43e79cf669e416ed50f3ccae0fbceb86d73757d23c778035e827f47643bc87ff6a2fc64b095345a3d53cbd0c4eb245c75364e907d7449f3a0886 -EBUILD lxd-4.0.8-r3.ebuild 5019 BLAKE2B d320ef4a693b34132b69bf530f4397e585510fc934fef816c66bfb5de08f81404e16abe1fb3e57c64856bcba75a02cac4d4e4cb95700ee1d5360e7c1ddcd655e SHA512 77c77eb5fa83156cd27aeb462ad3f5c4514f1f0deaffddaa96b957cdf6f1027314094310c108b13f4ed1364c029aa78b69c055911e597a29dbdc41cf0e1c38f4 EBUILD lxd-4.0.9-r3.ebuild 4790 BLAKE2B a9311e2749fe23a9da3768f95d222161ce56af1bb100b098c30e30b645e1b3b911edf038a1ecf7044b4d8527385ffa2b270aa15040597503cdaf83e91d3e175d SHA512 74093b3e455f3a8adf49a8083b60cbac5196d9472b658bc259106659cb26347e565d87c132efb3c24b5b544c532056c2b6a88853b3d040aae191be626fcb3292 MISC metadata.xml 777 BLAKE2B e25ff2ac780143763e40917f2570bbe8244c2a2a9eac1a9761199e7ea19df9863ade968ca8218f62da9fe41f3b9e7110ef86abff764c2a3d85f02ae102951a16 SHA512 e39a06e8b838990a9b0019f52e1d0c7dd83527c6a15bc8a14f0aa9fec2ee86c914de52f1ba48e7a586c3866d9da46dc32c2d6e1ea3e2c42ca985fdfe0783b40c diff --git a/app-containers/lxd/files/lxd-4.0.7-no-werror.patch b/app-containers/lxd/files/lxd-4.0.7-no-werror.patch deleted file mode 100644 index 50a916356019..000000000000 --- a/app-containers/lxd/files/lxd-4.0.7-no-werror.patch +++ /dev/null @@ -1,108 +0,0 @@ -diff -Naur lxd-4.0.7/lxd/cgo.go lxd-4.0.7-no-werror/lxd/cgo.go ---- lxd-4.0.7/lxd/cgo.go 2021-07-16 23:33:23.000000000 +0300 -+++ lxd-4.0.7-no-werror/lxd/cgo.go 2021-11-16 15:16:23.575299112 +0200 -@@ -3,7 +3,7 @@ - - package main - --// #cgo CFLAGS: -std=gnu11 -Wvla -Werror -fvisibility=hidden -Winit-self -+// #cgo CFLAGS: -std=gnu11 -Wvla -fvisibility=hidden -Winit-self - // #cgo CFLAGS: -Wformat=2 -Wshadow -Wendif-labels -fasynchronous-unwind-tables - // #cgo CFLAGS: -pipe --param=ssp-buffer-size=4 -g -Wunused - // #cgo CFLAGS: -Werror=implicit-function-declaration -diff -Naur lxd-4.0.7/lxd/seccomp/cgo.go lxd-4.0.7-no-werror/lxd/seccomp/cgo.go ---- lxd-4.0.7/lxd/seccomp/cgo.go 2021-07-16 23:33:23.000000000 +0300 -+++ lxd-4.0.7-no-werror/lxd/seccomp/cgo.go 2021-11-16 15:16:34.928629720 +0200 -@@ -3,7 +3,7 @@ - - package seccomp - --// #cgo CFLAGS: -std=gnu11 -Wvla -Werror -fvisibility=hidden -Winit-self -+// #cgo CFLAGS: -std=gnu11 -Wvla -fvisibility=hidden -Winit-self - // #cgo CFLAGS: -Wformat=2 -Wshadow -Wendif-labels -fasynchronous-unwind-tables - // #cgo CFLAGS: -pipe --param=ssp-buffer-size=4 -g -Wunused - // #cgo CFLAGS: -Werror=implicit-function-declaration -diff -Naur lxd-4.0.7/lxd/storage/cgo.go lxd-4.0.7-no-werror/lxd/storage/cgo.go ---- lxd-4.0.7/lxd/storage/cgo.go 2021-07-16 23:33:23.000000000 +0300 -+++ lxd-4.0.7-no-werror/lxd/storage/cgo.go 2021-11-16 15:16:44.585294068 +0200 -@@ -3,7 +3,7 @@ - - package storage - --// #cgo CFLAGS: -std=gnu11 -Wvla -Werror -fvisibility=hidden -Winit-self -+// #cgo CFLAGS: -std=gnu11 -Wvla -fvisibility=hidden -Winit-self - // #cgo CFLAGS: -Wformat=2 -Wshadow -Wendif-labels -fasynchronous-unwind-tables - // #cgo CFLAGS: -pipe --param=ssp-buffer-size=4 -g -Wunused - // #cgo CFLAGS: -Werror=implicit-function-declaration -diff -Naur lxd-4.0.7/lxd/storage/quota/cgo.go lxd-4.0.7-no-werror/lxd/storage/quota/cgo.go ---- lxd-4.0.7/lxd/storage/quota/cgo.go 2021-07-16 23:33:23.000000000 +0300 -+++ lxd-4.0.7-no-werror/lxd/storage/quota/cgo.go 2021-11-16 15:16:54.231958418 +0200 -@@ -3,7 +3,7 @@ - - package quota - --// #cgo CFLAGS: -std=gnu11 -Wvla -Werror -fvisibility=hidden -Winit-self -+// #cgo CFLAGS: -std=gnu11 -Wvla -fvisibility=hidden -Winit-self - // #cgo CFLAGS: -Wformat=2 -Wshadow -Wendif-labels -fasynchronous-unwind-tables - // #cgo CFLAGS: -pipe --param=ssp-buffer-size=4 -g -Wunused - // #cgo CFLAGS: -Werror=implicit-function-declaration -diff -Naur lxd-4.0.7/lxd-p2c/cgo.go lxd-4.0.7-no-werror/lxd-p2c/cgo.go ---- lxd-4.0.7/lxd-p2c/cgo.go 2021-07-16 23:33:23.000000000 +0300 -+++ lxd-4.0.7-no-werror/lxd-p2c/cgo.go 2021-11-16 15:17:06.185288881 +0200 -@@ -2,7 +2,7 @@ - - package main - --// #cgo CFLAGS: -std=gnu11 -Wvla -Werror -fvisibility=hidden -Winit-self -+// #cgo CFLAGS: -std=gnu11 -Wvla -fvisibility=hidden -Winit-self - // #cgo CFLAGS: -Wformat=2 -Wshadow -Wendif-labels -fasynchronous-unwind-tables - // #cgo CFLAGS: -pipe --param=ssp-buffer-size=4 -g -Wunused - // #cgo CFLAGS: -Werror=implicit-function-declaration -diff -Naur lxd-4.0.7/shared/cgo.go lxd-4.0.7-no-werror/shared/cgo.go ---- lxd-4.0.7/shared/cgo.go 2021-07-16 23:33:23.000000000 +0300 -+++ lxd-4.0.7-no-werror/shared/cgo.go 2021-11-16 15:17:15.238620041 +0200 -@@ -3,7 +3,7 @@ - - package shared - --// #cgo CFLAGS: -std=gnu11 -Wvla -Werror -fvisibility=hidden -Winit-self -+// #cgo CFLAGS: -std=gnu11 -Wvla -fvisibility=hidden -Winit-self - // #cgo CFLAGS: -Wformat=2 -Wshadow -Wendif-labels -fasynchronous-unwind-tables - // #cgo CFLAGS: -pipe --param=ssp-buffer-size=4 -g -Wunused - // #cgo CFLAGS: -Werror=implicit-function-declaration -diff -Naur lxd-4.0.7/shared/idmap/cgo.go lxd-4.0.7-no-werror/shared/idmap/cgo.go ---- lxd-4.0.7/shared/idmap/cgo.go 2021-07-16 23:33:23.000000000 +0300 -+++ lxd-4.0.7-no-werror/shared/idmap/cgo.go 2021-11-16 15:17:25.768617513 +0200 -@@ -3,7 +3,7 @@ - - package idmap - --// #cgo CFLAGS: -std=gnu11 -Wvla -Werror -fvisibility=hidden -Winit-self -+// #cgo CFLAGS: -std=gnu11 -Wvla -fvisibility=hidden -Winit-self - // #cgo CFLAGS: -Wformat=2 -Wshadow -Wendif-labels -fasynchronous-unwind-tables - // #cgo CFLAGS: -pipe --param=ssp-buffer-size=4 -g -Wunused - // #cgo CFLAGS: -Werror=implicit-function-declaration -diff -Naur lxd-4.0.7/shared/netutils/cgo.go lxd-4.0.7-no-werror/shared/netutils/cgo.go ---- lxd-4.0.7/shared/netutils/cgo.go 2021-07-16 23:33:23.000000000 +0300 -+++ lxd-4.0.7-no-werror/shared/netutils/cgo.go 2021-11-16 15:17:34.598615393 +0200 -@@ -3,7 +3,7 @@ - - package netutils - --// #cgo CFLAGS: -std=gnu11 -Wvla -Werror -fvisibility=hidden -Winit-self -+// #cgo CFLAGS: -std=gnu11 -Wvla -fvisibility=hidden -Winit-self - // #cgo CFLAGS: -Wformat=2 -Wshadow -Wendif-labels -fasynchronous-unwind-tables - // #cgo CFLAGS: -pipe --param=ssp-buffer-size=4 -g -Wunused - // #cgo CFLAGS: -Werror=implicit-function-declaration -diff -Naur lxd-4.0.7/shared/termios/cgo.go lxd-4.0.7-no-werror/shared/termios/cgo.go ---- lxd-4.0.7/shared/termios/cgo.go 2021-07-16 23:33:23.000000000 +0300 -+++ lxd-4.0.7-no-werror/shared/termios/cgo.go 2021-11-16 15:17:43.568613239 +0200 -@@ -3,7 +3,7 @@ - - package termios - --// #cgo CFLAGS: -std=gnu11 -Wvla -Werror -fvisibility=hidden -Winit-self -+// #cgo CFLAGS: -std=gnu11 -Wvla -fvisibility=hidden -Winit-self - // #cgo CFLAGS: -Wformat=2 -Wshadow -Wendif-labels -fasynchronous-unwind-tables - // #cgo CFLAGS: -pipe --param=ssp-buffer-size=4 -g -Wunused - // #cgo CFLAGS: -Werror=implicit-function-declaration diff --git a/app-containers/lxd/files/lxd-4.0.8-btrfs-progs-5.14-safety-check-fix.patch b/app-containers/lxd/files/lxd-4.0.8-btrfs-progs-5.14-safety-check-fix.patch deleted file mode 100644 index f32debff5e3b..000000000000 --- a/app-containers/lxd/files/lxd-4.0.8-btrfs-progs-5.14-safety-check-fix.patch +++ /dev/null @@ -1,75 +0,0 @@ -From 5efac9cfed92a890dc1a073fe60b1c814c305267 Mon Sep 17 00:00:00 2001 -From: =?UTF-8?q?St=C3=A9phane=20Graber?= -Date: Thu, 4 Nov 2021 14:05:27 -0400 -Subject: [PATCH] lxd/storage/btrfs: Support 5.14.2 -MIME-Version: 1.0 -Content-Type: text/plain; charset=UTF-8 -Content-Transfer-Encoding: 8bit - -Closes #9418 - -Signed-off-by: Stéphane Graber ---- - lxd/storage/drivers/driver_btrfs.go | 18 ++++++++++++++++++ - lxd/storage/drivers/driver_btrfs_utils.go | 8 +++++++- - 2 files changed, 25 insertions(+), 1 deletion(-) - -diff --git a/lxd/storage/drivers/driver_btrfs.go b/lxd/storage/drivers/driver_btrfs.go -index e6a64bf8136..a47be766f8f 100644 ---- a/lxd/storage/drivers/driver_btrfs.go -+++ b/lxd/storage/drivers/driver_btrfs.go -@@ -17,10 +17,12 @@ import ( - "github.com/lxc/lxd/shared/api" - "github.com/lxc/lxd/shared/units" - "github.com/lxc/lxd/shared/validate" -+ "github.com/lxc/lxd/shared/version" - ) - - var btrfsVersion string - var btrfsLoaded bool -+var btrfsPropertyForce bool - - type btrfs struct { - common -@@ -64,6 +66,22 @@ func (d *btrfs) load() error { - } - } - -+ // Check if we need --force to set properties. -+ ver5142, err := version.Parse("5.14.2") -+ if err != nil { -+ return err -+ } -+ -+ ourVer, err := version.Parse(btrfsVersion) -+ if err != nil { -+ return err -+ } -+ -+ // If running 5.14.2 or older, we need --force. -+ if ourVer.Compare(ver5142) > 0 { -+ btrfsPropertyForce = true -+ } -+ - btrfsLoaded = true - return nil - } -diff --git a/lxd/storage/drivers/driver_btrfs_utils.go b/lxd/storage/drivers/driver_btrfs_utils.go -index e1a359e8490..0618e29e6f2 100644 ---- a/lxd/storage/drivers/driver_btrfs_utils.go -+++ b/lxd/storage/drivers/driver_btrfs_utils.go -@@ -308,7 +308,13 @@ func (d *btrfs) setSubvolumeReadonlyProperty(path string, readonly bool) error { - return nil - } - -- _, err := shared.RunCommand("btrfs", "property", "set", "-ts", path, "ro", fmt.Sprintf("%t", readonly)) -+ args := []string{"property", "set"} -+ if btrfsPropertyForce { -+ args = append(args, "-f") -+ } -+ args = append(args, "-ts", path, "ro", fmt.Sprintf("%t", readonly)) -+ -+ _, err := shared.RunCommand("btrfs", args...) - return err - } - diff --git a/app-containers/lxd/lxd-4.0.8-r3.ebuild b/app-containers/lxd/lxd-4.0.8-r3.ebuild deleted file mode 100644 index f301c886cd62..000000000000 --- a/app-containers/lxd/lxd-4.0.8-r3.ebuild +++ /dev/null @@ -1,190 +0,0 @@ -# Copyright 1999-2022 Gentoo Authors -# Distributed under the terms of the GNU General Public License v2 - -EAPI=7 - -inherit bash-completion-r1 linux-info optfeature systemd verify-sig - -DESCRIPTION="Fast, dense and secure container management" -HOMEPAGE="https://linuxcontainers.org/lxd/introduction/ https://github.com/lxc/lxd" -SRC_URI="https://linuxcontainers.org/downloads/lxd/${P}.tar.gz - verify-sig? ( https://linuxcontainers.org/downloads/lxd/${P}.tar.gz.asc )" - -LICENSE="Apache-2.0" -SLOT="0" -KEYWORDS="amd64 ~x86" -IUSE="apparmor ipv6 nls verify-sig" - -DEPEND="acct-group/lxd - app-arch/xz-utils - >=app-containers/lxc-3.0.0[apparmor?,seccomp(+)] - dev-db/sqlite:3 - dev-libs/dqlite - dev-libs/lzo - dev-libs/raft[lz4] - >=dev-util/xdelta-3.0[lzma(+)] - net-dns/dnsmasq[dhcp,ipv6(+)?] - sys-libs/libcap - virtual/udev" -RDEPEND="${DEPEND} - net-firewall/ebtables - net-firewall/iptables[ipv6(+)?] - sys-apps/iproute2[ipv6(+)?] - sys-fs/fuse:* - sys-fs/lxcfs - sys-fs/squashfs-tools[lzma] - virtual/acl" -BDEPEND="dev-lang/go - nls? ( sys-devel/gettext ) - verify-sig? ( sec-keys/openpgp-keys-linuxcontainers )" - -CONFIG_CHECK=" - ~CGROUPS - ~IPC_NS - ~NET_NS - ~PID_NS - - ~SECCOMP - ~USER_NS - ~UTS_NS - - ~KVM - ~MACVTAP - ~VHOST_VSOCK -" - -ERROR_IPC_NS="CONFIG_IPC_NS is required." -ERROR_NET_NS="CONFIG_NET_NS is required." -ERROR_PID_NS="CONFIG_PID_NS is required." -ERROR_SECCOMP="CONFIG_SECCOMP is required." -ERROR_UTS_NS="CONFIG_UTS_NS is required." - -WARNING_KVM="CONFIG_KVM and CONFIG_KVM_AMD/-INTEL is required for virtual machines." -WARNING_MACVTAP="CONFIG_MACVTAP is required for virtual machines." -WARNING_VHOST_VSOCK="CONFIG_VHOST_VSOCK is required for virtual machines." - -# Go magic. -QA_PREBUILT="/usr/bin/fuidshift - /usr/bin/lxc - /usr/bin/lxc-to-lxd - /usr/bin/lxd-agent - /usr/bin/lxd-benchmark - /usr/bin/lxd-p2c - /usr/sbin/lxd" - -EGO_PN="github.com/lxc/lxd" -GOPATH="${S}/_dist" # this seems to reset every now and then, though - -VERIFY_SIG_OPENPGP_KEY_PATH=${BROOT}/usr/share/openpgp-keys/linuxcontainers.asc - -# The testsuite must be run as root. -# make: *** [Makefile:156: check] Error 1 -RESTRICT="test" - -PATCHES=( "${FILESDIR}"/lxd-4.0.8-btrfs-progs-5.14-safety-check-fix.patch - "${FILESDIR}"/lxd-4.0.7-no-werror.patch ) - -src_prepare() { - default - - export GOPATH="${S}/_dist" - - sed -i \ - -e "s:\./configure:./configure --prefix=/usr --libdir=${EPREFIX}/usr/lib/lxd:g" \ - -e "s:make:make ${MAKEOPTS}:g" \ - Makefile || die - - # Fix hardcoded ovmf file path, see bug 763180 - sed -i \ - -e "s:/usr/share/OVMF:/usr/share/edk2-ovmf:g" \ - -e "s:OVMF_VARS.ms.fd:OVMF_VARS.secboot.fd:g" \ - doc/environment.md \ - lxd/apparmor/instance.go \ - lxd/apparmor/instance_qemu.go \ - lxd/instance/drivers/driver_qemu.go || die "Failed to fix hardcoded ovmf paths." - - # Fix hardcoded virtfs-proxy-helper file path, see bug 798924 - sed -i \ - -e "s:/usr/lib/qemu/virtfs-proxy-helper:/usr/libexec/virtfs-proxy-helper:g" \ - lxd/device/disk.go || die "Failed to fix virtfs-proxy-helper path." - - cp "${FILESDIR}"/lxd-4.0.7-r1.service "${T}"/lxd.service || die - if use apparmor; then - sed -i \ - '/^EnvironmentFile=.*/a ExecStartPre=\/usr\/libexec\/lxc\/lxc-apparmor-load' \ - "${T}"/lxd.service || die - fi -} - -src_configure() { :; } - -src_compile() { - export GOPATH="${S}/_dist" - export GO111MODULE=auto - export CGO_LDFLAGS_ALLOW="-Wl,-z,now" - - cd "${S}" || die - - for k in fuidshift lxd-benchmark lxc lxc-to-lxd; do - go install -v -x "${EGO_PN}/${k}" || die "failed compiling ${k}" - done - - go install -v -x -tags libsqlite3 ${EGO_PN}/lxd || die "Failed to build the daemon" - - # Needs to be built statically - CGO_ENABLED=0 go install -v -tags netgo "${EGO_PN}"/lxd-p2c - CGO_ENABLED=0 go install -v -tags agent,netgo "${EGO_PN}"/lxd-agent - - use nls && emake build-mo -} - -src_test() { - emake check -} - -src_install() { - local bindir="_dist/bin" - export GOPATH="${S}/_dist" - - dosbin ${bindir}/lxd - - for l in fuidshift lxd-agent lxd-benchmark lxd-p2c lxc lxc-to-lxd; do - dobin ${bindir}/${l} - done - - cd "${S}" || die - - newbashcomp scripts/bash/lxd-client lxc - - newconfd "${FILESDIR}"/lxd-4.0.0.confd lxd - newinitd "${FILESDIR}"/lxd-4.0.0.initd lxd - - systemd_dounit "${T}"/lxd.service - - systemd_newunit "${FILESDIR}"/lxd-containers-4.0.0.service lxd-containers.service - systemd_newunit "${FILESDIR}"/lxd-4.0.0.socket lxd.socket - - # Temporary fix for #817287 - keepdir /var/log/lxd - fowners root:lxd /var/log/lxd - - dodoc AUTHORS doc/* - use nls && domo po/*.mo -} - -pkg_postinst() { - elog - elog "Consult https://wiki.gentoo.org/wiki/LXD for more information," - elog "including a Quick Start." - elog "For virtual machine support, see:" - elog "https://wiki.gentoo.org/wiki/LXD#Virtual_machines" - elog - elog "Please run 'lxc-checkconfig' to see all optional kernel features." - elog - optfeature "virtual machine support" app-emulation/qemu[spice,usbredir,virtfs] - optfeature "btrfs storage backend" sys-fs/btrfs-progs - optfeature "lvm2 storage backend" sys-fs/lvm2 - optfeature "zfs storage backend" sys-fs/zfs - elog - elog "Be sure to add your local user to the lxd group." -} diff --git a/app-containers/podman/Manifest b/app-containers/podman/Manifest index db94b1e01f69..f3d8bb223c42 100644 --- a/app-containers/podman/Manifest +++ b/app-containers/podman/Manifest @@ -1,10 +1,6 @@ AUX podman.confd 328 BLAKE2B e03a1f7f5cec555f195bd1ca9bea050a67ccac7866bd68f0c74dcbd3a6629b2da6f368274b4b664eaaa410773337a1f352c3144c3682ea0ea56b8c958b9d00a6 SHA512 58b05b7ff574f2153d7eeb3f726808e22ebe0821afc4d86dc3dea189944cdd6f2d6e1b051046456e149505b4b558a7957a278c1dba21db2fec65f2efbb3e1d84 AUX podman.initd 704 BLAKE2B 2fc4ffaa3b971774957ea244e05d851fa2797ec074529ea7c23bc6d7a3f597c04268d7f5580852dae4ab412629a513fed152f6a20a7ed432ef00cb96848c290c SHA512 bcf3e74a4a77bac82fc4679b3161091692b301426ecf81af7c5ea7e23ba66d15602d0cf1284f160d4179e52ae78f309ad826d9f3698dfcb78c2be2c6ac51417c AUX podman.logrotated 85 BLAKE2B 730899f93ee354e476629276b69224cfeaaa1603b6690cac3c0cd905cd75add19179f99e26f29edbd963d5f44c38a3a2db0b5a3613dc665ab801654eac13dc2e SHA512 0136d063b15b07c41a9370ba1845c4f368ec46a7a30683b7ff7cbb0b12e5b2711c9a45329f5102af6a969e562edcec006a8de9055e43e1caf9395847d0c5ec45 -DIST podman-3.4.4.tar.gz 10945990 BLAKE2B 3de69c9bc3bd1334837d21cb2817a9e9757fbb561a0b047658c7401608ecf1fbe09d5cd0c65497a82150a67a3775c77705d0dbd314a54f7b3a1953733cfb2906 SHA512 cfd295bf50ce86ea70741c3e663b409ed47b1e560c962bc579f319151a0fe2b24cdd3045667660083cce89449a9c5de1508c94a9a02375165a72ce7c16166666 -DIST podman-4.0.2.tar.gz 11377152 BLAKE2B ab022c3e7ef40685301f08b2d939e936b07e08231d5b86a84fefa6ea7a60c8f20a5e15b79788d862c263336204a9cd8d7206748b4530f2f42ccdd31df370747f SHA512 f3c42b3b3c75ca451b4c22c2d6f9f1b9ab9437b118b16e19f17f92f28b5849f8e3de4ebc97d8d249f565a61ba187214928c25a031204163a59174e94ce300a59 DIST podman-4.0.3.tar.gz 11392523 BLAKE2B 2d69fa8f52b061a931cf3dbe767edcb9eb5baf4f45fa77bcd9dd6e5541c126830c059a2bb97906f4fe9a4fd3257f77c801add06e1da910542ebafeaa2d032768 SHA512 a7c6f9a0f33641520c4143e6a3568129021783557f8ea7c846e4bc3f7da9bf70cb30b19cc7c6527809df2c46e6ded1d162a929dc4f44a5daafcf9d211b43b44a -EBUILD podman-3.4.4.ebuild 4769 BLAKE2B e7aafdf1f99f27730ab646f5d2c11bedc17e1b85b68124963ec885274663fe9ada2c0c6bfea394da3e318fc6cae3f9a86b1c9756e688b61ea7e7107cca8e193f SHA512 4ce9a78078814afba81c06066492ccb762438b36fd4bfa6448e86768b3491d0cb1b388cbbce848cf762ea2bc9b05ee7f5b23673088ba945064e446e75aacdb9a -EBUILD podman-4.0.2.ebuild 4719 BLAKE2B 29e40f5e31bf621c3cb9e9a9a5992f951c76cbee2a5a7e9ea79902f9686c91a2a9034d2623af2d0041ad9711b2194787d1f7c01e82ce86dfcd8873b865ba5d91 SHA512 da46f1e9064898caf13a04884d5df76ebf9e130ca5a722a04882398258de58ec43016f0104bcdbc2ad78c83fc649f1c925c75a6ea52e3fc514f7711dcd72a8bc -EBUILD podman-4.0.3.ebuild 4719 BLAKE2B 257bcbd6fcd2f80109f037c34861030cde4d20f9689d9f4823f5205a0d5113372dc7514afbc8b2802594cce5c115efc3e6aa2a6107219e649a4d29d7e8b4b5ba SHA512 634cdc23aef262008d22253e31d9a3fe314e0d2d5e5ce9a0ae1b0fe3e24aa5053e4be9735989c1b0046812fa803ea8efdf6c74fd604f068be06c9a7f6d7dd46c +EBUILD podman-4.0.3.ebuild 4757 BLAKE2B 1d5de8d1f2e87d1f9c4b2beff1832df41cdcbc287ec03176b31f0c958901449658155dc9b470da88a3c62100f5c72ee1b41c3471f1b052382bed59cde4ce4d6b SHA512 814cac6b4bd0e75e83b6d262b58eae9d22d84efaf0cc5e14e22f3aaa9db491ddfe9e581d3d96587d503e95cfdc5486493b112e40b504490c7df873a5dc3b24af MISC metadata.xml 1372 BLAKE2B b8d6a880c8f915394b01e98644672f4ec91937606e912158b58740df31576010cef8accb053e217991b700020ffa03b4e6440d90de4698dfd1a6645599d5a0be SHA512 c8b3b35f30b48b156ad9cc0ae4189fb40838e954a925f14abc169f734472b98fe02f88bb95b1d2bc28ce74b4535dec28c662719189a26b06a138f57820cc0a64 diff --git a/app-containers/podman/podman-3.4.4.ebuild b/app-containers/podman/podman-3.4.4.ebuild deleted file mode 100644 index d9c90056d70c..000000000000 --- a/app-containers/podman/podman-3.4.4.ebuild +++ /dev/null @@ -1,165 +0,0 @@ -# Copyright 1999-2022 Gentoo Authors -# Distributed under the terms of the GNU General Public License v2 - -EAPI=7 -EGIT_COMMIT="3450a60d2196cc0bee8a3fc28a7c93a7370d4515" - -inherit bash-completion-r1 flag-o-matic go-module tmpfiles - -DESCRIPTION="Library and podman tool for running OCI-based containers in Pods" -HOMEPAGE="https://github.com/containers/podman/" -MY_PN=podman -MY_P=${MY_PN}-${PV} -SRC_URI="https://github.com/containers/podman/archive/v${PV}.tar.gz -> ${MY_P}.tar.gz" -LICENSE="Apache-2.0 BSD BSD-2 CC-BY-SA-4.0 ISC MIT MPL-2.0" -SLOT="0" - -KEYWORDS="amd64 arm64 ~ppc64 ~riscv" -IUSE="apparmor btrfs +cgroup-hybrid +fuse +rootless selinux" -RESTRICT+=" test" - -COMMON_DEPEND=" - app-crypt/gpgme:= - >=app-containers/conmon-2.0.0 - cgroup-hybrid? ( >=app-containers/runc-1.0.0_rc6 ) - !cgroup-hybrid? ( app-containers/crun ) - dev-libs/libassuan:= - dev-libs/libgpg-error:= - >=net-misc/cni-plugins-0.8.6 - sys-fs/lvm2 - sys-libs/libseccomp:= - - apparmor? ( sys-libs/libapparmor ) - btrfs? ( sys-fs/btrfs-progs ) - rootless? ( app-containers/slirp4netns ) - selinux? ( sys-libs/libselinux:= ) -" -DEPEND=" - ${COMMON_DEPEND} - dev-go/go-md2man" -RDEPEND="${COMMON_DEPEND} - fuse? ( sys-fs/fuse-overlayfs )" - -S=${WORKDIR}/${MY_P} - -src_prepare() { - default - - # Disable installation of python modules here, since those are - # installed by separate ebuilds. - local makefile_sed_args=( - -e '/^GIT_.*/d' - -e 's/$(GO) build/$(GO) build -v -work -x/' - -e 's/^\(install:.*\) install\.python$/\1/' - -e 's|^pkg/varlink/iopodman.go: .gopathok pkg/varlink/io.podman.varlink$|pkg/varlink/iopodman.go: pkg/varlink/io.podman.varlink|' - ) - - has_version -b '>=dev-lang/go-1.13.9' || makefile_sed_args+=(-e 's:GO111MODULE=off:GO111MODULE=on:') - - sed "${makefile_sed_args[@]}" -i Makefile || die - - sed -e 's|OUTPUT="${CIRRUS_TAG:.*|OUTPUT='v${PV}'|' \ - -i hack/get_release_info.sh || die -} - -src_compile() { - local git_commiT=${EGIT_COMMIT} - - # Filter unsupported linker flags - filter-flags '-Wl,*' - - [[ -f hack/apparmor_tag.sh ]] || die - if use apparmor; then - echo -e "#!/bin/sh\necho apparmor" > hack/apparmor_tag.sh || die - else - echo -e "#!/bin/sh\ntrue" > hack/apparmor_tag.sh || die - fi - - [[ -f hack/btrfs_installed_tag.sh ]] || die - if use btrfs; then - echo -e "#!/bin/sh\ntrue" > hack/btrfs_installed_tag.sh || die - else - echo -e "#!/bin/sh\necho exclude_graphdriver_btrfs" > \ - hack/btrfs_installed_tag.sh || die - fi - - [[ -f hack/selinux_tag.sh ]] || die - if use selinux; then - echo -e "#!/bin/sh\necho selinux" > hack/selinux_tag.sh || die - else - echo -e "#!/bin/sh\ntrue" > hack/selinux_tag.sh || die - fi - - # Avoid this error when generating pkg/varlink/iopodman.go: - # cannot find package "github.com/varlink/go/varlink/idl" - mkdir -p _output || die - ln -snf ../vendor _output/src || die - GO111MODULE=off GOPATH=${PWD}/_output go generate ./pkg/varlink/... || die - rm _output/src || die - - export -n GOCACHE GOPATH XDG_CACHE_HOME - GOBIN="${S}/bin" \ - emake all \ - GIT_BRANCH=master \ - GIT_BRANCH_CLEAN=master \ - COMMIT_NO="${git_commit}" \ - GIT_COMMIT="${git_commit}" -} - -src_install() { - emake DESTDIR="${D}" PREFIX="${EPREFIX}/usr" install - - insinto /etc/containers - newins test/registries.conf registries.conf.example - newins test/policy.json policy.json.example - - insinto /usr/share/containers - doins vendor/github.com/containers/common/pkg/seccomp/seccomp.json - - newconfd "${FILESDIR}"/podman.confd podman - newinitd "${FILESDIR}"/podman.initd podman - - insinto /etc/logrotate.d - newins "${FILESDIR}/podman.logrotated" podman - - dobashcomp completions/bash/* - - insinto /usr/share/zsh/site-functions - doins completions/zsh/* - - insinto /usr/share/fish/vendor_completions.d - doins completions/fish/* - - keepdir /var/lib/containers -} - -pkg_preinst() { - PODMAN_ROOTLESS_UPGRADE=false - if use rootless; then - has_version 'app-containers/podman[rootless]' || PODMAN_ROOTLESS_UPGRADE=true - fi -} - -pkg_postinst() { - tmpfiles_process podman.conf - - local want_newline=false - if [[ ! ( -e ${EROOT%/*}/etc/containers/policy.json && -e ${EROOT%/*}/etc/containers/registries.conf ) ]]; then - elog "You need to create the following config files:" - elog "/etc/containers/registries.conf" - elog "/etc/containers/policy.json" - elog "To copy over default examples, use:" - elog "cp /etc/containers/registries.conf{.example,}" - elog "cp /etc/containers/policy.json{.example,}" - want_newline=true - fi - if [[ ${PODMAN_ROOTLESS_UPGRADE} == true ]] ; then - ${want_newline} && elog "" - elog "For rootless operation, you need to configure subuid/subgid" - elog "for user running podman. In case subuid/subgid has only been" - elog "configured for root, run:" - elog "usermod --add-subuids 1065536-1131071 " - elog "usermod --add-subgids 1065536-1131071 " - want_newline=true - fi -} diff --git a/app-containers/podman/podman-4.0.2.ebuild b/app-containers/podman/podman-4.0.2.ebuild deleted file mode 100644 index 62f957b6252a..000000000000 --- a/app-containers/podman/podman-4.0.2.ebuild +++ /dev/null @@ -1,163 +0,0 @@ -# Copyright 1999-2022 Gentoo Authors -# Distributed under the terms of the GNU General Public License v2 - -EAPI=7 -EGIT_COMMIT="342c8259381b63296e96ad29519bd4b9c7afbf97" - -inherit bash-completion-r1 flag-o-matic go-module tmpfiles - -DESCRIPTION="Library and podman tool for running OCI-based containers in Pods" -HOMEPAGE="https://github.com/containers/podman/" -MY_PN=podman -MY_P=${MY_PN}-${PV} -SRC_URI="https://github.com/containers/podman/archive/v${PV}.tar.gz -> ${MY_P}.tar.gz" -LICENSE="Apache-2.0 BSD BSD-2 CC-BY-SA-4.0 ISC MIT MPL-2.0" -SLOT="0" - -KEYWORDS="~amd64 ~arm64 ~ppc64 ~riscv" -IUSE="apparmor btrfs cgroup-hybrid +fuse +init +rootless selinux" -RESTRICT+=" test" - -COMMON_DEPEND=" - app-crypt/gpgme:= - >=app-containers/conmon-2.0.0 - cgroup-hybrid? ( >=app-containers/runc-1.0.0_rc6 ) - !cgroup-hybrid? ( app-containers/crun ) - dev-libs/libassuan:= - dev-libs/libgpg-error:= - >=net-misc/cni-plugins-0.8.6 - sys-fs/lvm2 - sys-libs/libseccomp:= - - apparmor? ( sys-libs/libapparmor ) - btrfs? ( sys-fs/btrfs-progs ) - init? ( app-containers/catatonit ) - rootless? ( app-containers/slirp4netns ) - selinux? ( sys-libs/libselinux:= ) -" -DEPEND=" - ${COMMON_DEPEND} - dev-go/go-md2man" -RDEPEND="${COMMON_DEPEND} - fuse? ( sys-fs/fuse-overlayfs )" - -S=${WORKDIR}/${MY_P} - -src_prepare() { - default - - # Disable installation of python modules here, since those are - # installed by separate ebuilds. - local makefile_sed_args=( - -e '/^GIT_.*/d' - -e 's/$(GO) build/$(GO) build -v -work -x/' - -e 's/^\(install:.*\) install\.python$/\1/' - -e 's|^pkg/varlink/iopodman.go: .gopathok pkg/varlink/io.podman.varlink$|pkg/varlink/iopodman.go: pkg/varlink/io.podman.varlink|' - ) - - has_version -b '>=dev-lang/go-1.13.9' || makefile_sed_args+=(-e 's:GO111MODULE=off:GO111MODULE=on:') - - sed "${makefile_sed_args[@]}" -i Makefile || die -} - -src_compile() { - local git_commit=${EGIT_COMMIT} - - # Filter unsupported linker flags - filter-flags '-Wl,*' - - [[ -f hack/apparmor_tag.sh ]] || die - if use apparmor; then - echo -e "#!/bin/sh\necho apparmor" > hack/apparmor_tag.sh || die - else - echo -e "#!/bin/sh\ntrue" > hack/apparmor_tag.sh || die - fi - - [[ -f hack/btrfs_installed_tag.sh ]] || die - if use btrfs; then - echo -e "#!/bin/sh\ntrue" > hack/btrfs_installed_tag.sh || die - else - echo -e "#!/bin/sh\necho exclude_graphdriver_btrfs" > \ - hack/btrfs_installed_tag.sh || die - fi - - [[ -f hack/selinux_tag.sh ]] || die - if use selinux; then - echo -e "#!/bin/sh\necho selinux" > hack/selinux_tag.sh || die - else - echo -e "#!/bin/sh\ntrue" > hack/selinux_tag.sh || die - fi - - # Avoid this error when generating pkg/varlink/iopodman.go: - # cannot find package "github.com/varlink/go/varlink/idl" - mkdir -p _output || die - ln -snf ../vendor _output/src || die - GO111MODULE=off GOPATH=${PWD}/_output go generate ./pkg/varlink/... || die - rm _output/src || die - - export -n GOCACHE GOPATH XDG_CACHE_HOME - GOBIN="${S}/bin" \ - emake all \ - GIT_BRANCH=master \ - GIT_BRANCH_CLEAN=master \ - COMMIT_NO="${git_commit}" \ - GIT_COMMIT="${git_commit}" -} - -src_install() { - emake DESTDIR="${D}" PREFIX="${EPREFIX}/usr" install - - insinto /etc/containers - newins test/registries.conf registries.conf.example - newins test/policy.json policy.json.example - - insinto /usr/share/containers - doins vendor/github.com/containers/common/pkg/seccomp/seccomp.json - - newconfd "${FILESDIR}"/podman.confd podman - newinitd "${FILESDIR}"/podman.initd podman - - insinto /etc/logrotate.d - newins "${FILESDIR}/podman.logrotated" podman - - dobashcomp completions/bash/* - - insinto /usr/share/zsh/site-functions - doins completions/zsh/* - - insinto /usr/share/fish/vendor_completions.d - doins completions/fish/* - - keepdir /var/lib/containers -} - -pkg_preinst() { - PODMAN_ROOTLESS_UPGRADE=false - if use rootless; then - has_version 'app-containers/podman[rootless]' || PODMAN_ROOTLESS_UPGRADE=true - fi -} - -pkg_postinst() { - tmpfiles_process podman.conf - - local want_newline=false - if [[ ! ( -e ${EROOT%/*}/etc/containers/policy.json && -e ${EROOT%/*}/etc/containers/registries.conf ) ]]; then - elog "You need to create the following config files:" - elog "/etc/containers/registries.conf" - elog "/etc/containers/policy.json" - elog "To copy over default examples, use:" - elog "cp /etc/containers/registries.conf{.example,}" - elog "cp /etc/containers/policy.json{.example,}" - want_newline=true - fi - if [[ ${PODMAN_ROOTLESS_UPGRADE} == true ]] ; then - ${want_newline} && elog "" - elog "For rootless operation, you need to configure subuid/subgid" - elog "for user running podman. In case subuid/subgid has only been" - elog "configured for root, run:" - elog "usermod --add-subuids 1065536-1131071 " - elog "usermod --add-subgids 1065536-1131071 " - want_newline=true - fi -} diff --git a/app-containers/podman/podman-4.0.3.ebuild b/app-containers/podman/podman-4.0.3.ebuild index 3b27406e15ab..3987dbf96654 100644 --- a/app-containers/podman/podman-4.0.3.ebuild +++ b/app-containers/podman/podman-4.0.3.ebuild @@ -14,7 +14,7 @@ SRC_URI="https://github.com/containers/podman/archive/v${PV}.tar.gz -> ${MY_P}.t LICENSE="Apache-2.0 BSD BSD-2 CC-BY-SA-4.0 ISC MIT MPL-2.0" SLOT="0" -KEYWORDS="~amd64 ~arm64 ~ppc64 ~riscv" +KEYWORDS="amd64 arm64 ~ppc64 ~riscv" IUSE="apparmor btrfs cgroup-hybrid +fuse +init +rootless selinux" RESTRICT+=" test" @@ -39,7 +39,8 @@ DEPEND=" ${COMMON_DEPEND} dev-go/go-md2man" RDEPEND="${COMMON_DEPEND} - fuse? ( sys-fs/fuse-overlayfs )" + fuse? ( sys-fs/fuse-overlayfs ) + selinux? ( sec-policy/selinux-podman )" S=${WORKDIR}/${MY_P} diff --git a/app-containers/runc/Manifest b/app-containers/runc/Manifest index 46112120cff2..2126ba206b32 100644 --- a/app-containers/runc/Manifest +++ b/app-containers/runc/Manifest @@ -1,10 +1,8 @@ AUX CVE-2021-43784.patch 3305 BLAKE2B c6e16dd2793d99c2513c3bc047c9ccbd9870c15908078895e9e436b437dac55854105ccb0edf48588294125958fc9285637f839b6804cce9a7269fb5f85f4360 SHA512 584bc4e5e88275fa2c300965882697ca6afb6e0987bc1a888d96febbc47e56b17f346c595fe6e3933a29c143c000d574a64475de8779e4f7ef2d724d7be43589 -DIST runc-1.0.2.tar.gz 2374156 BLAKE2B 526520adb7127e46e7258de75e66a15a5aac216a2a2fcb91f4d9c5da393892242c4d93c5f5483ab111bf29eed7d8f0c8c138ae83a22809d72802a981dcda0395 SHA512 434abd6d7ad2508c2272b627d8aeeb28ecd8461899bff463e7d2c7abbc0f0cbb2e0bafbfe81fc534fad506b1acb4bda3e05639ecd908bc9d0d2e9356f1e56e26 DIST runc-1.0.3.tar.gz 2375241 BLAKE2B 0fb9368ab5442462001c15a67a71821133ad90d16cac5aac760e52b2477db69c0a5dd59df42601119b19ede508889796c994a24624f88ec6a1a29dad19e0bf33 SHA512 64a1894c2b4ed5a68b185e88548fc9fbbd01d8a9495feed59fb196aa06763d64cfb71ca6cbc09d1defa26a0d94ad58626296585741f23df2e290147ba6c4c26e DIST runc-1.1.0.tar.gz 2332427 BLAKE2B 3a194221d0bab813249e23c5f725255e453ce6843c2cb7e1a40a3c6fdd90a1a805c18ebadf56ee5d535f253025716aae6ab3f437140a3cc69e854e750e205e0c SHA512 542ea87c488fd120f2b77e53e2c197f09cd504fbe55dbe47008aaa5b0565aa300fc49f8cadc24ead796e45a4e95a30dfb08bfeefa58dc370145a218fd2869e41 DIST runc-1.1.1.tar.gz 2332722 BLAKE2B d0abe624ddd17885bd25a5923e35ed760a7acaeb2ae7eefa18cdd28a2ecfc79a958d550eafac421b58865376620d7475338752df823e0f1b4a69be201fe4ea90 SHA512 baf622e7edae9b68d2fa255f02359d770489c7578be3c6379a5d939b4f1dfa697ec9eb4ef7dce252e64ee5225f76c06e45182a9b92b68a952e21e3f5f91450d0 -EBUILD runc-1.0.2-r1.ebuild 1841 BLAKE2B 8a4aa33bfe3ae59ee8681af70ef35eb0aaf87b12ce37e6d73dcb01561a911680b692afb5b89a9ed1618f9c2c5dd2388423d4f6e79fe14f4cd54b57a6264d5898 SHA512 8a0a701449cac7fa48dbb02af920a500e2a6f6595a2023ab80dbc5ac6c9effc01d78ea3c3a4b45cd82316e1e285c5b04dfcffd7f8b356e3ef687384dce985176 EBUILD runc-1.0.3.ebuild 1793 BLAKE2B f92e4d3fe0fb2125fdf5a2d3ef4cc9418c6cfb1cf864c2dc6a757d48f44b8771e52da88685e8fb661ed56cb9be2d949263c84379015a41a4c10d6beca2ddabf1 SHA512 015b6982421ddc244c9d841eb7919d9e6f83d604286b1cfe6991b97f56faafd7731e363ea55b1e46cb62c99bfb90e8fa6ea89b40c45a31c8b7cf80d9c5b3371a EBUILD runc-1.1.0.ebuild 1795 BLAKE2B 0df960fc7c3bf58ac6d271d61838416e229a200d2a948aaf392d65fec701c4e5718dd924ade42ef85620e95c3fa291b54f8de3cfefe75ec52fdcf0a27d829570 SHA512 9fdfb92e462491d95e208eeef50c3bc09c8d560c86d5f254574b7facf5d59028ac9b1e780de6c2dab6f96ba99e804dcd9b3a3bcd95d0a49b98320d9615187db2 -EBUILD runc-1.1.1.ebuild 1795 BLAKE2B 8e0978d0be8c03a1a0eeb430e7c68d5307485adef27aa99cb22d0610446cbe78146b34e30cd91f0c3aa728b61396665039881e28dac9d5b8112db5fae55f6336 SHA512 22100534f7b367b5aa16dc6130aca2e830b7fdace3088a55d592ce36ff7ee9c0924ad54c4aba5a98cd6fb196bbc01631878fb7060c0d259bf41b1dc2b29ceeef +EBUILD runc-1.1.1.ebuild 1846 BLAKE2B 3e7caa50bcd158e59043db753ec64aea99dfa26f6ecb693cda011606dc9649248e76e154efe13852b10c0f256accd78674f3eac12f4e259897820e567d35bcf8 SHA512 250d42b4f01bd6e610b7247a7b88d934f8b3765eec7e882cab9d3e0a7bb7eb6006a4ef018c8e3c15b462b1c5b58f767a7ab1dac57b510f23066d611aad93bd32 MISC metadata.xml 822 BLAKE2B 2029743d60c9a6197e3db4ca27c3ee48bc86f624a50d7caa9bfb7f958383a1736d8817f2f977ac0e673229bd61f341a00f266dbce35dcd9633ecc27b182478d5 SHA512 f80b366f7fc8f4ff5bd46245aa80871748800a557440af3aa45bd1a508732cf634b6f21a3445135450eefbac91ab16f7b344c3f557af8ef69fdd8120ca6cf4e5 diff --git a/app-containers/runc/runc-1.0.2-r1.ebuild b/app-containers/runc/runc-1.0.2-r1.ebuild deleted file mode 100644 index d31a90d65a0d..000000000000 --- a/app-containers/runc/runc-1.0.2-r1.ebuild +++ /dev/null @@ -1,80 +0,0 @@ -# Copyright 1999-2021 Gentoo Authors -# Distributed under the terms of the GNU General Public License v2 - -EAPI=7 - -inherit go-module linux-info - -# update on bump, look for https://github.com/docker\ -# docker-ce/blob//components/engine/hack/dockerfile/install/runc.installer -RUNC_COMMIT=52b36a2dd837e8462de8e01458bf02cf9eea47dd -CONFIG_CHECK="~USER_NS" - -DESCRIPTION="runc container cli tools" -HOMEPAGE="http://github.com/opencontainers/runc/" -MY_PV="${PV/_/-}" -SRC_URI="https://github.com/opencontainers/${PN}/archive/v${MY_PV}.tar.gz -> ${P}.tar.gz" - -LICENSE="Apache-2.0 BSD-2 BSD MIT" -SLOT="0" -KEYWORDS="amd64 ~arm arm64 ppc64 ~riscv ~x86" -IUSE="apparmor hardened +kmem +seccomp test" - -DEPEND="seccomp? ( sys-libs/libseccomp )" - -RDEPEND=" - ${DEPEND} - !app-emulation/docker-runc - apparmor? ( sys-libs/libapparmor ) -" - -BDEPEND=" - dev-go/go-md2man - test? ( "${RDEPEND}" ) -" - -PATCHES=( "${FILESDIR}/CVE-2021-43784.patch" ) - -# tests need busybox binary, and portage namespace -# sandboxing disabled: mount-sandbox pid-sandbox ipc-sandbox -# majority of tests pass -RESTRICT+=" test" - -S="${WORKDIR}/${PN}-${MY_PV}" - -src_compile() { - # Taken from app-containers/docker-1.7.0-r1 - export CGO_CFLAGS="-I${ESYSROOT}/usr/include" - export CGO_LDFLAGS="$(usex hardened '-fno-PIC ' '') - -L${ESYSROOT}/usr/$(get_libdir)" - - # build up optional flags - local options=( - $(usev apparmor) - $(usev seccomp) - $(usex kmem '' 'nokmem') - ) - - myemakeargs=( - BUILDTAGS="${options[*]}" - COMMIT="${RUNC_COMMIT}" - ) - - emake "${myemakeargs[@]}" runc man -} - -src_install() { - myemakeargs+=( - PREFIX="${ED}/usr" - BINDIR="${ED}/usr/bin" - MANDIR="${ED}/usr/share/man" - ) - emake "${myemakeargs[@]}" install install-man install-bash - - local DOCS=( README.md PRINCIPLES.md docs/. ) - einstalldocs -} - -src_test() { - emake "${myemakeargs[@]}" localunittest -} diff --git a/app-containers/runc/runc-1.1.1.ebuild b/app-containers/runc/runc-1.1.1.ebuild index 1f7972fd498f..655750e7d505 100644 --- a/app-containers/runc/runc-1.1.1.ebuild +++ b/app-containers/runc/runc-1.1.1.ebuild @@ -17,7 +17,7 @@ SRC_URI="https://github.com/opencontainers/${PN}/archive/v${MY_PV}.tar.gz -> ${P LICENSE="Apache-2.0 BSD-2 BSD MIT" SLOT="0" KEYWORDS="~amd64 ~arm ~arm64 ~ppc64 ~riscv ~x86" -IUSE="apparmor hardened +kmem +seccomp test" +IUSE="apparmor hardened +kmem +seccomp selinux test" DEPEND="seccomp? ( sys-libs/libseccomp )" @@ -25,6 +25,7 @@ RDEPEND=" ${DEPEND} !app-emulation/docker-runc apparmor? ( sys-libs/libapparmor ) + selinux? ( sec-policy/selinux-container ) " BDEPEND=" diff --git a/app-containers/snapd/Manifest b/app-containers/snapd/Manifest index 5309f53d3e68..b86973da0fa8 100644 --- a/app-containers/snapd/Manifest +++ b/app-containers/snapd/Manifest @@ -1,4 +1,6 @@ AUX README.gentoo 1941 BLAKE2B dd25269f2aaaea693701d74511d632bc45f2c99954ae683cb81d4df41c4c1f8007bb6c337234e46bfc5973aa7e8356cd12ac510e9109eca09890cbc42bd184bb SHA512 5b522e6c29bdad84a71245fa1f0289e9cfed0501d936b433829f66ef9d655f3cc13d6bca29beeae2c00e1b68f9fa30058608b9c4cde86ba66eab67bd011c9d00 DIST snapd-2.55.2.tar.xz 6659212 BLAKE2B a76cec2bf0f3c44212a20c8b0744e4327a725b28a0055be49dfbe638020532f4933c20edda3bdab20290d38f602459fd0962413a9c58400cdc8d6ef3b4634a41 SHA512 8fee8bb6ff52d3cbd5f0a9f206e7c93dea1b6c0ade9c2b6fbd7b0d729b6eeeb1fb01a28dab53543671c42ceac25d6d8932a8b4b9349332b0cde9b9226f6ec063 +DIST snapd-2.55.3.tar.xz 6673552 BLAKE2B 8a34a568a1563c786e6975fb44d6a23f8a943906ff16b4c587fcca9e1d6ae033d8389b069235e62449a327dff8f1d11e83528fecf02768c730aede72b6cd6790 SHA512 e9dbdc47a9b83792f32fa66d558b0602100ac2b7cfd02ea96e4346fe1bdda7aa5fbe23cfba090e1ba61430ce9cfb0e9bd015c420c13bdca282a500c6ab222817 EBUILD snapd-2.55.2.ebuild 5346 BLAKE2B 7ef48c06aab0a4acb0218c63721b9d20915f2cbc9be176211eb842f3e12835e1b159d6e90605ff88971e6fbf703a5a75dbed116605e09dff6a29660f0299e48c SHA512 9ab04af937a4af1b5ee3a6054fc84bc5fea342a7aba590e653d8f54dcd928d791b8f3e9417cef5c53e010eeee37f3aabf3ea06f53e0f242bcad56826e0909212 +EBUILD snapd-2.55.3.ebuild 5346 BLAKE2B 7ef48c06aab0a4acb0218c63721b9d20915f2cbc9be176211eb842f3e12835e1b159d6e90605ff88971e6fbf703a5a75dbed116605e09dff6a29660f0299e48c SHA512 9ab04af937a4af1b5ee3a6054fc84bc5fea342a7aba590e653d8f54dcd928d791b8f3e9417cef5c53e010eeee37f3aabf3ea06f53e0f242bcad56826e0909212 MISC metadata.xml 520 BLAKE2B cdca3f5b58c81ddf5796b174756e1497382390ea4f7411b2aa7a3c794fcafd7fbd919cae00c7cf5ff2251f4c837f5188026d0f5f61986834aee661724afb050d SHA512 2c26112a8808cd73c5575b525eb33129ab5fab8a5fdefba5de3760e568659264a864bf80c2397cf70bb2f9b0e6709e953185af9048cddde9082b040e4a0ee00f diff --git a/app-containers/snapd/snapd-2.55.3.ebuild b/app-containers/snapd/snapd-2.55.3.ebuild new file mode 100644 index 000000000000..4e8c75f7a53b --- /dev/null +++ b/app-containers/snapd/snapd-2.55.3.ebuild @@ -0,0 +1,183 @@ +# Copyright 2020-2022 Gentoo Authors +# Distributed under the terms of the GNU General Public License v2 + +EAPI=7 + +EGO_PN="github.com/snapcore/${PN}" +inherit autotools bash-completion-r1 flag-o-matic golang-vcs-snapshot linux-info readme.gentoo-r1 systemd xdg-utils + +DESCRIPTION="Service and tools for management of snap packages" +HOMEPAGE="http://snapcraft.io/" + +MY_S="${S}/src/github.com/snapcore/${PN}" + +SRC_URI="https://github.com/snapcore/${PN}/releases/download/${PV}/${PN}_${PV}.vendor.tar.xz -> ${P}.tar.xz" +MY_PV=${PV} +KEYWORDS="~amd64" + +LICENSE="GPL-3 Apache-2.0 BSD BSD-2 LGPL-3-with-linking-exception MIT" +SLOT="0" +IUSE="apparmor +forced-devmode gtk kde systemd" +REQUIRED_USE="!forced-devmode? ( apparmor ) systemd" + +CONFIG_CHECK="~CGROUPS + ~CGROUP_DEVICE + ~CGROUP_FREEZER + ~NAMESPACES + ~SQUASHFS + ~SQUASHFS_ZLIB + ~SQUASHFS_LZO + ~SQUASHFS_XZ + ~BLK_DEV_LOOP + ~SECCOMP + ~SECCOMP_FILTER" + +RDEPEND=" + sys-libs/libseccomp:= + apparmor? ( + sec-policy/apparmor-profiles + sys-apps/apparmor:= + ) + dev-libs/glib + virtual/libudev + systemd? ( sys-apps/systemd ) + sys-libs/libcap:= + sys-fs/squashfs-tools[lzma]" + +DEPEND="${RDEPEND}" + +BDEPEND=" + >=dev-lang/go-1.9 + dev-python/docutils + sys-devel/gettext + sys-fs/xfsprogs" + +PDEPEND="sys-auth/polkit[gtk?,kde?]" + +README_GENTOO_SUFFIX="" + +pkg_setup() { + if use apparmor; then + CONFIG_CHECK+=" ~SECURITY_APPARMOR" + fi + linux-info_pkg_setup + + # Seems to have issues building with -O3, switch to -O2 + replace-flags -O3 -O2 +} + +src_prepare() { + default + # Update apparmor profile to allow libtinfow.so* + sed -i 's/libtinfo/libtinfo{,w}/' \ + "${MY_S}/cmd/snap-confine/snap-confine.apparmor.in" || die + + if ! use forced-devmode; then + sed -e 's#return !apparmorFull#if !apparmorFull {\n\t\tpanic("USE=forced-devmode is disabled")\n\t}\n\treturn false#' \ + -i "${MY_S}/sandbox/forcedevmode.go" || die + grep -q 'panic("USE=forced-devmode is disabled")' "${MY_S}/sandbox/forcedevmode.go" || die "failed to disable forced-devmode" + fi + + sed -i 's:command -v git >/dev/null:false:' -i "${MY_S}/mkversion.sh" || die + + pushd "${MY_S}" >/dev/null || die + ./mkversion.sh "${PV}" + popd >/dev/null || die + pushd "${MY_S}/cmd" >/dev/null || die + eautoreconf +} + +src_configure() { + SNAPD_MAKEARGS=( + "BINDIR=${EPREFIX}/usr/bin" + "DBUSSERVICESDIR=${EPREFIX}/usr/share/dbus-1/services" + "LIBEXECDIR=${EPREFIX}/usr/lib" + "SNAP_MOUNT_DIR=${EPREFIX}/var/lib/snapd/snap" + "SYSTEMDSYSTEMUNITDIR=$(systemd_get_systemunitdir)" + ) + export CGO_ENABLED="1" + export CGO_CFLAGS="${CFLAGS}" + export CGO_CPPFLAGS="${CPPFLAGS}" + export CGO_CXXFLAGS="${CXXFLAGS}" + + pushd "${MY_S}/cmd" >/dev/null || die + econf --libdir="${EPREFIX}/usr/lib" \ + --libexecdir="${EPREFIX}/usr/lib/snapd" \ + $(use_enable apparmor) \ + --enable-nvidia-biarch \ + --with-snap-mount-dir="${EPREFIX}/var/lib/snapd/snap" +} + +src_compile() { + export -n GOCACHE XDG_CACHE_HOME + export GO111MODULE=off GOBIN="${S}/bin" GOPATH="${S}" + + local file + for file in "${MY_S}/po/"*.po; do + msgfmt "${file}" -o "${file%.po}.mo" || die + done + + emake -C "${MY_S}/data" "${SNAPD_MAKEARGS[@]}" + + local -a flags=(-buildmode=pie -ldflags "-s -linkmode external -extldflags '${LDFLAGS}'" -trimpath) + local -a staticflags=(-buildmode=pie -ldflags "-s -linkmode external -extldflags '${LDFLAGS} -static'" -trimpath) + + local cmd + for cmd in snap snapd snap-bootstrap snap-failure snap-preseed snap-recovery-chooser snap-repair snap-seccomp; do + go build -o "${GOBIN}/${cmd}" "${flags[@]}" \ + -v -x "github.com/snapcore/${PN}/cmd/${cmd}" + [[ -e "${GOBIN}/${cmd}" ]] || die "failed to build ${cmd}" + done + for cmd in snapctl snap-exec snap-update-ns; do + go build -o "${GOBIN}/${cmd}" "${staticflags[@]}" \ + -v -x "github.com/snapcore/${PN}/cmd/${cmd}" + [[ -e "${GOBIN}/${cmd}" ]] || die "failed to build ${cmd}" + done +} + +src_install() { + emake -C "${MY_S}/data" install "${SNAPD_MAKEARGS[@]}" DESTDIR="${D}" + emake -C "${MY_S}/cmd" install "${SNAPD_MAKEARGS[@]}" DESTDIR="${D}" + + if use apparmor; then + mv "${ED}/etc/apparmor.d/usr.lib.snapd.snap-confine"{,.real} || die + keepdir /var/lib/snapd/apparmor/profiles + fi + keepdir /var/lib/snapd/{apparmor/snap-confine,cache,cookie,snap,void} + fperms 700 /var/lib/snapd/{cache,cookie} + + dobin "${GOBIN}/"{snap,snapctl} + ln "${ED}/usr/bin/snapctl" "${ED}/usr/lib/snapd/snapctl" || die + + exeinto /usr/lib/snapd + doexe "${GOBIN}/"{snapd,snap-bootstrap,snap-failure,snap-exec,snap-preseed,snap-recovery-chooser,snap-repair,snap-seccomp,snap-update-ns} \ + "${MY_S}/"{cmd/snap-discard-ns/snap-discard-ns,cmd/snap-gdb-shim/snap-gdb-shim,cmd/snap-mgmt/snap-mgmt} \ + "${MY_S}/data/completion/bash/"{complete.sh,etelpmoc.sh,} + + dobashcomp "${MY_S}/data/completion/bash/snap" + + insinto /usr/share/zsh/site-functions + doins "${MY_S}/data/completion/zsh/_snap" + + insinto "/usr/share/polkit-1/actions" + doins "${MY_S}/data/polkit/io.snapcraft.snapd.policy" + + dodoc "${MY_S}/packaging/ubuntu-16.04/changelog" + domo "${MY_S}/po/"*.mo + + readme.gentoo_create_doc +} + +pkg_postinst() { + readme.gentoo_print_elog + xdg_desktop_database_update + + if use apparmor && [[ -z ${ROOT} && -e /sys/kernel/security/apparmor/profiles && + $(wc -l < /sys/kernel/security/apparmor/profiles) -gt 0 ]]; then + apparmor_parser -r "${EPREFIX}/etc/apparmor.d/usr.lib.snapd.snap-confine.real" + fi +} + +pkg_postrm() { + xdg_desktop_database_update +} -- cgit v1.2.3