From b7e7197ae1e50f7f8af48d8818d699e7e1a50bc860b3a8a6af8d78fbda70489b Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Andreas=20F=C3=A4rber?= Date: Thu, 6 Sep 2012 00:28:20 +0000 Subject: [PATCH] Accepting request 132876 from home:a_faerber:branches:Virtualization Update to v1.2.0 OBS-URL: https://build.opensuse.org/request/show/132876 OBS-URL: https://build.opensuse.org/package/show/Virtualization/qemu?expand=0&rev=107 --- ...-Handle-CPU-interrupts-by-inline-che.patch | 2 +- ...-XXX-dont-dump-core-on-sigabort.patc.patch | 2 +- ...-XXX-work-around-SA_RESTART-race-wit.patch | 2 +- 0004-qemu-0.9.0.cvs-binfmt.patch.patch | 2 +- 0005-qemu-cvs-alsa_bitfield.patch.patch | 2 +- 0006-qemu-cvs-alsa_ioctl.patch.patch | 2 +- 0007-qemu-cvs-alsa_mmap.patch.patch | 2 +- 0008-qemu-cvs-gettimeofday.patch.patch | 2 +- 0009-qemu-cvs-ioctl_debug.patch.patch | 2 +- 0010-qemu-cvs-ioctl_nodirection.patch.patch | 2 +- ...-block-vmdk-Support-creation-of-SCSI.patch | 2 +- ...-configure-Enable-mipsn32-linux-user.patch | 2 +- ...-linux-user-add-binfmt-wrapper-for-a.patch | 2 +- ...-linux-user-Ignore-timer_create-sysc.patch | 2 +- ...-linux-user-be-silent-about-capget-f.patch | 2 +- ...-PPC-KVM-Disable-mmu-notifier-check..patch | 2 +- ...-linux-user-fix-segfault-deadlock.pa.patch | 2 +- ...-linux-user-binfmt-support-host-bina.patch | 2 +- ...-linux-user-arm-no-tb_flush-on-reset.patch | 2 +- ...-linux-user-fix-multi-threaded-proc-.patch | 2 +- ...-use-libexecdir-instead-of-ignoring-.patch | 2 +- ...-linux-user-Ignore-broken-loop-ioctl.patch | 2 +- ...-linux-user-fix-segmentation-fault-p.patch | 2 +- 0024-linux-user-lock-tcg.patch.patch | 2 +- ...-linux-user-Run-multi-threaded-code-.patch | 2 +- ...-linux-user-lock-tb-flushing-too.pat.patch | 2 +- 0027-linux-user-Fake-proc-cpuinfo.patch.patch | 2 +- ...-linux-user-implement-FS_IOC_GETFLAG.patch | 2 +- ...-linux-user-implement-FS_IOC_SETFLAG.patch | 2 +- 0030-linux-user-fix-statfs.patch.patch | 2 +- ...-linux-user-XXX-disable-fiemap.patch.patch | 2 +- 0032-slirp-nooutgoing.patch.patch | 2 +- ...-vnc-password-file-and-incoming-conn.patch | 2 +- ...-console-bounds-check-whenever-chang.patch | 126 ------------------ qemu-1.2.0-rc3.tar.bz2 | 3 - qemu-1.2.0.tar.bz2 | 3 + qemu.changes | 7 + qemu.spec | 8 +- qemu.spec.in | 6 +- update_git.sh | 2 +- 40 files changed, 50 insertions(+), 171 deletions(-) delete mode 100644 0034-console-bounds-check-whenever-chang.patch delete mode 100644 qemu-1.2.0-rc3.tar.bz2 create mode 100644 qemu-1.2.0.tar.bz2 diff --git a/0001-Handle-CPU-interrupts-by-inline-che.patch b/0001-Handle-CPU-interrupts-by-inline-che.patch index eaa22684..a5eb5e29 100644 --- a/0001-Handle-CPU-interrupts-by-inline-che.patch +++ b/0001-Handle-CPU-interrupts-by-inline-che.patch @@ -1,4 +1,4 @@ -From b86973fedcaf5dc9d63e0eb3e6cc14053233ec63 Mon Sep 17 00:00:00 2001 +From 2cd9bcd07f83ae11c02b2e12eb4b4d743dca777a Mon Sep 17 00:00:00 2001 From: Peter Maydell Date: Wed, 5 Oct 2011 10:04:02 +0100 Subject: [PATCH] Handle CPU interrupts by inline checking of a flag diff --git a/0002-XXX-dont-dump-core-on-sigabort.patc.patch b/0002-XXX-dont-dump-core-on-sigabort.patc.patch index 22ef934b..c34447ea 100644 --- a/0002-XXX-dont-dump-core-on-sigabort.patc.patch +++ b/0002-XXX-dont-dump-core-on-sigabort.patc.patch @@ -1,4 +1,4 @@ -From fcb651f1c440e8ddd08d4b648f9e133f5192ce22 Mon Sep 17 00:00:00 2001 +From ed58a0a90acc2299a306080d356095a0978bca91 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 diff --git a/0003-XXX-work-around-SA_RESTART-race-wit.patch b/0003-XXX-work-around-SA_RESTART-race-wit.patch index 27fa01e5..6ac80f2b 100644 --- a/0003-XXX-work-around-SA_RESTART-race-wit.patch +++ b/0003-XXX-work-around-SA_RESTART-race-wit.patch @@ -1,4 +1,4 @@ -From 4de56c28e769d5cd0ee76994a0df31192ed1d7a1 Mon Sep 17 00:00:00 2001 +From 484a06c7e009880519d417c3b72e7170563ea36d Mon Sep 17 00:00:00 2001 From: Alexander Graf Date: Thu, 1 Dec 2011 19:00:01 +0100 Subject: [PATCH] XXX work around SA_RESTART race with boehm-gc (ARM only) diff --git a/0004-qemu-0.9.0.cvs-binfmt.patch.patch b/0004-qemu-0.9.0.cvs-binfmt.patch.patch index 53b01e2f..d1924bf9 100644 --- a/0004-qemu-0.9.0.cvs-binfmt.patch.patch +++ b/0004-qemu-0.9.0.cvs-binfmt.patch.patch @@ -1,4 +1,4 @@ -From 9256544290b6bb2cb0f103ab6e3ccb1f8d2ba8c3 Mon Sep 17 00:00:00 2001 +From b0fd82b0d90efb977b62491733361ea2466d1753 Mon Sep 17 00:00:00 2001 From: Ulrich Hecht Date: Tue, 14 Apr 2009 16:18:44 +0200 Subject: [PATCH] qemu-0.9.0.cvs-binfmt diff --git a/0005-qemu-cvs-alsa_bitfield.patch.patch b/0005-qemu-cvs-alsa_bitfield.patch.patch index 4e7a5534..e268c550 100644 --- a/0005-qemu-cvs-alsa_bitfield.patch.patch +++ b/0005-qemu-cvs-alsa_bitfield.patch.patch @@ -1,4 +1,4 @@ -From aac0fcf1caa161c2252199bf7adbb5ed133793a5 Mon Sep 17 00:00:00 2001 +From 6d14e9d5678e7c6e7aa051777730b164d510341e Mon Sep 17 00:00:00 2001 From: Alexander Graf Date: Tue, 14 Apr 2009 16:20:50 +0200 Subject: [PATCH] qemu-cvs-alsa_bitfield diff --git a/0006-qemu-cvs-alsa_ioctl.patch.patch b/0006-qemu-cvs-alsa_ioctl.patch.patch index 781f5202..992167f0 100644 --- a/0006-qemu-cvs-alsa_ioctl.patch.patch +++ b/0006-qemu-cvs-alsa_ioctl.patch.patch @@ -1,4 +1,4 @@ -From 70d857bf30544f31a4fced198a7dc7dd7ac9e1fe Mon Sep 17 00:00:00 2001 +From 9723717ddf7d021c368be04f2e160156d8ed8031 Mon Sep 17 00:00:00 2001 From: Alexander Graf Date: Tue, 14 Apr 2009 16:23:27 +0200 Subject: [PATCH] qemu-cvs-alsa_ioctl diff --git a/0007-qemu-cvs-alsa_mmap.patch.patch b/0007-qemu-cvs-alsa_mmap.patch.patch index ab637abe..2b0bbc40 100644 --- a/0007-qemu-cvs-alsa_mmap.patch.patch +++ b/0007-qemu-cvs-alsa_mmap.patch.patch @@ -1,4 +1,4 @@ -From 414a5cb3b7f83dbba5800ff761a78a72e6c81de2 Mon Sep 17 00:00:00 2001 +From 75938d42711c299d319a16d54942a439ef2abac4 Mon Sep 17 00:00:00 2001 From: Alexander Graf Date: Tue, 14 Apr 2009 16:24:15 +0200 Subject: [PATCH] qemu-cvs-alsa_mmap diff --git a/0008-qemu-cvs-gettimeofday.patch.patch b/0008-qemu-cvs-gettimeofday.patch.patch index 2b39c2af..47725199 100644 --- a/0008-qemu-cvs-gettimeofday.patch.patch +++ b/0008-qemu-cvs-gettimeofday.patch.patch @@ -1,4 +1,4 @@ -From 04dfbd49b4b4a31138327793bcf079c01d07d53a Mon Sep 17 00:00:00 2001 +From e21969aab220744e0412c51a46e685d593dde832 Mon Sep 17 00:00:00 2001 From: Ulrich Hecht Date: Tue, 14 Apr 2009 16:25:41 +0200 Subject: [PATCH] qemu-cvs-gettimeofday diff --git a/0009-qemu-cvs-ioctl_debug.patch.patch b/0009-qemu-cvs-ioctl_debug.patch.patch index 90c2a09b..957f2080 100644 --- a/0009-qemu-cvs-ioctl_debug.patch.patch +++ b/0009-qemu-cvs-ioctl_debug.patch.patch @@ -1,4 +1,4 @@ -From 1b36768d9012c5045cf44448c40618ea99bcc676 Mon Sep 17 00:00:00 2001 +From a28ad521ee4977748b405b7fbad25f686728d78a 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 diff --git a/0010-qemu-cvs-ioctl_nodirection.patch.patch b/0010-qemu-cvs-ioctl_nodirection.patch.patch index 6d67e75b..d7ad544a 100644 --- a/0010-qemu-cvs-ioctl_nodirection.patch.patch +++ b/0010-qemu-cvs-ioctl_nodirection.patch.patch @@ -1,4 +1,4 @@ -From e8fac1a0088a3dc35bf87ba01e5d7b79441a7519 Mon Sep 17 00:00:00 2001 +From 7732c5e1c49ffe35d73eed9a23a3b6fa603d8573 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 diff --git a/0011-block-vmdk-Support-creation-of-SCSI.patch b/0011-block-vmdk-Support-creation-of-SCSI.patch index f434bc6b..b11675dd 100644 --- a/0011-block-vmdk-Support-creation-of-SCSI.patch +++ b/0011-block-vmdk-Support-creation-of-SCSI.patch @@ -1,4 +1,4 @@ -From d009c84ae2dfa94b4d6257a80153970b4d0f1e3b Mon Sep 17 00:00:00 2001 +From c6a8d6d888cacb6e480539f0b2ffbac84d937845 Mon Sep 17 00:00:00 2001 From: Ulrich Hecht Date: Tue, 14 Apr 2009 16:37:42 +0200 Subject: [PATCH] block/vmdk: Support creation of SCSI VMDK images in qemu-img diff --git a/0012-configure-Enable-mipsn32-linux-user.patch b/0012-configure-Enable-mipsn32-linux-user.patch index dc2b646d..0d501669 100644 --- a/0012-configure-Enable-mipsn32-linux-user.patch +++ b/0012-configure-Enable-mipsn32-linux-user.patch @@ -1,4 +1,4 @@ -From 4d6b5adbac7c86e1f4491a1c9c80ad0fe7fb8684 Mon Sep 17 00:00:00 2001 +From c70851ae29a0c9c6671c1c0c813e043d6468f3b2 Mon Sep 17 00:00:00 2001 From: Ulrich Hecht Date: Wed, 25 Aug 2010 14:23:43 +0200 Subject: [PATCH] configure: Enable mipsn32*-linux-user builds diff --git a/0013-linux-user-add-binfmt-wrapper-for-a.patch b/0013-linux-user-add-binfmt-wrapper-for-a.patch index 30a5ba1e..6be4233d 100644 --- a/0013-linux-user-add-binfmt-wrapper-for-a.patch +++ b/0013-linux-user-add-binfmt-wrapper-for-a.patch @@ -1,4 +1,4 @@ -From fe2e852651db0905c24d2c9f8f67b1f117d6cc49 Mon Sep 17 00:00:00 2001 +From b7af750752167f3288ff3c8c94f6228964a37b26 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 diff --git a/0014-linux-user-Ignore-timer_create-sysc.patch b/0014-linux-user-Ignore-timer_create-sysc.patch index f7e1a656..4493a77a 100644 --- a/0014-linux-user-Ignore-timer_create-sysc.patch +++ b/0014-linux-user-Ignore-timer_create-sysc.patch @@ -1,4 +1,4 @@ -From 134ee32b68ff8d6c36fe57ba61ed71b8b6afb9b3 Mon Sep 17 00:00:00 2001 +From af1996be2ec3451ba2a50e079328916a5f4f2db0 Mon Sep 17 00:00:00 2001 From: Alexander Graf Date: Sun, 11 Dec 2011 01:19:24 +0100 Subject: [PATCH] linux-user: Ignore timer_create syscall diff --git a/0015-linux-user-be-silent-about-capget-f.patch b/0015-linux-user-be-silent-about-capget-f.patch index 3919a932..178d0373 100644 --- a/0015-linux-user-be-silent-about-capget-f.patch +++ b/0015-linux-user-be-silent-about-capget-f.patch @@ -1,4 +1,4 @@ -From 2f3a0dcdbeb25946e1a5b3ee99a149d5b9a65d91 Mon Sep 17 00:00:00 2001 +From f8f3c9eae7186bd49662efda635be42186d19f0e Mon Sep 17 00:00:00 2001 From: Alexander Graf Date: Sun, 11 Dec 2011 01:21:51 +0100 Subject: [PATCH] linux-user: be silent about capget failures diff --git a/0016-PPC-KVM-Disable-mmu-notifier-check..patch b/0016-PPC-KVM-Disable-mmu-notifier-check..patch index 736822f3..681fc38b 100644 --- a/0016-PPC-KVM-Disable-mmu-notifier-check..patch +++ b/0016-PPC-KVM-Disable-mmu-notifier-check..patch @@ -1,4 +1,4 @@ -From 63b00ae3e995042b79461eda870bdb0280edf348 Mon Sep 17 00:00:00 2001 +From ce883e32df0e52395c5df74364e424c255657a64 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 diff --git a/0017-linux-user-fix-segfault-deadlock.pa.patch b/0017-linux-user-fix-segfault-deadlock.pa.patch index ffa7bfdd..746b58f5 100644 --- a/0017-linux-user-fix-segfault-deadlock.pa.patch +++ b/0017-linux-user-fix-segfault-deadlock.pa.patch @@ -1,4 +1,4 @@ -From c45fab93fd75e8e2e1e468e1c1e1400923a57d04 Mon Sep 17 00:00:00 2001 +From 76d1a76b0286e02aa575faad3556f73481ade1b2 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 diff --git a/0018-linux-user-binfmt-support-host-bina.patch b/0018-linux-user-binfmt-support-host-bina.patch index 73f3a762..74dfb2b6 100644 --- a/0018-linux-user-binfmt-support-host-bina.patch +++ b/0018-linux-user-binfmt-support-host-bina.patch @@ -1,4 +1,4 @@ -From 7cc9578f1c652d52dd2917cd9fdeb8cacaeb5d58 Mon Sep 17 00:00:00 2001 +From 0ab4e7c155b5b5bc60fab22581480f50b100c6d7 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 diff --git a/0019-linux-user-arm-no-tb_flush-on-reset.patch b/0019-linux-user-arm-no-tb_flush-on-reset.patch index e86885a2..b069012f 100644 --- a/0019-linux-user-arm-no-tb_flush-on-reset.patch +++ b/0019-linux-user-arm-no-tb_flush-on-reset.patch @@ -1,4 +1,4 @@ -From 773935ea25dcd118931d6dbbd0b78be28a983a3f Mon Sep 17 00:00:00 2001 +From 3003a3645ad1ab3b81fe3cc33020edbc3c4d04c4 Mon Sep 17 00:00:00 2001 From: Alexander Graf Date: Tue, 29 May 2012 15:30:01 +0200 Subject: [PATCH] linux-user: arm: no tb_flush on reset diff --git a/0020-linux-user-fix-multi-threaded-proc-.patch b/0020-linux-user-fix-multi-threaded-proc-.patch index b227ebeb..d3c39a73 100644 --- a/0020-linux-user-fix-multi-threaded-proc-.patch +++ b/0020-linux-user-fix-multi-threaded-proc-.patch @@ -1,4 +1,4 @@ -From 6eedf1bd672636c89aa13ec72dc22f60775100bf Mon Sep 17 00:00:00 2001 +From bd56605435341c14ff8fb6194961f3ab7d00cc79 Mon Sep 17 00:00:00 2001 From: Alexander Graf Date: Wed, 30 May 2012 14:40:47 +0200 Subject: [PATCH] linux-user: fix multi-threaded /proc/self/maps diff --git a/0021-use-libexecdir-instead-of-ignoring-.patch b/0021-use-libexecdir-instead-of-ignoring-.patch index 36e3fca3..b82c13c9 100644 --- a/0021-use-libexecdir-instead-of-ignoring-.patch +++ b/0021-use-libexecdir-instead-of-ignoring-.patch @@ -1,4 +1,4 @@ -From f4a56321bd920f280dd05aaf34cc8890b584b7ba Mon Sep 17 00:00:00 2001 +From 50cab0124e30c58c786c181b8b1909c659a7d458 Mon Sep 17 00:00:00 2001 From: Michael Tokarev Date: Thu, 7 Jun 2012 01:11:00 +0400 Subject: [PATCH] use --libexecdir instead of ignoring it first and diff --git a/0022-linux-user-Ignore-broken-loop-ioctl.patch b/0022-linux-user-Ignore-broken-loop-ioctl.patch index 400eebf4..1cf95585 100644 --- a/0022-linux-user-Ignore-broken-loop-ioctl.patch +++ b/0022-linux-user-Ignore-broken-loop-ioctl.patch @@ -1,4 +1,4 @@ -From 4eb267d12db35359655f6661733536daa3e329e7 Mon Sep 17 00:00:00 2001 +From 220524131e4a49e2605d1f32eef7856e87f9e6ca Mon Sep 17 00:00:00 2001 From: Alexander Graf Date: Tue, 12 Jun 2012 04:41:10 +0200 Subject: [PATCH] linux-user: Ignore broken loop ioctl diff --git a/0023-linux-user-fix-segmentation-fault-p.patch b/0023-linux-user-fix-segmentation-fault-p.patch index ab36830c..c8735931 100644 --- a/0023-linux-user-fix-segmentation-fault-p.patch +++ b/0023-linux-user-fix-segmentation-fault-p.patch @@ -1,4 +1,4 @@ -From 5b5da5874c68710642aa30496e1552baa40368dd Mon Sep 17 00:00:00 2001 +From 15d8143262362abfe31588500946d49eb27f9d99 Mon Sep 17 00:00:00 2001 From: Alexander Graf Date: Mon, 25 Jun 2012 19:02:32 +0200 Subject: [PATCH] linux-user: fix segmentation fault passing with g2h(x) != x diff --git a/0024-linux-user-lock-tcg.patch.patch b/0024-linux-user-lock-tcg.patch.patch index 00e2edbd..ee35175a 100644 --- a/0024-linux-user-lock-tcg.patch.patch +++ b/0024-linux-user-lock-tcg.patch.patch @@ -1,4 +1,4 @@ -From a9476084ee13b6e263c734d7d7412f4a0f0b05be Mon Sep 17 00:00:00 2001 +From 7b0143c4d7b4db4d0abe3965a4005aea661adaf2 Mon Sep 17 00:00:00 2001 From: Alexander Graf Date: Thu, 5 Jul 2012 17:31:39 +0200 Subject: [PATCH] linux-user: lock tcg diff --git a/0025-linux-user-Run-multi-threaded-code-.patch b/0025-linux-user-Run-multi-threaded-code-.patch index 0918be9f..874e63d1 100644 --- a/0025-linux-user-Run-multi-threaded-code-.patch +++ b/0025-linux-user-Run-multi-threaded-code-.patch @@ -1,4 +1,4 @@ -From c1e14f5765b50d0b0a2067a5b034dbccc90bf1ca Mon Sep 17 00:00:00 2001 +From 04335a4529058c0a9a5821807291ef731716d222 Mon Sep 17 00:00:00 2001 From: Alexander Graf Date: Tue, 10 Jul 2012 20:40:55 +0200 Subject: [PATCH] linux-user: Run multi-threaded code on a single core diff --git a/0026-linux-user-lock-tb-flushing-too.pat.patch b/0026-linux-user-lock-tb-flushing-too.pat.patch index 90985713..f4ee0a8a 100644 --- a/0026-linux-user-lock-tb-flushing-too.pat.patch +++ b/0026-linux-user-lock-tb-flushing-too.pat.patch @@ -1,4 +1,4 @@ -From 257baa7a7d4c7ca84600f3214d7f5dc293d60ea4 Mon Sep 17 00:00:00 2001 +From 65070d242a976097ec3b3b7ee788a1d36fab9c79 Mon Sep 17 00:00:00 2001 From: Alexander Graf Date: Wed, 11 Jul 2012 16:47:42 +0200 Subject: [PATCH] linux-user: lock tb flushing too diff --git a/0027-linux-user-Fake-proc-cpuinfo.patch.patch b/0027-linux-user-Fake-proc-cpuinfo.patch.patch index d54a22c2..2bbb798c 100644 --- a/0027-linux-user-Fake-proc-cpuinfo.patch.patch +++ b/0027-linux-user-Fake-proc-cpuinfo.patch.patch @@ -1,4 +1,4 @@ -From 4d6a42dd97068641ad74212a9456b9c9a6a2f754 Mon Sep 17 00:00:00 2001 +From 509cbfc6fe50080a4ee8751596c54ef28af923da 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 diff --git a/0028-linux-user-implement-FS_IOC_GETFLAG.patch b/0028-linux-user-implement-FS_IOC_GETFLAG.patch index 79a8defd..3122b670 100644 --- a/0028-linux-user-implement-FS_IOC_GETFLAG.patch +++ b/0028-linux-user-implement-FS_IOC_GETFLAG.patch @@ -1,4 +1,4 @@ -From 4e8876da88b5749b7dd210676601f7217356e1b0 Mon Sep 17 00:00:00 2001 +From e77d8fc983222a9dec1394d864caf79f386b119a Mon Sep 17 00:00:00 2001 From: Alexander Graf Date: Mon, 20 Aug 2012 00:02:52 +0200 Subject: [PATCH] linux-user: implement FS_IOC_GETFLAGS ioctl diff --git a/0029-linux-user-implement-FS_IOC_SETFLAG.patch b/0029-linux-user-implement-FS_IOC_SETFLAG.patch index f8f3ae19..eeb58458 100644 --- a/0029-linux-user-implement-FS_IOC_SETFLAG.patch +++ b/0029-linux-user-implement-FS_IOC_SETFLAG.patch @@ -1,4 +1,4 @@ -From 2948a837102e3167e1afbfe58a38c9ea2b1fbc22 Mon Sep 17 00:00:00 2001 +From 43841edd5e2c1bfba458b38aa2c9c47b7c9c958b Mon Sep 17 00:00:00 2001 From: Alexander Graf Date: Mon, 20 Aug 2012 00:07:13 +0200 Subject: [PATCH] linux-user: implement FS_IOC_SETFLAGS ioctl diff --git a/0030-linux-user-fix-statfs.patch.patch b/0030-linux-user-fix-statfs.patch.patch index 93550670..ba5c7e00 100644 --- a/0030-linux-user-fix-statfs.patch.patch +++ b/0030-linux-user-fix-statfs.patch.patch @@ -1,4 +1,4 @@ -From 097557f666be4d8c1a5080edf0a1b5fd075fda25 Mon Sep 17 00:00:00 2001 +From d26d1a74112810944a891ad905244b88aa8493f6 Mon Sep 17 00:00:00 2001 From: Alexander Graf Date: Tue, 21 Aug 2012 11:16:06 +0200 Subject: [PATCH] linux-user: fix statfs diff --git a/0031-linux-user-XXX-disable-fiemap.patch.patch b/0031-linux-user-XXX-disable-fiemap.patch.patch index 7f05d9e0..2221619c 100644 --- a/0031-linux-user-XXX-disable-fiemap.patch.patch +++ b/0031-linux-user-XXX-disable-fiemap.patch.patch @@ -1,4 +1,4 @@ -From 8b7e8296ce618d49e6cc2341adb02870129aa1af Mon Sep 17 00:00:00 2001 +From c01c98579c21974e3c5e983c0bc1426d6fdccdce Mon Sep 17 00:00:00 2001 From: Alexander Graf Date: Tue, 21 Aug 2012 14:20:40 +0200 Subject: [PATCH] linux-user: XXX disable fiemap diff --git a/0032-slirp-nooutgoing.patch.patch b/0032-slirp-nooutgoing.patch.patch index 5bb3d791..4abe3fd0 100644 --- a/0032-slirp-nooutgoing.patch.patch +++ b/0032-slirp-nooutgoing.patch.patch @@ -1,4 +1,4 @@ -From d3d407c4b349278a76aa6e70e4eddd2f4d526d77 Mon Sep 17 00:00:00 2001 +From 512ceb1779ce40a1f2a91fad147210bfa5996512 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Andreas=20F=C3=A4rber?= Date: Wed, 29 Aug 2012 18:42:56 +0200 Subject: [PATCH] slirp: -nooutgoing diff --git a/0033-vnc-password-file-and-incoming-conn.patch b/0033-vnc-password-file-and-incoming-conn.patch index 344d7831..5af64175 100644 --- a/0033-vnc-password-file-and-incoming-conn.patch +++ b/0033-vnc-password-file-and-incoming-conn.patch @@ -1,4 +1,4 @@ -From 7a34b5b68be85ba446ff715095e67fba0e80ee07 Mon Sep 17 00:00:00 2001 +From 25c622437e7c59a99e35fe9318cb5ec11c7cff4a Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Andreas=20F=C3=A4rber?= Date: Wed, 29 Aug 2012 20:06:01 +0200 Subject: [PATCH] vnc: password-file= and incoming-connections= diff --git a/0034-console-bounds-check-whenever-chang.patch b/0034-console-bounds-check-whenever-chang.patch deleted file mode 100644 index 9452aa93..00000000 --- a/0034-console-bounds-check-whenever-chang.patch +++ /dev/null @@ -1,126 +0,0 @@ -From 0a57a3cd95bf6b0a3d4764129981f0938dbfaed3 Mon Sep 17 00:00:00 2001 -From: Ian Campbell -Date: Wed, 5 Sep 2012 12:19:51 +0200 -Subject: [PATCH] console: bounds check whenever changing the cursor due to an - escape code -MIME-Version: 1.0 -Content-Type: text/plain; charset=UTF-8 -Content-Transfer-Encoding: 8bit - -This is XSA-17 / CVE-2012-3515 - -Signed-off-by: Ian Campbell -[AF: fixed Coding Style; bnc#777084] -Signed-off-by: Andreas Färber ---- - console.c | 58 +++++++++++++++++++++++++++++----------------------------- - 1 files changed, 29 insertions(+), 29 deletions(-) - -diff --git a/console.c b/console.c -index f5e8814..7fa6516 100644 ---- a/console.c -+++ b/console.c -@@ -850,6 +850,26 @@ static void console_clear_xy(TextConsole *s, int x, int y) - update_xy(s, x, y); - } - -+/* set cursor, checking bounds */ -+static void set_cursor(TextConsole *s, int x, int y) -+{ -+ if (x < 0) { -+ x = 0; -+ } -+ if (y < 0) { -+ y = 0; -+ } -+ if (y >= s->height) { -+ y = s->height - 1; -+ } -+ if (x >= s->width) { -+ x = s->width - 1; -+ } -+ -+ s->x = x; -+ s->y = y; -+} -+ - static void console_putchar(TextConsole *s, int ch) - { - TextCell *c; -@@ -921,7 +941,9 @@ static void console_putchar(TextConsole *s, int ch) - s->esc_params[s->nb_esc_params] * 10 + ch - '0'; - } - } else { -- s->nb_esc_params++; -+ if (s->nb_esc_params < MAX_ESC_PARAMS) { -+ s->nb_esc_params++; -+ } - if (ch == ';') - break; - #ifdef DEBUG_CONSOLE -@@ -935,59 +957,37 @@ static void console_putchar(TextConsole *s, int ch) - if (s->esc_params[0] == 0) { - s->esc_params[0] = 1; - } -- s->y -= s->esc_params[0]; -- if (s->y < 0) { -- s->y = 0; -- } -+ set_cursor(s, s->x, s->y - s->esc_params[0]); - break; - case 'B': - /* move cursor down */ - if (s->esc_params[0] == 0) { - s->esc_params[0] = 1; - } -- s->y += s->esc_params[0]; -- if (s->y >= s->height) { -- s->y = s->height - 1; -- } -+ set_cursor(s, s->x, s->y + s->esc_params[0]); - break; - case 'C': - /* move cursor right */ - if (s->esc_params[0] == 0) { - s->esc_params[0] = 1; - } -- s->x += s->esc_params[0]; -- if (s->x >= s->width) { -- s->x = s->width - 1; -- } -+ set_cursor(s, s->x + s->esc_params[0], s->y); - break; - case 'D': - /* move cursor left */ - if (s->esc_params[0] == 0) { - s->esc_params[0] = 1; - } -- s->x -= s->esc_params[0]; -- if (s->x < 0) { -- s->x = 0; -- } -+ set_cursor(s, s->x - s->esc_params[0], s->y); - break; - case 'G': - /* move cursor to column */ -- s->x = s->esc_params[0] - 1; -- if (s->x < 0) { -- s->x = 0; -- } -+ set_cursor(s, s->esc_params[0] - 1, s->y); - break; - case 'f': - case 'H': - /* move cursor to row, column */ -- s->x = s->esc_params[1] - 1; -- if (s->x < 0) { -- s->x = 0; -- } -- s->y = s->esc_params[0] - 1; -- if (s->y < 0) { -- s->y = 0; -- } -+ set_cursor(s, s->esc_params[1] - 1, s->esc_params[0] - 1); - break; - case 'J': - switch (s->esc_params[0]) { diff --git a/qemu-1.2.0-rc3.tar.bz2 b/qemu-1.2.0-rc3.tar.bz2 deleted file mode 100644 index 74e4c22b..00000000 --- a/qemu-1.2.0-rc3.tar.bz2 +++ /dev/null @@ -1,3 +0,0 @@ -version https://git-lfs.github.com/spec/v1 -oid sha256:53376f8661790a8b0c7de8af73add2e944e3ea56671488e16c782eaed46e24c9 -size 9870152 diff --git a/qemu-1.2.0.tar.bz2 b/qemu-1.2.0.tar.bz2 new file mode 100644 index 00000000..a0a1fbe1 --- /dev/null +++ b/qemu-1.2.0.tar.bz2 @@ -0,0 +1,3 @@ +version https://git-lfs.github.com/spec/v1 +oid sha256:c8b84420d9f4869397f84cad2dabd9a475b7723d619a924a873740353e9df936 +size 9865186 diff --git a/qemu.changes b/qemu.changes index 86311364..7de9d770 100644 --- a/qemu.changes +++ b/qemu.changes @@ -1,3 +1,10 @@ +------------------------------------------------------------------- +Wed Sep 5 17:39:17 UTC 2012 - afaerber@suse.de + +- update to v1.2.0: see http://wiki.qemu.org/ChangeLog/1.2 +* adapt update_git.sh script +* this includes the fix for CVE-2012-3515 + ------------------------------------------------------------------- Wed Sep 5 10:26:38 UTC 2012 - afaerber@suse.de diff --git a/qemu.spec b/qemu.spec index 61aab5be..d491f098 100644 --- a/qemu.spec +++ b/qemu.spec @@ -21,9 +21,9 @@ Url: http://www.qemu.org/ Summary: Universal CPU emulator License: BSD-3-Clause ; GPL-2.0+ ; LGPL-2.1+ ; MIT Group: System/Emulators/PC -Version: 1.2.0rc3 +Version: 1.2.0 Release: 0 -Source: %name-1.2.0-rc3.tar.bz2 +Source: %name-%version.tar.bz2 Patch0001: 0001-Handle-CPU-interrupts-by-inline-che.patch Patch0002: 0002-XXX-dont-dump-core-on-sigabort.patc.patch Patch0003: 0003-XXX-work-around-SA_RESTART-race-wit.patch @@ -57,7 +57,6 @@ Patch0030: 0030-linux-user-fix-statfs.patch.patch Patch0031: 0031-linux-user-XXX-disable-fiemap.patch.patch Patch0032: 0032-slirp-nooutgoing.patch.patch Patch0033: 0033-vnc-password-file-and-incoming-conn.patch -Patch0034: 0034-console-bounds-check-whenever-chang.patch # this is to make lint happy Source300: rpmlintrc Source302: bridge.conf @@ -168,7 +167,7 @@ emulations. This can be used together with the OBS build script to run cross-architecture builds. %prep -%setup -q -n qemu-1.2.0-rc3 +%setup -q -n %name-%version %patch0001 -p1 %patch0002 -p1 %patch0003 -p1 @@ -202,7 +201,6 @@ run cross-architecture builds. %patch0031 -p1 %patch0032 -p1 %patch0033 -p1 -%patch0034 -p1 %build # build QEMU diff --git a/qemu.spec.in b/qemu.spec.in index a70834ce..84254220 100644 --- a/qemu.spec.in +++ b/qemu.spec.in @@ -21,9 +21,9 @@ Url: http://www.qemu.org/ Summary: Universal CPU emulator License: BSD-3-Clause ; GPL-2.0+ ; LGPL-2.1+ ; MIT Group: System/Emulators/PC -Version: 1.2.0rc3 +Version: 1.2.0 Release: 0 -Source: %name-1.2.0-rc3.tar.bz2 +Source: %name-%version.tar.bz2 PATCH_FILES # this is to make lint happy Source300: rpmlintrc @@ -135,7 +135,7 @@ emulations. This can be used together with the OBS build script to run cross-architecture builds. %prep -%setup -q -n qemu-1.2.0-rc3 +%setup -q -n %name-%version PATCH_EXEC %build diff --git a/update_git.sh b/update_git.sh index 9c7e3559..73a2f74a 100644 --- a/update_git.sh +++ b/update_git.sh @@ -13,7 +13,7 @@ GIT_TREE=git://repo.or.cz/qemu/agraf.git GIT_LOCAL_TREE=/suse/agraf/git/qemu GIT_BRANCH=suse-1.2 -GIT_UPSTREAM_TAG=v1.2.0-rc3 +GIT_UPSTREAM_TAG=v1.2.0 QEMU_TMP=/dev/shm/qemu-tmp # clean up