Hello community,
here is the log from the commit of package qemu for openSUSE:Factory checked in at 2018-08-15 10:30:02
++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Comparing /work/SRC/openSUSE:Factory/qemu (Old)
and /work/SRC/openSUSE:Factory/.qemu.new (New)
++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Package is "qemu"
Wed Aug 15 10:30:02 2018 rev:144 rq:627736 version:2.12.1
Changes:
--------
--- /work/SRC/openSUSE:Factory/qemu/qemu-linux-user.changes 2018-08-03 12:30:30.914967893 +0200
+++ /work/SRC/openSUSE:Factory/.qemu.new/qemu-linux-user.changes 2018-08-15 10:30:17.991411137 +0200
@@ -1,0 +2,47 @@
+Fri Aug 3 14:05:52 UTC 2018 - brogers@suse.com
+
+- Update to v2.12.1, a stable, (mostly) bug-fix-only release
+* This update contains new mitigation functionality for
+ CVE-2018-3639 (Speculative Store Bypass) in x86. There are also
+ bug fixes for migration, Intel IOMMU emulation, block layer/image
+ handling, ARM emulation, and various other areas.
+ (Note that a number of 2.12.1 patches were already included by us
+ previously) (CVE-2018-3639 bsc#1092885)
+
+* Patches dropped (subsumed by stable update):
+ 0039-device_tree-Increase-FDT_MAX_SIZE-t.patch
+ 0040-vnc-fix-use-after-free.patch
+ 0041-ccid-Fix-dwProtocols-advertisement-.patch
+ 0042-tcg-arm-Fix-memory-barrier-encoding.patch
+ 0043-s390-ccw-force-diag-308-subcode-to-.patch
+ 0044-nbd-client-fix-nbd_negotiate_simple.patch
+ 0045-migration-block-dirty-bitmap-fix-me.patch
+ 0046-nbd-client-Fix-error-messages-durin.patch
+ 0047-nbd-client-Relax-handling-of-large-.patch
+ 0048-qxl-fix-local-renderer-crash.patch
+ 0049-tcg-Limit-the-number-of-ops-in-a-TB.patch
+ 0050-target-arm-Clear-SVE-high-bits-for-.patch
+ 0051-cpus-tcg-fix-never-exiting-loop-on-.patch
+ 0052-s390x-css-disabled-subchannels-cann.patch
+ 0053-pc-bios-s390-ccw-struct-tpi_info-mu.patch
+ 0054-virtio-ccw-common-reset-handler.patch
+ 0055-s390x-ccw-make-sure-all-ccw-devices.patch
+ 0056-blockjob-expose-error-string-via-qu.patch
+ 0058-qemu-io-Use-purely-string-blockdev-.patch
+ 0059-qemu-img-Use-only-string-options-in.patch
+ 0060-nfs-Remove-processed-options-from-Q.patch
+ 0061-i386-define-the-ssbd-CPUID-feature-.patch
+ 0062-i386-Define-the-Virt-SSBD-MSR-and-h.patch
+ 0063-i386-define-the-AMD-virt-ssbd-CPUID.patch
+ 0064-ahci-fix-PxCI-register-race.patch
+ 0065-ccid-card-passthru-fix-regression-i.patch
+* Patches renamed:
+ 0057-blockjob-Fix-assertion-in-block_job.patch
+ -> 0039-blockjob-Fix-assertion-in-block_job.patch
+ 0066-xen-add-block-resize-support-for-xe.patch
+ -> 0040-xen-add-block-resize-support-for-xe.patch
+ 0067-seccomp-allow-sched_setscheduler-wi.patch
+ -> 0041-seccomp-allow-sched_setscheduler-wi.patch
+- Patch queue updated from git://github.com/openSUSE/qemu.git opensuse-2.12
+
+-------------------------------------------------------------------
--- /work/SRC/openSUSE:Factory/qemu/qemu-testsuite.changes 2018-08-03 12:30:31.150968240 +0200
+++ /work/SRC/openSUSE:Factory/.qemu.new/qemu-testsuite.changes 2018-08-15 10:30:18.163411447 +0200
@@ -1,0 +2,47 @@
+Fri Aug 3 14:05:49 UTC 2018 - brogers@suse.com
+
+- Update to v2.12.1, a stable, (mostly) bug-fix-only release
+* This update contains new mitigation functionality for
+ CVE-2018-3639 (Speculative Store Bypass) in x86. There are also
+ bug fixes for migration, Intel IOMMU emulation, block layer/image
+ handling, ARM emulation, and various other areas.
+ (Note that a number of 2.12.1 patches were already included by us
+ previously) (CVE-2018-3639 bsc#1092885)
+
+* Patches dropped (subsumed by stable update):
+ 0039-device_tree-Increase-FDT_MAX_SIZE-t.patch
+ 0040-vnc-fix-use-after-free.patch
+ 0041-ccid-Fix-dwProtocols-advertisement-.patch
+ 0042-tcg-arm-Fix-memory-barrier-encoding.patch
+ 0043-s390-ccw-force-diag-308-subcode-to-.patch
+ 0044-nbd-client-fix-nbd_negotiate_simple.patch
+ 0045-migration-block-dirty-bitmap-fix-me.patch
+ 0046-nbd-client-Fix-error-messages-durin.patch
+ 0047-nbd-client-Relax-handling-of-large-.patch
+ 0048-qxl-fix-local-renderer-crash.patch
+ 0049-tcg-Limit-the-number-of-ops-in-a-TB.patch
+ 0050-target-arm-Clear-SVE-high-bits-for-.patch
+ 0051-cpus-tcg-fix-never-exiting-loop-on-.patch
+ 0052-s390x-css-disabled-subchannels-cann.patch
+ 0053-pc-bios-s390-ccw-struct-tpi_info-mu.patch
+ 0054-virtio-ccw-common-reset-handler.patch
+ 0055-s390x-ccw-make-sure-all-ccw-devices.patch
+ 0056-blockjob-expose-error-string-via-qu.patch
+ 0058-qemu-io-Use-purely-string-blockdev-.patch
+ 0059-qemu-img-Use-only-string-options-in.patch
+ 0060-nfs-Remove-processed-options-from-Q.patch
+ 0061-i386-define-the-ssbd-CPUID-feature-.patch
+ 0062-i386-Define-the-Virt-SSBD-MSR-and-h.patch
+ 0063-i386-define-the-AMD-virt-ssbd-CPUID.patch
+ 0064-ahci-fix-PxCI-register-race.patch
+ 0065-ccid-card-passthru-fix-regression-i.patch
+* Patches renamed:
+ 0057-blockjob-Fix-assertion-in-block_job.patch
+ -> 0039-blockjob-Fix-assertion-in-block_job.patch
+ 0066-xen-add-block-resize-support-for-xe.patch
+ -> 0040-xen-add-block-resize-support-for-xe.patch
+ 0067-seccomp-allow-sched_setscheduler-wi.patch
+ -> 0041-seccomp-allow-sched_setscheduler-wi.patch
+- Patch queue updated from git://github.com/openSUSE/qemu.git opensuse-2.12
+
+-------------------------------------------------------------------
qemu.changes: same change
Old:
----
0039-device_tree-Increase-FDT_MAX_SIZE-t.patch
0040-vnc-fix-use-after-free.patch
0041-ccid-Fix-dwProtocols-advertisement-.patch
0042-tcg-arm-Fix-memory-barrier-encoding.patch
0043-s390-ccw-force-diag-308-subcode-to-.patch
0044-nbd-client-fix-nbd_negotiate_simple.patch
0045-migration-block-dirty-bitmap-fix-me.patch
0046-nbd-client-Fix-error-messages-durin.patch
0047-nbd-client-Relax-handling-of-large-.patch
0048-qxl-fix-local-renderer-crash.patch
0049-tcg-Limit-the-number-of-ops-in-a-TB.patch
0050-target-arm-Clear-SVE-high-bits-for-.patch
0051-cpus-tcg-fix-never-exiting-loop-on-.patch
0052-s390x-css-disabled-subchannels-cann.patch
0053-pc-bios-s390-ccw-struct-tpi_info-mu.patch
0054-virtio-ccw-common-reset-handler.patch
0055-s390x-ccw-make-sure-all-ccw-devices.patch
0056-blockjob-expose-error-string-via-qu.patch
0057-blockjob-Fix-assertion-in-block_job.patch
0058-qemu-io-Use-purely-string-blockdev-.patch
0059-qemu-img-Use-only-string-options-in.patch
0060-nfs-Remove-processed-options-from-Q.patch
0061-i386-define-the-ssbd-CPUID-feature-.patch
0062-i386-Define-the-Virt-SSBD-MSR-and-h.patch
0063-i386-define-the-AMD-virt-ssbd-CPUID.patch
0064-ahci-fix-PxCI-register-race.patch
0065-ccid-card-passthru-fix-regression-i.patch
0066-xen-add-block-resize-support-for-xe.patch
0067-seccomp-allow-sched_setscheduler-wi.patch
qemu-2.12.0.tar.xz
qemu-2.12.0.tar.xz.sig
New:
----
0039-blockjob-Fix-assertion-in-block_job.patch
0040-xen-add-block-resize-support-for-xe.patch
0041-seccomp-allow-sched_setscheduler-wi.patch
qemu-2.12.1.tar.xz
qemu-2.12.1.tar.xz.sig
++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Other differences:
------------------
++++++ qemu-linux-user.spec ++++++
--- /var/tmp/diff_new_pack.VYwV20/_old 2018-08-15 10:30:21.455417392 +0200
+++ /var/tmp/diff_new_pack.VYwV20/_new 2018-08-15 10:30:21.459417400 +0200
@@ -21,9 +21,9 @@
Summary: CPU emulator for user space
License: BSD-3-Clause AND GPL-2.0-only AND GPL-2.0-or-later AND LGPL-2.1-or-later AND MIT
Group: System/Emulators/PC
-Version: 2.12.0
+Version: 2.12.1
Release: 0
-Source: qemu-2.12.0.tar.xz
+Source: qemu-2.12.1.tar.xz
# Upstream First -- http://wiki.qemu-project.org/Contribute/SubmitAPatch
# This patch queue is auto-generated from https://github.com/openSUSE/qemu
Patch0001: 0001-XXX-dont-dump-core-on-sigabort.patch
@@ -64,35 +64,9 @@
Patch0036: 0036-configure-Modify-python-used-for-io.patch
Patch0037: 0037-qemu-io-tests-comment-out-problemat.patch
Patch0038: 0038-tests-test-thread-pool-is-racy-add-.patch
-Patch0039: 0039-device_tree-Increase-FDT_MAX_SIZE-t.patch
-Patch0040: 0040-vnc-fix-use-after-free.patch
-Patch0041: 0041-ccid-Fix-dwProtocols-advertisement-.patch
-Patch0042: 0042-tcg-arm-Fix-memory-barrier-encoding.patch
-Patch0043: 0043-s390-ccw-force-diag-308-subcode-to-.patch
-Patch0044: 0044-nbd-client-fix-nbd_negotiate_simple.patch
-Patch0045: 0045-migration-block-dirty-bitmap-fix-me.patch
-Patch0046: 0046-nbd-client-Fix-error-messages-durin.patch
-Patch0047: 0047-nbd-client-Relax-handling-of-large-.patch
-Patch0048: 0048-qxl-fix-local-renderer-crash.patch
-Patch0049: 0049-tcg-Limit-the-number-of-ops-in-a-TB.patch
-Patch0050: 0050-target-arm-Clear-SVE-high-bits-for-.patch
-Patch0051: 0051-cpus-tcg-fix-never-exiting-loop-on-.patch
-Patch0052: 0052-s390x-css-disabled-subchannels-cann.patch
-Patch0053: 0053-pc-bios-s390-ccw-struct-tpi_info-mu.patch
-Patch0054: 0054-virtio-ccw-common-reset-handler.patch
-Patch0055: 0055-s390x-ccw-make-sure-all-ccw-devices.patch
-Patch0056: 0056-blockjob-expose-error-string-via-qu.patch
-Patch0057: 0057-blockjob-Fix-assertion-in-block_job.patch
-Patch0058: 0058-qemu-io-Use-purely-string-blockdev-.patch
-Patch0059: 0059-qemu-img-Use-only-string-options-in.patch
-Patch0060: 0060-nfs-Remove-processed-options-from-Q.patch
-Patch0061: 0061-i386-define-the-ssbd-CPUID-feature-.patch
-Patch0062: 0062-i386-Define-the-Virt-SSBD-MSR-and-h.patch
-Patch0063: 0063-i386-define-the-AMD-virt-ssbd-CPUID.patch
-Patch0064: 0064-ahci-fix-PxCI-register-race.patch
-Patch0065: 0065-ccid-card-passthru-fix-regression-i.patch
-Patch0066: 0066-xen-add-block-resize-support-for-xe.patch
-Patch0067: 0067-seccomp-allow-sched_setscheduler-wi.patch
+Patch0039: 0039-blockjob-Fix-assertion-in-block_job.patch
+Patch0040: 0040-xen-add-block-resize-support-for-xe.patch
+Patch0041: 0041-seccomp-allow-sched_setscheduler-wi.patch
# Please do not add QEMU patches manually here.
# Run update_git.sh to regenerate this queue.
Source400: update_git.sh
@@ -125,7 +99,7 @@
syscall layer occurs on the native hardware and operating system.
%prep
-%setup -q -n qemu-2.12.0
+%setup -q -n qemu-2.12.1
%patch0001 -p1
%patch0002 -p1
%patch0003 -p1
@@ -167,32 +141,6 @@
%patch0039 -p1
%patch0040 -p1
%patch0041 -p1
-%patch0042 -p1
-%patch0043 -p1
-%patch0044 -p1
-%patch0045 -p1
-%patch0046 -p1
-%patch0047 -p1
-%patch0048 -p1
-%patch0049 -p1
-%patch0050 -p1
-%patch0051 -p1
-%patch0052 -p1
-%patch0053 -p1
-%patch0054 -p1
-%patch0055 -p1
-%patch0056 -p1
-%patch0057 -p1
-%patch0058 -p1
-%patch0059 -p1
-%patch0060 -p1
-%patch0061 -p1
-%patch0062 -p1
-%patch0063 -p1
-%patch0064 -p1
-%patch0065 -p1
-%patch0066 -p1
-%patch0067 -p1
%build
./configure \
++++++ qemu-testsuite.spec ++++++
--- /var/tmp/diff_new_pack.VYwV20/_old 2018-08-15 10:30:21.491417457 +0200
+++ /var/tmp/diff_new_pack.VYwV20/_new 2018-08-15 10:30:21.491417457 +0200
@@ -109,10 +109,10 @@
Summary: Machine emulator and virtualizer
License: BSD-3-Clause AND GPL-2.0-only AND GPL-2.0-or-later AND LGPL-2.1-or-later AND MIT
Group: System/Emulators/PC
-Version: 2.12.0
+Version: 2.12.1
Release: 0
-Source: http://wiki.qemu.org/download/qemu-2.12.0.tar.xz
-Source99: http://wiki.qemu.org/download/qemu-2.12.0.tar.xz.sig
+Source: http://wiki.qemu.org/download/qemu-2.12.1.tar.xz
+Source99: http://wiki.qemu.org/download/qemu-2.12.1.tar.xz.sig
Source1: 80-kvm.rules
Source2: qemu-ifup
Source3: kvm_stat
@@ -168,35 +168,9 @@
Patch0036: 0036-configure-Modify-python-used-for-io.patch
Patch0037: 0037-qemu-io-tests-comment-out-problemat.patch
Patch0038: 0038-tests-test-thread-pool-is-racy-add-.patch
-Patch0039: 0039-device_tree-Increase-FDT_MAX_SIZE-t.patch
-Patch0040: 0040-vnc-fix-use-after-free.patch
-Patch0041: 0041-ccid-Fix-dwProtocols-advertisement-.patch
-Patch0042: 0042-tcg-arm-Fix-memory-barrier-encoding.patch
-Patch0043: 0043-s390-ccw-force-diag-308-subcode-to-.patch
-Patch0044: 0044-nbd-client-fix-nbd_negotiate_simple.patch
-Patch0045: 0045-migration-block-dirty-bitmap-fix-me.patch
-Patch0046: 0046-nbd-client-Fix-error-messages-durin.patch
-Patch0047: 0047-nbd-client-Relax-handling-of-large-.patch
-Patch0048: 0048-qxl-fix-local-renderer-crash.patch
-Patch0049: 0049-tcg-Limit-the-number-of-ops-in-a-TB.patch
-Patch0050: 0050-target-arm-Clear-SVE-high-bits-for-.patch
-Patch0051: 0051-cpus-tcg-fix-never-exiting-loop-on-.patch
-Patch0052: 0052-s390x-css-disabled-subchannels-cann.patch
-Patch0053: 0053-pc-bios-s390-ccw-struct-tpi_info-mu.patch
-Patch0054: 0054-virtio-ccw-common-reset-handler.patch
-Patch0055: 0055-s390x-ccw-make-sure-all-ccw-devices.patch
-Patch0056: 0056-blockjob-expose-error-string-via-qu.patch
-Patch0057: 0057-blockjob-Fix-assertion-in-block_job.patch
-Patch0058: 0058-qemu-io-Use-purely-string-blockdev-.patch
-Patch0059: 0059-qemu-img-Use-only-string-options-in.patch
-Patch0060: 0060-nfs-Remove-processed-options-from-Q.patch
-Patch0061: 0061-i386-define-the-ssbd-CPUID-feature-.patch
-Patch0062: 0062-i386-Define-the-Virt-SSBD-MSR-and-h.patch
-Patch0063: 0063-i386-define-the-AMD-virt-ssbd-CPUID.patch
-Patch0064: 0064-ahci-fix-PxCI-register-race.patch
-Patch0065: 0065-ccid-card-passthru-fix-regression-i.patch
-Patch0066: 0066-xen-add-block-resize-support-for-xe.patch
-Patch0067: 0067-seccomp-allow-sched_setscheduler-wi.patch
+Patch0039: 0039-blockjob-Fix-assertion-in-block_job.patch
+Patch0040: 0040-xen-add-block-resize-support-for-xe.patch
+Patch0041: 0041-seccomp-allow-sched_setscheduler-wi.patch
# Please do not add QEMU patches manually here.
# Run update_git.sh to regenerate this queue.
@@ -221,7 +195,7 @@
# SLOF (Currently no patches)
-# skiboot (Currently no patches)
+# skiboot
Patch1500: skiboot-hdata-i2c.c-fix-building-with-gcc8.patch
# ui/keycodemapdb (Currently no patches)
@@ -866,7 +840,7 @@
%endif # !qemu-testsuite
%prep
-%setup -q -n qemu-2.12.0
+%setup -q -n qemu-2.12.1
%patch0001 -p1
%patch0002 -p1
%patch0003 -p1
@@ -908,32 +882,6 @@
%patch0039 -p1
%patch0040 -p1
%patch0041 -p1
-%patch0042 -p1
-%patch0043 -p1
-%patch0044 -p1
-%patch0045 -p1
-%patch0046 -p1
-%patch0047 -p1
-%patch0048 -p1
-%patch0049 -p1
-%patch0050 -p1
-%patch0051 -p1
-%patch0052 -p1
-%patch0053 -p1
-%patch0054 -p1
-%patch0055 -p1
-%patch0056 -p1
-%patch0057 -p1
-%patch0058 -p1
-%patch0059 -p1
-%patch0060 -p1
-%patch0061 -p1
-%patch0062 -p1
-%patch0063 -p1
-%patch0064 -p1
-%patch0065 -p1
-%patch0066 -p1
-%patch0067 -p1
%if 0%{?suse_version} > 1320
%patch1000 -p1
++++++ qemu.spec ++++++
--- /var/tmp/diff_new_pack.VYwV20/_old 2018-08-15 10:30:21.547417559 +0200
+++ /var/tmp/diff_new_pack.VYwV20/_new 2018-08-15 10:30:21.551417566 +0200
@@ -109,10 +109,10 @@
Summary: Machine emulator and virtualizer
License: BSD-3-Clause AND GPL-2.0-only AND GPL-2.0-or-later AND LGPL-2.1-or-later AND MIT
Group: System/Emulators/PC
-Version: 2.12.0
+Version: 2.12.1
Release: 0
-Source: http://wiki.qemu.org/download/qemu-2.12.0.tar.xz
-Source99: http://wiki.qemu.org/download/qemu-2.12.0.tar.xz.sig
+Source: http://wiki.qemu.org/download/qemu-2.12.1.tar.xz
+Source99: http://wiki.qemu.org/download/qemu-2.12.1.tar.xz.sig
Source1: 80-kvm.rules
Source2: qemu-ifup
Source3: kvm_stat
@@ -168,35 +168,9 @@
Patch0036: 0036-configure-Modify-python-used-for-io.patch
Patch0037: 0037-qemu-io-tests-comment-out-problemat.patch
Patch0038: 0038-tests-test-thread-pool-is-racy-add-.patch
-Patch0039: 0039-device_tree-Increase-FDT_MAX_SIZE-t.patch
-Patch0040: 0040-vnc-fix-use-after-free.patch
-Patch0041: 0041-ccid-Fix-dwProtocols-advertisement-.patch
-Patch0042: 0042-tcg-arm-Fix-memory-barrier-encoding.patch
-Patch0043: 0043-s390-ccw-force-diag-308-subcode-to-.patch
-Patch0044: 0044-nbd-client-fix-nbd_negotiate_simple.patch
-Patch0045: 0045-migration-block-dirty-bitmap-fix-me.patch
-Patch0046: 0046-nbd-client-Fix-error-messages-durin.patch
-Patch0047: 0047-nbd-client-Relax-handling-of-large-.patch
-Patch0048: 0048-qxl-fix-local-renderer-crash.patch
-Patch0049: 0049-tcg-Limit-the-number-of-ops-in-a-TB.patch
-Patch0050: 0050-target-arm-Clear-SVE-high-bits-for-.patch
-Patch0051: 0051-cpus-tcg-fix-never-exiting-loop-on-.patch
-Patch0052: 0052-s390x-css-disabled-subchannels-cann.patch
-Patch0053: 0053-pc-bios-s390-ccw-struct-tpi_info-mu.patch
-Patch0054: 0054-virtio-ccw-common-reset-handler.patch
-Patch0055: 0055-s390x-ccw-make-sure-all-ccw-devices.patch
-Patch0056: 0056-blockjob-expose-error-string-via-qu.patch
-Patch0057: 0057-blockjob-Fix-assertion-in-block_job.patch
-Patch0058: 0058-qemu-io-Use-purely-string-blockdev-.patch
-Patch0059: 0059-qemu-img-Use-only-string-options-in.patch
-Patch0060: 0060-nfs-Remove-processed-options-from-Q.patch
-Patch0061: 0061-i386-define-the-ssbd-CPUID-feature-.patch
-Patch0062: 0062-i386-Define-the-Virt-SSBD-MSR-and-h.patch
-Patch0063: 0063-i386-define-the-AMD-virt-ssbd-CPUID.patch
-Patch0064: 0064-ahci-fix-PxCI-register-race.patch
-Patch0065: 0065-ccid-card-passthru-fix-regression-i.patch
-Patch0066: 0066-xen-add-block-resize-support-for-xe.patch
-Patch0067: 0067-seccomp-allow-sched_setscheduler-wi.patch
+Patch0039: 0039-blockjob-Fix-assertion-in-block_job.patch
+Patch0040: 0040-xen-add-block-resize-support-for-xe.patch
+Patch0041: 0041-seccomp-allow-sched_setscheduler-wi.patch
# Please do not add QEMU patches manually here.
# Run update_git.sh to regenerate this queue.
@@ -221,7 +195,7 @@
# SLOF (Currently no patches)
-# skiboot (Currently no patches)
+# skiboot
Patch1500: skiboot-hdata-i2c.c-fix-building-with-gcc8.patch
# ui/keycodemapdb (Currently no patches)
@@ -866,7 +840,7 @@
%endif # !qemu-testsuite
%prep
-%setup -q -n qemu-2.12.0
+%setup -q -n qemu-2.12.1
%patch0001 -p1
%patch0002 -p1
%patch0003 -p1
@@ -908,32 +882,6 @@
%patch0039 -p1
%patch0040 -p1
%patch0041 -p1
-%patch0042 -p1
-%patch0043 -p1
-%patch0044 -p1
-%patch0045 -p1
-%patch0046 -p1
-%patch0047 -p1
-%patch0048 -p1
-%patch0049 -p1
-%patch0050 -p1
-%patch0051 -p1
-%patch0052 -p1
-%patch0053 -p1
-%patch0054 -p1
-%patch0055 -p1
-%patch0056 -p1
-%patch0057 -p1
-%patch0058 -p1
-%patch0059 -p1
-%patch0060 -p1
-%patch0061 -p1
-%patch0062 -p1
-%patch0063 -p1
-%patch0064 -p1
-%patch0065 -p1
-%patch0066 -p1
-%patch0067 -p1
%if 0%{?suse_version} > 1320
%patch1000 -p1
++++++ 0001-XXX-dont-dump-core-on-sigabort.patch ++++++
--- /var/tmp/diff_new_pack.VYwV20/_old 2018-08-15 10:30:21.591417638 +0200
+++ /var/tmp/diff_new_pack.VYwV20/_new 2018-08-15 10:30:21.591417638 +0200
@@ -1,4 +1,4 @@
-From 853d867a5db06bc90044554b6f30c339377a8389 Mon Sep 17 00:00:00 2001
+From 1c52bb7e5eddde98e1ec2b93dce09976ca8c5d31 Mon Sep 17 00:00:00 2001
From: Alexander Graf
Date: Mon, 21 Nov 2011 23:50:36 +0100
Subject: [PATCH] XXX dont dump core on sigabort
++++++ 0002-qemu-binfmt-conf-Modify-default-pat.patch ++++++
--- /var/tmp/diff_new_pack.VYwV20/_old 2018-08-15 10:30:21.595417645 +0200
+++ /var/tmp/diff_new_pack.VYwV20/_new 2018-08-15 10:30:21.595417645 +0200
@@ -1,4 +1,4 @@
-From 59f664e34a535f0c55ffcb1f37b1dc10ece83c9f Mon Sep 17 00:00:00 2001
+From ff80b2b25fe1068630412065e9be32dbad1cc51d Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Andreas=20F=C3=A4rber?=
Date: Wed, 10 Aug 2016 19:00:24 +0200
Subject: [PATCH] qemu-binfmt-conf: Modify default path
++++++ 0003-qemu-cvs-gettimeofday.patch ++++++
--- /var/tmp/diff_new_pack.VYwV20/_old 2018-08-15 10:30:21.607417667 +0200
+++ /var/tmp/diff_new_pack.VYwV20/_new 2018-08-15 10:30:21.607417667 +0200
@@ -1,4 +1,4 @@
-From fa82bb32e04288022ab786ad7d5b223d6e4fa4b5 Mon Sep 17 00:00:00 2001
+From d41683a7c527171a36f3f77e448f0599b9a6e1f4 Mon Sep 17 00:00:00 2001
From: Ulrich Hecht
Date: Tue, 14 Apr 2009 16:25:41 +0200
Subject: [PATCH] qemu-cvs-gettimeofday
++++++ 0004-qemu-cvs-ioctl_debug.patch ++++++
--- /var/tmp/diff_new_pack.VYwV20/_old 2018-08-15 10:30:21.623417696 +0200
+++ /var/tmp/diff_new_pack.VYwV20/_new 2018-08-15 10:30:21.623417696 +0200
@@ -1,4 +1,4 @@
-From f04ab80dbccb7dc8badb7e510b80d75675a340f5 Mon Sep 17 00:00:00 2001
+From 7ea11bc96063bd9256a8e0106e9886ba9c20c951 Mon Sep 17 00:00:00 2001
From: Alexander Graf
Date: Tue, 14 Apr 2009 16:26:33 +0200
Subject: [PATCH] qemu-cvs-ioctl_debug
++++++ 0005-qemu-cvs-ioctl_nodirection.patch ++++++
--- /var/tmp/diff_new_pack.VYwV20/_old 2018-08-15 10:30:21.639417725 +0200
+++ /var/tmp/diff_new_pack.VYwV20/_new 2018-08-15 10:30:21.639417725 +0200
@@ -1,4 +1,4 @@
-From 2dfd9f6a65dd6a5b2ea36ca9cbdb13c7ee649891 Mon Sep 17 00:00:00 2001
+From 62603c271e2ea6bbd3e6f9b463d8450f712e16fc Mon Sep 17 00:00:00 2001
From: Alexander Graf
Date: Tue, 14 Apr 2009 16:27:36 +0200
Subject: [PATCH] qemu-cvs-ioctl_nodirection
++++++ 0006-linux-user-add-binfmt-wrapper-for-a.patch ++++++
--- /var/tmp/diff_new_pack.VYwV20/_old 2018-08-15 10:30:21.647417739 +0200
+++ /var/tmp/diff_new_pack.VYwV20/_new 2018-08-15 10:30:21.647417739 +0200
@@ -1,4 +1,4 @@
-From 8b8005b5c48ab1ee7ca8254d055c8fd2825df176 Mon Sep 17 00:00:00 2001
+From 7a2745150f04fcc553a715421a60cc3f85c6794f Mon Sep 17 00:00:00 2001
From: Alexander Graf
Date: Fri, 30 Sep 2011 19:40:36 +0200
Subject: [PATCH] linux-user: add binfmt wrapper for argv[0] handling
++++++ 0007-PPC-KVM-Disable-mmu-notifier-check.patch ++++++
--- /var/tmp/diff_new_pack.VYwV20/_old 2018-08-15 10:30:21.655417754 +0200
+++ /var/tmp/diff_new_pack.VYwV20/_new 2018-08-15 10:30:21.655417754 +0200
@@ -1,4 +1,4 @@
-From 55aceb5b2167a94a65e03da12676d5c8318d1625 Mon Sep 17 00:00:00 2001
+From c3dee2b9a06d0f7c0e5093cf3fb98f5f4dbe2912 Mon Sep 17 00:00:00 2001
From: Alexander Graf
Date: Fri, 6 Jan 2012 01:05:55 +0100
Subject: [PATCH] PPC: KVM: Disable mmu notifier check
++++++ 0008-linux-user-fix-segfault-deadlock.patch ++++++
--- /var/tmp/diff_new_pack.VYwV20/_old 2018-08-15 10:30:21.663417768 +0200
+++ /var/tmp/diff_new_pack.VYwV20/_new 2018-08-15 10:30:21.663417768 +0200
@@ -1,4 +1,4 @@
-From 2635ac986fb70408292c274b4c0327f2cfc401e2 Mon Sep 17 00:00:00 2001
+From d082166f9ab67080ceddde9293fac81adf5519f2 Mon Sep 17 00:00:00 2001
From: Alexander Graf
Date: Fri, 13 Jan 2012 17:05:41 +0100
Subject: [PATCH] linux-user: fix segfault deadlock
++++++ 0009-linux-user-binfmt-support-host-bina.patch ++++++
--- /var/tmp/diff_new_pack.VYwV20/_old 2018-08-15 10:30:21.671417782 +0200
+++ /var/tmp/diff_new_pack.VYwV20/_new 2018-08-15 10:30:21.679417797 +0200
@@ -1,4 +1,4 @@
-From 18678e03622d987031ceb4da08fdc67f2d428832 Mon Sep 17 00:00:00 2001
+From 5392574e5590368b0a3ec208bec8022a67de2fc0 Mon Sep 17 00:00:00 2001
From: Alexander Graf
Date: Thu, 2 Feb 2012 18:02:33 +0100
Subject: [PATCH] linux-user: binfmt: support host binaries
++++++ 0010-linux-user-Fake-proc-cpuinfo.patch ++++++
--- /var/tmp/diff_new_pack.VYwV20/_old 2018-08-15 10:30:21.683417804 +0200
+++ /var/tmp/diff_new_pack.VYwV20/_new 2018-08-15 10:30:21.687417812 +0200
@@ -1,4 +1,4 @@
-From 5398492297fa5a5ae2b893aeed5c12d62c1a58de Mon Sep 17 00:00:00 2001
+From a7335abe6db76da2d826fdab1effae19b95a4a8c Mon Sep 17 00:00:00 2001
From: Alexander Graf
Date: Mon, 23 Jul 2012 10:24:14 +0200
Subject: [PATCH] linux-user: Fake /proc/cpuinfo
++++++ 0011-Remove-problematic-evdev-86-key-fro.patch ++++++
--- /var/tmp/diff_new_pack.VYwV20/_old 2018-08-15 10:30:21.703417840 +0200
+++ /var/tmp/diff_new_pack.VYwV20/_new 2018-08-15 10:30:21.703417840 +0200
@@ -1,4 +1,4 @@
-From f28ef07b4c0c013a95baf2736e45d92982eab376 Mon Sep 17 00:00:00 2001
+From 3342309d6c6c1b426e856d4575c7f757e031fa00 Mon Sep 17 00:00:00 2001
From: Adam Williamson
Date: Wed, 20 Dec 2017 15:43:07 -0800
Subject: [PATCH] Remove problematic 'evdev 86' key from en-us keymap
++++++ 0012-linux-user-use-target_ulong.patch ++++++
--- /var/tmp/diff_new_pack.VYwV20/_old 2018-08-15 10:30:21.739417906 +0200
+++ /var/tmp/diff_new_pack.VYwV20/_new 2018-08-15 10:30:21.739417906 +0200
@@ -1,4 +1,4 @@
-From 5ab0ac94b8cc2400e23d4eb3b6f15b12af1d9901 Mon Sep 17 00:00:00 2001
+From 34e9123848291dcfa90aab73e6a6117054e5155c Mon Sep 17 00:00:00 2001
From: Alexander Graf
Date: Tue, 9 Oct 2012 09:06:49 +0200
Subject: [PATCH] linux-user: use target_ulong
++++++ 0013-Make-char-muxer-more-robust-wrt-sma.patch ++++++
--- /var/tmp/diff_new_pack.VYwV20/_old 2018-08-15 10:30:21.743417913 +0200
+++ /var/tmp/diff_new_pack.VYwV20/_new 2018-08-15 10:30:21.747417920 +0200
@@ -1,4 +1,4 @@
-From 3d82609282e2d57b71ec4c7593d6cc188eec7532 Mon Sep 17 00:00:00 2001
+From 515368558bf1a4a36c58510047b55a6b8e096c39 Mon Sep 17 00:00:00 2001
From: Alexander Graf
Date: Thu, 1 Apr 2010 17:36:23 +0200
Subject: [PATCH] Make char muxer more robust wrt small FIFOs
@@ -40,7 +40,7 @@
#include "qemu/error-report.h"
#include "qapi/error.h"
diff --git a/chardev/char-mux.c b/chardev/char-mux.c
-index 1b925c8dec..bc97973f87 100644
+index 6055e76293..1afcc09829 100644
--- a/chardev/char-mux.c
+++ b/chardev/char-mux.c
@@ -22,6 +22,7 @@
@@ -67,7 +67,7 @@
}
static int mux_chr_can_read(void *opaque)
-@@ -323,6 +333,10 @@ static void qemu_chr_open_mux(Chardev *chr,
+@@ -324,6 +334,10 @@ static void qemu_chr_open_mux(Chardev *chr,
}
d->focus = -1;
@@ -105,7 +105,7 @@
int mux_cnt;
int term_got_escape;
diff --git a/tests/test-char.c b/tests/test-char.c
-index 306c728335..918f7b8820 100644
+index b81b1e8e05..f90ae770cd 100644
--- a/tests/test-char.c
+++ b/tests/test-char.c
@@ -1,3 +1,4 @@
++++++ 0014-linux-user-lseek-explicitly-cast-no.patch ++++++
--- /var/tmp/diff_new_pack.VYwV20/_old 2018-08-15 10:30:21.755417934 +0200
+++ /var/tmp/diff_new_pack.VYwV20/_new 2018-08-15 10:30:21.755417934 +0200
@@ -1,4 +1,4 @@
-From 2e1c45d401a7a855063d2e8634a4a0a3128b3aff Mon Sep 17 00:00:00 2001
+From 8eaf05e41e21e772fa3cb502e5e08b390f630914 Mon Sep 17 00:00:00 2001
From: Alexander Graf
Date: Thu, 13 Dec 2012 14:29:22 +0100
Subject: [PATCH] linux-user: lseek: explicitly cast non-set offsets to signed
++++++ 0015-AIO-Reduce-number-of-threads-for-32.patch ++++++
--- /var/tmp/diff_new_pack.VYwV20/_old 2018-08-15 10:30:21.759417941 +0200
+++ /var/tmp/diff_new_pack.VYwV20/_new 2018-08-15 10:30:21.759417941 +0200
@@ -1,4 +1,4 @@
-From 1be70a0c9b350d305a6874e4bf13266d7a9d907c Mon Sep 17 00:00:00 2001
+From 8159b9aefeb5a8cf6df27f8ba22524538995aa3b Mon Sep 17 00:00:00 2001
From: Alexander Graf
Date: Wed, 14 Jan 2015 01:32:11 +0100
Subject: [PATCH] AIO: Reduce number of threads for 32bit hosts
++++++ 0016-xen_disk-Add-suse-specific-flush-di.patch ++++++
--- /var/tmp/diff_new_pack.VYwV20/_old 2018-08-15 10:30:21.767417956 +0200
+++ /var/tmp/diff_new_pack.VYwV20/_new 2018-08-15 10:30:21.767417956 +0200
@@ -1,4 +1,4 @@
-From 084d570d65e35f6a9e76d7ba1ec1c4804fd3e295 Mon Sep 17 00:00:00 2001
+From 5cd1a933c12cf0ae8146e6555a41179ad255431b Mon Sep 17 00:00:00 2001
From: Bruce Rogers
Date: Wed, 9 Mar 2016 15:18:11 -0700
Subject: [PATCH] xen_disk: Add suse specific flush disable handling and map to
++++++ 0017-qemu-bridge-helper-reduce-security-.patch ++++++
--- /var/tmp/diff_new_pack.VYwV20/_old 2018-08-15 10:30:21.775417970 +0200
+++ /var/tmp/diff_new_pack.VYwV20/_new 2018-08-15 10:30:21.775417970 +0200
@@ -1,4 +1,4 @@
-From fa7458f06121fc882064886561b9451bc1edc0a2 Mon Sep 17 00:00:00 2001
+From 880795f6609a675f7926228ee71821d64062ea1c Mon Sep 17 00:00:00 2001
From: Bruce Rogers
Date: Tue, 2 Aug 2016 11:36:02 -0600
Subject: [PATCH] qemu-bridge-helper: reduce security profile
++++++ 0018-qemu-binfmt-conf-use-qemu-ARCH-binf.patch ++++++
--- /var/tmp/diff_new_pack.VYwV20/_old 2018-08-15 10:30:21.783417985 +0200
+++ /var/tmp/diff_new_pack.VYwV20/_new 2018-08-15 10:30:21.783417985 +0200
@@ -1,4 +1,4 @@
-From e5f31c687180c21f0c605c3907085ff083f1ab04 Mon Sep 17 00:00:00 2001
+From de37332ee7019356d8d6b14aa4ad701f9b97113b Mon Sep 17 00:00:00 2001
From: Andreas Schwab
Date: Fri, 12 Aug 2016 18:20:49 +0200
Subject: [PATCH] qemu-binfmt-conf: use qemu-ARCH-binfmt
++++++ 0019-linux-user-properly-test-for-infini.patch ++++++
--- /var/tmp/diff_new_pack.VYwV20/_old 2018-08-15 10:30:21.787417992 +0200
+++ /var/tmp/diff_new_pack.VYwV20/_new 2018-08-15 10:30:21.791417999 +0200
@@ -1,4 +1,4 @@
-From 8d1847b2dc82e1cc306ad7f5b94b44ef82b31364 Mon Sep 17 00:00:00 2001
+From 2207224e716784c1de3877bbb208572b59e33516 Mon Sep 17 00:00:00 2001
From: Andreas Schwab
Date: Thu, 8 Sep 2016 11:21:05 +0200
Subject: [PATCH] linux-user: properly test for infinite timeout in poll (#8)
++++++ 0020-roms-Makefile-pass-a-packaging-time.patch ++++++
--- /var/tmp/diff_new_pack.VYwV20/_old 2018-08-15 10:30:21.799418014 +0200
+++ /var/tmp/diff_new_pack.VYwV20/_new 2018-08-15 10:30:21.799418014 +0200
@@ -1,4 +1,4 @@
-From be018ba774291252216b001e94b8463e1f753320 Mon Sep 17 00:00:00 2001
+From f1427767434f6cb0dab71e8333e489f38f3194a2 Mon Sep 17 00:00:00 2001
From: Bruce Rogers
Date: Sat, 19 Nov 2016 08:06:30 -0700
Subject: [PATCH] roms/Makefile: pass a packaging timestamp to subpackages with
++++++ 0021-Raise-soft-address-space-limit-to-h.patch ++++++
--- /var/tmp/diff_new_pack.VYwV20/_old 2018-08-15 10:30:21.811418035 +0200
+++ /var/tmp/diff_new_pack.VYwV20/_new 2018-08-15 10:30:21.811418035 +0200
@@ -1,4 +1,4 @@
-From d01d9e3c04391f841b78daff095c5d653a4c332b Mon Sep 17 00:00:00 2001
+From 5121ac04d076e3855b7d1d3657658b44171ec30c Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Andreas=20F=C3=A4rber?=
Date: Sun, 15 Jan 2012 19:53:49 +0100
Subject: [PATCH] Raise soft address space limit to hard limit
++++++ 0022-increase-x86_64-physical-bits-to-42.patch ++++++
--- /var/tmp/diff_new_pack.VYwV20/_old 2018-08-15 10:30:21.823418057 +0200
+++ /var/tmp/diff_new_pack.VYwV20/_new 2018-08-15 10:30:21.831418071 +0200
@@ -1,4 +1,4 @@
-From e04322319d12cbbbc9c98ddc92c2ee6c1d26c5b8 Mon Sep 17 00:00:00 2001
+From f3fc8add8b9999be0c050be64b66d1bb5c95372b Mon Sep 17 00:00:00 2001
From: Bruce Rogers
Date: Fri, 17 May 2013 16:49:58 -0600
Subject: [PATCH] increase x86_64 physical bits to 42
@@ -19,10 +19,10 @@
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/target/i386/cpu.h b/target/i386/cpu.h
-index 1b219fafc4..164884f1d8 100644
+index 75e821cefe..e63205d1f0 100644
--- a/target/i386/cpu.h
+++ b/target/i386/cpu.h
-@@ -1583,7 +1583,7 @@ uint64_t cpu_get_tsc(CPUX86State *env);
+@@ -1586,7 +1586,7 @@ uint64_t cpu_get_tsc(CPUX86State *env);
/* XXX: This value should match the one returned by CPUID
* and in exec.c */
# if defined(TARGET_X86_64)
++++++ 0023-vga-Raise-VRAM-to-16-MiB-for-pc-0.1.patch ++++++
--- /var/tmp/diff_new_pack.VYwV20/_old 2018-08-15 10:30:21.839418086 +0200
+++ /var/tmp/diff_new_pack.VYwV20/_new 2018-08-15 10:30:21.843418093 +0200
@@ -1,4 +1,4 @@
-From 4481918a925174e852fe0da79bebafa1f78d5e60 Mon Sep 17 00:00:00 2001
+From 988cfa72f5a1853abcec4608f0c7ecb0807906b6 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Andreas=20F=C3=A4rber?=
Date: Wed, 12 Jun 2013 19:26:37 +0200
Subject: [PATCH] vga: Raise VRAM to 16 MiB for pc-0.15 and below
++++++ 0024-i8254-Fix-migration-from-SLE11-SP2.patch ++++++
--- /var/tmp/diff_new_pack.VYwV20/_old 2018-08-15 10:30:21.855418115 +0200
+++ /var/tmp/diff_new_pack.VYwV20/_new 2018-08-15 10:30:21.855418115 +0200
@@ -1,4 +1,4 @@
-From 73d118f4a62698fab8262a5fa628e21122fb7776 Mon Sep 17 00:00:00 2001
+From 24d6420ba7194b0c06e41ad464eca93292a41ede Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Andreas=20F=C3=A4rber?=
Date: Wed, 31 Jul 2013 17:05:29 +0200
Subject: [PATCH] i8254: Fix migration from SLE11 SP2
++++++ 0025-acpi_piix4-Fix-migration-from-SLE11.patch ++++++
--- /var/tmp/diff_new_pack.VYwV20/_old 2018-08-15 10:30:21.863418129 +0200
+++ /var/tmp/diff_new_pack.VYwV20/_new 2018-08-15 10:30:21.867418136 +0200
@@ -1,4 +1,4 @@
-From 7612772e02272f4f27877a802bad99a572715d22 Mon Sep 17 00:00:00 2001
+From e60d65bd393ce6c5389fa4f1ee7743de7ce1bcaa Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Andreas=20F=C3=A4rber?=
Date: Wed, 31 Jul 2013 17:32:35 +0200
Subject: [PATCH] acpi_piix4: Fix migration from SLE11 SP2
++++++ 0026-Fix-tigervnc-long-press-issue.patch ++++++
--- /var/tmp/diff_new_pack.VYwV20/_old 2018-08-15 10:30:21.871418144 +0200
+++ /var/tmp/diff_new_pack.VYwV20/_new 2018-08-15 10:30:21.871418144 +0200
@@ -1,4 +1,4 @@
-From 2a3aee7bf03a2f3551cf5697a3d83ad09237feb6 Mon Sep 17 00:00:00 2001
+From 64706e7671a07bce389c48c77369c1cd76b2b9cb Mon Sep 17 00:00:00 2001
From: Chunyan Liu
Date: Thu, 3 Mar 2016 16:48:17 +0800
Subject: [PATCH] Fix tigervnc long press issue
@@ -24,10 +24,10 @@
1 file changed, 19 insertions(+)
diff --git a/ui/vnc.c b/ui/vnc.c
-index e164eb798c..5ebae6f664 100644
+index 5526e54f48..a4b2cc7666 100644
--- a/ui/vnc.c
+++ b/ui/vnc.c
-@@ -1817,6 +1817,25 @@ static void do_key_event(VncState *vs, int down, int keycode, int sym)
+@@ -1818,6 +1818,25 @@ static void do_key_event(VncState *vs, int down, int keycode, int sym)
if (down)
vs->modifiers_state[keycode] ^= 1;
break;
++++++ 0027-string-input-visitor-Fix-uint64-par.patch ++++++
--- /var/tmp/diff_new_pack.VYwV20/_old 2018-08-15 10:30:21.895418187 +0200
+++ /var/tmp/diff_new_pack.VYwV20/_new 2018-08-15 10:30:21.895418187 +0200
@@ -1,4 +1,4 @@
-From c3e25d9b1dede2fcc19a7dc9e6710b03f9b9ea40 Mon Sep 17 00:00:00 2001
+From 9828006ad0a5150f6e33774f52dbe0c1cd83c127 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Andreas=20F=C3=A4rber?=
Date: Thu, 24 Sep 2015 19:21:11 +0200
Subject: [PATCH] string-input-visitor: Fix uint64 parsing
++++++ 0028-test-string-input-visitor-Add-int-t.patch ++++++
--- /var/tmp/diff_new_pack.VYwV20/_old 2018-08-15 10:30:21.911418216 +0200
+++ /var/tmp/diff_new_pack.VYwV20/_new 2018-08-15 10:30:21.911418216 +0200
@@ -1,4 +1,4 @@
-From 96c23573df3d30857d8cabe89b5f5db12e4ca215 Mon Sep 17 00:00:00 2001
+From 475c5683bb5f62150cdab5b2206c8f3e396564e0 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Andreas=20F=C3=A4rber?=
Date: Thu, 24 Sep 2015 19:23:50 +0200
Subject: [PATCH] test-string-input-visitor: Add int test case
++++++ 0029-test-string-input-visitor-Add-uint6.patch ++++++
--- /var/tmp/diff_new_pack.VYwV20/_old 2018-08-15 10:30:21.919418230 +0200
+++ /var/tmp/diff_new_pack.VYwV20/_new 2018-08-15 10:30:21.923418238 +0200
@@ -1,4 +1,4 @@
-From e8ec9ebc856b19cb598b43ead231188ed1fc6059 Mon Sep 17 00:00:00 2001
+From 35ff4045ae70674705a9a73d287801fec6dbe3b6 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Andreas=20F=C3=A4rber?=
Date: Thu, 24 Sep 2015 19:24:23 +0200
Subject: [PATCH] test-string-input-visitor: Add uint64 test
++++++ 0030-tests-Add-QOM-property-unit-tests.patch ++++++
--- /var/tmp/diff_new_pack.VYwV20/_old 2018-08-15 10:30:21.935418259 +0200
+++ /var/tmp/diff_new_pack.VYwV20/_new 2018-08-15 10:30:21.935418259 +0200
@@ -1,4 +1,4 @@
-From b807b462563cfc7c921b63000b94e666f93e2cd5 Mon Sep 17 00:00:00 2001
+From ac3be2e198d0651911efe748d66b03fcb1729ed9 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Andreas=20F=C3=A4rber?=
Date: Sun, 6 Sep 2015 20:12:42 +0200
Subject: [PATCH] tests: Add QOM property unit tests
@@ -16,7 +16,7 @@
3 files changed, 126 insertions(+)
diff --git a/MAINTAINERS b/MAINTAINERS
-index 24b70169bc..97a12a92fa 100644
+index ada7c33485..fa02f8d7bb 100644
--- a/MAINTAINERS
+++ b/MAINTAINERS
@@ -1619,6 +1619,7 @@ F: qom/
++++++ 0031-tests-Add-scsi-disk-test.patch ++++++
--- /var/tmp/diff_new_pack.VYwV20/_old 2018-08-15 10:30:21.943418274 +0200
+++ /var/tmp/diff_new_pack.VYwV20/_new 2018-08-15 10:30:21.943418274 +0200
@@ -1,4 +1,4 @@
-From 0c1511f2e47617d012d1ec548cd0349e946cec57 Mon Sep 17 00:00:00 2001
+From 94dfb04c2d225bd3805043f5ad1372a9bdfea0a1 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Andreas=20F=C3=A4rber?=
Date: Fri, 25 Sep 2015 12:31:11 +0200
Subject: [PATCH] tests: Add scsi-disk test
@@ -19,7 +19,7 @@
3 files changed, 87 insertions(+)
diff --git a/MAINTAINERS b/MAINTAINERS
-index 97a12a92fa..3546001872 100644
+index fa02f8d7bb..a01f9d3c20 100644
--- a/MAINTAINERS
+++ b/MAINTAINERS
@@ -1093,6 +1093,7 @@ R: Fam Zheng
++++++ 0032-Switch-order-of-libraries-for-mpath.patch ++++++
--- /var/tmp/diff_new_pack.VYwV20/_old 2018-08-15 10:30:21.951418288 +0200
+++ /var/tmp/diff_new_pack.VYwV20/_new 2018-08-15 10:30:21.971418324 +0200
@@ -1,4 +1,4 @@
-From 2de59e4c15255acdf0ee171287f230eb18937b96 Mon Sep 17 00:00:00 2001
+From fd50e2e8a90887300e49d50863bff64a116f93b8 Mon Sep 17 00:00:00 2001
From: Bruce Rogers
Date: Fri, 3 Nov 2017 11:12:40 -0600
Subject: [PATCH] Switch order of libraries for mpath support
@@ -23,10 +23,10 @@
qemu-img-cmds.h: $(SRC_PATH)/qemu-img-cmds.hx $(SRC_PATH)/scripts/hxtool
diff --git a/configure b/configure
-index 0a19b033bc..e84dce857d 100755
+index 457684a7e6..96edba0aed 100755
--- a/configure
+++ b/configure
-@@ -3486,7 +3486,7 @@ int main(void) {
+@@ -3488,7 +3488,7 @@ int main(void) {
return 0;
}
EOF
++++++ 0033-Make-installed-scripts-explicitly-p.patch ++++++
--- /var/tmp/diff_new_pack.VYwV20/_old 2018-08-15 10:30:21.975418331 +0200
+++ /var/tmp/diff_new_pack.VYwV20/_new 2018-08-15 10:30:21.975418331 +0200
@@ -1,4 +1,4 @@
-From 6c1e821ec978e2b61dd9527565b3635d04fb52ef Mon Sep 17 00:00:00 2001
+From a2df489a5073322fd0eec514e59cde6e7788e845 Mon Sep 17 00:00:00 2001
From: Bruce Rogers
Date: Thu, 25 Jan 2018 14:16:10 -0700
Subject: [PATCH] Make installed scripts explicitly python2
++++++ 0034-migration-warn-about-inconsistent-s.patch ++++++
--- /var/tmp/diff_new_pack.VYwV20/_old 2018-08-15 10:30:21.991418360 +0200
+++ /var/tmp/diff_new_pack.VYwV20/_new 2018-08-15 10:30:21.995418368 +0200
@@ -1,4 +1,4 @@
-From 431c431cf4cb7cf068a9916934199a5b82a82197 Mon Sep 17 00:00:00 2001
+From c82bb4d1c7daf2c41d3a7e6d44f26cab65b138f9 Mon Sep 17 00:00:00 2001
From: Bruce Rogers
Date: Wed, 21 Feb 2018 14:00:52 -0700
Subject: [PATCH] migration: warn about inconsistent spec_ctrl state
@@ -22,10 +22,10 @@
3 files changed, 21 insertions(+)
diff --git a/cpus.c b/cpus.c
-index 38eba8bff3..ef39603cf9 100644
+index 6fa701e423..b57038fda5 100644
--- a/cpus.c
+++ b/cpus.c
-@@ -2312,6 +2312,18 @@ exit:
+@@ -2326,6 +2326,18 @@ exit:
fclose(f);
}
++++++ 0035-smbios-Add-1-terminator-if-any-stri.patch ++++++
--- /var/tmp/diff_new_pack.VYwV20/_old 2018-08-15 10:30:22.019418411 +0200
+++ /var/tmp/diff_new_pack.VYwV20/_new 2018-08-15 10:30:22.019418411 +0200
@@ -1,4 +1,4 @@
-From 8a173a95df291b47ba4449a4452a043347f986ec Mon Sep 17 00:00:00 2001
+From 01bcb184df242a24536a42d4dc5ef1443659e372 Mon Sep 17 00:00:00 2001
From: Lin Ma
Date: Wed, 14 Mar 2018 14:31:26 +0800
Subject: [PATCH] smbios: Add 1 terminator if any string fields defined in
++++++ 0036-configure-Modify-python-used-for-io.patch ++++++
--- /var/tmp/diff_new_pack.VYwV20/_old 2018-08-15 10:30:22.027418425 +0200
+++ /var/tmp/diff_new_pack.VYwV20/_new 2018-08-15 10:30:22.027418425 +0200
@@ -1,4 +1,4 @@
-From d2c41deb233a86e4dc4e512f54613828197e6ced Mon Sep 17 00:00:00 2001
+From 6fc40e2e4fd28137984e26595214f86542237e1f Mon Sep 17 00:00:00 2001
From: Bruce Rogers
Date: Fri, 6 Apr 2018 09:21:56 -0600
Subject: [PATCH] configure: Modify python used for io tests
@@ -12,10 +12,10 @@
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/configure b/configure
-index e84dce857d..a0e53bffc7 100755
+index 96edba0aed..9f54af3811 100755
--- a/configure
+++ b/configure
-@@ -7188,7 +7188,7 @@ iotests_check="tests/qemu-iotests/check"
+@@ -7190,7 +7190,7 @@ iotests_check="tests/qemu-iotests/check"
echo "# Automatically generated by configure - do not modify" > "$iotests_common_env"
echo >> "$iotests_common_env"
++++++ 0037-qemu-io-tests-comment-out-problemat.patch ++++++
--- /var/tmp/diff_new_pack.VYwV20/_old 2018-08-15 10:30:22.047418462 +0200
+++ /var/tmp/diff_new_pack.VYwV20/_new 2018-08-15 10:30:22.051418469 +0200
@@ -1,4 +1,4 @@
-From 537712ba25f699b883e48bd56a8e06b5f90753f0 Mon Sep 17 00:00:00 2001
+From 98e7409be18fc3f5be3abef72a7ecdc5b4b6cb44 Mon Sep 17 00:00:00 2001
From: Bruce Rogers
Date: Fri, 6 Apr 2018 13:33:31 -0600
Subject: [PATCH] qemu-io tests: comment out problematic block io tests issues
@@ -14,7 +14,7 @@
1 file changed, 3 insertions(+), 3 deletions(-)
diff --git a/tests/qemu-iotests/group b/tests/qemu-iotests/group
-index 52a80f3f9e..16f248fca2 100644
+index 6bb961f4a4..f0f0fa67c3 100644
--- a/tests/qemu-iotests/group
+++ b/tests/qemu-iotests/group
@@ -136,7 +136,7 @@
++++++ 0038-tests-test-thread-pool-is-racy-add-.patch ++++++
--- /var/tmp/diff_new_pack.VYwV20/_old 2018-08-15 10:30:22.071418505 +0200
+++ /var/tmp/diff_new_pack.VYwV20/_new 2018-08-15 10:30:22.083418527 +0200
@@ -1,4 +1,4 @@
-From d8e65a001a16d3a46cd7b7f983e9c018edc735b6 Mon Sep 17 00:00:00 2001
+From c08a2b4509e471944ab27e31d8cf2592eaf74611 Mon Sep 17 00:00:00 2001
From: Bruce Rogers
Date: Fri, 13 Apr 2018 11:46:47 -0600
Subject: [PATCH] tests: test-thread-pool is racy - add some barriers
++++++ 0057-blockjob-Fix-assertion-in-block_job.patch -> 0039-blockjob-Fix-assertion-in-block_job.patch ++++++
--- /work/SRC/openSUSE:Factory/qemu/0057-blockjob-Fix-assertion-in-block_job.patch 2018-07-13 10:16:10.398085951 +0200
+++ /work/SRC/openSUSE:Factory/.qemu.new/0039-blockjob-Fix-assertion-in-block_job.patch 2018-08-15 10:30:16.963409280 +0200
@@ -1,4 +1,4 @@
-From 4f38141a30b761f064cbd636f1818f9d174592c2 Mon Sep 17 00:00:00 2001
+From 7369fc58700028a5ce4d91676a88a1b05f9179b1 Mon Sep 17 00:00:00 2001
From: Kevin Wolf
Date: Tue, 8 May 2018 11:55:30 +0200
Subject: [PATCH] blockjob: Fix assertion in block_job_finalize()
++++++ 0066-xen-add-block-resize-support-for-xe.patch -> 0040-xen-add-block-resize-support-for-xe.patch ++++++
--- /work/SRC/openSUSE:Factory/qemu/0066-xen-add-block-resize-support-for-xe.patch 2018-07-13 10:16:10.854086490 +0200
+++ /work/SRC/openSUSE:Factory/.qemu.new/0040-xen-add-block-resize-support-for-xe.patch 2018-08-15 10:30:16.979409309 +0200
@@ -1,4 +1,4 @@
-From 00ff3002e7f7a83ee977196f785f59a7425c0b72 Mon Sep 17 00:00:00 2001
+From 0cfb8139037fde82de1263951c8c1ce8d4c2592c Mon Sep 17 00:00:00 2001
From: Bruce Rogers
Date: Fri, 8 Jun 2018 11:04:36 -0600
Subject: [PATCH] xen: add block resize support for xen disks
++++++ 0067-seccomp-allow-sched_setscheduler-wi.patch -> 0041-seccomp-allow-sched_setscheduler-wi.patch ++++++
--- /work/SRC/openSUSE:Factory/qemu/0067-seccomp-allow-sched_setscheduler-wi.patch 2018-08-03 12:30:30.630967475 +0200
+++ /work/SRC/openSUSE:Factory/.qemu.new/0041-seccomp-allow-sched_setscheduler-wi.patch 2018-08-15 10:30:16.991409331 +0200
@@ -1,4 +1,4 @@
-From 88a1488c572c681f9737bd3e3ae24e9a3c936212 Mon Sep 17 00:00:00 2001
+From 7ce038453d10846a02f693ca2ef83eaf9c42f2b9 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Marc-Andr=C3=A9=20Lureau?=
Date: Tue, 10 Jul 2018 16:55:57 +0200
Subject: [PATCH] seccomp: allow sched_setscheduler() with SCHED_IDLE policy
@@ -20,7 +20,7 @@
Signed-off-by: Marc-André Lureau
Acked-by: Eduardo Otubo
(cherry picked from commit 056de1e894155fbb99e7b43c1c4382d4920cf437)
-[LD: BSD#1102627]
+[LD: BSC#1102627]
Signed-off-by: Larry Dewey
---
qemu-seccomp.c | 12 ++++++++++--
++++++ qemu-2.12.0.tar.xz -> qemu-2.12.1.tar.xz ++++++
/work/SRC/openSUSE:Factory/qemu/qemu-2.12.0.tar.xz /work/SRC/openSUSE:Factory/.qemu.new/qemu-2.12.1.tar.xz differ: char 26, line 1
++++++ qemu-linux-user.spec.in ++++++
--- /var/tmp/diff_new_pack.VYwV20/_old 2018-08-15 10:30:22.339418989 +0200
+++ /var/tmp/diff_new_pack.VYwV20/_new 2018-08-15 10:30:22.339418989 +0200
@@ -19,11 +19,11 @@
Name: qemu-linux-user
Url: http://www.qemu.org/
Summary: CPU emulator for user space
-License: BSD-3-Clause AND GPL-2.0 AND GPL-2.0+ AND LGPL-2.1+ AND MIT
+License: BSD-3-Clause AND GPL-2.0-only AND GPL-2.0-or-later AND LGPL-2.1-or-later AND MIT
Group: System/Emulators/PC
QEMU_VERSION
Release: 0
-Source: qemu-2.12.0.tar.xz
+Source: qemu-2.12.1.tar.xz
# Upstream First -- http://wiki.qemu-project.org/Contribute/SubmitAPatch
# This patch queue is auto-generated from https://github.com/openSUSE/qemu
PATCH_FILES
@@ -59,7 +59,7 @@
syscall layer occurs on the native hardware and operating system.
%prep
-%setup -q -n qemu-2.12.0
+%setup -q -n qemu-2.12.1
PATCH_EXEC
%build
++++++ qemu.spec.in ++++++
--- /var/tmp/diff_new_pack.VYwV20/_old 2018-08-15 10:30:22.375419054 +0200
+++ /var/tmp/diff_new_pack.VYwV20/_new 2018-08-15 10:30:22.375419054 +0200
@@ -107,12 +107,12 @@
Name: qemu
Url: http://www.qemu.org/
Summary: Machine emulator and virtualizer
-License: BSD-3-Clause AND GPL-2.0 AND GPL-2.0+ AND LGPL-2.1+ AND MIT
+License: BSD-3-Clause AND GPL-2.0-only AND GPL-2.0-or-later AND LGPL-2.1-or-later AND MIT
Group: System/Emulators/PC
QEMU_VERSION
Release: 0
-Source: http://wiki.qemu.org/download/qemu-2.12.0.tar.xz
-Source99: http://wiki.qemu.org/download/qemu-2.12.0.tar.xz.sig
+Source: http://wiki.qemu.org/download/qemu-2.12.1.tar.xz
+Source99: http://wiki.qemu.org/download/qemu-2.12.1.tar.xz.sig
Source1: 80-kvm.rules
Source2: qemu-ifup
Source3: kvm_stat
@@ -142,7 +142,6 @@
Patch1100: seabios-use-python2-explicitly-as-needed.patch
Patch1101: seabios-switch-to-python3-as-needed.patch
-
# ipxe
# PATCH-FIX-OPENSUSE ipxe-stable-buildid.patch brogers@suse.com -- reproducible builds
Patch1200: ipxe-stable-buildid.patch
@@ -156,7 +155,7 @@
# SLOF (Currently no patches)
-# skiboot (Currently no patches)
+# skiboot
Patch1500: skiboot-hdata-i2c.c-fix-building-with-gcc8.patch
# ui/keycodemapdb (Currently no patches)
@@ -801,7 +800,7 @@
%endif # !qemu-testsuite
%prep
-%setup -q -n qemu-2.12.0
+%setup -q -n qemu-2.12.1
PATCH_EXEC
%if 0%{?suse_version} > 1320
++++++ update_git.sh ++++++
--- /var/tmp/diff_new_pack.VYwV20/_old 2018-08-15 10:30:22.459419206 +0200
+++ /var/tmp/diff_new_pack.VYwV20/_new 2018-08-15 10:30:22.459419206 +0200
@@ -14,7 +14,7 @@
GIT_TREE=git://github.com/openSUSE/qemu.git
GIT_LOCAL_TREE=~/git/qemu-opensuse
GIT_BRANCH=opensuse-2.12
-GIT_UPSTREAM_TAG=v2.12.0
+GIT_UPSTREAM_TAG=v2.12.1
GIT_DIR=/dev/shm/qemu-factory-git-dir
CMP_DIR=/dev/shm/qemu-factory-cmp-dir
@@ -156,6 +156,8 @@
if [ "$1" = "-f" ]; then
echo "running osc service to format spec file"
osc service localrun format_spec_file
+else
+ echo "note: not running osc format_spec_file service. If desired, pass -f"
fi
/bin/sh pre_checkin.sh -q