commit: 46d903c2665d2910a22d78656c5f7bafdf702135 Author: Matthias Maier <tamiko <AT> gentoo <DOT> org> AuthorDate: Sun Mar 18 19:08:44 2018 +0000 Commit: Matthias Maier <tamiko <AT> gentoo <DOT> org> CommitDate: Sun Mar 18 20:01:49 2018 +0000 URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=46d903c2
app-emulation/qemu: 2.11.1: New binary blob pinning, CVE patches, maintenance * new binary blobs pinning =sys-firmware/edk2-ovmf-2017_p20180211 =sys-firmware/ipxe-1.0.0_p20180211 =sys-firmware/seabios-1.11.0 =sys-firmware/sgabios-0.1_pre8-r1 =sys-firmware/vgabios-0.7a-r1 keyword ebuild * fix include path for capstone, bug 647570 * add USE=capstone support, bug 647570 * apply patch for CVE-2018-7550 Closes: https://bugs.gentoo.org/647570 Bug: https://bugs.gentoo.org/649616 Package-Manager: Portage-2.3.24, Repoman-2.3.6 app-emulation/qemu/Manifest | 1 + .../qemu/files/qemu-2.11.1-capstone_include_path.patch | 11 +++++++++++ app-emulation/qemu/metadata.xml | 1 + .../qemu/{qemu-2.11.1-r50.ebuild => qemu-2.11.1-r51.ebuild} | 13 ++++++------- 4 files changed, 19 insertions(+), 7 deletions(-) diff --git a/app-emulation/qemu/Manifest b/app-emulation/qemu/Manifest index 218a778906a..cb0bb800a22 100644 --- a/app-emulation/qemu/Manifest +++ b/app-emulation/qemu/Manifest @@ -1,4 +1,5 @@ DIST qemu-2.11.0-patches-r0.tar.xz 16140 BLAKE2B 2e23908075195a7c28df574525a159e171277a2da6d7c0656a341a2db6a622237106d2dd8de5c9d61b5fb62fa5a163e9657406a2996cebc05baa53d42c5f5d15 SHA512 f7d92c2232398565b8cde294d38dc281c13503fb5967cc7871a2233b7fa354799619445e9ec89c285ef051f62ecef0bd38a135b0093bf5528c0b28c6e580c839 DIST qemu-2.11.0.tar.bz2 32816398 BLAKE2B 2014a8246f3cba9069186629d9ec8c221672fcfd3e8cd28a7e57f467add81f7bd84363183ef5cc5d18af91bde9186a4da49c0133c8ead83eae4626b9fc364e99 SHA512 3681700833573c0aa6283af950bfa298970056f1b44489088d8863840a7694512138321f86961ef43b256abf15eddd2612fb9cdbe3d9a358542d4e7037cc2004 DIST qemu-2.11.1-patches-r0.tar.xz 1640 BLAKE2B 8402a0bd086307413c3f088b7b2523adda5f370e3ce8e9ec39db905a5df495842cc2168b93b57e8516e98703ee1620e7cad77740529959a09a1d4224988829bc SHA512 2906f9497e61799da8efca0dac4a19addd3bf59770c742e3ed1600143b69397bbc4eecb2c1f64aef0e103447966d47ced1ec6908f78a793b8d06f99a0aa6dc4a +DIST qemu-2.11.1-patches-r1.tar.xz 2064 BLAKE2B 533c916b01c014bcfa6c733b76aa6da1f12cdf5f0d4ae33136453705a8aca9fdfeef998747cfdc72d19e08fa40ea97e2fd4c21412c030af314605059282f49ef SHA512 12de7b4777ec98871d0786291534f61b37534feef64b556caeab72e020ff14d61fe19d24cb151ebfdb912df2a7ba72c0d882566b368d88d02c9f1354c2adae4a DIST qemu-2.11.1.tar.bz2 32819412 BLAKE2B 6b6d4e7b8dcf33aeedb0b33bad267da07ad17c2eeeb5fbd2c038d760bc03224e55ba0f03eb248c62bc0e8636c2c660ea76b367eaea96bee16388053f82c8b8a9 SHA512 1b692bbdfc3dc785738c7192aa2a3f9cf53d9f5bf3b3f49fa8692050dc50f7056c8a4d1b527d48ffb2a674a0fd3a46d87addd1eaaa758f35eec1ab5adfe32354 diff --git a/app-emulation/qemu/files/qemu-2.11.1-capstone_include_path.patch b/app-emulation/qemu/files/qemu-2.11.1-capstone_include_path.patch new file mode 100644 index 00000000000..d79570ebb8a --- /dev/null +++ b/app-emulation/qemu/files/qemu-2.11.1-capstone_include_path.patch @@ -0,0 +1,11 @@ +--- qemu-2.11.1/include/disas/capstone.h 2018-02-14 22:53:22.000000000 +0100 ++++ qemu-2.11.1/include/disas/capstone.h 2018-02-17 20:12:12.754703951 +0100 +@@ -3,7 +3,7 @@ + + #ifdef CONFIG_CAPSTONE + +-#include <capstone.h> ++#include <capstone/capstone.h> + + #else + diff --git a/app-emulation/qemu/metadata.xml b/app-emulation/qemu/metadata.xml index 3fe0408cc40..61c159a6584 100644 --- a/app-emulation/qemu/metadata.xml +++ b/app-emulation/qemu/metadata.xml @@ -9,6 +9,7 @@ <flag name="accessibility">Adds support for braille displays using brltty</flag> <flag name="aio">Enables support for Linux's Async IO</flag> <flag name="alsa">Enable alsa output for sound emulation</flag> + <flag name="capstone">Enable disassembly support with <pkg>dev-libs/capstone</pkg></flag> <flag name="curl">Support ISOs / -cdrom directives vis HTTP or HTTPS.</flag> <flag name="fdt">Enables firmware device tree support</flag> <flag name="glusterfs">Enables GlusterFS cluster fileystem via diff --git a/app-emulation/qemu/qemu-2.11.1-r50.ebuild b/app-emulation/qemu/qemu-2.11.1-r51.ebuild similarity index 98% rename from app-emulation/qemu/qemu-2.11.1-r50.ebuild rename to app-emulation/qemu/qemu-2.11.1-r51.ebuild index 355bcfb72d4..ced8efcacc9 100644 --- a/app-emulation/qemu/qemu-2.11.1-r50.ebuild +++ b/app-emulation/qemu/qemu-2.11.1-r51.ebuild @@ -23,7 +23,7 @@ else # KEYWORDS="~amd64 ~arm64 ~ppc ~ppc64 ~x86 ~x86-fbsd" # Gentoo specific patchsets: - SRC_URI+=" https://dev.gentoo.org/~chutzpah/distfiles/${P}-patches-r0.tar.xz" + SRC_URI+=" https://dev.gentoo.org/~tamiko/distfiles/${P}-patches-r1.tar.xz" fi DESCRIPTION="QEMU + Kernel-based Virtual Machine userland tools" @@ -31,8 +31,8 @@ HOMEPAGE="http://www.qemu.org http://www.linux-kvm.org" LICENSE="GPL-2 LGPL-2 BSD-2" SLOT="0" -IUSE="accessibility +aio alsa bluetooth bzip2 +caps +curl debug +fdt - glusterfs gnutls gtk gtk2 infiniband iscsi +jpeg kernel_linux +IUSE="accessibility +aio alsa bluetooth bzip2 capstone +caps +curl debug + +fdt glusterfs gnutls gtk gtk2 infiniband iscsi +jpeg kernel_linux kernel_FreeBSD lzo ncurses nfs nls numa opengl +pin-upstream-blobs +png pulseaudio python rbd sasl +seccomp sdl sdl2 selinux smartcard snappy spice ssh static static-user systemtap tci test usb usbredir vde @@ -71,7 +71,7 @@ REQUIRED_USE="${PYTHON_REQUIRED_USE} # # The attr lib isn't always linked in (although the USE flag is always # respected). This is because qemu supports using the C library's API -# when available rather than always using the extranl library. +# when available rather than always using the external library. ALL_DEPEND=" >=dev-libs/glib-2.0[static-libs(+)] sys-libs/zlib[static-libs(+)] @@ -209,6 +209,7 @@ PATCHES=( "${FILESDIR}"/${PN}-2.5.0-cflags.patch "${FILESDIR}"/${PN}-2.5.0-sysmacros.patch "${FILESDIR}"/${PN}-2.11.0-glibc-2.27.patch + "${FILESDIR}"/${PN}-2.11.1-capstone_include_path.patch "${WORKDIR}"/patches ) @@ -436,6 +437,7 @@ qemu_src_configure() { $(conf_notuser aio linux-aio) $(conf_notuser bzip2) $(conf_notuser bluetooth bluez) + $(conf_notuser capstone) $(conf_notuser caps cap-ng) $(conf_notuser curl) $(conf_notuser fdt) @@ -531,9 +533,6 @@ qemu_src_configure() { tc-enables-pie && conf_opts+=( --enable-pie ) fi - #bug #647570 - conf_opts+=( --disable-capstone ) - echo "../configure ${conf_opts[*]}" cd "${builddir}" ../configure "${conf_opts[@]}" || die "configure failed"