diff --git a/.gitignore b/.gitignore index faaded8..80f39d1 100644 --- a/.gitignore +++ b/.gitignore @@ -17,3 +17,4 @@ /qemu-2.11.0-rc3.tar.xz /qemu-2.11.0.tar.xz /qemu-2.11.1.tar.xz +/qemu-2.11.2.tar.xz diff --git a/qemu.spec b/qemu.spec index 3f0dfab..e38f236 100644 --- a/qemu.spec +++ b/qemu.spec @@ -99,8 +99,8 @@ Requires: %{name}-block-ssh = %{epoch}:%{version}-%{release} Summary: QEMU is a FAST! processor emulator Name: qemu -Version: 2.11.1 -Release: 3%{?rcrel}%{?dist} +Version: 2.11.2 +Release: 1%{?rcrel}%{?dist} Epoch: 2 License: GPLv2 and BSD and MIT and CC-BY URL: http://www.qemu.org/ @@ -135,22 +135,8 @@ Source21: 50-kvm-s390x.conf # /etc/security/limits.d/95-kvm-ppc64-memlock.conf Source22: 95-kvm-ppc64-memlock.conf -# fix compilation on newer glibc -Patch0001: 0001-memfd-fix-configure-test.patch - # hacky fix for https://bugs.launchpad.net/qemu/+bug/1738283 -Patch0002: 0001-Remove-problematic-evdev-86-key-from-en-us-keymap.patch - -# Non-deterministic python hash iterator sort ordering -Patch0003: 0001-qapi-ensure-stable-sort-ordering-when-checking-QAPI-.patch - -# Avoid breakage in tests due to stricter crypto policies -Patch0004: 0001-crypto-ensure-we-use-a-predictable-TLS-priority-sett.patch - -# CVE-2018-3639 Speculative Store Bypass -Patch0005: 0001-i386-define-the-ssbd-CPUID-feature-bit-CVE-2018-3639.patch -Patch0006: 0002-i386-Define-the-Virt-SSBD-MSR-and-handling-of-it-CVE.patch -Patch0007: 0003-i386-define-the-AMD-virt-ssbd-CPUID-feature-bit-CVE-.patch +Patch0001: 0001-Remove-problematic-evdev-86-key-from-en-us-keymap.patch @@ -1977,6 +1963,9 @@ getent passwd qemu >/dev/null || \ %changelog +* Tue Jul 03 2018 Cole Robinson - 2:2.11.2-1 +- Rebase to qemu 2.11.2 stable release + * Mon Jun 18 2018 Daniel P. Berrangé - 2:2.11.1-3 - New CPU features for speculative store bypass (CVE-2018-3639) diff --git a/sources b/sources index 07f92da..102ab60 100644 --- a/sources +++ b/sources @@ -1 +1 @@ -SHA512 (qemu-2.11.1.tar.xz) = 7fd4a7c6fa8627510431ed34f05bdd6b055ea66207bab29904bbce66dfd5b07546f02dfcb34937f48efb67184200ab3c8501763776adc1cdc1302a924fb2a5ef +SHA512 (qemu-2.11.2.tar.xz) = af65764401155691d14e1cd6fc8ac2d4aedf4b8674b4dc7e5ed259e71c9a186105267fc680f9d0857697b0e5eb51e685ccb047dba50a73ceb5cb3351cb7790d9