diff --git a/hw-intc-arm_gic-Fix-interrupt-ID-in-GICD.patch b/hw-intc-arm_gic-Fix-interrupt-ID-in-GICD.patch index 1948d7d6..2e5c07ee 100644 --- a/hw-intc-arm_gic-Fix-interrupt-ID-in-GICD.patch +++ b/hw-intc-arm_gic-Fix-interrupt-ID-in-GICD.patch @@ -6,6 +6,7 @@ Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit Git-commit: edfe2eb4360cde4ed5d95bda7777edcb3510f76a +References: bsc#1181933 Per the ARM Generic Interrupt Controller Architecture specification (document "ARM IHI 0048B.b (ID072613)"), the SGIINTID field is 4 bit, diff --git a/qemu.changes b/qemu.changes index 73a3ae49..ff0f91c0 100644 --- a/qemu.changes +++ b/qemu.changes @@ -1,3 +1,20 @@ +------------------------------------------------------------------- +Mon Feb 8 20:53:03 UTC 2021 - Bruce Rogers + +- Switch the modules qemu-ui-display-gpu and qemu-ui-display-gpu-pci + from being an x86 only Recommends, to a Recommends for all arch's + except s390x (boo#1181350) +- Fix qemu-hw-usb-smartcard to not be a Recommends for s390x +- Minor spec file tweaks for compatibility with upcoming spec file + formatter + +------------------------------------------------------------------- +Mon Feb 8 17:11:21 UTC 2021 - Bruce Rogers + +- Make note that this patch takes care of an OOB access in ARM + interrupt handling (CVE-2021-20221 bsc#1181933) + hw-intc-arm_gic-Fix-interrupt-ID-in-GICD.patch + ------------------------------------------------------------------- Fri Feb 5 18:54:34 UTC 2021 - Bruce Rogers diff --git a/qemu.spec b/qemu.spec index 33ece51c..0c0280df 100644 --- a/qemu.spec +++ b/qemu.spec @@ -1,5 +1,5 @@ # -# spec file for package qemu +# spec file for package qemu%{name_suffix} # # Copyright (c) 2021 SUSE LLC # @@ -367,20 +367,20 @@ Requires(post): procps Recommends: kvm_stat %endif Recommends: qemu-block-curl -Recommends: qemu-hw-usb-smartcard Recommends: qemu-ksm = %{qemuver} Recommends: qemu-tools Recommends: qemu-ui-curses %ifnarch s390x Recommends: qemu-hw-display-qxl +Recommends: qemu-hw-display-virtio-gpu +Recommends: qemu-hw-display-virtio-gpu-pci Recommends: qemu-hw-display-virtio-vga Recommends: qemu-hw-usb-redirect +Recommends: qemu-hw-usb-smartcard Recommends: qemu-ui-gtk Recommends: qemu-ui-spice-app %endif %ifarch %{ix86} x86_64 -Recommends: qemu-hw-display-virtio-gpu -Recommends: qemu-hw-display-virtio-gpu-pci Recommends: qemu-x86 %else Suggests: qemu-x86 @@ -483,10 +483,10 @@ Group: System/Emulators/PC Version: %{qemuver} Release: 0 Requires: %name = %{qemuver} -Recommends: qemu-ipxe -Recommends: qemu-vgabios Recommends: ovmf +Recommends: qemu-ipxe Recommends: qemu-uefi-aarch64 +Recommends: qemu-vgabios %description arm %{generic_qemu_description} @@ -500,8 +500,8 @@ Version: %{qemuver} Release: 0 Requires: %name = %{qemuver} Recommends: qemu-ipxe -Recommends: qemu-vgabios Recommends: qemu-skiboot +Recommends: qemu-vgabios %description extra %{generic_qemu_description} @@ -861,8 +861,8 @@ Release: 0 Requires: group(kvm) Requires(post): udev Supplements: modalias(acpi*:QEMU0002%3A*) -Supplements: modalias(pci:v0000FFFDd00000101sv*sd*bc*sc*i*) Supplements: modalias(pci:v00005853d00000001sv*sd*bc*sc*i*) +Supplements: modalias(pci:v0000FFFDd00000101sv*sd*bc*sc*i*) %{?systemd_ordering} %description guest-agent @@ -941,7 +941,7 @@ Version: %{qemuver} Release: 0 BuildArch: noarch Requires(post): update-alternatives -Requires(postun): update-alternatives +Requires(postun):update-alternatives Provides: %name:%_datadir/%name/forsplits/06 %description skiboot diff --git a/qemu.spec.in b/qemu.spec.in index 0b36f5a7..c366cf2c 100644 --- a/qemu.spec.in +++ b/qemu.spec.in @@ -1,5 +1,5 @@ # -# spec file for package qemu +# spec file for package qemu%{name_suffix} # # Copyright (c) 2021 SUSE LLC # @@ -281,20 +281,20 @@ Requires(post): procps Recommends: kvm_stat %endif Recommends: qemu-block-curl -Recommends: qemu-hw-usb-smartcard Recommends: qemu-ksm = %{qemuver} Recommends: qemu-tools Recommends: qemu-ui-curses %ifnarch s390x Recommends: qemu-hw-display-qxl +Recommends: qemu-hw-display-virtio-gpu +Recommends: qemu-hw-display-virtio-gpu-pci Recommends: qemu-hw-display-virtio-vga Recommends: qemu-hw-usb-redirect +Recommends: qemu-hw-usb-smartcard Recommends: qemu-ui-gtk Recommends: qemu-ui-spice-app %endif %ifarch %{ix86} x86_64 -Recommends: qemu-hw-display-virtio-gpu -Recommends: qemu-hw-display-virtio-gpu-pci Recommends: qemu-x86 %else Suggests: qemu-x86 @@ -397,10 +397,10 @@ Group: System/Emulators/PC Version: %{qemuver} Release: 0 Requires: %name = %{qemuver} -Recommends: qemu-ipxe -Recommends: qemu-vgabios Recommends: ovmf +Recommends: qemu-ipxe Recommends: qemu-uefi-aarch64 +Recommends: qemu-vgabios %description arm %{generic_qemu_description} @@ -414,8 +414,8 @@ Version: %{qemuver} Release: 0 Requires: %name = %{qemuver} Recommends: qemu-ipxe -Recommends: qemu-vgabios Recommends: qemu-skiboot +Recommends: qemu-vgabios %description extra %{generic_qemu_description} @@ -775,8 +775,8 @@ Release: 0 Requires: group(kvm) Requires(post): udev Supplements: modalias(acpi*:QEMU0002%3A*) -Supplements: modalias(pci:v0000FFFDd00000101sv*sd*bc*sc*i*) Supplements: modalias(pci:v00005853d00000001sv*sd*bc*sc*i*) +Supplements: modalias(pci:v0000FFFDd00000101sv*sd*bc*sc*i*) %{?systemd_ordering} %description guest-agent @@ -855,7 +855,7 @@ Version: %{qemuver} Release: 0 BuildArch: noarch Requires(post): update-alternatives -Requires(postun): update-alternatives +Requires(postun):update-alternatives Provides: %name:%_datadir/%name/forsplits/06 %description skiboot diff --git a/update_git.sh b/update_git.sh index 6d12b523..b01be211 100644 --- a/update_git.sh +++ b/update_git.sh @@ -597,6 +597,7 @@ rm -rf $CMP_DIR rm -rf checkdir osc service localrun format_spec_file +sed -i 's/^# spec file for package qemu$/# spec file for package qemu%{name_suffix}/g' qemu.spec } #==============================================================================