commit: 74f5d45c968b306b0063063f945b30163e9add89 Author: Sergei Trofimovich <slyfox <AT> gentoo <DOT> org> AuthorDate: Sat Jul 11 14:34:05 2020 +0000 Commit: Sergei Trofimovich <slyfox <AT> gentoo <DOT> org> CommitDate: Sat Jul 11 14:34:21 2020 +0000 URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=74f5d45c
app-emulation/qemu: use system slirp via USE=slirp Reported-by: Yaroslav Isakov Bug: https://bugs.gentoo.org/732144 Package-Manager: Portage-2.3.103, Repoman-2.3.23 Signed-off-by: Sergei Trofimovich <slyfox <AT> gentoo.org> app-emulation/qemu/metadata.xml | 4 ++-- app-emulation/qemu/{qemu-9999.ebuild => qemu-5.0.0-r2.ebuild} | 8 ++++++-- app-emulation/qemu/qemu-9999.ebuild | 4 +++- 3 files changed, 11 insertions(+), 5 deletions(-) diff --git a/app-emulation/qemu/metadata.xml b/app-emulation/qemu/metadata.xml index 0c30c458264..eda19489ec9 100644 --- a/app-emulation/qemu/metadata.xml +++ b/app-emulation/qemu/metadata.xml @@ -40,6 +40,7 @@ <flag name="rbd">Enable rados block device backend support, see http://ceph.newdream.net/wiki/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> <flag name="spice">Enable Spice protocol support via <pkg>app-emulation/spice</pkg></flag> <flag name="ssh">Enable SSH based block device support via <pkg>net-libs/libssh2</pkg></flag> <flag name="static-user">Build the User targets as static binaries</flag> @@ -58,8 +59,7 @@ <flag name="virtfs">Enable VirtFS via virtio-9p-pci / fsdev. See http://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> + <pkg>sys-apps/attr</pkg>. Requisite for the virtfs backend.</flag> <flag name="xen">Enables support for Xen backends</flag> <flag name="xfs">Support xfsctl() notification and syncing for XFS backed virtual disks.</flag> diff --git a/app-emulation/qemu/qemu-9999.ebuild b/app-emulation/qemu/qemu-5.0.0-r2.ebuild similarity index 99% copy from app-emulation/qemu/qemu-9999.ebuild copy to app-emulation/qemu/qemu-5.0.0-r2.ebuild index 8b929852984..dd30807e985 100644 --- a/app-emulation/qemu/qemu-9999.ebuild +++ b/app-emulation/qemu/qemu-5.0.0-r2.ebuild @@ -6,7 +6,7 @@ EAPI="7" PYTHON_COMPAT=( python{3_6,3_7,3_8} ) PYTHON_REQ_USE="ncurses,readline" -PLOCALES="bg de_DE fr_FR hu it sv tr zh_CN" +PLOCALES="bg de_DE fr_FR hu it tr zh_CN" FIRMWARE_ABI_VERSION="4.0.0-r50" @@ -16,7 +16,6 @@ inherit eutils linux-info toolchain-funcs multilib python-r1 \ if [[ ${PV} = *9999* ]]; then EGIT_REPO_URI="https://git.qemu.org/git/qemu.git"; EGIT_SUBMODULES=( - slirp tests/fp/berkeley-{test,soft}float-3 ui/keycodemapdb ) @@ -38,6 +37,7 @@ IUSE="accessibility +aio alsa bzip2 capstone +caps +curl debug doc jemalloc +jpeg kernel_linux kernel_FreeBSD lzo ncurses nfs nls numa opengl +oss +pin-upstream-blobs plugins +png pulseaudio python rbd sasl +seccomp sdl sdl-image selinux + slirp smartcard snappy spice ssh static static-user systemtap tci test usb usbredir vde +vhost-net vhost-user-fs virgl virtfs +vnc vte xattr xen xfs +xkb zstd" @@ -146,6 +146,7 @@ SOFTMMU_TOOLS_DEPEND=" ) sdl-image? ( media-libs/sdl2-image[static-libs(+)] ) seccomp? ( >=sys-libs/libseccomp-2.1.0[static-libs(+)] ) + slirp? ( net-libs/libslirp ) smartcard? ( >=app-emulation/libcacard-2.5.0[static-libs(+)] ) snappy? ( app-arch/snappy:= ) spice? ( @@ -221,6 +222,8 @@ PATCHES=( "${FILESDIR}"/${PN}-2.11.1-capstone_include_path.patch "${FILESDIR}"/${PN}-4.0.0-mkdir_systemtap.patch #684902 "${FILESDIR}"/${PN}-4.2.0-cflags.patch + "${FILESDIR}"/${PN}-5.0.0-epoll-strace.patch + "${FILESDIR}"/${PN}-5.0.0-ipv6-slirp-CVE-2020-10756.patch #731992 ) QA_PREBUILT=" @@ -468,6 +471,7 @@ qemu_src_configure() { $(conf_notuser sdl) $(conf_notuser sdl-image) $(conf_notuser seccomp) + $(conf_notuser slirp slirp system) $(conf_notuser smartcard) $(conf_notuser snappy) $(conf_notuser spice) diff --git a/app-emulation/qemu/qemu-9999.ebuild b/app-emulation/qemu/qemu-9999.ebuild index 8b929852984..cf78c79fb47 100644 --- a/app-emulation/qemu/qemu-9999.ebuild +++ b/app-emulation/qemu/qemu-9999.ebuild @@ -16,7 +16,6 @@ inherit eutils linux-info toolchain-funcs multilib python-r1 \ if [[ ${PV} = *9999* ]]; then EGIT_REPO_URI="https://git.qemu.org/git/qemu.git"; EGIT_SUBMODULES=( - slirp tests/fp/berkeley-{test,soft}float-3 ui/keycodemapdb ) @@ -38,6 +37,7 @@ IUSE="accessibility +aio alsa bzip2 capstone +caps +curl debug doc jemalloc +jpeg kernel_linux kernel_FreeBSD lzo ncurses nfs nls numa opengl +oss +pin-upstream-blobs plugins +png pulseaudio python rbd sasl +seccomp sdl sdl-image selinux + slirp smartcard snappy spice ssh static static-user systemtap tci test usb usbredir vde +vhost-net vhost-user-fs virgl virtfs +vnc vte xattr xen xfs +xkb zstd" @@ -146,6 +146,7 @@ SOFTMMU_TOOLS_DEPEND=" ) sdl-image? ( media-libs/sdl2-image[static-libs(+)] ) seccomp? ( >=sys-libs/libseccomp-2.1.0[static-libs(+)] ) + slirp? ( net-libs/libslirp ) smartcard? ( >=app-emulation/libcacard-2.5.0[static-libs(+)] ) snappy? ( app-arch/snappy:= ) spice? ( @@ -468,6 +469,7 @@ qemu_src_configure() { $(conf_notuser sdl) $(conf_notuser sdl-image) $(conf_notuser seccomp) + $(conf_notuser slirp slirp system) $(conf_notuser smartcard) $(conf_notuser snappy) $(conf_notuser spice)
