diff options
Diffstat (limited to 'app-containers')
-rw-r--r-- | app-containers/Manifest.gz | bin | 9401 -> 9400 bytes | |||
-rw-r--r-- | app-containers/docker-credential-helpers/Manifest | 2 | ||||
-rw-r--r-- | app-containers/docker-credential-helpers/docker-credential-helpers-0.6.3.ebuild | 55 | ||||
-rw-r--r-- | app-containers/incus/Manifest | 3 | ||||
-rw-r--r-- | app-containers/incus/incus-6.9.ebuild | 223 | ||||
-rw-r--r-- | app-containers/lxc/Manifest | 2 | ||||
-rw-r--r-- | app-containers/lxc/lxc-6.0.3.ebuild | 4 |
7 files changed, 229 insertions, 60 deletions
diff --git a/app-containers/Manifest.gz b/app-containers/Manifest.gz Binary files differindex 625758da43a1..231c2f514078 100644 --- a/app-containers/Manifest.gz +++ b/app-containers/Manifest.gz diff --git a/app-containers/docker-credential-helpers/Manifest b/app-containers/docker-credential-helpers/Manifest index a31beb80bfb7..fb44a48f9b82 100644 --- a/app-containers/docker-credential-helpers/Manifest +++ b/app-containers/docker-credential-helpers/Manifest @@ -1,5 +1,3 @@ -DIST docker-credential-helpers-0.6.3.tar.gz 28971 BLAKE2B b50e4de0f3b126e0118f24f845a94be5e932975ab54ad6e0a52129a56109ecafb021f14986569295242cb0af4ea109d8786b8a5ca8481cc48daad14671841432 SHA512 2d15be8df134bff08eef9461348f07cd57c70c15a0ab044de2e69296c400b8c0e16198c90fd064d5ce83037d0bad57520e7524b0832b7a00e69397203dc90d10 DIST docker-credential-helpers-0.8.2.tar.gz 283816 BLAKE2B 334ca059b619e5e3528864a99b07eea61b98083989aa8e8b619c83d781caad97fbf5f3ed60879adacf27d81e0b991a38567e1fa2bc27b9a772d86b51437a6e03 SHA512 ca04b7fe78871389c9f968b730c18e2aca2d2a818ce87c1f138efb7dafbfdea7b83c2c16504131d04c295428debee2187036e603dba711369b5de1a3993c2e8c -EBUILD docker-credential-helpers-0.6.3.ebuild 1199 BLAKE2B 3514e6402ebac85acbe88f0be29923cf223cef79180604945d1c139381ebb3e4039e82f8aff82090c8fe914588b4c4ae0a286d60c344326fef202b22a750fec6 SHA512 0b126b657a1360c159d651e66893cb2333b0fc936c0419e0f04e2c4557d96db40544f54ddd414c6254371267dae269049369e67d5767d08f2793e2576b0b40f0 EBUILD docker-credential-helpers-0.8.2.ebuild 1098 BLAKE2B 23b78b3383b70948d849a93141be0fc0a0adc43d963f5e995fcaeb37230b92f81a1d9a5ff1c1553b0656e67dc9b56654744a5e930de1b6127b8057203e6b385d SHA512 8ede9d28c11f60ca7508799486edfc4c8277261396bd0c1ee848b9a81007c6517b04e74c22fa51604dc09a8dd1dac48f5218b2c02df187e139aefb529eafc5d5 MISC metadata.xml 847 BLAKE2B daa036739753388691baec54b1c47810a14858ba2dfeae12673abf0dc7ad16d8c956b9e134c6618782fb94e45408746a1e52f81102690b1d4a8cabc57d9a9934 SHA512 3fe3ed079e79e0bc7ee744f1ffcb2f4eaec1f966ee897c9bae75d5f5465cff1f8b75d59b42f1aad69475a452c502f0244fec0a5bda585a78968b77c6ae791bd8 diff --git a/app-containers/docker-credential-helpers/docker-credential-helpers-0.6.3.ebuild b/app-containers/docker-credential-helpers/docker-credential-helpers-0.6.3.ebuild deleted file mode 100644 index e10a2730beea..000000000000 --- a/app-containers/docker-credential-helpers/docker-credential-helpers-0.6.3.ebuild +++ /dev/null @@ -1,55 +0,0 @@ -# Copyright 1999-2023 Gentoo Authors -# Distributed under the terms of the GNU General Public License v2 - -EAPI=7 - -DESCRIPTION="Suite of programs to use native stores to keep Docker credentials safe" -HOMEPAGE="https://github.com/docker/docker-credential-helpers" -EGO_PN=github.com/docker/docker-credential-helpers - -LICENSE="MIT" -SLOT="0" - -if [[ ${PV} = *9999* ]]; then - inherit golang-vcs -else - KEYWORDS="amd64 arm64" - EGIT_COMMIT="v${PV}" - SRC_URI="https://${EGO_PN}/archive/${EGIT_COMMIT}.tar.gz -> ${P}.tar.gz" - inherit golang-vcs-snapshot -fi -inherit golang-build - -IUSE="keyring pass" -REQUIRED_USE="|| ( keyring pass )" -RESTRICT="test" - -DEPEND="keyring? ( app-crypt/libsecret )" -RDEPEND="${DEPEND} - pass? ( app-admin/pass ) -" - -S="${WORKDIR}/${P}/src/${EGO_PN}" - -src_compile() { - local -x GOPATH="${WORKDIR}/${P}" - use keyring && emake secretservice - use pass && emake pass -} - -src_install() { - dobin bin/* - dodoc CHANGELOG.md MAINTAINERS README.md -} - -pkg_postinst() { - if use keyring; then - elog "For keyring/kwallet add:\n" - elog ' "credStore": "secretservice"'"\n" - fi - if use pass; then - elog "For 'pass' add:\n" - elog ' "credStore": "pass"'"\n" - fi - elog "to your ~/.docker/config.json" -} diff --git a/app-containers/incus/Manifest b/app-containers/incus/Manifest index 84dd603e2f91..f46aff623267 100644 --- a/app-containers/incus/Manifest +++ b/app-containers/incus/Manifest @@ -15,8 +15,11 @@ DIST incus-6.7.tar.xz 11313960 BLAKE2B c55ec6c584eeb6123d707b628ff27f96f6555ad5d DIST incus-6.7.tar.xz.asc 833 BLAKE2B 6c72ca10f20f55607b1059bf908e4b36d81b499c2b6e329855c8769cafe9def44bf8cc6a320718150192daf6e820f6e42beb1b9e7a90f794b9c906734b0ba742 SHA512 dd6d55f8f3e8538f8050fce0124bbab1495978ad1ccee954a3d38cc1bb33c0a8f9f6a7f673e7e0942e9bc732a2acdbcb71245c110eb091ef0b53015ef05e9d74 DIST incus-6.8.tar.xz 11403916 BLAKE2B 09d8e2a8619a040550600234d7fe2e65eea8c6a7054e0b790f3774721ad5de982dee5d0151f8141cda0f5c6b9d63e18b1c4964e4027bf9470ed44a28d482f999 SHA512 c7b0cc22014f482981777f3cef3b0064c02b46c7ced4e8572fd9548eec45a0d87ac868e94ab8d2af80eb24986db64a930ac578c8555e2759022cad559b74ac5c DIST incus-6.8.tar.xz.asc 833 BLAKE2B 77b937177b4239da27478ff7826c633d34ee3b5e02e988387fdc63ff43fad307786c27dee2c3cefb8c4129ce8777fad3361c2e2a86152d202c55231d4105d7a8 SHA512 3111e196da18d362c2e60482e313da888ba6ffba1b5ae134bf9d7e89951ebf6d2b2af922d78ee6fd2e9b51bffea5ccadd0d11bf0a3527d07d8351733ce66f2e3 +DIST incus-6.9.tar.xz 11444156 BLAKE2B 440e9ee9422935d68a52370406c1259ad226db680241000ec27633ef213c86cf8dfa49954c9ade4438b4f14ba9f301869a8b18c588edf5ed3439a85fd4a40fc8 SHA512 f8d704a76455fe4073a1fd67aea6dfd4af35d624aa0e91bb568871d5006ec49d9a7e5a19826c58ea300aa28c081e42ae98960f1c6d78a883434c4fd427a0a67b +DIST incus-6.9.tar.xz.asc 833 BLAKE2B 8051c12f9451b4e0300c2d3eea44743fcb61fc77181d1bc289aa85a5aeeba18b1866d84e387cc99f05996333f869738e8930ee63f28ea12b06ec3cd7bb2bd8c3 SHA512 6ef81ff6432333629888309e8b7ac48d4e92d80da77fe8fcabf248bd1c8927b4d180f9893a8895e7fbc32b8b1dec99388b154bf201275d77660af339f47ca2a2 EBUILD incus-6.0.2.ebuild 6083 BLAKE2B c9caaeb98078d7dad8bb277196fbe651eb956020bb933fdbd7d84a1f7caef1c2450d7bb31cfb9ea7717d768bf8cd4dde45c68f81508783e15150b56efc492c79 SHA512 0c6cb9391eaff33920b0e18daf1dc3299db0be2f451a547aa146fdbe85d0b3bafea31cf09f8fb744ec305de41d9ac7c3978ff1bc33aeafd0b8c5794817be3d8f EBUILD incus-6.0.3.ebuild 6271 BLAKE2B c6e13a1cc4efd21365cef8837fd5ca25578fb197a412d8071a58f59d7c1fe39d0c3788bb77563099d6cbc5e13499f34a1026dacf3e213b144d2b50b4ecb355f4 SHA512 275d5a6a9d500ba9895d0d0d99f75eb6ef0d6a6e2d7688d9d5d9d32241b0c2721f5bfb620df80043d1ff281e7e115b6294d0e5fc8abea54387c5e2dccf9038f2 EBUILD incus-6.7.ebuild 6173 BLAKE2B 1ac2d20ccfafee4697587c57ea676835fbfe84d70e4154c33ef8316fd1066f328a44c7b41bc84ec971271ade061b4f09f616c7fc746b22664f45b703fe2f25a3 SHA512 2037e19a3a43be689f666b3d794be77627cfa6da9aff0fb03f5340628ffd8fae375ec9c130f2cfb3f3ffb5c89d6968eeaebcd0e36a881654633809dd18c96c72 EBUILD incus-6.8.ebuild 6383 BLAKE2B 5b00f4b6de57500591485d076152684d5b841d2e4ead9c245607b1c4919fea96d88cfe84896b66c86dfb2049a9f17b2832cedf6a968801f0bd1ba9c8d7075b91 SHA512 7bf9f2b7e203522178a5569faf332bb309d0b68e3d5e27224c111fec441d1ee847a0d3e58c344fa6409bb72fd2884ec3fd1fe94d86fbafe9cc137595ba1ba42a +EBUILD incus-6.9.ebuild 6134 BLAKE2B 57403c2d66d44dc21ff487f9b06d7902a39ab330b0ecb10fd27688e5cf39afc9e4447519da9e44c93de5f7763a4ca0cb562f83f7b9922dc3f4d7b8069ec11e16 SHA512 6826d115f3439710c90345d19600994cba5fc21774b95024d17836dfbdb26fa82e080cee4435da0ab3ba13bcf67318786b584a56e2283d1a3ad1d3a2e72f7347 MISC metadata.xml 1696 BLAKE2B d15b2a9b4a9f2197369466403fe00ff6a2a10d3d2b86e2f306a7eeaad4ef3eb6709c22b08df6dc4a8fa0f6d9468da6a240fca27d587c222f081644b8e303da6f SHA512 e07b3700562381e6634ae5bb50163c63fdec2e2798c055da53bd1e84e65a394482b4b95a57effac61f037ecee91440e1d3d608322978846b7c6c5e200e503f0f diff --git a/app-containers/incus/incus-6.9.ebuild b/app-containers/incus/incus-6.9.ebuild new file mode 100644 index 000000000000..fa843c98a152 --- /dev/null +++ b/app-containers/incus/incus-6.9.ebuild @@ -0,0 +1,223 @@ +# Copyright 1999-2025 Gentoo Authors +# Distributed under the terms of the GNU General Public License v2 + +EAPI=8 + +inherit go-module linux-info optfeature systemd toolchain-funcs verify-sig + +DESCRIPTION="Modern, secure and powerful system container and virtual machine manager" +HOMEPAGE="https://linuxcontainers.org/incus/introduction/ https://github.com/lxc/incus" +SRC_URI="https://linuxcontainers.org/downloads/incus/${P}.tar.xz + verify-sig? ( https://linuxcontainers.org/downloads/incus/${P}.tar.xz.asc )" + +LICENSE="Apache-2.0 BSD LGPL-3 MIT" +SLOT="0/stable" +KEYWORDS="~amd64 ~arm64" +IUSE="apparmor fuidshift nls qemu" + +DEPEND="acct-group/incus + acct-group/incus-admin + app-arch/xz-utils + >=app-containers/lxc-5.0.0:=[apparmor?,seccomp(+)] + dev-db/sqlite:3 + >=dev-libs/cowsql-1.15.6 + dev-libs/lzo + >=dev-libs/raft-0.22.1:=[lz4] + >=dev-util/xdelta-3.0[lzma(+)] + net-dns/dnsmasq[dhcp] + sys-libs/libcap + virtual/udev" +RDEPEND="${DEPEND} + || ( + net-firewall/iptables + net-firewall/nftables + ) + fuidshift? ( !app-containers/lxd ) + net-firewall/ebtables + sys-apps/iproute2 + sys-fs/fuse:* + >=sys-fs/lxcfs-5.0.0 + sys-fs/squashfs-tools[lzma] + virtual/acl + qemu? ( + app-cdr/cdrtools + app-emulation/qemu[spice,usbredir,virtfs] + sys-apps/gptfdisk + )" +BDEPEND=">=dev-lang/go-1.21 + 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/incus + /usr/bin/incus-agent + /usr/bin/incus-benchmark + /usr/bin/incus-migrate + /usr/bin/lxc-to-incus + /usr/sbin/fuidshift + /usr/sbin/incusd + /usr/sbin/lxd-to-incus" + +VERIFY_SIG_OPENPGP_KEY_PATH=/usr/share/openpgp-keys/linuxcontainers.asc + +# The testsuite must be run as root. +# make: *** [Makefile:156: check] Error 1 +RESTRICT="test" + +GOPATH="${S}/_dist" + +src_unpack() { + verify-sig_src_unpack + go-module_src_unpack +} + +src_prepare() { + export GOPATH="${S}/_dist" + + default + + sed -i \ + -e "s:\./configure:./configure --prefix=/usr --libdir=${EPREFIX}/usr/lib/incus:g" \ + -e "s:make:make ${MAKEOPTS}:g" \ + Makefile || die + + sed -i \ + -e "s:/usr/share/OVMF:/usr/share/edk2/OvmfX64:g" \ + -e "s:OVMF_VARS.ms.fd:OVMF_VARS.fd:g" \ + internal/server/instance/drivers/edk2/driver_edk2.go || die "Failed to fix hardcoded ovmf paths." + + cp "${FILESDIR}"/incus-0.4.service "${T}"/incus.service || die + if use apparmor; then + sed -i \ + '/^EnvironmentFile=.*/a ExecStartPre=\/usr\/libexec\/lxc\/lxc-apparmor-load' \ + "${T}"/incus.service || die + fi + + # Disable -Werror's from go modules. + find "${S}" -name "cgo.go" -exec sed -i "s/ -Werror / /g" {} + || die +} + +src_configure() { :; } + +src_compile() { + export GOPATH="${S}/_dist" + export CGO_LDFLAGS_ALLOW="-Wl,-z,now" + + for k in incus-benchmark incus-simplestreams incus-user incus lxc-to-incus lxd-to-incus ; do + ego install -v -x "${S}/cmd/${k}" + done + + if use fuidshift ; then + ego install -v -x "${S}/cmd/fuidshift" + fi + + ego install -v -x -tags libsqlite3 "${S}"/cmd/incusd + + # Needs to be built statically + CGO_ENABLED=0 go install -v -tags netgo "${S}"/cmd/incus-migrate + CGO_ENABLED=0 go install -v -tags agent,netgo "${S}"/cmd/incus-agent + + use nls && emake build-mo +} + +src_test() { + emake check +} + +src_install() { + export GOPATH="${S}/_dist" + + if tc-is-cross-compiler ; then + local bindir="_dist/bin/linux_${GOARCH}" + else + local bindir="_dist/bin" + fi + + newsbin "${FILESDIR}"/incus-startup-0.4.sh incus-startup + + # Admin tools + for l in incusd incus-user lxd-to-incus ; do + dosbin ${bindir}/${l} + done + + # User tools + for m in incus-agent incus-benchmark incus-migrate incus-simplestreams incus lxc-to-incus ; do + dobin ${bindir}/${m} + done + + # fuidshift, should be moved under admin tools at some point + if use fuidshift ; then + dosbin ${bindir}/fuidshift + fi + + newconfd "${FILESDIR}"/incus-6.0.confd incus + newinitd "${FILESDIR}"/incus-6.0.initd incus + newinitd "${FILESDIR}"/incus-user-0.4.initd incus-user + + systemd_dounit "${T}"/incus.service + systemd_newunit "${FILESDIR}"/incus-0.4.socket incus.socket + systemd_newunit "${FILESDIR}"/incus-startup-0.4.service incus-startup.service + systemd_newunit "${FILESDIR}"/incus-user-0.4.service incus-user.service + systemd_newunit "${FILESDIR}"/incus-user-0.4.socket incus-user.socket + + if ! tc-is-cross-compiler; then + # Generate and install shell completion files. + mkdir -p "${D}"/usr/share/{bash-completion/completions/,fish/vendor_completions.d/,zsh/site-functions/} || die + "${bindir}"/incus completion bash > "${D}"/usr/share/bash-completion/completions/incus || die + "${bindir}"/incus completion fish > "${D}"/usr/share/fish/vendor_completions.d/incus.fish || die + "${bindir}"/incus completion zsh > "${D}"/usr/share/zsh/site-functions/_incus || die + else + ewarn "Shell completion files not installed! Install them manually with incus completion --help" + fi + + dodoc AUTHORS + dodoc -r doc/* + use nls && domo po/*.mo + + # Incus needs INCUS_EDK2_PATH in env to find OVMF files for virtual machines, #946184 + newenvd - 90incus <<- _EOF_ + INCUS_EDK2_PATH=${EPREFIX}/usr/share/edk2-ovmf + _EOF_ +} + +pkg_postinst() { + elog + elog "Please see" + elog " https://wiki.gentoo.org/wiki/Incus" + elog " https://wiki.gentoo.org/wiki/Incus#Migrating_from_LXD" + elog + optfeature "OCI container images support" app-containers/skopeo app-containers/umoci + optfeature "btrfs storage backend" sys-fs/btrfs-progs + optfeature "ipv6 support" net-dns/dnsmasq[ipv6] + optfeature "full incus-migrate support" net-misc/rsync + 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 incus group." + elog +} diff --git a/app-containers/lxc/Manifest b/app-containers/lxc/Manifest index b5e448e87b7f..434f91a4b36e 100644 --- a/app-containers/lxc/Manifest +++ b/app-containers/lxc/Manifest @@ -11,5 +11,5 @@ DIST lxc-6.0.3.tar.gz 964210 BLAKE2B 8d5dec7f088111a2ca82aadd6cd90eb30a3a1b61900 DIST lxc-6.0.3.tar.gz.asc 833 BLAKE2B 3a23eacfdd248a95c9fa41a6edcb55abb07abc81314fa227649663ac264a9e5fdcf81cb38b79f1bd51b9172a70a0aee5bf65ecfdaf438c944c25f11c882ab562 SHA512 5de32e772bd2864e3b688a90fd9f08d98829d61ba3e1cc76a9b403fc005256149f55ad034e186c3329f3abe52a8815f60c5027b16de46be0bc81b14d0134babd EBUILD lxc-5.0.3.ebuild 5052 BLAKE2B 99a20e705617194a9e38ec6dabbc52fd43dbd5615a6b00379921f4ba200c2110f666878c00195917109f37cfed961258978b79bc3db0814986c36429537e660c SHA512 050ebb35250bd258a602ee84f9f1b1c35531caa0c3f9954bb8380927a8c262ffd66776cc0af643aaf69a7e0c51dccfe82bb2e3993e264ba2a0c91de8bd94faf5 EBUILD lxc-6.0.2.ebuild 5601 BLAKE2B 8885d5a0fe2400dbecf8ccbe8766f3d5795fd675094387d0319ad1e8bfcb3f0b052b2a20e42c3fb11cd4961b0500580356349001755904c52adc7c1298f932d1 SHA512 68e97e42d5ca082c867f089c36264d545bbe69dde4df07136bdcd3c4458b9c986fc2b2c879485ea2348f745d19585953a1ac2032fa99a69c8ab542aaada1ffa1 -EBUILD lxc-6.0.3.ebuild 5414 BLAKE2B 14da79e37b0ef4bf03ec9082b9aa3324b2b7848ce0228b3489d55c74a227bff090c077505062b99971da5a9888336d2898edb66ac6d2df3f3944b61823dd101b SHA512 b31cc99781e8f5ab93100dbdc90c8b2fd335ca7303a1d05d27524a289a5a5bc3d51d20206ae69bd5109363c11ff9f0254457e384e89acb0f03b385818a4cb93c +EBUILD lxc-6.0.3.ebuild 5412 BLAKE2B 37cb83c04bbf15d7f697ce901248aaf96f83110cdc315c77f6331ff6157896218a6523c99390f9c0907bab4b263103344bd5e9d18f142955d25a674112305104 SHA512 95b0e84ceb394986fa4eb6e348caa31240d5b91fe6bdacb264be1a0dd2769627a2f18839e8d3814fad84743237a848f006e287c5d27ac85623b0c1da1bea089b MISC metadata.xml 629 BLAKE2B 1dde5fefd2199c46a6b2714be94513f02494baf8d382195f79452c749cfe82c90ee1e353428d5d661cb991b25a6d9774605e292b0a4e1321e0a3d269c4eb3334 SHA512 245d00b1e44762fd76ad1978763158438db9a685f383575bce93cf4aac82358331cb41ee7fabc142849a90f8fc116cf14a646e254e6b5be4d46fa90798a48ff6 diff --git a/app-containers/lxc/lxc-6.0.3.ebuild b/app-containers/lxc/lxc-6.0.3.ebuild index 804d6c7d0bee..4f9dce380f01 100644 --- a/app-containers/lxc/lxc-6.0.3.ebuild +++ b/app-containers/lxc/lxc-6.0.3.ebuild @@ -1,4 +1,4 @@ -# Copyright 2022-2024 Gentoo Authors +# Copyright 2022-2025 Gentoo Authors # Distributed under the terms of the GNU General Public License v2 EAPI=8 @@ -12,7 +12,7 @@ SRC_URI="https://linuxcontainers.org/downloads/lxc/${P}.tar.gz LICENSE="GPL-2 LGPL-2.1 LGPL-3" SLOT="0/1.8" # SONAME liblxc.so.1 + ${PV//./} _if_ breaking ABI change while bumping. -KEYWORDS="~amd64 ~arm ~arm64 ~ppc64 ~riscv ~x86" +KEYWORDS="amd64 ~arm ~arm64 ~ppc64 ~riscv x86" IUSE="apparmor +caps examples io-uring man pam seccomp selinux ssl systemd test +tools" RDEPEND="acct-group/lxc |