commit: f80abc70fa18166129b827b6ed4c671cb5c656b0 Author: Sam James <sam <AT> gentoo <DOT> org> AuthorDate: Sun Apr 3 04:04:09 2022 +0000 Commit: Sam James <sam <AT> gentoo <DOT> org> CommitDate: Sun Apr 3 04:35:37 2022 +0000 URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=f80abc70
app-emulation/libvirt: add 8.2.0 * Add 8.2.0 * Tighten up some lower bounds on dependencies * Add shorewall to init script 'after' Bug: https://bugs.gentoo.org/836128 Closes: https://bugs.gentoo.org/833754 Closes: https://bugs.gentoo.org/831121 Signed-off-by: Sam James <sam <AT> gentoo.org> app-emulation/libvirt/Manifest | 2 + app-emulation/libvirt/files/libvirtd.init-r19 | 2 +- .../{libvirt-9999.ebuild => libvirt-8.2.0.ebuild} | 52 +++++++++++----------- app-emulation/libvirt/libvirt-9999.ebuild | 52 +++++++++++----------- app-emulation/libvirt/metadata.xml | 4 ++ 5 files changed, 57 insertions(+), 55 deletions(-) diff --git a/app-emulation/libvirt/Manifest b/app-emulation/libvirt/Manifest index 98669a94c4d6..10e25ce2940e 100644 --- a/app-emulation/libvirt/Manifest +++ b/app-emulation/libvirt/Manifest @@ -6,3 +6,5 @@ DIST libvirt-8.0.0.tar.xz 8860124 BLAKE2B 4669ae8f4de6379c3f94d3b6875ccc8eb435fb DIST libvirt-8.0.0.tar.xz.asc 833 BLAKE2B 2571ee10d433630ddd79761b1a50948aed33f61ef11e793a7e563e37c28e48bc856139aa1cc62bf50852b056de14f36bb75fa97155b31bfa97c8af2ef55ba4dc SHA512 ce1252a034723774542ab00e782c24b7ef243b5ca302033e45993f90273c697cdb82e9a126b729557a6c90b5f407f0f06b78c0affb6eefe60c364fa979831f8b DIST libvirt-8.1.0.tar.xz 8881608 BLAKE2B ddbd684f43a75ab04aca8be0a761ec5890c365e3c802af55e85d0f3b906a3b075f737acd14648d46cdacce90cbd2ccdda12d39784eaa17a05657b13447df1fe7 SHA512 5db227b78f48e35f917030eeb45ce9d0f7e868c5ce75da496ca06fad175ad6b026173b2fb78415c0103a61af24aec78d89bcebdf60b817d8ff6e84dc926faa97 DIST libvirt-8.1.0.tar.xz.asc 833 BLAKE2B 21ea45127d68313264b9e17c315d75b20e409ef56ce3f6a61899c3c9d9ce1ff51a4743d912f7440d2197230df802d955516cbc8d6f98960cef8a0265a7d0f334 SHA512 9a28b0405c01518f7d6837d02df492d6d97d6e73cd711e718b53cc18d8830a1216aa87366b2065ef5ce65b12d72cbb3d80024529264430de20fe89d8bf595d76 +DIST libvirt-8.2.0.tar.xz 8871236 BLAKE2B 85c4fd7323f4ea0564e6fcb37dffe643d0ff54f228a695476c1b24c78022402a86cf967503e40fad003d82528f24a02bef79466e38c133c5ad37cbcd5783f01d SHA512 fbdc2953e86117643aafb3198a3d9327188d94abfd155eae4439ee0e722737a57ee44dbb2929746c0a28e10e275c35f4a8190e99668e4cba4025555358591544 +DIST libvirt-8.2.0.tar.xz.asc 833 BLAKE2B 3dba2fe7dc76052307ab8b1d7f2a61445759ed15e130615ca2a6325e981ae5c1a7143e7d78ee67f2bf9001cdf82126dff89f4f1eb3b39b77620721a5b75f4cfa SHA512 33ecc465da1b7e4b53733611255d01414f8c1081c96fdcb0a9f1a0e194823872b7f9f9032938527f6d1d8bbebc3b61f2dc393875b8d11fdd47bec40e9408475b diff --git a/app-emulation/libvirt/files/libvirtd.init-r19 b/app-emulation/libvirt/files/libvirtd.init-r19 index 60dad6a791dc..bbfe6766317c 100644 --- a/app-emulation/libvirt/files/libvirtd.init-r19 +++ b/app-emulation/libvirt/files/libvirtd.init-r19 @@ -16,7 +16,7 @@ retry="${LIBVIRTD_TERMTIMEOUT}" depend() { need virtlogd use ceph dbus iscsid virtlockd - after cgconfig corosync ebtables iptables ip6tables nfs nfsmount ntp-client ntpdportmap rpc.statd sanlock xenconsoled + after cgconfig corosync ebtables iptables ip6tables shorewall nfs nfsmount ntp-client ntpdportmap rpc.statd sanlock xenconsoled USE_FLAG_FIREWALLD } diff --git a/app-emulation/libvirt/libvirt-9999.ebuild b/app-emulation/libvirt/libvirt-8.2.0.ebuild similarity index 90% copy from app-emulation/libvirt/libvirt-9999.ebuild copy to app-emulation/libvirt/libvirt-8.2.0.ebuild index 8f9dda421577..ba77ccd2daa7 100644 --- a/app-emulation/libvirt/libvirt-9999.ebuild +++ b/app-emulation/libvirt/libvirt-8.2.0.ebuild @@ -1,34 +1,31 @@ # Copyright 1999-2022 Gentoo Authors # Distributed under the terms of the GNU General Public License v2 -EAPI=7 +EAPI=8 # Please bump with dev-python/libvirt-python! PYTHON_COMPAT=( python3_{8..10} ) - +VERIFY_SIG_OPENPGP_KEY_PATH="${BROOT}"/usr/share/openpgp-keys/libvirt.org.asc inherit meson bash-completion-r1 linux-info python-any-r1 readme.gentoo-r1 tmpfiles verify-sig if [[ ${PV} = *9999* ]]; then inherit git-r3 EGIT_REPO_URI="https://gitlab.com/libvirt/libvirt.git"; EGIT_BRANCH="master" - SRC_URI="" - SLOT="0" else SRC_URI="https://libvirt.org/sources/${P}.tar.xz verify-sig? ( https://libvirt.org/sources/${P}.tar.xz.asc )" KEYWORDS="~amd64 ~arm64 ~ppc64 ~x86" - SLOT="0/${PV}" fi DESCRIPTION="C toolkit to manipulate virtual machines" HOMEPAGE="https://www.libvirt.org/ https://gitlab.com/libvirt/libvirt/"; LICENSE="LGPL-2.1" -VERIFY_SIG_OPENPGP_KEY_PATH=${BROOT}/usr/share/openpgp-keys/libvirt.org.asc +SLOT="0/${PV}" IUSE=" apparmor audit bash-completion +caps dtrace firewalld fuse glusterfs - iscsi iscsi-direct +libvirtd lvm libssh lxc nfs nls numa openvz + iscsi iscsi-direct +libvirtd lvm libssh libssh2 lxc nfs nls numa openvz parted pcap policykit +qemu rbd sasl selinux +udev virtualbox +virt-network wireshark-plugins xen zfs " @@ -61,32 +58,32 @@ BDEPEND=" RDEPEND=" acct-user/qemu app-misc/scrub - >=dev-libs/glib-2.48.0 - dev-libs/libgcrypt:0 + >=dev-libs/glib-2.56.0 + dev-libs/libgcrypt dev-libs/libnl:3 - >=dev-libs/libxml2-2.7.6 + >=dev-libs/libxml2-2.9.1 >=net-analyzer/openbsd-netcat-1.105-r1 - >=net-libs/gnutls-1.0.25:0= - net-libs/libssh2 - net-libs/libtirpc + >=net-libs/gnutls-3.2.0:= + net-libs/libtirpc:= net-libs/rpcsvc-proto >=net-misc/curl-7.18.0 sys-apps/dbus sys-apps/dmidecode sys-devel/gettext - sys-libs/ncurses:0= - sys-libs/readline:= + sys-libs/ncurses:= + >=sys-libs/readline-7.0:= virtual/acl apparmor? ( sys-libs/libapparmor ) audit? ( sys-process/audit ) caps? ( sys-libs/libcap-ng ) dtrace? ( dev-util/systemtap ) firewalld? ( >=net-firewall/firewalld-0.6.3 ) - fuse? ( sys-fs/fuse:0= ) + fuse? ( sys-fs/fuse:= ) glusterfs? ( >=sys-cluster/glusterfs-3.4.1 ) - iscsi? ( sys-block/open-iscsi ) + iscsi? ( >=sys-block/open-iscsi-1.18.0 ) iscsi-direct? ( >=net-libs/libiscsi-1.18.0 ) - libssh? ( net-libs/libssh ) + libssh? ( >=net-libs/libssh-0.7:= ) + libssh2? ( >=net-libs/libssh2-1.3 ) lvm? ( >=sys-fs/lvm2-2.02.48-r2[-device-mapper-only(-)] ) lxc? ( !sys-apps/systemd[cgroup-hybrid(-)] ) nfs? ( net-fs/nfs-utils ) @@ -98,17 +95,17 @@ RDEPEND=" >=sys-block/parted-1.8[device-mapper] sys-fs/lvm2[-device-mapper-only(-)] ) - pcap? ( >=net-libs/libpcap-1.0.0 ) + pcap? ( >=net-libs/libpcap-1.8.0 ) policykit? ( acct-group/libvirt >=sys-auth/polkit-0.9 ) qemu? ( >=app-emulation/qemu-2.11 - dev-libs/yajl + >=dev-libs/yajl-2.0.3:= ) rbd? ( sys-cluster/ceph ) - sasl? ( dev-libs/cyrus-sasl ) + sasl? ( >=dev-libs/cyrus-sasl-2.1.26 ) selinux? ( >=sys-libs/libselinux-2.0.85 ) virt-network? ( net-dns/dnsmasq[dhcp,ipv6(+),script] @@ -117,25 +114,25 @@ RDEPEND=" net-misc/radvd sys-apps/iproute2[-minimal] ) - wireshark-plugins? ( net-analyzer/wireshark:= ) + wireshark-plugins? ( >=net-analyzer/wireshark-2.6.0:= ) xen? ( >=app-emulation/xen-4.9.0 app-emulation/xen-tools:= ) udev? ( - virtual/libudev + virtual/libudev:= >=x11-libs/libpciaccess-0.10.9 ) - zfs? ( sys-fs/zfs )" - + zfs? ( sys-fs/zfs ) + kernel_linux? ( sys-apps/util-linux )" DEPEND="${BDEPEND} ${RDEPEND} ${PYTHON_DEPS}" PATCHES=( "${FILESDIR}"/${PN}-6.0.0-fix_paths_in_libvirt-guests_sh.patch - "${FILESDIR}"/${PN}-6.7.0-fix-paths-for-apparmor.patch - "${FILESDIR}"/${PN}-8.1.0-do-not-use-sysconfig.patch + "${FILESDIR}"/${PN}-8.2.0-do-not-use-sysconfig.patch + "${FILESDIR}"/${PN}-8.2.0-fix-paths-for-apparmor.patch ) pkg_setup() { @@ -245,6 +242,7 @@ src_configure() { $(meson_feature iscsi-direct storage_iscsi_direct) $(meson_feature libvirtd driver_libvirtd) $(meson_feature libssh) + $(meson_feature libssh2) $(meson_feature lvm storage_lvm) $(meson_feature lvm storage_mpath) $(meson_feature lxc driver_lxc) diff --git a/app-emulation/libvirt/libvirt-9999.ebuild b/app-emulation/libvirt/libvirt-9999.ebuild index 8f9dda421577..ba77ccd2daa7 100644 --- a/app-emulation/libvirt/libvirt-9999.ebuild +++ b/app-emulation/libvirt/libvirt-9999.ebuild @@ -1,34 +1,31 @@ # Copyright 1999-2022 Gentoo Authors # Distributed under the terms of the GNU General Public License v2 -EAPI=7 +EAPI=8 # Please bump with dev-python/libvirt-python! PYTHON_COMPAT=( python3_{8..10} ) - +VERIFY_SIG_OPENPGP_KEY_PATH="${BROOT}"/usr/share/openpgp-keys/libvirt.org.asc inherit meson bash-completion-r1 linux-info python-any-r1 readme.gentoo-r1 tmpfiles verify-sig if [[ ${PV} = *9999* ]]; then inherit git-r3 EGIT_REPO_URI="https://gitlab.com/libvirt/libvirt.git"; EGIT_BRANCH="master" - SRC_URI="" - SLOT="0" else SRC_URI="https://libvirt.org/sources/${P}.tar.xz verify-sig? ( https://libvirt.org/sources/${P}.tar.xz.asc )" KEYWORDS="~amd64 ~arm64 ~ppc64 ~x86" - SLOT="0/${PV}" fi DESCRIPTION="C toolkit to manipulate virtual machines" HOMEPAGE="https://www.libvirt.org/ https://gitlab.com/libvirt/libvirt/"; LICENSE="LGPL-2.1" -VERIFY_SIG_OPENPGP_KEY_PATH=${BROOT}/usr/share/openpgp-keys/libvirt.org.asc +SLOT="0/${PV}" IUSE=" apparmor audit bash-completion +caps dtrace firewalld fuse glusterfs - iscsi iscsi-direct +libvirtd lvm libssh lxc nfs nls numa openvz + iscsi iscsi-direct +libvirtd lvm libssh libssh2 lxc nfs nls numa openvz parted pcap policykit +qemu rbd sasl selinux +udev virtualbox +virt-network wireshark-plugins xen zfs " @@ -61,32 +58,32 @@ BDEPEND=" RDEPEND=" acct-user/qemu app-misc/scrub - >=dev-libs/glib-2.48.0 - dev-libs/libgcrypt:0 + >=dev-libs/glib-2.56.0 + dev-libs/libgcrypt dev-libs/libnl:3 - >=dev-libs/libxml2-2.7.6 + >=dev-libs/libxml2-2.9.1 >=net-analyzer/openbsd-netcat-1.105-r1 - >=net-libs/gnutls-1.0.25:0= - net-libs/libssh2 - net-libs/libtirpc + >=net-libs/gnutls-3.2.0:= + net-libs/libtirpc:= net-libs/rpcsvc-proto >=net-misc/curl-7.18.0 sys-apps/dbus sys-apps/dmidecode sys-devel/gettext - sys-libs/ncurses:0= - sys-libs/readline:= + sys-libs/ncurses:= + >=sys-libs/readline-7.0:= virtual/acl apparmor? ( sys-libs/libapparmor ) audit? ( sys-process/audit ) caps? ( sys-libs/libcap-ng ) dtrace? ( dev-util/systemtap ) firewalld? ( >=net-firewall/firewalld-0.6.3 ) - fuse? ( sys-fs/fuse:0= ) + fuse? ( sys-fs/fuse:= ) glusterfs? ( >=sys-cluster/glusterfs-3.4.1 ) - iscsi? ( sys-block/open-iscsi ) + iscsi? ( >=sys-block/open-iscsi-1.18.0 ) iscsi-direct? ( >=net-libs/libiscsi-1.18.0 ) - libssh? ( net-libs/libssh ) + libssh? ( >=net-libs/libssh-0.7:= ) + libssh2? ( >=net-libs/libssh2-1.3 ) lvm? ( >=sys-fs/lvm2-2.02.48-r2[-device-mapper-only(-)] ) lxc? ( !sys-apps/systemd[cgroup-hybrid(-)] ) nfs? ( net-fs/nfs-utils ) @@ -98,17 +95,17 @@ RDEPEND=" >=sys-block/parted-1.8[device-mapper] sys-fs/lvm2[-device-mapper-only(-)] ) - pcap? ( >=net-libs/libpcap-1.0.0 ) + pcap? ( >=net-libs/libpcap-1.8.0 ) policykit? ( acct-group/libvirt >=sys-auth/polkit-0.9 ) qemu? ( >=app-emulation/qemu-2.11 - dev-libs/yajl + >=dev-libs/yajl-2.0.3:= ) rbd? ( sys-cluster/ceph ) - sasl? ( dev-libs/cyrus-sasl ) + sasl? ( >=dev-libs/cyrus-sasl-2.1.26 ) selinux? ( >=sys-libs/libselinux-2.0.85 ) virt-network? ( net-dns/dnsmasq[dhcp,ipv6(+),script] @@ -117,25 +114,25 @@ RDEPEND=" net-misc/radvd sys-apps/iproute2[-minimal] ) - wireshark-plugins? ( net-analyzer/wireshark:= ) + wireshark-plugins? ( >=net-analyzer/wireshark-2.6.0:= ) xen? ( >=app-emulation/xen-4.9.0 app-emulation/xen-tools:= ) udev? ( - virtual/libudev + virtual/libudev:= >=x11-libs/libpciaccess-0.10.9 ) - zfs? ( sys-fs/zfs )" - + zfs? ( sys-fs/zfs ) + kernel_linux? ( sys-apps/util-linux )" DEPEND="${BDEPEND} ${RDEPEND} ${PYTHON_DEPS}" PATCHES=( "${FILESDIR}"/${PN}-6.0.0-fix_paths_in_libvirt-guests_sh.patch - "${FILESDIR}"/${PN}-6.7.0-fix-paths-for-apparmor.patch - "${FILESDIR}"/${PN}-8.1.0-do-not-use-sysconfig.patch + "${FILESDIR}"/${PN}-8.2.0-do-not-use-sysconfig.patch + "${FILESDIR}"/${PN}-8.2.0-fix-paths-for-apparmor.patch ) pkg_setup() { @@ -245,6 +242,7 @@ src_configure() { $(meson_feature iscsi-direct storage_iscsi_direct) $(meson_feature libvirtd driver_libvirtd) $(meson_feature libssh) + $(meson_feature libssh2) $(meson_feature lvm storage_lvm) $(meson_feature lvm storage_mpath) $(meson_feature lxc driver_lxc) diff --git a/app-emulation/libvirt/metadata.xml b/app-emulation/libvirt/metadata.xml index cd76572452f6..ab1603dc9f57 100644 --- a/app-emulation/libvirt/metadata.xml +++ b/app-emulation/libvirt/metadata.xml @@ -64,6 +64,10 @@ Use <pkg>net-libs/libssh</pkg> to communicate with remote libvirtd hosts, for example: qemu+libssh://server/system </flag> + <flag name="libssh2"> + Use <pkg>net-libs/libssh2</pkg> to communicate with remote libvirtd hosts, + for example: qemu+libssh2://server/system + </flag> <flag name="pcap"> Support auto learning IP addreses for routing </flag>
