diff options
Diffstat (limited to 'app-emulation')
39 files changed, 469 insertions, 892 deletions
diff --git a/app-emulation/Manifest.gz b/app-emulation/Manifest.gz Binary files differindex 87a38f9f4d72..b37f91b55d8a 100644 --- a/app-emulation/Manifest.gz +++ b/app-emulation/Manifest.gz diff --git a/app-emulation/containerd/Manifest b/app-emulation/containerd/Manifest index 553b9466474c..32535f3c9531 100644 --- a/app-emulation/containerd/Manifest +++ b/app-emulation/containerd/Manifest @@ -1,6 +1,6 @@ AUX containerd.initd 766 BLAKE2B 07b323c35f9cafa156969644ccab7c618baf60a82ad8037538ae23562c5663742a7453e00412eeafa72129a4806f3610f3f77865c7ebf3e58223a7286c9f712e SHA512 b70abb44d6bc0cdd8115104ef1fbb5099a270c29040351ceff738b9b6ff796a802f92dbbe2c49e04ae058043546bbe6a854e25044f5c07bea7bf6b6fc4f66018 -DIST containerd-1.4.8.tar.gz 6400374 BLAKE2B def2d6e47d550d641888289943fee5c860a5523b1b4e347efafbf43a8dbf9d86bbcef0f4286efdf2591a42faf75aa2dc0acad11f2cfcdd99c7e3e89fcd13fa22 SHA512 3c4c52a7a1b3fb76f7837ef7260024e25df14e86ccaea351a0811dd9b7335eddc94019e3fb7e6acb4a41a3dee9c18387d0b44ea406c3534c64e8a4b3dee6a45b -DIST containerd-1.5.4.tar.gz 7675134 BLAKE2B b50061655b0b78a9f4c8bf7355213d02517c5a15e3ff2a623e59ffcde8e7f59ef39aafaf9790f7d977b285eac4d38338505920cdd032d975c50d42605e7157a5 SHA512 91d2fce2dc218070078f0e9e8141d091eca9f23c0b1ff244180260f214a46cdd66ba5c89472b40c0875cbd25580e19765bb030abf2ad749cfd4eea712dacadc1 -EBUILD containerd-1.4.8.ebuild 1952 BLAKE2B 31be2b2d210f3ea3ef86f11eeb6e270c35a508f7ae12934b75a02d7c6977149b98f436a6a00253faa72d370035535b1fc8a9c9d8a11c25583b774ddc025dae0c SHA512 d79147ba9bdc69cac1e4049a04f3b8d62fdaf5e4bbdbaec9325d8e47c38be3246c31d6b5715dda2f66cb8e76dc31e7707b5c6158727431e0aefa56efdbf8f726 -EBUILD containerd-1.5.4.ebuild 1951 BLAKE2B dcb90b060f362ea0c7d541e47c447c0e11e307c9a0b848306969eaf8fb4e804886ea0d99d31a1cd76d326f1945cbcdd101f3978104a70f09b321303a5736d08b SHA512 ae029f43534698a7c0cd0d2f50f807e7d41307ebd1a2a72148e527b1440eca4ed9e1de1694cd0b1a52c058413d114c9b58dfd25b18e9a95a820a89b18c26fa7d +DIST containerd-1.4.11.tar.gz 6406769 BLAKE2B a4882223e2f71944a4d46fb0500a95248cfa33735447952f94c7d7350c2cb62b4911adc77f96559116cca462be02b7270185a0a3dfed5ce4c530465cca7e2078 SHA512 16aa6ae4209939754e122545b454d8b25027a3621464a4b4e0379480b35adf0efb318271f82cf2b959a62fffe531979c9bdfee9ac7d47d4b33269a6bafe2d070 +DIST containerd-1.5.7.tar.gz 7714453 BLAKE2B 621b6527814665432c52e72263da371840a183aa65f621a686111b59ee48e85dd96919abd35f069476b97858a8112d3c92b03afbe42d57495649ca0d2af2fd50 SHA512 ce0d9d355b4a6142569690a9fcde8cd07de20b5788098f1184a728106a60dd11a437c87499a97af0c147b14372c2bca4daa823ea470f10b5e1b8a1e34ba530b0 +EBUILD containerd-1.4.11.ebuild 1936 BLAKE2B a6206c40dc64a882fb9732b2892e4725fb564f5f3b850cda62d34e80b04a6883edc607475a769d168a558740ace1e3e7550516ad01e77b789f7eef237887ad32 SHA512 1d6e1a8136ed8a86a9d2a9d2eebe2645cfac1e2811ec559823f1d7b99c8fdf6c48b63275963bd9ba14c92493925d59008d24712e99d055d080e48557b94a9043 +EBUILD containerd-1.5.7.ebuild 1907 BLAKE2B 2f09ab3d48a9200d8ebc4c1ee6d99db77082a03dd54985f8ee84fdb63aab545b3b04a26d680bf4fa88fcbacd0452f48320c7d8f0e55969a3e3daec9b928ef46a SHA512 df883f40f60131805e92f7807e449a0c5ef692995b68c7ac5b1bc106f40a1b3b03c2c4f59233f1e43d3816e00f8630a76f47e6f0a12eb8b0fa4fbbe1fac3c14e MISC metadata.xml 1144 BLAKE2B 960f8dd81a1e56c0d381355da41a845c2e9c12db0c8c546da1593a0499e4929b37610dff83943c388f8edc5878b9824e47ddac02ba129176a916054400e10e90 SHA512 904a5a11d7729ea6021aaf1b1d91ae3f7609c08b8c191d9f4c35c62914b0acf1ee45f3f7e0416711225809f129da4b4c76c934e6207026b69b0096f431820982 diff --git a/app-emulation/containerd/containerd-1.4.8.ebuild b/app-emulation/containerd/containerd-1.4.11.ebuild index 9e30a14ae4d1..d2038dd4a85c 100644 --- a/app-emulation/containerd/containerd-1.4.8.ebuild +++ b/app-emulation/containerd/containerd-1.4.11.ebuild @@ -3,9 +3,9 @@ EAPI=7 -CONTAINERD_COMMIT=7eba5930496d9bbe375fdf71603e610ad737d2b2 +CONTAINERD_COMMIT=5b46e404f6b9f661a205e28d59c982d3634148f8 EGO_PN="github.com/containerd/${PN}" -inherit golang-vcs-snapshot toolchain-funcs +inherit golang-vcs-snapshot DESCRIPTION="A daemon to control runC" HOMEPAGE="https://containerd.io/" @@ -24,7 +24,7 @@ DEPEND=" # recommended version of runc is found in script/setup/runc-version RDEPEND=" ${DEPEND} - ~app-emulation/runc-1.0.0 + ~app-emulation/runc-1.0.2 " BDEPEND=" diff --git a/app-emulation/containerd/containerd-1.5.4.ebuild b/app-emulation/containerd/containerd-1.5.7.ebuild index 5c02912623d2..03b79d4159d6 100644 --- a/app-emulation/containerd/containerd-1.5.4.ebuild +++ b/app-emulation/containerd/containerd-1.5.7.ebuild @@ -2,7 +2,8 @@ # Distributed under the terms of the GNU General Public License v2 EAPI=7 -inherit go-module systemd toolchain-funcs +GIT_REVISION=8686ededfc90076914c5238eb96c883ea093a8ba +inherit go-module systemd DESCRIPTION="A daemon to control runC" HOMEPAGE="https://containerd.io/" @@ -21,7 +22,7 @@ DEPEND=" # recommended version of runc is found in script/setup/runc-version RDEPEND=" ${DEPEND} - ~app-emulation/runc-1.0.0 + ~app-emulation/runc-1.0.2 " BDEPEND=" @@ -55,15 +56,14 @@ src_compile() { myemakeargs=( BUILDTAGS="${options[*]}" - GO_BUILD_FLAGS="-mod vendor" LDFLAGS="$(usex hardened '-extldflags -fno-PIC' '')" - REVISION=69107e47a62e1d690afa2b9b1d43f8ece3ff4483 + REVISION="${GIT_REVISION}" VERSION=v${PV} ) # race condition in man target https://bugs.gentoo.org/765100 # we need to explicitly specify GOFLAGS for "go run" to use vendor source - GOFLAGS="-v -x -mod=vendor" emake "${myemakeargs[@]}" man -j1 #nowarn + emake "${myemakeargs[@]}" man -j1 #nowarn emake "${myemakeargs[@]}" all } diff --git a/app-emulation/docker-cli/Manifest b/app-emulation/docker-cli/Manifest index a04bedcf1842..9ee539b671a6 100644 --- a/app-emulation/docker-cli/Manifest +++ b/app-emulation/docker-cli/Manifest @@ -1,5 +1,3 @@ -DIST docker-cli-20.10.7.tar.gz 7523515 BLAKE2B 36ae46a28ca943e75419014b8b8453dbdd36bf240b9c36aed245447241dd07635da0319fd9b6ea409ecbe4c419eec8650d94d2a296e45a9c3b02a9a47a314888 SHA512 4523ae70cb27d848da119070171af2eb84e974ac39d70be4feee105e37c949487c7f72a9bc30c32ce71bffb0787e27b7b9194ce5a8aeae57bdfeb3f2d730010f -DIST docker-cli-20.10.8.tar.gz 7526374 BLAKE2B 65b7733c9a71c7f266e83b7014ecdca998915e71352a1bbbb346be6a3a65f1ed6644b321b62d0592f2dbf308ff51d3d4ad0d9828831f5f90b451c6ff23452faa SHA512 60e9e623180d3cafd8bd6458d02574274871f94e88a0fa461e2200520717e837371a1b5d7fab6c9c4591e64807ab6f560e0756a9cfb1c1c8c9624b1f653346d0 -EBUILD docker-cli-20.10.7.ebuild 1846 BLAKE2B a05d7129af51396d5da5017c9bc15a4229ebe3f56aa1afc8d92ee58c8e00b22d4e9baf42274b8e268dc00a3e417fd5435e3aac6da46a5b1e37a4909b4c736da6 SHA512 592eecad2f2e76c1bb9283e22a146983035e14ab481b867388c0ff2a0c0692592d88186f5007dd01c7c35e0bceb93143b54369bacce39f73fa40417345da1057 -EBUILD docker-cli-20.10.8.ebuild 1850 BLAKE2B b7988aee408677f63c3e48b4458b7e95c206af96e746a2e1bcd86bdeb19e60d61d301197967b6e9e6afb63ee84978c74811958d6fe4b53307032302fdfaf90dc SHA512 74009ab9f1e011b98c93d7890bdec2794f7d977c943f83187a30257c54021468265deee59094595e5906b2fa53bf992ac947d9b14a7dde37c17759fcf37cb418 +DIST docker-cli-20.10.9.tar.gz 7525889 BLAKE2B 7b12f81ed98ed416fb00211b9e6d965ed3209fd83db17a98bef7fef0eb56b27f495093facb3d43e40ec651568a7d83dd484c014c998e046a57662087b1d7c2c6 SHA512 0a9bd36c139bb5e1cd4a975913aa5429ffce8c746d2104aa2a54d937c67073ddaa2a8a5e93d71d2d435459af58168de0e7e3a44fd452da535f3995738da206df +EBUILD docker-cli-20.10.9.ebuild 1838 BLAKE2B 7dd7cffb7cf076deea07126889949be9840321cca315362ba4c279123ffb94d3ab20849d33a5fec59dc5b2ad5805aaee6eeb86f3b4b6c60f415aa52f3b8dbec0 SHA512 93fc4165286f5dfa39d7007e77a42c5a4420ff93fce38d665b143a727906afb94b91f1669f6210360bf756bc57036745cff9c984668e787b8f5750176f7366bb MISC metadata.xml 249 BLAKE2B 08603bf9d754b59bae12620988552abc7f76b87a1390d02038789eba034c22412a3593d10f443794a5171ff3905c2b5c822368b2eb9f53a528097b7b6c80ffe9 SHA512 338d72efbd040697be98aad4229b81c9694eb27ecbc39f3a18332f4cc766a46b4a0a92f32612203259bf58f5838d0aff7f0b1abec7766f6cd2394c73f7f0b251 diff --git a/app-emulation/docker-cli/docker-cli-20.10.7.ebuild b/app-emulation/docker-cli/docker-cli-20.10.7.ebuild deleted file mode 100644 index ab025371c183..000000000000 --- a/app-emulation/docker-cli/docker-cli-20.10.7.ebuild +++ /dev/null @@ -1,64 +0,0 @@ -# Copyright 1999-2021 Gentoo Authors -# Distributed under the terms of the GNU General Public License v2 - -EAPI=7 -GIT_COMMIT=f0df35096d5f5e6b559b42c7fde6c65a2909f7c5 -EGO_PN="github.com/docker/cli" -inherit bash-completion-r1 golang-vcs-snapshot - -DESCRIPTION="the command line binary for docker" -HOMEPAGE="https://www.docker.com/" -MY_PV=${PV/_/-} -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 ~x86" -IUSE="hardened" - -RDEPEND="!<app-emulation/docker-20.10.1" -BDEPEND="dev-go/go-md2man" - -RESTRICT="installsources strip" - -S="${WORKDIR}/${P}/src/${EGO_PN}" - -src_prepare() { - default - sed -i 's@dockerd\?\.exe@@g' contrib/completion/bash/docker || die -} - -src_compile() { - export DISABLE_WARN_OUTSIDE_CONTAINER=1 - export GOPATH="${WORKDIR}/${P}" - # setup CFLAGS and LDFLAGS for separate build target - # see https://github.com/tianon/docker-overlay/pull/10 - export CGO_CFLAGS="-I${ESYSROOT}/usr/include" - export CGO_LDFLAGS="-L${ESYSROOT}/usr/$(get_libdir)" - emake \ - LDFLAGS="$(usex hardened '-extldflags -fno-PIC' '')" \ - VERSION="$(cat VERSION)" \ - GITCOMMIT="${GIT_COMMIT}" \ - dynbinary - - # build man pages - # see "cli/scripts/docs/generate-man.sh" (which also does "go get" for go-md2man) - mkdir -p ./man/man1 || die "mkdir failed" - go build -o "${T}"/gen-manpages ./man || - die 'build gen-manpages failed' - "${T}"/gen-manpages --root "$(pwd)" --target "$(pwd)"/man/man1 || - die 'gen-manpages failed' - ./man/md2man-all.sh -q || - die 'md2man-all.sh failed' -} - -src_install() { - dobin build/docker - doman man/man*/* - dobashcomp contrib/completion/bash/* - bashcomp_alias docker dockerd - insinto /usr/share/fish/vendor_completions.d/ - doins contrib/completion/fish/docker.fish - insinto /usr/share/zsh/site-functions - doins contrib/completion/zsh/_* -} diff --git a/app-emulation/docker-cli/docker-cli-20.10.8.ebuild b/app-emulation/docker-cli/docker-cli-20.10.9.ebuild index 1e802fb5d247..30e81b53f7fc 100644 --- a/app-emulation/docker-cli/docker-cli-20.10.8.ebuild +++ b/app-emulation/docker-cli/docker-cli-20.10.9.ebuild @@ -2,7 +2,7 @@ # Distributed under the terms of the GNU General Public License v2 EAPI=7 -GIT_COMMIT=3967b7d28e +GIT_COMMIT=c2ea9bc90b EGO_PN="github.com/docker/cli" MY_PV=${PV/_/-} inherit bash-completion-r1 golang-vcs-snapshot @@ -13,7 +13,7 @@ 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" +KEYWORDS="amd64 ~arm arm64 ppc64 ~riscv ~x86" IUSE="hardened" RDEPEND="!<app-emulation/docker-20.10.1" @@ -39,7 +39,7 @@ src_compile() { export CGO_LDFLAGS="-L${ESYSROOT}/usr/$(get_libdir)" emake \ LDFLAGS="$(usex hardened '-extldflags -fno-PIC' '')" \ - VERSION="$(cat VERSION)" \ + VERSION="${PV}" \ GITCOMMIT="${GIT_COMMIT}" \ dynbinary diff --git a/app-emulation/docker/Manifest b/app-emulation/docker/Manifest index 8cf9bc5b5e62..a73e0010d192 100644 --- a/app-emulation/docker/Manifest +++ b/app-emulation/docker/Manifest @@ -1,7 +1,5 @@ AUX etcd-F_OFD_GETLK-fix.patch 868 BLAKE2B 478be67388bc9001c90031c47e001c8bcc0435433df44b42ea4c15cdb595d2169c0b2d05a4e774d20f7f971e64c08e132b736e8847cf0966c65bf1816f6a958c SHA512 4caf8a8a1f4363545d02695fed4a06ce96fdad181d5773188ae8c2ef95e4f4fbfee6d7906ece6bf0d85dd57e159f2a3774aa228f0e6e1da0cdfef63ced62a434 AUX ppc64-buildmode.patch 916 BLAKE2B c28a2fcfed4812f44b664dc9b24e87f3999fcb9b79b7f47c6fd5a6b024529c49ef71817d4c379c7a95832a44b9c2f45c9f7707cb580b31be18dff4ee9a110e44 SHA512 bc87464d9f3351b2791e6f86bc7f2101e652c25b99cdcc02e46e4ff18f4bfb7ffc35d338370656bde6ad09ed98805e045065012dc6a264967d26272f7de099ff -DIST docker-20.10.7.tar.gz 11077660 BLAKE2B 081b36668ead0fd727ebdabc0d07fdf1992f64e3ab1e7c09933130b37f9ad60876c36d1fcda5619ba1bffac7fadafe63d7fc647868c3c6ba30429487c2ebc31b SHA512 2341faa3ebb903d74fa434712fce45e7acf0423710b97cdca11e3999db2819c4385d9a7fb3850925592f20f02c6261edbade6c9d6a2fefbc32f05a6b44ec3073 -DIST docker-20.10.8.tar.gz 11080739 BLAKE2B 1e5c14e23c4e9c8b0568cf19c98cb4cdbedc43742357bed61201f0188d5e3f4949d5e2a2231fd89635290c8784678005dff707a4e00ececfb82d88c69d31d235 SHA512 17c0519c8938227c578e5fe37689dd5a362b9673fabe06f98145b6fd5ae99e099a304c5706a84df30a2810855987fd694ac9cae7574023710fd1d99b0ca1aaf8 -EBUILD docker-20.10.7.ebuild 7898 BLAKE2B c70fd9e392d62c80a69783170a9d48ff0f17b817a5897b86c4bbf26e5e624b6cc62205ceecef1036400cce494c4ea46ced8b7107e1466d41b6295eaf6bce8a2a SHA512 683ceab1c02cb2a2db344a0574baae9673dfb414af2a10a6ea31b8221ed48b36540a510258a1ef8adcb811e093e88e7f948550ee6db2e6c0ae3a98f34dc6f34e -EBUILD docker-20.10.8.ebuild 7907 BLAKE2B 57c9adb81cb2b68c3d5e277394db114d14d7e1be317afb68858bcb92838a81e74a9b11bb9a29503efc1eec28cfa9d9f55804f2b0c411870e42a1cbac9caacb92 SHA512 010900f954a407dac0443415f83e077c1b6f2498c958d1e8241a7071ea84409cea5ebbae6dc0ffdd405f6474359d94d88c6c26b1d0ec1e31e0bffb2a32a5e63c +DIST docker-20.10.9.tar.gz 11083239 BLAKE2B 16dbd22b67ecd626b638406fffaec3c62eeee7dc93e661f982e12436afa10f230da4257a22a38ab1df366026033207d00e6571f3b853477852f3e14f24d9f567 SHA512 e4ae9e37633c821892e929e7a5f9dab652fe17f348a24cd37778bc4bfc33d99cdb347e2f575966364a37664dcfa83d1500f2bff7d0b0398a890f2039155a0c0c +EBUILD docker-20.10.9.ebuild 7904 BLAKE2B f371a6e198151c32145d64454a75ddbd66e0ac3305110bb60529823211f36ed770b765960a2c34137f3ccf8c7eac0e877b3f57a48958801dbad98d846a16144f SHA512 bc990a30037d4fde4f981a0a0130abfa9d22162edfee25e5ddf485bd4d8fc811ecfbdf7edb9ab64a87a770f5eece86e047abda00854b1e801ebcb0f0db63ecd0 MISC metadata.xml 1731 BLAKE2B 008fec552206e6653470955861cab8def2d13795044a88eb37cfba0e28094503449a65a95604116a83f4a032a13a73aadb467696b5dadfca8ea5b4ace9129e96 SHA512 a736b59cb300017650aab6dc1808bbb0b0f88de2566001fbeb52c4396ac59dda0126f823e74b911778bb67c6959a92b86c80ed48781b994f48df3ffc13796d9c diff --git a/app-emulation/docker/docker-20.10.7.ebuild b/app-emulation/docker/docker-20.10.7.ebuild deleted file mode 100644 index 6cad3fd57db4..000000000000 --- a/app-emulation/docker/docker-20.10.7.ebuild +++ /dev/null @@ -1,279 +0,0 @@ -# Copyright 1999-2021 Gentoo Authors -# Distributed under the terms of the GNU General Public License v2 - -EAPI=7 -EGO_PN=github.com/docker/docker -GIT_COMMIT=8728dd246c -inherit bash-completion-r1 linux-info systemd udev golang-vcs-snapshot - -DESCRIPTION="The core functions you need to create Docker images and run Docker containers" -HOMEPAGE="https://www.docker.com/" -MY_PV=${PV/_/-} -SRC_URI="https://github.com/moby/moby/archive/v${MY_PV}.tar.gz -> ${P}.tar.gz" - -LICENSE="Apache-2.0" -SLOT="0" -KEYWORDS="amd64 ~arm arm64 ppc64 ~x86" -IUSE="apparmor aufs btrfs +cli +container-init device-mapper hardened overlay seccomp" - -DEPEND=" - acct-group/docker - >=dev-db/sqlite-3.7.9:3 - apparmor? ( sys-libs/libapparmor ) - btrfs? ( >=sys-fs/btrfs-progs-3.16.1 ) - device-mapper? ( >=sys-fs/lvm2-2.02.89[thin] ) - seccomp? ( >=sys-libs/libseccomp-2.2.1 ) -" - -# https://github.com/moby/moby/blob/master/project/PACKAGERS.md#runtime-dependencies -# https://github.com/moby/moby/blob/master/project/PACKAGERS.md#optional-dependencies -# https://github.com/moby/moby/tree/master//hack/dockerfile/install -# make sure docker-proxy is pinned to exact version from ^, -# for appropriate branchch/version of course -RDEPEND=" - ${DEPEND} - >=net-firewall/iptables-1.4 - sys-process/procps - >=dev-vcs/git-1.7 - >=app-arch/xz-utils-4.9 - dev-libs/libltdl - >=app-emulation/containerd-1.4.6[apparmor?,btrfs?,device-mapper?,seccomp?] - ~app-emulation/docker-proxy-0.8.0_p20210525 - cli? ( app-emulation/docker-cli ) - container-init? ( >=sys-process/tini-0.19.0[static] ) -" - -# https://github.com/docker/docker/blob/master/project/PACKAGERS.md#build-dependencies -BDEPEND=" - >=dev-lang/go-1.13.12 - dev-go/go-md2man - virtual/pkgconfig -" -# tests require running dockerd as root and downloading containers -RESTRICT="installsources strip test" - -S="${WORKDIR}/${P}/src/${EGO_PN}" - -# https://bugs.gentoo.org/748984 https://github.com/etcd-io/etcd/pull/12552 -PATCHES=( - "${FILESDIR}/etcd-F_OFD_GETLK-fix.patch" - "${FILESDIR}/ppc64-buildmode.patch" -) - -# see "contrib/check-config.sh" from upstream's sources -CONFIG_CHECK=" - ~NAMESPACES ~NET_NS ~PID_NS ~IPC_NS ~UTS_NS - ~CGROUPS ~CGROUP_CPUACCT ~CGROUP_DEVICE ~CGROUP_FREEZER ~CGROUP_SCHED ~CPUSETS ~MEMCG - ~CGROUP_NET_PRIO - ~KEYS - ~VETH ~BRIDGE ~BRIDGE_NETFILTER - ~IP_NF_FILTER ~IP_NF_TARGET_MASQUERADE ~NETFILTER_XT_MARK - ~NETFILTER_NETLINK ~NETFILTER_XT_MATCH_ADDRTYPE ~NETFILTER_XT_MATCH_CONNTRACK ~NETFILTER_XT_MATCH_IPVS - ~IP_NF_NAT ~NF_NAT - ~POSIX_MQUEUE - - ~USER_NS - ~SECCOMP - ~CGROUP_PIDS - ~MEMCG_SWAP - - ~BLK_CGROUP ~BLK_DEV_THROTTLING - ~CGROUP_PERF - ~CGROUP_HUGETLB - ~NET_CLS_CGROUP - ~CFS_BANDWIDTH ~FAIR_GROUP_SCHED - ~IP_VS ~IP_VS_PROTO_TCP ~IP_VS_PROTO_UDP ~IP_VS_NFCT ~IP_VS_RR - - ~VXLAN - ~CRYPTO ~CRYPTO_AEAD ~CRYPTO_GCM ~CRYPTO_SEQIV ~CRYPTO_GHASH ~XFRM_ALGO ~XFRM_USER - ~IPVLAN - ~MACVLAN ~DUMMY - - ~OVERLAY_FS ~!OVERLAY_FS_REDIRECT_DIR - ~EXT4_FS_SECURITY - ~EXT4_FS_POSIX_ACL -" - -ERROR_KEYS="CONFIG_KEYS: is mandatory" -ERROR_MEMCG_SWAP="CONFIG_MEMCG_SWAP: is required if you wish to limit swap usage of containers" -ERROR_RESOURCE_COUNTERS="CONFIG_RESOURCE_COUNTERS: is optional for container statistics gathering" - -ERROR_BLK_CGROUP="CONFIG_BLK_CGROUP: is optional for container statistics gathering" -ERROR_IOSCHED_CFQ="CONFIG_IOSCHED_CFQ: is optional for container statistics gathering" -ERROR_CGROUP_PERF="CONFIG_CGROUP_PERF: is optional for container statistics gathering" -ERROR_CFS_BANDWIDTH="CONFIG_CFS_BANDWIDTH: is optional for container statistics gathering" -ERROR_XFRM_ALGO="CONFIG_XFRM_ALGO: is optional for secure networks" -ERROR_XFRM_USER="CONFIG_XFRM_USER: is optional for secure networks" - -pkg_setup() { - - if kernel_is lt 4 5; then - CONFIG_CHECK+=" - ~MEMCG_KMEM - " - ERROR_MEMCG_KMEM="CONFIG_MEMCG_KMEM: is optional" - fi - - if kernel_is lt 4 7; then - CONFIG_CHECK+=" - ~DEVPTS_MULTIPLE_INSTANCES - " - fi - - if kernel_is lt 5 1; then - CONFIG_CHECK+=" - ~NF_NAT_IPV4 - ~IOSCHED_CFQ - ~CFQ_GROUP_IOSCHED - " - fi - - if kernel_is lt 5 2; then - CONFIG_CHECK+=" - ~NF_NAT_NEEDED - " - fi - - if kernel_is lt 5 8; then - CONFIG_CHECK+=" - ~MEMCG_SWAP_ENABLED - " - fi - - if use aufs; then - CONFIG_CHECK+=" - ~AUFS_FS - ~EXT4_FS_POSIX_ACL ~EXT4_FS_SECURITY - " - ERROR_AUFS_FS="CONFIG_AUFS_FS: is required to be set if and only if aufs is patched to kernel instead of using standalone" - fi - - if use btrfs; then - CONFIG_CHECK+=" - ~BTRFS_FS - ~BTRFS_FS_POSIX_ACL - " - fi - - if use device-mapper; then - CONFIG_CHECK+=" - ~BLK_DEV_DM ~DM_THIN_PROVISIONING ~EXT4_FS ~EXT4_FS_POSIX_ACL ~EXT4_FS_SECURITY - " - fi - - linux-info_pkg_setup -} - -src_compile() { - export DOCKER_GITCOMMIT="${GIT_COMMIT}" - export GOPATH="${WORKDIR}/${P}" - export VERSION=${PV} - - # setup CFLAGS and LDFLAGS for separate build target - # see https://github.com/tianon/docker-overlay/pull/10 - export CGO_CFLAGS="-I${ESYSROOT}/usr/include" - export CGO_LDFLAGS="-L${ESYSROOT}/usr/$(get_libdir)" - - # let's set up some optional features :) - export DOCKER_BUILDTAGS='' - for gd in aufs btrfs device-mapper overlay; do - if ! use $gd; then - DOCKER_BUILDTAGS+=" exclude_graphdriver_${gd//-/}" - fi - done - - for tag in apparmor seccomp; do - if use $tag; then - DOCKER_BUILDTAGS+=" $tag" - fi - done - - if use hardened; then - sed -i "s/EXTLDFLAGS_STATIC='/&-fno-PIC /" hack/make.sh || die - grep -q -- '-fno-PIC' hack/make.sh || die 'hardened sed failed' - sed "s/LDFLAGS_STATIC_DOCKER='/&-extldflags -fno-PIC /" \ - -i hack/make/dynbinary-daemon || die - grep -q -- '-fno-PIC' hack/make/dynbinary-daemon || die 'hardened sed failed' - fi - - # build daemon - ./hack/make.sh dynbinary || die 'dynbinary failed' -} - -src_install() { - dosym containerd /usr/bin/docker-containerd - dosym containerd-shim /usr/bin/docker-containerd-shim - dosym runc /usr/bin/docker-runc - use container-init && dosym tini /usr/bin/docker-init - newbin bundles/dynbinary-daemon/dockerd dockerd - - newinitd contrib/init/openrc/docker.initd docker - newconfd contrib/init/openrc/docker.confd docker - - systemd_dounit contrib/init/systemd/docker.{service,socket} - - udev_dorules contrib/udev/*.rules - - dodoc AUTHORS CONTRIBUTING.md CHANGELOG.md NOTICE README.md - dodoc -r docs/* - - # note: intentionally not using "doins" so that we preserve +x bits - dodir /usr/share/${PN}/contrib - cp -R contrib/* "${ED}/usr/share/${PN}/contrib" -} - -pkg_postinst() { - udev_reload - - elog - elog "To use Docker, the Docker daemon must be running as root. To automatically" - elog "start the Docker daemon at boot:" - if systemd_is_booted || has_version sys-apps/systemd; then - elog " systemctl enable docker.service" - else - elog " rc-update add docker default" - fi - elog - elog "To use Docker as a non-root user, add yourself to the 'docker' group:" - elog ' usermod -aG docker <youruser>' - 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-emulation/docker contains the daemon and" - ewarn "app-emulation/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-emulation/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-emulation/docker/docker-20.10.8.ebuild b/app-emulation/docker/docker-20.10.9.ebuild index f7af35d12def..68375cdfa6df 100644 --- a/app-emulation/docker/docker-20.10.8.ebuild +++ b/app-emulation/docker/docker-20.10.9.ebuild @@ -4,7 +4,7 @@ EAPI=7 EGO_PN=github.com/docker/docker MY_PV=${PV/_/-} -GIT_COMMIT=75249d88bc +GIT_COMMIT=79ea9d3080 inherit bash-completion-r1 linux-info systemd udev golang-vcs-snapshot DESCRIPTION="The core functions you need to create Docker images and run Docker containers" @@ -13,7 +13,7 @@ SRC_URI="https://github.com/moby/moby/archive/v${MY_PV}.tar.gz -> ${P}.tar.gz" LICENSE="Apache-2.0" SLOT="0" -KEYWORDS="~amd64 ~arm ~arm64 ~ppc64 ~riscv ~x86" +KEYWORDS="amd64 ~arm arm64 ppc64 ~riscv ~x86" IUSE="apparmor aufs btrfs +cli +container-init device-mapper hardened overlay seccomp" DEPEND=" diff --git a/app-emulation/guestfs-tools/Manifest b/app-emulation/guestfs-tools/Manifest new file mode 100644 index 000000000000..6bbb27bf4f04 --- /dev/null +++ b/app-emulation/guestfs-tools/Manifest @@ -0,0 +1,3 @@ +DIST guestfs-tools-1.46.1.tar.gz 12665804 BLAKE2B 7800954dfa961900035b127f6ac2556f584dd2d156143bf82fd1ba9fd1f327091706987192d91cb4251295d9565e56f769ab06bdac677160ac31d2e8f9d9a488 SHA512 d2bd0790343d54a2517237e56d1b982cd41335654fd205cfeec42a1b7cbbf4c0923597b767b8769dfe74766e078a817d520db251895990b922522030806d0b85 +EBUILD guestfs-tools-1.46.1-r1.ebuild 3826 BLAKE2B e3717c4579fcbce5452659bde90d43d90fa7d8f73642e3d01271b1da85589efa5334064cbe84229df60084751dfb58535f75b84de163e283e57c763b1c019c00 SHA512 b992e2c1ee8e3caacea080e9e3854f3c1b4648ac3e874018a58a03942777411bac6b123877ecba854f9ea1b80a16e77574027f18b8352dfc9157b5c7f8525ea6 +MISC metadata.xml 168 BLAKE2B 2e0e000b4c3b6ca04c12903fdbe278415c05a822623c52e9aa95cbbf3d50bcb1246b7edbda7d2f6b559af8950c6374e6e0a69b76319964cfe686bf50b0604a57 SHA512 4dcf45d1809e8390a2d8155c8ebfe0dd610203e392aeab0ccd8a10f42cc8532a4925eff32b35e7a6c35598a4efd288229034ec0732299dbd8cfa0acff705fed3 diff --git a/app-emulation/guestfs-tools/guestfs-tools-1.46.1-r1.ebuild b/app-emulation/guestfs-tools/guestfs-tools-1.46.1-r1.ebuild new file mode 100644 index 000000000000..1ac17ff9fb4e --- /dev/null +++ b/app-emulation/guestfs-tools/guestfs-tools-1.46.1-r1.ebuild @@ -0,0 +1,151 @@ +# Copyright 1999-2021 Gentoo Authors +# Distributed under the terms of the GNU General Public License v2 + +EAPI=7 + +inherit flag-o-matic linux-info perl-functions strip-linguas toolchain-funcs + +MY_PV_1="$(ver_cut 1-2)" +MY_PV_2="$(ver_cut 2)" +[[ $(( ${MY_PV_2} % 2 )) -eq 0 ]] && SD="stable" || SD="development" + +DESCRIPTION="Tools for accessing, inspecting, and modifying virtual machine (VM) disk images" +HOMEPAGE="https://libguestfs.org/" +SRC_URI="https://download.libguestfs.org/${PN}/${MY_PV_1}-${SD}/${P}.tar.gz" + +LICENSE="GPL-2 LGPL-2" +SLOT="0/${MY_PV_1}" +# Keyword with newer libguestfs, bug #816693 +#KEYWORDS="~amd64" +IUSE="doc +ocaml +perl test" +RESTRICT="!test? ( test )" + +# Failures - doc +COMMON_DEPEND=" + !<app-emulation/libguestfs-1.46.0-r1 + app-arch/cpio + app-arch/lzma + app-arch/unzip[natspec] + app-arch/xz-utils + app-crypt/gnupg + >=app-emulation/libguestfs-${MY_PV_1}:=[ocaml?,perl?] + app-emulation/libvirt:= + >=app-emulation/qemu-2.0[qemu_softmmu_targets_x86_64,filecaps] + dev-lang/perl:= + dev-libs/libpcre2:= + dev-libs/libxml2:2 + dev-libs/jansson:= + >=sys-apps/fakechroot-2.8 + sys-fs/squashfs-tools:* + sys-libs/libxcrypt:= + virtual/libcrypt:= + ocaml? ( >=dev-lang/ocaml-4.03:=[ocamlopt] ) + perl? ( + virtual/perl-Data-Dumper + virtual/perl-Getopt-Long + dev-perl/Module-Build + dev-perl/libintl-perl + virtual/perl-ExtUtils-MakeMaker + >=dev-perl/Sys-Virt-0.2.4 + dev-perl/String-ShellQuote + test? ( virtual/perl-Test-Simple ) + ) +" +# Some OCaml is always required +# bug #729674 +DEPEND="${COMMON_DEPEND} + >=dev-lang/ocaml-4.03:=[ocamlopt] + dev-ml/findlib[ocamlopt] + doc? ( app-text/po4a ) + ocaml? ( + dev-ml/ounit2[ocamlopt] + || ( + <dev-ml/ocaml-gettext-0.4.2 + dev-ml/ocaml-gettext-stub[ocamlopt] + ) + ) +" +BDEPEND="virtual/pkgconfig" +RDEPEND="${COMMON_DEPEND} + app-emulation/libguestfs-appliance +" + +DOCS=( AUTHORS BUGS ChangeLog HACKING README TODO ) + +#PATCHES=( +# "${FILESDIR}"/${MY_PV_1}/ +#) + +pkg_setup() { + CONFIG_CHECK="~KVM ~VIRTIO" + [[ -n "${CONFIG_CHECK}" ]] && check_extra_config +} + +src_configure() { + # bug #794877 + tc-export AR + + if use test ; then + # Skip Bash test + # (See 13-test-suite.log in linked bug) + # bug #794874 + export SKIP_TEST_COMPLETE_IN_SCRIPT_SH=1 + + # This test requires libvirt support in libguestfs and it makes + # no difference at runtime. Just gracefully skip it to make life + # easier for e.g. arch testing. + if ! has_version 'app-emulation/libguestfs[libvirt]' ; then + export SKIP_TEST_VIRT_ALIGNMENT_SCAN_GUESTS_SH=1 + fi + + # Needed for the inspector tests. Provided by libguestfs-appliance. + #export LIBGUESTFS_PATH="${BROOT}"/usr/share/guestfs/appliance/ + # But the inspector tests seem fragile anyway... + export SKIP_TEST_VIRT_INSPECTOR_LUKS_SH=1 + export SKIP_TEST_VIRT_INSPECTOR_SH=1 + fi + + # Disable feature test for kvm for more reason + # i.e: not loaded module in __build__ time, + # build server not supported kvm, etc. ... + # + # In fact, this feature is virtio support and requires + # configured kernel. + export vmchannel_test=no + + # Give a nudge to help find libxcrypt[-system] + # We have a := dep on virtual/libcrypt to ensure this + # doesn't become stale. + # bug #703118, bug #789354 + if ! has_version 'sys-libs/libxcrypt[system]' ; then + append-ldflags "-L${ESYSROOT}/usr/$(get_libdir)/xcrypt" + append-ldflags "-Wl,-R${ESYSROOT}/usr/$(get_libdir)/xcrypt" + fi + + econf \ + $(usex doc '' PO4A=no) \ + $(use_enable ocaml) \ + $(use_enable perl) +} + +src_install() { + strip-linguas -i po + + emake DESTDIR="${D}" install "LINGUAS=""${LINGUAS}""" + + find "${ED}" -name '*.la' -delete || die + + if use perl ; then + perl_delete_localpod + fi +} + +pkg_postinst() { + if ! use ocaml ; then + einfo "OCaml based tools and bindings (virt-resize, virt-sparsify, virt-sysprep, ...) NOT installed" + fi + + if ! use perl ; then + einfo "Perl based tools NOT built" + fi +} diff --git a/app-emulation/guestfs-tools/metadata.xml b/app-emulation/guestfs-tools/metadata.xml new file mode 100644 index 000000000000..115e9d64a669 --- /dev/null +++ b/app-emulation/guestfs-tools/metadata.xml @@ -0,0 +1,5 @@ +<?xml version="1.0" encoding="UTF-8"?> +<!DOCTYPE pkgmetadata SYSTEM "https://www.gentoo.org/dtd/metadata.dtd"> +<pkgmetadata> + <!-- maintainer-needed --> +</pkgmetadata> diff --git a/app-emulation/libguestfs-appliance/Manifest b/app-emulation/libguestfs-appliance/Manifest index 892215c1188b..eacf9eaca296 100644 --- a/app-emulation/libguestfs-appliance/Manifest +++ b/app-emulation/libguestfs-appliance/Manifest @@ -2,5 +2,5 @@ AUX env.file 47 BLAKE2B 2b9034e60acea9f2300ec234a7ccdd6b438d2370808f8c30c8470c73 DIST appliance-1.38.0.tar.xz 96537604 BLAKE2B 8b425b624dec274f2913ab9ff89cc02fea6c9244d6e3ee64f054d2a91f7959d9dbc03d55e9f5b4f5df835007581a18914b5c790f55b01c3398412ce5a7e9309d SHA512 a423fd54627ffb9c2ae05b26ad60b9089f8119a99d30612a33921a2662ba42332ad0a7a7ad6c33b7042fc02a5c4dc9b563158650c6cb4a3eaaae6b764f7d7082 DIST appliance-1.40.1.tar.xz 111566640 BLAKE2B b6ddd3b120a466ce343d67d9e058c201a78f5e605b8bbc2d47fc30c5eaaa874cc032b879a67c5f134b8fa65c58fc27893b062de0c3a21705b64766dd86df648f SHA512 2d63b2ce8850929b42ddc91518b0e2b37d13e358be94bb54899da6c310afa308d708a3443b9f3b3aa3c46f4f2079036a6a4b34027788f183c17a20b68fcf4e6e EBUILD libguestfs-appliance-1.38.0.ebuild 1060 BLAKE2B 410ffc74f5ca09546e6bb299915a36696a7f813a8b7e28236c074e04ed411359407d1822568fc8e69fdc5c62127c57736a715525ca0f745e801ec2f58dbb2083 SHA512 069e996f0e69e4dbcea8b7811cee8a53c087ada0bb2ca73f4a5feeb8ded3acd84aa719d0c48754a1491cfbbef8413dcde5a749da0a3cb22c061a0cfe2dd97a57 -EBUILD libguestfs-appliance-1.40.1.ebuild 1059 BLAKE2B 82f336d9ccbb6033a6d5b2335e409218c1ea8f5697d31e7bef2b7af60d3e2cce7ac3855edba758a5d7b656c344cba73fd59edaa370ade88de605d9ec7db19305 SHA512 c7e21c1dd6951c3566cefb5405779ea7d61095136db000772fac9361fadeb0dc938e99ee17bc567cae1d6315a22b34af0e37c859d4058990aa13cdf89df580d0 +EBUILD libguestfs-appliance-1.40.1.ebuild 1175 BLAKE2B f55b99e4c55b03615ddfc74a59ac74ad32b6f7df020138182230234bcd0344ff9d6274639cfeb30434f0ffeb7f2d02eae36f8fed9cdf9c3ff5b8a98ea23becbf SHA512 70750e18bfd4a7cc3b661931cd31f4a3f514a8f1659b98d97e94591da0368318be53b93f85767aed6449f11c9c562d50c99ce6b96aa9a74862bc383e84c0450c MISC metadata.xml 358 BLAKE2B 5c53a4234d111074211770ddf29787389265ae3d1c4b9df049fbe9866eaf6d21d567f3174a1d7cf609f6058587fcc82baec92a89cbb77bc7223d4fdeccbe7905 SHA512 d6a65ffa0ef14230ff77b36edb0885781820f0be0a5ba915e805669539478cbd9cdf89532d621336a9189c443a3b9399d47502fdd87993ae0167eada9e95afee diff --git a/app-emulation/libguestfs-appliance/libguestfs-appliance-1.40.1.ebuild b/app-emulation/libguestfs-appliance/libguestfs-appliance-1.40.1.ebuild index 2e8d1b9eed95..5e02fc97cf98 100644 --- a/app-emulation/libguestfs-appliance/libguestfs-appliance-1.40.1.ebuild +++ b/app-emulation/libguestfs-appliance/libguestfs-appliance-1.40.1.ebuild @@ -41,3 +41,8 @@ src_install() { newenvd "${FILESDIR}"/env.file 99${PN} } + +pkg_postinst() { + # bug #776790 + elog "Please run . ${EROOT}/etc/profile before attempting to use this package!" +} diff --git a/app-emulation/libguestfs/Manifest b/app-emulation/libguestfs/Manifest index c993c95a469d..39120ef90464 100644 --- a/app-emulation/libguestfs/Manifest +++ b/app-emulation/libguestfs/Manifest @@ -3,6 +3,8 @@ AUX 1.38/0002-Loosen-build-time-requirement-on-bash-completion.patch 1697 BLAKE2 AUX 1.44/0001-Check-for-caml_alloc_initialized_string-existence-ev.patch 991 BLAKE2B 213bea03f22a03f6cd7a82d310fcd106c1b06493e744a7bfb95b7820fe7813208e343170cf9d4322180528ea9e05ab94d54b1ba601bd0550388a33b1bf222211 SHA512 344729229c35e66d21911ae040b4a15ce9a5b37de0f1965272de1c85f21d3293182bbb7953cdd99bb8fe7909754ae462c5d7e973d369ff6d0b64c590fc1d2ee8 DIST libguestfs-1.38.6.tar.gz 23284845 BLAKE2B 005aaef731e1711dc5f4552dbecff80f2c7a79fd8a13f6b79675b0a381dcd7b9ad16867ed0dda73a9f20ab0a7e03892b5ebffa5436b870613233fbd2024ca846 SHA512 20a254f1d6a4628a11f42c08947d1165430a020030da7e6ee7b22859b552245e8f3822a2d86c60055878ca00d8f17d346a0ad8274e8f0bb03ef4a9410b9630f1 DIST libguestfs-1.44.1.tar.gz 23798268 BLAKE2B a2266d28e611204f03fc88c7a51331b49eb9fb908a318024bbc98af6a283ef4ba80be9caa0fb7e10f4d8bf67be5aaddae73d213828956e59f3233ab280a0185b SHA512 db6eab7350d9318a5ad5f968b24ed77ab411c9be3476b62b2b8448cf06db2462af1e3c9d8b02b54011d43651c281d74db7cb8023426a3f09667aa5b3597c7c33 -EBUILD libguestfs-1.38.6-r103.ebuild 4678 BLAKE2B 5814cea0363f5da8073e999453ecaae15d757b2226d7ad649af381dc98a816514ba9b37ad6ab959d317c879dea0ab378285b8af371eb894dd28e522327b5da3b SHA512 f309897cfbaab4ec2e60d75a6c22710601fa49c9ba195ce8a4d3cc365a16a1dcf458d9fb390cbd7373fe8c5c0c8a9bba15154c2341ba05a5c65f394bd83c7408 -EBUILD libguestfs-1.44.1.ebuild 5009 BLAKE2B 18bc69f5f5226e0ff42b40a053ba927773daba0b1a0d706db02046850878f3252367acfbc58d157d5c2eb20f9aeabac701269746883e649cc1d8dadae845e118 SHA512 23ba4651454afe1bdcc2b92937473b5fca78958228b9a06fcd6ab807efa1ec7a22459c25bf8ac0f30ba41ccc48ce4c1fa54d169a5835ae682fb7e28242aeeede -MISC metadata.xml 776 BLAKE2B 250160aed5c8e8eeae9ab42879e725e7a49bce2ddfb798013807955618cda163160cea671d199a946676b216b48be81093f10fa660922b33c0596ed3fe8666bd SHA512 1a14b857f9ff97d44fa00f708c9021cb1aa6c49ec7de1dd2c61b853709e0e879aeb8e15bf5d612d418d62f1405da625a37c7841122973de709a3e773ca85278f +DIST libguestfs-1.46.0.tar.gz 18500858 BLAKE2B 1d69d79fa33b5a6bdde00cdb3acdad51a6042d0307117ab6c230259dbc9646fe694df0d7e8f2cf2ae63f146ea756269ea7bf139e61786c46d42c33bb176937e1 SHA512 9b1670dff924e046ab82ff1ce6e25428d95b88700b507d4f1dd68a309641e376d14520c7b5aa5bbb81a6ba5c708ebcc46b6fe0970d903a3ed79e76d4ccdca614 +EBUILD libguestfs-1.38.6-r104.ebuild 4708 BLAKE2B 1a55c043dfacd8975e1e401425292e5e13c35d7ac117bfece2b5b1b8dd745d0b16bf41090922cda2eab3ccd507032e2c986381e381837de0ef25411b07674612 SHA512 f20bcceea53ac79ed720a0dcedba0c936f46cf6236b1464493aa0403418fdb1906c1a81a645a9bb98ebd25b4f6a46895976fbe22d4e2be3cd144a1385ab22afc +EBUILD libguestfs-1.44.1-r1.ebuild 5020 BLAKE2B ffc8eb503c07b171a6caf8531c1d2f0b940368bc5aa3c8f59340535ea4837fccdf6532e4f6d11c323471e846d4a06b092ca65743833abb5d9b621ae5bbeecab3 SHA512 d2134eb6e9855f5d65377b43aadffc6fceeddc5d14777654aafa24a1aa4c366d090c18b1bd0ec3ba94a719a3bf0e1fbd246a39239f5cda568d1c047866570324 +EBUILD libguestfs-1.46.0-r1.ebuild 5496 BLAKE2B ea3b297973605ef8d617ce512f2a04e42efe319e3c3bc3c0151cbfed74d8371ab60b9414a2e1103a510e9920fd9dcff2a2c5f28aa28bf28a3c107bcf8332ce5d SHA512 62363a50410c784f3dd380d3af16705fad5a210c0f6e057c535abaf8ec4220143fbb9447d965fc49364b9d8cbd6456a467dca002e674ffceb22bcd5040002076 +MISC metadata.xml 612 BLAKE2B 434f61bf6376288a782f4d2781938b6d647b7c1fab5d598a8fdd96c380ecef5947bd326a2c4f0d09fa40b6d00b1d59b86b27bea92cef311d9eae411d31465c3c SHA512 3dc1ae8480b6d1c1e2a800d8f8bb0f4171f645c69a47c9319b6d7ccefc2434c2d57fbcd0b47d48008196d1d1835693ccef984219bf7a2b10c444ffd04ef55672 diff --git a/app-emulation/libguestfs/libguestfs-1.38.6-r103.ebuild b/app-emulation/libguestfs/libguestfs-1.38.6-r104.ebuild index 12a00b8b9477..7556d8a8b6d4 100644 --- a/app-emulation/libguestfs/libguestfs-1.38.6-r103.ebuild +++ b/app-emulation/libguestfs/libguestfs-1.38.6-r104.ebuild @@ -30,6 +30,7 @@ REQUIRED_USE="lua? ( ${LUA_REQUIRED_USE} ) # FIXME: selinux support is automagic COMMON_DEPEND=" + !app-emulation/guestfs-tools sys-libs/ncurses:0= sys-devel/gettext >=app-misc/hivex-1.3.1 diff --git a/app-emulation/libguestfs/libguestfs-1.44.1.ebuild b/app-emulation/libguestfs/libguestfs-1.44.1-r1.ebuild index a7311dc74bb0..845470ae27d0 100644 --- a/app-emulation/libguestfs/libguestfs-1.44.1.ebuild +++ b/app-emulation/libguestfs/libguestfs-1.44.1-r1.ebuild @@ -6,7 +6,7 @@ EAPI=7 LUA_COMPAT=( lua5-1 ) PYTHON_COMPAT=( python3_{7,8,9} ) -inherit autotools bash-completion-r1 linux-info lua-single perl-functions python-single-r1 strip-linguas toolchain-funcs xdg-utils flag-o-matic +inherit autotools linux-info lua-single perl-functions python-single-r1 strip-linguas toolchain-funcs xdg-utils flag-o-matic MY_PV_1="$(ver_cut 1-2)" MY_PV_2="$(ver_cut 2)" @@ -30,6 +30,7 @@ REQUIRED_USE="lua? ( ${LUA_REQUIRED_USE} ) # FIXME: selinux support is automagic COMMON_DEPEND=" + !app-emulation/guestfs-tools sys-libs/ncurses:0= sys-devel/gettext >=app-misc/hivex-1.3.1 diff --git a/app-emulation/libguestfs/libguestfs-1.46.0-r1.ebuild b/app-emulation/libguestfs/libguestfs-1.46.0-r1.ebuild new file mode 100644 index 000000000000..32fe3a85f203 --- /dev/null +++ b/app-emulation/libguestfs/libguestfs-1.46.0-r1.ebuild @@ -0,0 +1,218 @@ +# Copyright 1999-2021 Gentoo Authors +# Distributed under the terms of the GNU General Public License v2 + +EAPI=7 + +LUA_COMPAT=( lua5-1 ) +PYTHON_COMPAT=( python3_{8,9,10} ) + +inherit flag-o-matic linux-info lua-single perl-functions python-single-r1 strip-linguas toolchain-funcs + +MY_PV_1="$(ver_cut 1-2)" +MY_PV_2="$(ver_cut 2)" +[[ $(( ${MY_PV_2} % 2 )) -eq 0 ]] && SD="stable" || SD="development" + +DESCRIPTION="Tools for accessing, inspecting, and modifying virtual machine (VM) disk images" +HOMEPAGE="https://libguestfs.org/" +SRC_URI="https://libguestfs.org/download/${MY_PV_1}-${SD}/${P}.tar.gz" + +LICENSE="GPL-2 LGPL-2" +SLOT="0/${MY_PV_1}" +# Unkeyworded for testing guestfs-tools split, #816693 +#KEYWORDS="~amd64" +IUSE="doc erlang +fuse gtk inspect-icons introspection libvirt lua +ocaml +perl python ruby selinux static-libs systemtap test" +RESTRICT="!test? ( test )" + +REQUIRED_USE="lua? ( ${LUA_REQUIRED_USE} ) + python? ( ${PYTHON_REQUIRED_USE} )" + +# Failures - doc +# FIXME: selinux support is automagic +COMMON_DEPEND=" + >=app-admin/augeas-1.8.0 + app-arch/cpio + app-arch/lzma + app-arch/unzip[natspec] + app-arch/xz-utils + app-cdr/cdrtools + app-crypt/gnupg + >=app-emulation/qemu-2.0[qemu_softmmu_targets_x86_64,systemtap?,selinux?,filecaps] + >=app-misc/hivex-1.3.1 + dev-lang/perl:= + dev-libs/libconfig:= + dev-libs/libpcre:3 + dev-libs/libxml2:2= + dev-libs/jansson:= + >=dev-libs/yajl-2.0.4 + net-libs/libtirpc:= + sys-libs/ncurses:0= + >=sys-apps/fakechroot-2.8 + sys-apps/fakeroot + sys-apps/file + sys-devel/gettext + sys-fs/squashfs-tools:* + >=sys-libs/db-4.6:* + sys-libs/libcap + sys-libs/readline:= + virtual/acl + virtual/libcrypt:= + erlang? ( dev-lang/erlang ) + perl? ( + virtual/perl-ExtUtils-MakeMaker + >=dev-perl/Sys-Virt-0.2.4 + virtual/perl-Getopt-Long + virtual/perl-Data-Dumper + dev-perl/libintl-perl + >=app-misc/hivex-1.3.1[perl?] + dev-perl/String-ShellQuote + ) + python? ( ${PYTHON_DEPS} ) + fuse? ( sys-fs/fuse:= ) + gtk? ( + sys-apps/dbus + x11-libs/gtk+:3 + ) + introspection? ( + >=dev-libs/glib-2.26:2 + >=dev-libs/gobject-introspection-1.30.0:= + ) + inspect-icons? ( + media-libs/netpbm + media-gfx/icoutils + ) + libvirt? ( app-emulation/libvirt ) + lua? ( ${LUA_DEPS} ) + ocaml? ( >=dev-lang/ocaml-4.03:=[ocamlopt] ) + selinux? ( + sys-libs/libselinux + sys-libs/libsemanage + ) + systemtap? ( dev-util/systemtap ) +" +# Some OCaml is always required +# bug #729674 +DEPEND="${COMMON_DEPEND} + >=dev-lang/ocaml-4.03:=[ocamlopt] + dev-util/gperf + dev-ml/findlib[ocamlopt] + doc? ( app-text/po4a ) + ocaml? ( + dev-ml/ounit2[ocamlopt] + || ( + <dev-ml/ocaml-gettext-0.4.2 + dev-ml/ocaml-gettext-stub[ocamlopt] + ) + ) + ruby? ( dev-lang/ruby virtual/rubygems dev-ruby/rake ) + test? ( introspection? ( dev-libs/gjs ) ) +" +BDEPEND="virtual/pkgconfig" +RDEPEND="${COMMON_DEPEND} + app-emulation/libguestfs-appliance + acct-group/kvm +" +# Upstream build scripts compile and install Lua bindings for the ABI version +# obtained by running 'lua' on the build host +BDEPEND="lua? ( ${LUA_DEPS} )" + +DOCS=( AUTHORS BUGS ChangeLog HACKING README TODO ) + +#PATCHES=( +# "${FILESDIR}"/${MY_PV_1}/ +#) + +pkg_setup() { + CONFIG_CHECK="~KVM ~VIRTIO" + [[ -n "${CONFIG_CHECK}" ]] && check_extra_config + + use lua && lua-single_pkg_setup + use python && python-single-r1_pkg_setup +} + +src_configure() { + # bug #794877 + tc-export AR + + # Skip Bash test + # (See 13-test-suite.log in linked bug) + # bug #794874 + export SKIP_TEST_COMPLETE_IN_SCRIPT_SH=1 + + # Disable feature test for kvm for more reason + # i.e: not loaded module in __build__ time, + # build server not supported kvm, etc. ... + # + # In fact, this feature is virtio support and requires + # configured kernel. + export vmchannel_test=no + + # Give a nudge to help find libxcrypt[-system] + # We have a := dep on virtual/libcrypt to ensure this doesn't become stale. + # bug #703118, bug #789354 + if ! has_version 'sys-libs/libxcrypt[system]' ; then + append-ldflags "-L${ESYSROOT}/usr/$(get_libdir)/xcrypt" + append-ldflags "-Wl,-R${ESYSROOT}/usr/$(get_libdir)/xcrypt" + fi + + econf \ + --disable-appliance \ + --disable-daemon \ + --disable-haskell \ + --disable-golang \ + --disable-rust \ + --disable-php \ + --without-java \ + --with-extra="-gentoo" \ + --with-readline \ + $(usex doc '' PO4A=no) \ + $(use_enable ocaml) \ + $(use_enable erlang) \ + $(use_enable fuse) \ + $(use_enable introspection gobject) \ + $(use_enable introspection) \ + $(use_with libvirt) \ + $(use_enable lua) \ + $(use_enable python) \ + $(use_enable perl) \ + $(use_enable ruby) \ + $(use_enable static-libs static) \ + $(use_enable systemtap probes) +} + +src_install() { + strip-linguas -i po + + emake DESTDIR="${D}" install "LINGUAS=""${LINGUAS}""" + + find "${ED}" -name '*.la' -delete || die + + if use perl ; then + perl_delete_localpod + + # Workaround Build.PL for now + doman "${ED}"/usr/man/man3/Sys::Guestfs.3pm + rm -rf "${ED}"/usr/man || die + fi +} + +pkg_preinst() { + local libguestfs_depstring="<app-emulation/libguestfs-1.46.0-r1" + + # Did we have a version of libguestfs before the split into guestfs-tools? + # (libguestfs used to install the tools too) + if has_version "${libguestfs_depstring}[ocaml]" || has_version "${libguestfs_depstring}[perl]" ; then + HAD_LIBGUESTFS_WITH_TOOLS=1 + fi +} + +pkg_postinst() { + einfo "Please ensure you are in the 'kvm' group for decent performance!" + + if ! use gtk ; then + einfo "virt-p2v NOT installed" + fi + + if [[ ${HAD_LIBGUESTFS_WITH_TOOLS} -eq 1 ]] ; then + ewarn "libguestfs' tools are now packaged as app-emulation/guestfs-tools from 1.46.0 onwards!" + fi +} diff --git a/app-emulation/libguestfs/metadata.xml b/app-emulation/libguestfs/metadata.xml index 4f3be3f3c1c2..ddd4c20532b2 100644 --- a/app-emulation/libguestfs/metadata.xml +++ b/app-emulation/libguestfs/metadata.xml @@ -1,19 +1,12 @@ <?xml version="1.0" encoding="UTF-8"?> <!DOCTYPE pkgmetadata SYSTEM "https://www.gentoo.org/dtd/metadata.dtd"> <pkgmetadata> -<!-- maintainer-needed --> -<!-- -<maintainer type="person"> - <email>rich@annexia.org</email> - <name>Richard Jones</name> - <description>Upstream - please CC on bugs that concerns upstream</description> -</maintainer> ---> -<use> - <flag name="erlang">Build Erlang bindings</flag> - <flag name="fuse">Enable image mount support via fuse</flag> - <flag name="inspect-icons">Use <pkg>media-gfx/icoutils</pkg> for acces icon file in image and inspect it</flag> - <flag name="libvirt">Use <pkg>app-emulation/libvirt</pkg> to manipulate VMs</flag> - <flag name="systemtap">Use <pkg>dev-util/systemtap</pkg> to inspect VM via "probes" way</flag> -</use> + <!-- maintainer-needed --> + <use> + <flag name="erlang">Build Erlang bindings</flag> + <flag name="fuse">Enable image mount support via <pkg>sys-fs/fuse</pkg></flag> + <flag name="inspect-icons">Use <pkg>media-gfx/icoutils</pkg> for accessing/inspecting icon file within images</flag> + <flag name="libvirt">Use <pkg>app-emulation/libvirt</pkg> to manipulate VMs</flag> + <flag name="systemtap">Use <pkg>dev-util/systemtap</pkg> to inspect VM via "probes"</flag> + </use> </pkgmetadata> diff --git a/app-emulation/lxc/Manifest b/app-emulation/lxc/Manifest index 1d52dcc6c69e..bd8fcd842827 100644 --- a/app-emulation/lxc/Manifest +++ b/app-emulation/lxc/Manifest @@ -1,12 +1,8 @@ AUX lxc-2.0.5-omit-sysconfig.patch 259 BLAKE2B 977e151fbb8c9d98e89aaa5ee0426e64ab4286b4440af1582086a0ced8c6568efb470ccf68786da6ea52c82d1f4e81feac45bec411febc04fc31d108f05ccde2 SHA512 0aed9aca687accc6df79e97f48ab333043256e8ae68c8643f2b2452cc8013191238867d64ec71f7d399c59a43d3ba698b35d965090c5cb149b4f41302432e6e7 AUX lxc-3.0.0-bash-completion.patch 915 BLAKE2B 8bb879e391cec349d211b47d321c64ea091c8475ac9a8c4adfb45918c044f6c49d9b9bce546082907d696f697baf0870893c4427abeafa496db89f99190cd091 SHA512 2f3728fcf5e88eecc1ae05bf038ef83baa375194c5bef0d0ef68feaf4d8092cdd8efef6b3c27207c4abd28b085f087af517242c65747b47d0a8fa840f6b9d279 -AUX lxc-4.0.9-handle-kernels-with-CAP_SETFCAP.patch 3529 BLAKE2B 6a9ac29e1c38643383df135981a3893e8bea631af85271499f687614a3c779d5a2adfee7d20ca3eca5358ac8b123ee1c969af9d41b1d5bc85749a91937f1845d SHA512 62640563ec638b9a2c9e66c533a604585d8289b7f71362b70fb1110ec2e840b68758cc217b1953d181cd34e1b8881bb24ff7fca6d2c3145ac2b973d157d1a979 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.10.tar.gz 1515002 BLAKE2B 2a5b94ad767c8a11a5c34d19f12d812bd284337045ad5021c80a5f69be608085ac465edde8c385cc558e45638c9f061793c0c9db616ccbe0614554b4fbf62005 SHA512 ec3ccf344a91b50b30985562c54ad93d2db2d29c24d31da8e3a69e801c8bd23c1560274c1850c39eb7e984940ba86d3ebae75db136320d6bbc5eb03bda4c5318 DIST lxc-4.0.10.tar.gz.asc 833 BLAKE2B 3dd6e8793d1b725ab9eb73d4fa78ce2767bf830fb70d6cc7052e70d2adbc46e4fcf6d986595322b64cb9c71417b801ef6ee3c7612c46dbeb10acba01a5bd69e0 SHA512 dd2d3ac4e066eca4e0358c9a2c371a227d3a0b5cf6e452fe34fa5c8cff46e25fa0555c9f707511a8603348fa969c1e7abf85ad7d27fdcaff613b733066861608 -DIST lxc-4.0.9.tar.gz 1500310 BLAKE2B 3796d36b6f76ec595dc28207e66ec9f5a7c1a39f5c5ebc851638c519be35f59b4ec06a71b2866cd8fef0a6140f61fd4b70c900f5a8ffd42d7da7a30d3ff59975 SHA512 4ef9d9efdd4118fdffde8b49c6ae71cf5eb060be51daaa4f4ceb804c743fbf3278e6518e6a694faefc720f2834f98ac48d67842d589a2120b8f7ec4c3b61fa84 -DIST lxc-4.0.9.tar.gz.asc 833 BLAKE2B 2d275c968831410d987aa7f8062f4e35ba15043f92f38fd3bdd6bf80964906741d05ccd93789132d421ee1c8778cec6a2e76c4f0eb2165cf0107261495fa6856 SHA512 4c90dfbdba90959ee8df5da8ca8b240f65ab03ab91637833c677e2a73592c09f9c5a55b9a261be6efb0888156c916223ff1aa9003b18d46e667908aaa550c944 EBUILD lxc-4.0.10.ebuild 4702 BLAKE2B 7e549ac644545bf600f8af1231a29c99b34d4c72e0b95f5eab3a0739ea2277e978abba2c00a66404e28a6dc4597fd3f6834d1aac8a46caa3d27902af114f9f7b SHA512 17c2d30d229e0c2c2909aeade12c06613c3b22ed291a12abd37d08cfcef22a4ebeac8864eaf76ead5e40d969bd88e468ef7eb7c439a02a63fb4db62982b81ff1 -EBUILD lxc-4.0.9-r1.ebuild 4745 BLAKE2B 24c899647ef171da052c4ba0a6b670896105a882560acdb63b21041ae253d44605cee6c624fd5ef2c65b29d215e6a8c1eb06b2cde4c5f5ba20a1c67e07024264 SHA512 3d58635170c9977b332336abd4efa8bef78263216fe186a29f8d405264421d668d6f2d82bc08d899987a8e42d289d8a7563c26b86d125992f92e33296730dd38 MISC metadata.xml 621 BLAKE2B 0af5fd56a744f9b684e2ad9a62a86f1c21f6c70599ed273062b0ce680e0452c5be34055434d8840f70e40d886abea8dae25a28c925e24b491f7307f792ebdeba SHA512 2155aca1c8020145709646fa8040db9eaa425fcfc430ebe77d1a09bda40b8f9c6b927a26ae3dc875e6022257fd0890bd6d22b5b7f2ba38f74d46daef6e80cd49 diff --git a/app-emulation/lxc/files/lxc-4.0.9-handle-kernels-with-CAP_SETFCAP.patch b/app-emulation/lxc/files/lxc-4.0.9-handle-kernels-with-CAP_SETFCAP.patch deleted file mode 100644 index 6fba3c4154a4..000000000000 --- a/app-emulation/lxc/files/lxc-4.0.9-handle-kernels-with-CAP_SETFCAP.patch +++ /dev/null @@ -1,93 +0,0 @@ -From 91ad9b94bcd964adfbaa8d84d8f39304d39835d0 Mon Sep 17 00:00:00 2001 -From: Christian Brauner <christian.brauner@ubuntu.com> -Date: Thu, 6 May 2021 18:16:45 +0200 -Subject: [PATCH] conf: handle kernels with CAP_SETFCAP - -LXC is being very clever and sometimes maps the caller's uid into the -child userns. This means that the caller can technically write fscaps -that are valid in the ancestor userns (which can be a security issue in -some scenarios) so newer kernels require CAP_SETFCAP to do this. Until -newuidmap/newgidmap are updated to account for this simply write the -mapping directly in this case. - -Cc: stable-4.0 -Signed-off-by: Christian Brauner <christian.brauner@ubuntu.com> ---- - src/lxc/conf.c | 25 ++++++++++++++++++++----- - 1 file changed, 20 insertions(+), 5 deletions(-) - -diff --git a/src/lxc/conf.c b/src/lxc/conf.c -index 72e21b5300..f388946970 100644 ---- a/src/lxc/conf.c -+++ b/src/lxc/conf.c -@@ -2978,6 +2978,9 @@ static int lxc_map_ids_exec_wrapper(void *args) - return -1; - } - -+static struct id_map *find_mapped_hostid_entry(const struct lxc_list *idmap, -+ unsigned id, enum idtype idtype); -+ - int lxc_map_ids(struct lxc_list *idmap, pid_t pid) - { - int fill, left; -@@ -2991,12 +2994,22 @@ int lxc_map_ids(struct lxc_list *idmap, pid_t pid) - char mapbuf[STRLITERALLEN("new@idmap") + STRLITERALLEN(" ") + - INTTYPE_TO_STRLEN(pid_t) + STRLITERALLEN(" ") + - LXC_IDMAPLEN] = {0}; -- bool had_entry = false, use_shadow = false; -+ bool had_entry = false, maps_host_root = false, use_shadow = false; - int hostuid, hostgid; - - hostuid = geteuid(); - hostgid = getegid(); - -+ /* -+ * Check whether caller wants to map host root. -+ * Due to a security fix newer kernels require CAP_SETFCAP when mapping -+ * host root into the child userns as you would be able to write fscaps -+ * that would be valid in the ancestor userns. Mapping host root should -+ * rarely be the case but LXC is being clever in a bunch of cases. -+ */ -+ if (find_mapped_hostid_entry(idmap, 0, ID_TYPE_UID)) -+ maps_host_root = true; -+ - /* If new{g,u}idmap exists, that is, if shadow is handing out subuid - * ranges, then insist that root also reserve ranges in subuid. This - * will protected it by preventing another user from being handed the -@@ -3014,7 +3027,9 @@ int lxc_map_ids(struct lxc_list *idmap, pid_t pid) - else if (!gidmap) - WARN("newgidmap is lacking necessary privileges"); - -- if (uidmap > 0 && gidmap > 0) { -+ if (maps_host_root) { -+ INFO("Caller maps host root. Writing mapping directly"); -+ } else if (uidmap > 0 && gidmap > 0) { - DEBUG("Functional newuidmap and newgidmap binary found"); - use_shadow = true; - } else { -@@ -4229,14 +4244,14 @@ static struct id_map *mapped_nsid_add(const struct lxc_conf *conf, unsigned id, - return retmap; - } - --static struct id_map *find_mapped_hostid_entry(const struct lxc_conf *conf, -+static struct id_map *find_mapped_hostid_entry(const struct lxc_list *idmap, - unsigned id, enum idtype idtype) - { - struct id_map *map; - struct lxc_list *it; - struct id_map *retmap = NULL; - -- lxc_list_for_each (it, &conf->id_map) { -+ lxc_list_for_each (it, idmap) { - map = it->elem; - if (map->idtype != idtype) - continue; -@@ -4265,7 +4280,7 @@ static struct id_map *mapped_hostid_add(const struct lxc_conf *conf, uid_t id, - return NULL; - - /* Reuse existing mapping. */ -- tmp = find_mapped_hostid_entry(conf, id, type); -+ tmp = find_mapped_hostid_entry(&conf->id_map, id, type); - if (tmp) { - memcpy(entry, tmp, sizeof(*entry)); - } else { diff --git a/app-emulation/lxc/lxc-4.0.9-r1.ebuild b/app-emulation/lxc/lxc-4.0.9-r1.ebuild deleted file mode 100644 index 243fd583e982..000000000000 --- a/app-emulation/lxc/lxc-4.0.9-r1.ebuild +++ /dev/null @@ -1,174 +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}.tar.gz - verify-sig? ( https://linuxcontainers.org/downloads/lxc/${P}.tar.gz.asc )" - -KEYWORDS="amd64 ~arm ~arm64 ~ppc64 x86" - -LICENSE="LGPL-3" -SLOT="0" -IUSE="apparmor +caps doc man pam selinux +ssl +tools verify-sig" - -RDEPEND="acct-group/lxc - acct-user/lxc - app-misc/pax-utils - sys-apps/util-linux - sys-libs/libcap - sys-libs/libseccomp - virtual/awk - caps? ( sys-libs/libcap ) - pam? ( sys-libs/pam ) - selinux? ( sys-libs/libselinux ) - ssl? ( - dev-libs/openssl:0= - )" -DEPEND="${RDEPEND} - >=sys-kernel/linux-headers-4 - apparmor? ( sys-apps/apparmor )" -BDEPEND="doc? ( app-doc/doxygen ) - man? ( app-text/docbook-sgml-utils ) - verify-sig? ( app-crypt/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}"/lxc-4.0.9-handle-kernels-with-CAP_SETFCAP.patch # bug 789012 - "${FILESDIR}"/${PN}-3.0.0-bash-completion.patch - "${FILESDIR}"/${PN}-2.0.5-omit-sysconfig.patch # bug 558854 -) - -VERIFY_SIG_OPENPGP_KEY_PATH=${BROOT}/usr/share/openpgp-keys/linuxcontainers.asc - -src_prepare() { - default - 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-seccomp - --enable-thread-safety - - $(use_enable apparmor) - $(use_enable caps capabilities) - $(use_enable doc api-docs) - $(use_enable doc examples) - $(use_enable man doc) - $(use_enable pam) - $(use_enable selinux) - $(use_enable ssl openssl) - $(use_enable tools) - - $(use_with pam pamdir $(getpam_mod_dir)) - ) - - econf "${myeconfargs[@]}" -} - -src_install() { - default - - mv "${ED}"/usr/share/bash-completion/completions/${PN} "${ED}"/$(get_bashcompdir)/${PN}-start || die - bashcomp_alias ${PN}-start \ - ${PN}-{attach,cgroup,copy,console,create,destroy,device,execute,freeze,info,monitor,snapshot,stop,unfreeze,wait} - - 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}/${PN}.initd.8" ${PN} - - # Remember to compare our systemd unit file with the upstream one - # config/init/systemd/lxc.service.in - systemd_newunit "${FILESDIR}"/${PN}_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-emulation/lxc-templates - optfeature "Debian-based distribution container image support" dev-util/debootstrap - optfeature "snapshot & restore functionality" sys-process/criu -} diff --git a/app-emulation/lxd/Manifest b/app-emulation/lxd/Manifest index a5a98a50e5a0..85c1b4b96915 100644 --- a/app-emulation/lxd/Manifest +++ b/app-emulation/lxd/Manifest @@ -8,6 +8,6 @@ AUX lxd-containers-4.0.0.service 322 BLAKE2B a38cffd4b5809946abdac858564dcab2c29 AUX lxd-syscall_wrappers-don-t-conflict-with-glibc-provided.patch 2055 BLAKE2B 4f17aeb03e6022b6e88c4279865215fbecb699b9cc112a8e1fe16d9cda113e41d39faf448d17f9810bb65efb37d37b74b3c20ffb65329e012820f46705235f6f SHA512 1f0846ab9aa3ebfd96e79a91bc17be871f0ac3af44ddd3f9ba2a17570b2d800407a76634476e61d6d1f8bfbb880f5df37ad3b435a139e62f4c1c786c002d29d4 DIST lxd-4.0.7.tar.gz 15454709 BLAKE2B 6278fa058efa15a689a982dcf0bce58bf320ac500bc8bd6cd4227f5f126a03dd85a65363d4d36b3437a0a2fd8e08e8a7332b96f9aba8e8eb2aa508d1129fec13 SHA512 dd99db21a4de95d95e6bd53dcbd68f4d9f0ffbd9e60d994340cd0b1e820068e671507a9718d1c56488c79ad49019f86637a4a8b9c945cdd3f70d59c9e2026fb1 DIST lxd-4.0.7.tar.gz.asc 833 BLAKE2B a28e43d1fd0d5851a62121069703637e7ba25cbeb142507e4e162b254eddce2b5a13a100eedb202fbf3d8aa40f6e20b4fd587ef38f6c73a07d2bd9d8d9d00c8f SHA512 561d7cbf94a37e7ed03828ac98a2022dc1a4e11b80cdee3ad925bf4226b78b9e1d1b9c51ed070e60fba881b69e06dc70be2713026285b10de5cca59549ac5f82 -EBUILD lxd-4.0.7-r1.ebuild 4357 BLAKE2B cb3dc55ab05afa9339f6eeb2cac4a39628eb430bf4914c8e3548fd30f793e4102e9de7ee61ee001bd8f91dc2b18f7980ef7c3db3d845b6de7e0176159091b2a3 SHA512 d91618a54fb6a0868c4f450ce2a7ffdfec0aeac7e74b337b2488e4912c1044ba0d891ed1eaf74d3578a4c56481074c44d1c7a37bf0cea337229f802e61dbb29c +EBUILD lxd-4.0.7-r1.ebuild 4362 BLAKE2B 2585df5d2e0d58a6f56a2ecd5a2542f88f31b5aaa5dd402048aa1a4ea6142245e4196f9a0fb9e91da6153a014fa68930fcf76cb8f2368086e64e69f47f618ecf SHA512 e0653c62444b847348507fefaa9364fc4220dbeaaf38a3b7cb0eff122558a752e3512d14d29174c69795fad96f560284bb8a64d027c7d66e260e16e825d8f88f EBUILD lxd-4.0.7.ebuild 4190 BLAKE2B 2938b717899c7ad9199b13265c4f250959d1b353ea4e591b8e77470c31e2cb72da47733dd823bcfbd842c26bcca9a9e820fb56784c0aca048b8221ac5ba7fbd6 SHA512 5699cdbb47c6752012f5500abae8d0ff655111d6d7843583e97e3ebd000bb63745e77dc7f3d4099c80d60939cf5d1972f74e8f90012c195ff135d7e9e3b6e749 MISC metadata.xml 777 BLAKE2B e25ff2ac780143763e40917f2570bbe8244c2a2a9eac1a9761199e7ea19df9863ade968ca8218f62da9fe41f3b9e7110ef86abff764c2a3d85f02ae102951a16 SHA512 e39a06e8b838990a9b0019f52e1d0c7dd83527c6a15bc8a14f0aa9fec2ee86c914de52f1ba48e7a586c3866d9da46dc32c2d6e1ea3e2c42ca985fdfe0783b40c diff --git a/app-emulation/lxd/lxd-4.0.7-r1.ebuild b/app-emulation/lxd/lxd-4.0.7-r1.ebuild index f7a259aeafe0..cdfd0052cb63 100644 --- a/app-emulation/lxd/lxd-4.0.7-r1.ebuild +++ b/app-emulation/lxd/lxd-4.0.7-r1.ebuild @@ -12,7 +12,7 @@ SRC_URI="https://linuxcontainers.org/downloads/lxd/${P}.tar.gz LICENSE="Apache-2.0" SLOT="0" -KEYWORDS="~amd64" +KEYWORDS="~amd64 ~x86" IUSE="apparmor ipv6 nls verify-sig" DEPEND="app-arch/xz-utils diff --git a/app-emulation/qemu/Manifest b/app-emulation/qemu/Manifest index 484f6d6dbde9..8766efeb83ee 100644 --- a/app-emulation/qemu/Manifest +++ b/app-emulation/qemu/Manifest @@ -11,8 +11,8 @@ AUX qemu-binfmt.initd.head 1442 BLAKE2B 23aa5338914aa7c47f9b1cc1d28291abd0ea037a AUX qemu-binfmt.initd.tail 245 BLAKE2B dd59f2944c6e3f0c4d282b94b687a9b5c51dd77c5103fb9889bd9ce56874495397676ae6c8375d9e9e23094828477240778d9e0f361e68cdd63fdad574851561 SHA512 bcca16805f8380d52cc591ea3d65a8f6e5de456730618f6aee301510edb75d235a22d4d7aeed224882210392840adb403eb53234b6cb76a4cb24533852a8b737 DIST qemu-6.0.0.tar.xz 107333232 BLAKE2B 7746329d3e13782b7c346ce4052cc517cfc65cd9b2d514d199e4d5b8570ca79566ec04b0c114db2e97c84e68eb551e0d4cdce1b14b91a88fe08d2a5f682c1418 SHA512 ee3ff00aebec4d8891d2ff6dabe4e667e510b2a4fe3f6190aa34673a91ea32dcd2db2e9bf94c2f1bf05aa79788f17cfbbedc6027c0988ea08a92587b79ee05e4 DIST qemu-6.1.0.tar.xz 111258808 BLAKE2B 412eecf6d39debd6089b26d3b22e5d25c6c8c30d2eaf31b17c25cc2b3a1b10794a30218dfb151c78801aa295255aa974b297f1fe05b93f14334f203c2af5ccee SHA512 3378ae21c75b77ee6a759827f1fcf7b2a50a0fef07e3b0e89117108022a8d8655fa977e4d65596f4f24f7c735c6594d44b0c6f69732ea4465e88a7406b1d5d3c -EBUILD qemu-6.0.0-r3.ebuild 25705 BLAKE2B df201ef5eca3ff9a4bac85506f21e46090a0a6833a8e69f23f9098c20ef08a0d285a6ea5c6886c63f2f5cb0bb508f49a2311b73720fb4ebddfe395fb1cb0eb8e SHA512 597ece956b0019cf5c2f258d87dbd48f6f4f62da6058d3ecffb73a5353deaf70c29412c29ea289beb218587436536ea459711b5a8ff829d32d4d36f20222b6d2 -EBUILD qemu-6.0.0-r53.ebuild 25773 BLAKE2B 47a79709694066d58e0bec797842ec7e47620093f4ececdb7bc0b3bfbf5308ab77ba1dfd65496a96701ab15bc58be39f2ce250ca42e3671899e47cd590ff4d7a SHA512 e2ec452965b44ef759ea29b2ab1e5e6e71c82eb2003b8979223f8e49b44eec8367c39afc079993e49950ede76b2276c6ec053f8467cdc72a778a3fa2e4e7463f -EBUILD qemu-6.1.0.ebuild 25677 BLAKE2B a76260c356b8d28d637026de6da8a307e2b91a9d6e0d78b9c160acf5ac9fccc529252aa5bde910824720477d9bb86a95623724e59ce74c337687d51e5367ae9e SHA512 fb1c7cf27602c5afee1ff7241024db7e923f12963b06f3bab4beae8a601f608b9c360fd6137280a5853e34e81a5b8faddcf1b90e877f6f5a9d09e284d0eead5e -EBUILD qemu-9999.ebuild 25641 BLAKE2B 83ae500dbf12f4105575280b5ab51fd2d3b745996edd82870c2cbad2603ae5d400f0f76e8e62b21ba7df7dd9196ee5ab531a8a9b3d05c4aeb2228d6be2864255 SHA512 b74d34bbcc5da5310d4b24e39c20805269f452f58611cf8835c27e6da4a652db9173b6899065ca66aa030c43e8284f7e9f9f9d263acc15ba07d55f5e95574ed5 -MISC metadata.xml 4404 BLAKE2B 2b4bfa49d040e8ec3d4b6f6ac86dc68fc6c28e96731eacf78894c87b0f8f63c625a9b7b08640b002d20ad8ccde90c0fadab8cbb80808d9f43f238d428a24ec6a SHA512 095113ce8366dcb78945a6cda3bcda99a2add394f3ff6ffd0798c8f8c1ef471ea20bd74b0a2dbfe41155886fa05e3d5e817319931091154164b251f01c41ca1f +EBUILD qemu-6.0.0-r3.ebuild 25707 BLAKE2B e42d63e7b996356466a1aaecc99b6b6435d8a7c733694b9afd5279cebc973c9236e8544dc806d3117a60ee725e1a5a0bb3a2fbbecc0d7053b57fb4b5e66211b8 SHA512 26ff7c7d12b427621dbfea2a6fb9e5e79ae8e5ee6eb8bebfd6c0512bed547bb62c99629592d23ca2f24611fb17fd37f15a43ae063b5b4b8bf9c9ad0712c3c1ec +EBUILD qemu-6.0.0-r53.ebuild 25774 BLAKE2B ad019835cd1acd45f7b5c4d29161b3626a8a285d3d2c67b65aca3a5fe05a8748b252eadaddfbd177213f70f8be14dfec820e29a7ff068eb7fe87e5e742bc5901 SHA512 21c12bd597e7f1ed984aa1a6fb880a3cdfc5d7eb91dedd6265b8cd9be1d162eab371b3245ae02975fd9d7c981d5f1b944fa00fe4abd55458544e0fea72d75d7d +EBUILD qemu-6.1.0.ebuild 25679 BLAKE2B 41ce7b2b45928ea5b5218f5764d0de0e96b40235663e573ec9fea0531e77dc3764dc87107239d6aa08e2b20b44cd30d01bf6bd344045a7ba8a42d9ebb4f7635e SHA512 0e26b90e4395d33b1cdebb5bf6ceb38f49fb0c191a3ce11b736cf94a1fb29369134fab7df834faa3b289a4ae68206063b4ade91d524b2d06ea7ba894cf26b885 +EBUILD qemu-9999.ebuild 25643 BLAKE2B 662ee64944087293a48267ce2c2e09ae940b088a50bf1ff6e09efddaf2656119267511130b8030c1d4e05fa3eabfc6c69ed7c302da6d1e952679c743a16e9dda SHA512 7389c614c6f092a0e333d5f9deca972d85dbc08fdd9bcfc3894aa14b506bcbcfa2810ac8ca097de7415eb1c3915a02c5984ea483db2dd9260a71aafcad407009 +MISC metadata.xml 4412 BLAKE2B c941bfcd3b0e601598859f87e5651959553e5b0baaa5f0adad01c6ea840cffb03612310e9fa034a92b16a1db27a5c07be3bd41be5105ba02bd8719e65bd43d6e SHA512 3639168093bf902d954c90748b69e3af66d9d03aeae8ddbf8ee5969ea9329f5a3a57312adf6995d12a26140b952a0a534eb4db6952f59b8bdd979c9bc91323c1 diff --git a/app-emulation/qemu/metadata.xml b/app-emulation/qemu/metadata.xml index c46cc09199c2..6cc5daac8dcd 100644 --- a/app-emulation/qemu/metadata.xml +++ b/app-emulation/qemu/metadata.xml @@ -40,7 +40,7 @@ When the blobs are different, random corruption/bugs/crashes/etc... may be observed.</flag> <flag name="plugins">Enable qemu plugin API via shared library loading.</flag> <flag name="pulseaudio">Enable pulseaudio output for sound emulation</flag> - <flag name="rbd">Enable rados block device backend support, see http://ceph.newdream.net/wiki/QEMU-RBD</flag> + <flag name="rbd">Enable rados block device backend support, see https://docs.ceph.com/en/mimic/rbd/qemu-rbd/</flag> <flag name="sdl">Enable the SDL-based console</flag> <flag name="sdl-image">SDL Image support for icons</flag> <flag name="slirp">Enable TCP/IP in hypervisor via <pkg>net-libs/libslirp</pkg></flag> @@ -55,10 +55,10 @@ <flag name="usb">Enable USB passthrough via <pkg>dev-libs/libusb</pkg></flag> <flag name="usbredir">Use <pkg>sys-apps/usbredir</pkg> to redirect USB devices to another machine over TCP</flag> <flag name="vde">Enable VDE-based networking</flag> - <flag name="vhost-net">Enable accelerated networking using vhost-net, see http://www.linux-kvm.org/page/VhostNet</flag> + <flag name="vhost-net">Enable accelerated networking using vhost-net, see https://www.linux-kvm.org/page/VhostNet</flag> <flag name="vhost-user-fs">Enable shared file system access using the FUSE protocol carried over virtio.</flag> <flag name="virgl">Enable experimental Virgil 3d (virtual software GPU)</flag> - <flag name="virtfs">Enable VirtFS via virtio-9p-pci / fsdev. See http://wiki.qemu.org/Documentation/9psetup</flag> + <flag name="virtfs">Enable VirtFS via virtio-9p-pci / fsdev. See https://wiki.qemu.org/Documentation/9psetup</flag> <flag name="vte">Enable terminal support (<pkg>x11-libs/vte</pkg>) in the GTK+ interface</flag> <flag name="xattr">Add support for getting and setting POSIX extended attributes, through <pkg>sys-apps/attr</pkg>. Requisite for the virtfs backend.</flag> diff --git a/app-emulation/qemu/qemu-6.0.0-r3.ebuild b/app-emulation/qemu/qemu-6.0.0-r3.ebuild index 975fb3832626..3b96068f5a28 100644 --- a/app-emulation/qemu/qemu-6.0.0-r3.ebuild +++ b/app-emulation/qemu/qemu-6.0.0-r3.ebuild @@ -27,7 +27,7 @@ else fi DESCRIPTION="QEMU + Kernel-based Virtual Machine userland tools" -HOMEPAGE="http://www.qemu.org http://www.linux-kvm.org" +HOMEPAGE="https://www.qemu.org https://www.linux-kvm.org" LICENSE="GPL-2 LGPL-2 BSD-2" SLOT="0" diff --git a/app-emulation/qemu/qemu-6.0.0-r53.ebuild b/app-emulation/qemu/qemu-6.0.0-r53.ebuild index 29d79b1c24a3..ea4fef2265a6 100644 --- a/app-emulation/qemu/qemu-6.0.0-r53.ebuild +++ b/app-emulation/qemu/qemu-6.0.0-r53.ebuild @@ -23,11 +23,11 @@ if [[ ${PV} = *9999* ]]; then SRC_URI="" else SRC_URI="https://download.qemu.org/${P}.tar.xz" - KEYWORDS="~amd64 ~arm64 ~ppc ~ppc64 ~x86" + KEYWORDS="amd64 ~arm64 ~ppc ~ppc64 ~x86" fi DESCRIPTION="QEMU + Kernel-based Virtual Machine userland tools" -HOMEPAGE="http://www.qemu.org http://www.linux-kvm.org" +HOMEPAGE="https://www.qemu.org https://www.linux-kvm.org" LICENSE="GPL-2 LGPL-2 BSD-2" SLOT="0" diff --git a/app-emulation/qemu/qemu-6.1.0.ebuild b/app-emulation/qemu/qemu-6.1.0.ebuild index 33bb63f8bb96..8365c047729d 100644 --- a/app-emulation/qemu/qemu-6.1.0.ebuild +++ b/app-emulation/qemu/qemu-6.1.0.ebuild @@ -27,7 +27,7 @@ else fi DESCRIPTION="QEMU + Kernel-based Virtual Machine userland tools" -HOMEPAGE="http://www.qemu.org http://www.linux-kvm.org" +HOMEPAGE="https://www.qemu.org https://www.linux-kvm.org" LICENSE="GPL-2 LGPL-2 BSD-2" SLOT="0" diff --git a/app-emulation/qemu/qemu-9999.ebuild b/app-emulation/qemu/qemu-9999.ebuild index d887f5b1537a..d0b927f0738f 100644 --- a/app-emulation/qemu/qemu-9999.ebuild +++ b/app-emulation/qemu/qemu-9999.ebuild @@ -27,7 +27,7 @@ else fi DESCRIPTION="QEMU + Kernel-based Virtual Machine userland tools" -HOMEPAGE="http://www.qemu.org http://www.linux-kvm.org" +HOMEPAGE="https://www.qemu.org https://www.linux-kvm.org" LICENSE="GPL-2 LGPL-2 BSD-2" SLOT="0" diff --git a/app-emulation/runc/Manifest b/app-emulation/runc/Manifest index 4dc444f6e716..5ca9bfb9bd2e 100644 --- a/app-emulation/runc/Manifest +++ b/app-emulation/runc/Manifest @@ -1,3 +1,3 @@ -DIST runc-1.0.0.tar.gz 2366170 BLAKE2B 1b6455cd45bc51b92c12b3293037446da62957d441124e9b76fd44ce92329e0eb2fde2ef71c6519fc4d58bcbd4ef580f64d71753a6fc06f3f6e347de170bd9c3 SHA512 8ddad1e031237c07b6cab5cfe5bdb7b11bf98d5d1064ec06845f36da073fe65a0facc6a28ba5daff71cdcb50cfd5d1cd25e97385b4eddb35b287113c2771365c -EBUILD runc-1.0.0.ebuild 1768 BLAKE2B 5a52de86a2f479f3d06dbb6c4c91c62e6907037aaf3bdd4402c791613da63b112ff25661a64cad452ded1f092090e7c040fac6c60034fe8812f2f10e93269fe9 SHA512 6a525717611258d7707f99086ab199fa29aadaa5480713415a06983ba16ada0b1214bfb610a21407502f2534eb2ac1e496ef2e2910f0a27090cfca7303989919 +DIST runc-1.0.2.tar.gz 2374156 BLAKE2B 526520adb7127e46e7258de75e66a15a5aac216a2a2fcb91f4d9c5da393892242c4d93c5f5483ab111bf29eed7d8f0c8c138ae83a22809d72802a981dcda0395 SHA512 434abd6d7ad2508c2272b627d8aeeb28ecd8461899bff463e7d2c7abbc0f0cbb2e0bafbfe81fc534fad506b1acb4bda3e05639ecd908bc9d0d2e9356f1e56e26 +EBUILD runc-1.0.2.ebuild 1768 BLAKE2B 96de4aa7bf5e25378a4ad78aeb5ee60215ff993cab30452222c8983f08e8dee11b8d1c65eec85f592c1f923889496e60b688a8926585f428d7b419247edaf2ff SHA512 8d657d6739da04ff5f3bfba31f7bacd66122300de287e8db0a1f3371f3c6e55b0bee7b95823b77ba30fab57c141c15c530978fd964c49c3658369de33c12cda6 MISC metadata.xml 822 BLAKE2B 2029743d60c9a6197e3db4ca27c3ee48bc86f624a50d7caa9bfb7f958383a1736d8817f2f977ac0e673229bd61f341a00f266dbce35dcd9633ecc27b182478d5 SHA512 f80b366f7fc8f4ff5bd46245aa80871748800a557440af3aa45bd1a508732cf634b6f21a3445135450eefbac91ab16f7b344c3f557af8ef69fdd8120ca6cf4e5 diff --git a/app-emulation/runc/runc-1.0.0.ebuild b/app-emulation/runc/runc-1.0.2.ebuild index bda21966de77..d61c2be1edd1 100644 --- a/app-emulation/runc/runc-1.0.0.ebuild +++ b/app-emulation/runc/runc-1.0.2.ebuild @@ -7,7 +7,7 @@ inherit go-module linux-info # update on bump, look for https://github.com/docker\ # docker-ce/blob/<docker ver OR branch>/components/engine/hack/dockerfile/install/runc.installer -RUNC_COMMIT=84113eef6fc27af1b01b3181f31bbaf708715301 +RUNC_COMMIT=52b36a2dd837e8462de8e01458bf02cf9eea47dd CONFIG_CHECK="~USER_NS" DESCRIPTION="runc container cli tools" diff --git a/app-emulation/simplevirt/files/simplevirtd.initd b/app-emulation/simplevirt/files/simplevirtd.initd index d8dfadbcb69b..d8dfadbcb69b 100644..100755 --- a/app-emulation/simplevirt/files/simplevirtd.initd +++ b/app-emulation/simplevirt/files/simplevirtd.initd diff --git a/app-emulation/snapd/Manifest b/app-emulation/snapd/Manifest index 99d7dfa07654..881e030824c5 100644 --- a/app-emulation/snapd/Manifest +++ b/app-emulation/snapd/Manifest @@ -1,8 +1,6 @@ AUX README.gentoo 1941 BLAKE2B dd25269f2aaaea693701d74511d632bc45f2c99954ae683cb81d4df41c4c1f8007bb6c337234e46bfc5973aa7e8356cd12ac510e9109eca09890cbc42bd184bb SHA512 5b522e6c29bdad84a71245fa1f0289e9cfed0501d936b433829f66ef9d655f3cc13d6bca29beeae2c00e1b68f9fa30058608b9c4cde86ba66eab67bd011c9d00 -DIST snapd-2.48.tar.xz 3757292 BLAKE2B 4d1fd4b9ff3bd7cf05ebf0e27db4bcc87b5de689be470b4c62758e411e9d99a541ae084c7b1afe4ede44ad6dce19a53b337dcddc18d0b82957ef537f466e720a SHA512 27e1924d86296a969cd18980d6100c8e41be66f2ad0214ac2857580a2686b1e7ef01e2561c6ed532106eadb1ac2d5fd070ef9eb05e5fabfb8fa9a98456259b89 -DIST snapd-2.51.tar.xz 4036884 BLAKE2B debdfe51407306451ecdb7851e3768be5aa5b9714b2861cb17e9989194dfbf441b1569955c6440a7d44f1d36996b398bcf60b903a76116e14dcc3173625e105c SHA512 959cceb8fcb326a14557347cecfb931763084e00639b828dc539646d2988cdeb3c9276ab8b770c6bbe37c7a05fb6548f609f490c55f7ee28713a4eb80cf3da15 +DIST snapd-2.52.1.tar.xz 4142764 BLAKE2B aaeebe91ef5d009deae37258cfcdbdcb415d5a2d5f954d01f277d6c4911449c80c49c486f6af71d4a2abc6a1d73f49f54d506dcb178adc33e1d685f1dc3c6b01 SHA512 ae829ff898708843e56688e2c1bd189c765cced11146a504ae8badd1acb1559536e13cec101e57ac4ffed2a3d1fa51323b87785b93290db7a1eec2e1579d1c6c DIST snapd-2.52.tar.xz 4146496 BLAKE2B 49b952503c60b589fe7ddea9ded135139243da34b35b39d9e309df6854109fb3a99f52ca324737fa7f5773221d453f7093047dcdcb1114d0389e20ba24c3d2c3 SHA512 56d3a2c5048d2ffde5b34f63e6a99dc74a7c6e4637f36250f674a68863c4b997cf940689529eca9d3bf58b0148cc18a0b4033d93aa06375a5f12c552d40472da -EBUILD snapd-2.48.ebuild 5366 BLAKE2B 1dd5ce2d317e9be68f85edae48806f53fd8e79f7479c08af66b0dd329273f80fc9d8fded1550af67210e751ae276a4848fb3e51f13c172376cd865d47bff9ea0 SHA512 2f237c6514e5319eb4d99578f7b1ad2c4a9f506bf29e7f3d5212a41eb56c0a9158f19b11f4a0385653e146691890427f2b07eaf5dbd4c743a95aba1339c13ad1 -EBUILD snapd-2.51.ebuild 5372 BLAKE2B af735d3f690eb176b37611bc16770bfd92c311bbe8578254b9859b57df1ccb9e650358f40b24770934198a7edd74df758848f70b79503869da11dcc388a04381 SHA512 41d520a0c0a03d47e00b01dd67db1336599c42af377e6b8213c257ff751ec6fb1593c250b37b0c6668b515f30bb16a4fd7d459fe3d1376dcaa39d16e19555ce8 +EBUILD snapd-2.52.1.ebuild 5372 BLAKE2B af735d3f690eb176b37611bc16770bfd92c311bbe8578254b9859b57df1ccb9e650358f40b24770934198a7edd74df758848f70b79503869da11dcc388a04381 SHA512 41d520a0c0a03d47e00b01dd67db1336599c42af377e6b8213c257ff751ec6fb1593c250b37b0c6668b515f30bb16a4fd7d459fe3d1376dcaa39d16e19555ce8 EBUILD snapd-2.52.ebuild 5372 BLAKE2B af735d3f690eb176b37611bc16770bfd92c311bbe8578254b9859b57df1ccb9e650358f40b24770934198a7edd74df758848f70b79503869da11dcc388a04381 SHA512 41d520a0c0a03d47e00b01dd67db1336599c42af377e6b8213c257ff751ec6fb1593c250b37b0c6668b515f30bb16a4fd7d459fe3d1376dcaa39d16e19555ce8 MISC metadata.xml 636 BLAKE2B 4a281c549f4279097b8cb1739e557eabe36f97e8c43e1736c68385bb4f0fe46d6952991b0e0ca531552ec27fd9f3c990324c2f35d44cf6030a4957f6eaf4f441 SHA512 6cb86bb37aa587be9744e8a45f80bc8c78df644f97f7cfbd8c7e0228d26ea7a1d834ef8e1542bed099e1b80f7c91797871e4b447102c4bfbf2f46489b59dc244 diff --git a/app-emulation/snapd/snapd-2.48.ebuild b/app-emulation/snapd/snapd-2.48.ebuild deleted file mode 100644 index b25ca4a9b988..000000000000 --- a/app-emulation/snapd/snapd-2.48.ebuild +++ /dev/null @@ -1,180 +0,0 @@ -# Copyright 2020-2021 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 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 +cgroup-hybrid +forced-devmode gtk kde systemd" -REQUIRED_USE="!forced-devmode? ( apparmor cgroup-hybrid ) 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[cgroup-hybrid(+)?] ) - sys-libs/libcap:= - sys-fs/squashfs-tools" - -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 -} - -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 || cgroupv2\)#//\1\n\tif !apparmorFull || cgroupv2 {\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-confine/snap-device-helper,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 -} diff --git a/app-emulation/snapd/snapd-2.51.ebuild b/app-emulation/snapd/snapd-2.52.1.ebuild index abc28376ab87..abc28376ab87 100644 --- a/app-emulation/snapd/snapd-2.51.ebuild +++ b/app-emulation/snapd/snapd-2.52.1.ebuild diff --git a/app-emulation/vice/Manifest b/app-emulation/vice/Manifest index 3f512704a6cb..48dce6866252 100644 --- a/app-emulation/vice/Manifest +++ b/app-emulation/vice/Manifest @@ -2,5 +2,5 @@ AUX vice-pkg-config-3.4_p38553.patch 816 BLAKE2B 58fdde3647c520b12434b221197b91d DIST vice-3.5.tar.gz 22557578 BLAKE2B 5573951052c2c7b2beb4dd194ad8612c53e484e47a4d935e0dbc880f2f06611252add3631f99c9656f2c941088d0147b0783020ffcc5a29505bab75ef8dc128e SHA512 02f364c1645138cacb461346d44de8f524fb2aba7d980181caf039c46ca9d30db98466e5b0e56e6a41417cd7bbd63d73bf6eb110af1271e23732e320dd1fab70 DIST vice-emu-code-r38553-trunk-vice.zip 27146846 BLAKE2B 5139e4b1e9269c3885313889dffc055298c52152da77e5a824270feb0af6ba61a1726160a6d259e9f8840fefe486cc184f5bfda3ba1797e0359159ccf1e9824f SHA512 c4d3f132bae2980163e74695126e979bd68dddecb17c2eea8227edbb675985d1f04ade665b946a5e3c707bc17e260efb61f57aa141b6ef712385d4d85a68ef86 EBUILD vice-3.4_p38553.ebuild 4410 BLAKE2B ea6539484a88baac8d3d98bbff3c4f589c4bac49c76586496b8453e7b1cfa5c402ff5a1e7a029483da5cf07d78006bc35a3557a67a63230bc85a8b12f3f469d6 SHA512 dd7a3ad05ceb453a71667e0628d8d925b03c864d07c90857d283e5737e0105895222f6bf635c28f0274c005c1f03324dfffef57610b9f32c031b76e2782339eb -EBUILD vice-3.5.ebuild 4094 BLAKE2B 466b405315ac250de41388a96b060f9b3a781dfbda835ee071dea7a1565b3b454dfb448cc5ccec5f7d7dba9570ea65c25d7700b1ffb2e486250bd8e2479d0b43 SHA512 b9fce3160d93891730afa5b87a267b9ead102b953ce241a61fd7c235e1894ec27f16c09b606c532dbf4e1e9608281a8f477fb7237c13cd239f88c2c3d184ba93 +EBUILD vice-3.5-r1.ebuild 4079 BLAKE2B d771d1c419cc9e22ebc6e0c6b62ef55c5f52d16facb22c88997cc18ea053420bd3b6dc324a1f7c34a5cc59dec6960db213b083fddfa07348a0d45ada9abdaff2 SHA512 03bc43270e3ccbb5703006920f06854bf03ce06ebe7af33bf7a956355a527a47f671d0216c7e425345a6ede31e2f495247f23c11538f16bd4d69264d73b1ab30 MISC metadata.xml 785 BLAKE2B 1dc59c7b40fda968680e97b1ad83e741faf223143bbc1ab2d523e37312badd3a3aaedc3bbffbd158531c74ae73dab1bb1ee03666a081eb17d819dc9e0b783ee2 SHA512 b483d325702723d1395bca771d215709fc68b6ca8309c4297c6a668d5940502c9c8d5d4149e1f52b8fd6d5062cf04b2e3d7046ecfc0555d2703b064e329af283 diff --git a/app-emulation/vice/vice-3.5.ebuild b/app-emulation/vice/vice-3.5-r1.ebuild index 4518b5ff92ff..625f1bce3a1f 100644 --- a/app-emulation/vice/vice-3.5.ebuild +++ b/app-emulation/vice/vice-3.5-r1.ebuild @@ -13,31 +13,33 @@ LICENSE="GPL-2+" SLOT="0" KEYWORDS="~amd64 ~x86" IUSE=" - alsa cpuhistory debug doc ethernet ffmpeg flac gif +gtk headless - ipv6 jpeg lame mpg123 ogg oss parport pci png portaudio pulseaudio - sdl zlib" + alsa cpuhistory debug doc ethernet ffmpeg flac gif +gtk headless jpeg + lame mpg123 ogg oss parport pci png portaudio pulseaudio sdl zlib" REQUIRED_USE=" || ( gtk headless sdl ) gtk? ( zlib )" RDEPEND=" - sys-libs/readline:0= + sys-libs/readline:= virtual/libintl alsa? ( media-libs/alsa-lib ) ethernet? ( - >=net-libs/libnet-1.1.2.1:1.1 - >=net-libs/libpcap-0.9.8 + net-libs/libnet:1.1 + net-libs/libpcap ) ffmpeg? ( media-video/ffmpeg:= ) flac? ( media-libs/flac ) gif? ( media-libs/giflib:= ) gtk? ( + dev-libs/atk dev-libs/glib:2 media-libs/fontconfig:1.0 media-libs/glew:0= virtual/opengl x11-libs/cairo - x11-libs/gtk+:3 + x11-libs/gdk-pixbuf:2 + x11-libs/gtk+:3[X] + x11-libs/libX11 x11-libs/pango ) jpeg? ( virtual/jpeg ) @@ -49,14 +51,14 @@ RDEPEND=" ) parport? ( sys-libs/libieee1284 ) pci? ( sys-apps/pciutils ) - png? ( media-libs/libpng:0= ) + png? ( media-libs/libpng:= ) portaudio? ( media-libs/portaudio ) pulseaudio? ( media-sound/pulseaudio ) sdl? ( media-libs/libsdl2[video] media-libs/sdl2-image ) - zlib? ( sys-libs/zlib )" + zlib? ( sys-libs/zlib:= )" DEPEND=" ${RDEPEND} x11-base/xorg-proto" @@ -98,14 +100,6 @@ src_configure() { multibuild_foreach_variant run_in_build_dir multibuild_src_configure } -multibuild_enable() { - if [[ ${MULTIBUILD_VARIANT} == ${1} ]]; then - echo --enable-${2} - else - echo --disable-${2} - fi -} - multibuild_src_configure() { # Append ".variant" to x* programs if building multiple variants. local xform @@ -113,20 +107,26 @@ multibuild_src_configure() { xform="/^x/s/\$/.${MULTIBUILD_VARIANT}/" fi + vice-multi_enable() { + if [[ ${MULTIBUILD_VARIANT} == ${1} ]]; then + echo --enable-${2} + else + echo --disable-${2} + fi + } + local econfargs=( --program-transform-name="${xform}" - $(multibuild_enable gtk desktop-files) - $(multibuild_enable gtk native-gtk3ui) - $(multibuild_enable headless headlessui) - $(multibuild_enable sdl sdlui2) - + $(vice-multi_enable gtk desktop-files) + $(vice-multi_enable gtk native-gtk3ui) + $(vice-multi_enable headless headlessui) + $(vice-multi_enable sdl sdlui2) $(use_enable cpuhistory) $(use_enable debug debug-gtk3ui) $(use_enable debug) $(use_enable doc pdf-docs) $(use_enable ethernet) $(use_enable ffmpeg external-ffmpeg) - $(use_enable ipv6) $(use_enable lame) $(use_enable parport libieee1284) $(use_enable portaudio) @@ -140,18 +140,16 @@ multibuild_src_configure() { $(use_with png) $(use_with pulseaudio pulse) $(use_with zlib) + $(usex alsa --enable-midi $(use_enable oss midi)) + $(usex pci '' ac_cv_header_pci_pci_h=no) --disable-arch --disable-sdlui --disable-shared-ffmpeg --disable-static-ffmpeg + --disable-static-lame --enable-html-docs - - # Some dependencies lack configure options so prevent them becoming - # automagic by using configure cache variables. - $(usex pci '' ac_cv_header_pci_pci_h=no) - - # Ensure we use giflib, not ungif. - ac_cv_lib_ungif_EGifPutLine=no + --enable-ipv6 + ac_cv_lib_ungif_EGifPutLine=no # ensure use giflib, not ungif ) econf "${econfargs[@]}" |