From 92a9a3adda432ad2b7af58e08f5493ed6dc81196 Mon Sep 17 00:00:00 2001 From: V3n3RiX Date: Fri, 22 Sep 2023 11:16:57 +0100 Subject: gentoo auto-resync : 22:09:2023 - 11:16:57 --- app-containers/Manifest.gz | Bin 8406 -> 8408 bytes app-containers/lxd/Manifest | 6 +- ...egression-in-lxd_combined.tar.gz-handling.patch | 21 +++ app-containers/lxd/lxd-5.18.ebuild | 187 +++++++++++++++++++++ app-containers/lxd/metadata.xml | 4 - 5 files changed, 213 insertions(+), 5 deletions(-) create mode 100644 app-containers/lxd/files/lxd-5.18-handle-regression-in-lxd_combined.tar.gz-handling.patch create mode 100644 app-containers/lxd/lxd-5.18.ebuild (limited to 'app-containers') diff --git a/app-containers/Manifest.gz b/app-containers/Manifest.gz index 95c2f4b2950b..61fc28c7ce73 100644 Binary files a/app-containers/Manifest.gz and b/app-containers/Manifest.gz differ diff --git a/app-containers/lxd/Manifest b/app-containers/lxd/Manifest index 86da7c49980c..c20d7a968a0f 100644 --- a/app-containers/lxd/Manifest +++ b/app-containers/lxd/Manifest @@ -7,6 +7,7 @@ AUX lxd-5.0.2-r1.initd 1710 BLAKE2B a9597d32e88502f521f3ae784e4f653ab6d3ab144537 AUX lxd-5.0.2-remove-shellcheck-buildsystem-checks.patch 1059 BLAKE2B 2f75a4825584bfb864702f6d5b7023850ca19601014a0f594c2909b892c94b355013eac32d430caf7600e3fdc85fe5140d1e01bd6c26d3cb80df52ccf5cb3ee2 SHA512 026847b13dee7b92e718ea4c6697483d115cc452a9f129acedf7aa8df78f9f67c2b9ff72bec959560d1baabce9d5cf8c9b791fbd5b829cca18a488e8572e6872 AUX lxd-5.0.3-btrfs-quota-group-fix.patch 1762 BLAKE2B c26a2cfe479cace5dda6bccf09c4c67d5e787fb0595da58959c182ec866b7a22ebed11856b29feb77a24d4b44fed213dae649f3b74fd55f6211c8c98f3a8d55d SHA512 0438c12eb728a968ec80562e6ca839ab14cb7c09294ae527a8e20e24e927e8941f87ffc8a145f4931bb8867f5ad2cdf61c965f29f0320e5716aa387dbd3e5880 AUX lxd-5.17-remove-shellcheck-buildsystem-checks.patch 988 BLAKE2B a6d1d72af01a645c8bc129e377273f53cd2e95729f00623597fd161bf3fd7d86bb053eb9e09062c356bc0447c79d0ae5d2da9351123d8c96df0098fca3079d8a SHA512 4e4853dca86e4ac7c3c7c4ed4cf35f0850cfae50839b3a51f17046390277585d24d3cc9a128fc5821b0b19b50b04cab2c301fec3c7b1794ccd8953e262cbd3c2 +AUX lxd-5.18-handle-regression-in-lxd_combined.tar.gz-handling.patch 910 BLAKE2B 60fec0f3bf05a9955c0682a623dc4492626bda0fa4fc9ab78fcdb8d842ec53ff3ce51ad11dab71f12fe5bc03df9977cfac3e1a0087439bf3d056045954dba422 SHA512 307bc002271c3cb0013c59ec23b6f58ce5abf33b9b68dbd89dc41d3d4474ac4633269a8707033f24182b3debe77c5ac9a5003b53de38e023d22c6465b25ceee2 AUX lxd-containers-4.0.0.service 322 BLAKE2B a38cffd4b5809946abdac858564dcab2c2967c295d671df0d315d790df1849e25f0bc052e20cd0d9e4c23403289050b4538f5a52437ab8ae9ca3b40c6a9a1571 SHA512 a55f2c1a367c5c3c5eb6880e01893977de18c6e9463949236ee3247715fbf53641bbe1b69404362dd6cb6ba2a30ac6539fd362b21059e529dc4dac4ec5ca6718 DIST lxd-4.0.9.tar.gz 9117078 BLAKE2B aa6689c1e958258484fba5c060765dd71d5406cb4375d3132cdc38633277e6c95322e8e3aed5e9dd251140c6868ec42470e797639dde4af42848e138f3b45ee2 SHA512 657949311753895f3941deaabae2d03092fc67490d2de78db48b296fdd3e9df4c5844467dd6913814426ca423a6ee1da9705bb1a2652ea99fe1356eb7da97ebb DIST lxd-4.0.9.tar.gz.asc 833 BLAKE2B 7cd0d3ab518d947ca3ea6dc804c6a59b592e4e568152c078fdd3c102420bcd94d2f0b2c335b8b4ecdb19dc3c9a10f665a1510903f395247da956717beaa172a3 SHA512 79a4111571ab43e79cf669e416ed50f3ccae0fbceb86d73757d23c778035e827f47643bc87ff6a2fc64b095345a3d53cbd0c4eb245c75364e907d7449f3a0886 @@ -14,7 +15,10 @@ DIST lxd-5.0.2.tar.gz 16258766 BLAKE2B a0d4e3108664724c064fb8c16031ff7dfa3f49735 DIST lxd-5.0.2.tar.gz.asc 833 BLAKE2B 606cae1439148060acd3fb04fdb108654a351ce2b7484081f7874ab2b0af8de2b5befc5a5409a94af0da25308622234db2e3b411edb20324df458fe85f46ac21 SHA512 884c921a263a8baf2d94958c72e232a0a47d0747f5a9d36ed8fc270edfa18dfc240d1e858e75dcc03eae921dae08d3ddfd34d9146d1510de6a09031da26aaccc DIST lxd-5.17.tar.gz 22319517 BLAKE2B b9dfd934fad6b21b6f2b1d25291b4201f647b2b09a1ae155577a88257c021cc36b43a08802411d0f3268b726da7fa38b8627302696f670a1747e3795db0b0efe SHA512 f5feca34fff0b01a9db8041dd18fde82ad089f36ab171cf338556ebec9b2accfa450b0734d72b25bbb7296aaaeafed247aac2117c32f3ebfce5ae716e4b196bf DIST lxd-5.17.tar.gz.asc 833 BLAKE2B bc781d520b8314261b6681603f17fcb82d045bb969ebf8eec64c82ef73f493892d48d50c870f72e9f4f1f6c7dd4b63239a5039949e4f7bb49539c69538b4a2f2 SHA512 7e76a6cfcb1bf5b7b864125b412d5bd4766b4af6cdab40d70324c4103d1a716c39dfa5cf0eccf2cb7862f182c7c469f18ca46b981a1be3fc0fac8c47537d6c1c +DIST lxd-5.18.tar.gz 22536474 BLAKE2B 44dabd50c137adde794ed266484a071d1aecff9300f8710d748a550415bd5f21b5f4ab40602f7b648cc05f9acc403782209636bdb8fe9720ff2808e8816aa27b SHA512 a9bdc276fb040413bad47579fb420951a007d725319c89abfde14062933267c7e5c67c546f2222905232231997a8f47fa097ed603d93dde2b9990b3e7018103f +DIST lxd-5.18.tar.gz.asc 833 BLAKE2B 2eee2786d2930bce45b5f23943d3e9b0dab61595608a38077429585c3191476915d0ba7ef5eb05633a014dd92542cc5a5bfa70c4c0a63b94733297d37d78717e SHA512 959911019bffeca1cddae6b44c65b2cdbd71658cf9f714e41dd3de755629aedc0e8de196dac6ba0de0f27247e859f7090dc23edf4896e7a6c028b87e3665a5e2 EBUILD lxd-4.0.9-r4.ebuild 4862 BLAKE2B 438e4194a54cfcd91b95205a1bf2ebfa7c2cc52d418721393fe0d334b60630a2ca8f7ec2ee11ce3c2d08c76eb17a50e5d549f8c7f4eb233354cf22166ed3ab94 SHA512 7755fa1159cce2e2bb4d92ab4429d9648697a7b7e28e6970bc080332252653c71bf09f0b687a6ecd162d04ffb08e7f473558110424a6670a0115f0692086f088 EBUILD lxd-5.0.2-r3.ebuild 5836 BLAKE2B 93bc0776308a1c60ba40039151c43d6338d80ec9a4f7db53cfc6ddea660617a933420abd06b8baa21cbd10462e7249c24a2723d2ffaf515f8d48c54906f0a836 SHA512 228a13650b11c65eca1dfa8b3d82be35139fc00f458c9bdb1f94452f7d352c45a6da06a5bb1ad759feefa39f837e48c512835ccae1f13e6b3dba702b93af8c96 EBUILD lxd-5.17.ebuild 5022 BLAKE2B 73f0746b08ec86e20d8bc6ae1ecae070a553798dfeebd9262529c88d9874da4b9c58037fcdb688c6b43fc2870efa8248be674b487ec25e58ccc5f796eabb0dea SHA512 daafae5e3a646583f6277736285d12336b1f97d22952db4f95e5577448db5c0aa0d4924c411dfb2f62f15e6fca0cdbcb987d2d6de487d7e6fe500b78654fb085 -MISC metadata.xml 1681 BLAKE2B a3860fc32de053d30da292bc75177ceb0ba946a1d05af243c919f8a0b0d69465de91adacd30b4f16e33777d2fc1f66b3e2c8c3087b81e312dbdd9b7ed5b77ec8 SHA512 426a2f4fcbc3d24791ab7769884da2e954d4f7618ed14a472ab0e4271c80d86f879ac30a3221645a8a4aa195d12700584c3c4c3c02ae347f2425520b5d2f95cf +EBUILD lxd-5.18.ebuild 5031 BLAKE2B b30aba7a0ea41aa2155b629b892422cb5e56b1c8bd4d4503ac43ddbb52d805864879ea3e0b577691ba7bf49008054dbd43dca8d151d6f7457ba424bce7faa098 SHA512 d1299f4b04b827175b4ab849d4aafbb1046ecc00c408fb8e6208f6ae56850abd7557b857a10c0e039b5cca40e483dd2e18d33127bb427f7e69eda42b24fd5480 +MISC metadata.xml 1542 BLAKE2B 5dd8be7c1a6c3207c5ea702c82ee8dc647663f28feb99ad8d0df7d0cabad9f5e5a99b3a5366a305fc06b4aa3228a9648cbc4a5e69a2a6f0f162944570e20b1ff SHA512 5e019f57f6bbe4ebf47fc4affe1c0a7bb15affda5d2445072f8e7b7998dadec390b077a63c2836a0dff57e055c5108686b547c8687310661be66dded52767854 diff --git a/app-containers/lxd/files/lxd-5.18-handle-regression-in-lxd_combined.tar.gz-handling.patch b/app-containers/lxd/files/lxd-5.18-handle-regression-in-lxd_combined.tar.gz-handling.patch new file mode 100644 index 000000000000..025a9e6a8e6c --- /dev/null +++ b/app-containers/lxd/files/lxd-5.18-handle-regression-in-lxd_combined.tar.gz-handling.patch @@ -0,0 +1,21 @@ +https://github.com/canonical/lxd/commit/2d8481712055d0cbb3bd952e25a1df469939990d.patch +From: Thomas Parrott +Date: Thu, 21 Sep 2023 22:12:19 +0100 +Subject: [PATCH] shared/simplestreams/products: Fix regression in + lxd_combined.tar.gz handling + +For reasons that are likely lost to history simplestreams uses lxd.tar.xz +whereas the combined file is lxd_combined.tar.gz (not xz). + +Signed-off-by: Thomas Parrott +--- a/shared/simplestreams/products.go ++++ b/shared/simplestreams/products.go +@@ -10,7 +10,7 @@ import ( + "github.com/canonical/lxd/shared/osarch" + ) + +-var lxdCompatCombinedItems = []string{"lxd_combined.tar.xz", "incus_combined.tar.xz"} ++var lxdCompatCombinedItems = []string{"lxd_combined.tar.gz", "incus_combined.tar.gz"} + var lxdCompatItems = []string{"lxd.tar.xz", "incus.tar.xz"} + + // Products represents the base of download.json. diff --git a/app-containers/lxd/lxd-5.18.ebuild b/app-containers/lxd/lxd-5.18.ebuild new file mode 100644 index 000000000000..de51e5e5b7dd --- /dev/null +++ b/app-containers/lxd/lxd-5.18.ebuild @@ -0,0 +1,187 @@ +# Copyright 1999-2023 Gentoo Authors +# Distributed under the terms of the GNU General Public License v2 + +EAPI=8 + +inherit bash-completion-r1 go-module linux-info optfeature systemd verify-sig + +DESCRIPTION="Modern, secure and powerful system container and virtual machine manager" +HOMEPAGE="https://ubuntu.com/lxd https://github.com/canonical/lxd" +SRC_URI="https://github.com/canonical/lxd/releases/download/${P}/${P}.tar.gz + verify-sig? ( https://github.com/canonical/lxd/releases/download/${P}/${P}.tar.gz.asc +)" + +LICENSE="Apache-2.0 BSD LGPL-3 MIT" +SLOT="0/stable" +KEYWORDS="~amd64 ~arm64 ~x86" +IUSE="apparmor nls" + +DEPEND="acct-group/lxd + app-arch/xz-utils + >=app-containers/lxc-5.0.0:=[apparmor?,seccomp(+)] + dev-db/sqlite:3 + >=dev-libs/dqlite-1.13.0:= + dev-libs/lzo + >=dev-libs/raft-0.17.1:=[lz4] + >=dev-util/xdelta-3.0[lzma(+)] + net-dns/dnsmasq[dhcp] + sys-libs/libcap + virtual/udev" +RDEPEND="${DEPEND} + net-firewall/ebtables + net-firewall/iptables + sys-apps/iproute2 + sys-fs/fuse:3 + >=sys-fs/lxcfs-5.0.0 + sys-fs/squashfs-tools[lzma] + virtual/acl" +BDEPEND="dev-lang/go + nls? ( sys-devel/gettext ) + verify-sig? ( sec-keys/openpgp-keys-canonical )" + +CONFIG_CHECK=" + ~CGROUPS + ~IPC_NS + ~NET_NS + ~PID_NS + + ~SECCOMP + ~USER_NS + ~UTS_NS + + ~KVM + ~MACVTAP + ~VHOST_VSOCK +" + +ERROR_IPC_NS="CONFIG_IPC_NS is required." +ERROR_NET_NS="CONFIG_NET_NS is required." +ERROR_PID_NS="CONFIG_PID_NS is required." +ERROR_SECCOMP="CONFIG_SECCOMP is required." +ERROR_UTS_NS="CONFIG_UTS_NS is required." + +WARNING_KVM="CONFIG_KVM and CONFIG_KVM_AMD/-INTEL is required for virtual machines." +WARNING_MACVTAP="CONFIG_MACVTAP is required for virtual machines." +WARNING_VHOST_VSOCK="CONFIG_VHOST_VSOCK is required for virtual machines." + +# Go magic. +QA_PREBUILT="/usr/bin/fuidshift + /usr/bin/lxc + /usr/bin/lxc-to-lxd + /usr/bin/lxd-agent + /usr/bin/lxd-benchmark + /usr/bin/lxd-migrate + /usr/sbin/lxd" + +VERIFY_SIG_OPENPGP_KEY_PATH=${BROOT}/usr/share/openpgp-keys/canonical.asc + +# The testsuite must be run as root. +# make: *** [Makefile:156: check] Error 1 +RESTRICT="test" + +GOPATH="${S}/_dist" + +PATCHES=( + "${FILESDIR}"/${P}-handle-regression-in-lxd_combined.tar.gz-handling.patch +) + +src_prepare() { + export GOPATH="${S}/_dist" + + default + + sed -i \ + -e "s:\./configure:./configure --prefix=/usr --libdir=${EPREFIX}/usr/lib/lxd:g" \ + -e "s:make:make ${MAKEOPTS}:g" \ + Makefile || die + + # Fix hardcoded ovmf file path, see bug 763180 + sed -i \ + -e "s:/usr/share/OVMF:/usr/share/edk2-ovmf:g" \ + -e "s:OVMF_VARS.ms.fd:OVMF_VARS.fd:g" \ + doc/environment.md \ + lxd/apparmor/instance.go \ + lxd/apparmor/instance_qemu.go \ + lxd/instance/drivers/driver_qemu.go || die "Failed to fix hardcoded ovmf paths." + + # Fix hardcoded virtfs-proxy-helper file path, see bug 798924 + sed -i \ + -e "s:/usr/lib/qemu/virtfs-proxy-helper:/usr/libexec/virtfs-proxy-helper:g" \ + lxd/device/device_utils_disk.go || die "Failed to fix virtfs-proxy-helper path." + + cp "${FILESDIR}"/lxd-4.0.9-r1.service "${T}"/lxd.service || die + if use apparmor; then + sed -i \ + '/^EnvironmentFile=.*/a ExecStartPre=\/usr\/libexec\/lxc\/lxc-apparmor-load' \ + "${T}"/lxd.service || die + fi + + # 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 fuidshift lxd-benchmark lxc lxc-to-lxd; do + go install -v -x "${S}/${k}" || die "failed compiling ${k}" + done + + go install -v -x -tags libsqlite3 "${S}"/lxd || die "Failed to build the daemon" + + # Needs to be built statically + CGO_ENABLED=0 go install -v -tags netgo "${S}"/lxd-migrate + CGO_ENABLED=0 go install -v -tags agent,netgo "${S}"/lxd-agent + + use nls && emake build-mo +} + +src_test() { + emake check +} + +src_install() { + export GOPATH="${S}/_dist" + local bindir="_dist/bin" + + dosbin ${bindir}/lxd + + for l in fuidshift lxd-agent lxd-benchmark lxd-migrate lxc lxc-to-lxd; do + dobin ${bindir}/${l} + done + + newbashcomp scripts/bash/lxd-client lxc + + newconfd "${FILESDIR}"/lxd-4.0.0.confd lxd + newinitd "${FILESDIR}"/lxd-5.0.2-r1.initd lxd + + systemd_dounit "${T}"/lxd.service + systemd_newunit "${FILESDIR}"/lxd-containers-4.0.0.service lxd-containers.service + systemd_newunit "${FILESDIR}"/lxd-4.0.0.socket lxd.socket + + dodoc AUTHORS + dodoc -r doc/* + use nls && domo po/*.mo +} + +pkg_postinst() { + elog + elog "Consult https://wiki.gentoo.org/wiki/LXD for more information," + elog "including a Quick Start." + elog "For virtual machine support, see:" + elog "https://wiki.gentoo.org/wiki/LXD#Virtual_machines" + elog + elog "Please run 'lxc-checkconfig' to see all optional kernel features." + elog + optfeature "virtual machine support" app-emulation/qemu[spice,usbredir,virtfs] + optfeature "btrfs storage backend" sys-fs/btrfs-progs + optfeature "ipv6 support" net-dns/dnsmasq[ipv6] + optfeature "full lxd-migrate support" + optfeature "lvm2 storage backend" sys-fs/lvm2 + optfeature "zfs storage backend" sys-fs/zfs + elog + elog "Be sure to add your local user to the lxd group." +} diff --git a/app-containers/lxd/metadata.xml b/app-containers/lxd/metadata.xml index fd92d5b3194e..b2f6ed72c3df 100644 --- a/app-containers/lxd/metadata.xml +++ b/app-containers/lxd/metadata.xml @@ -13,10 +13,6 @@ virtualization@gentoo.org Gentoo Virtualization Project - - proxy-maint@gentoo.org - Proxy Maintainers - LXD is a modern, secure and powerful system container and virtual machine manager. -- cgit v1.2.3