Removed app-emulation/qemu-softmmu, whose functionality has been provided by app-emulation/qemu for some time.

6 files changed, 0 insertions, 771 deletions

diff --git a/app-emulation/qemu-softmmu/ChangeLog b/app-emulation/qemu-softmmu/ChangeLog
deleted file mode 100644
index 714032d4c574..000000000000
--- a/app-emulation/qemu-softmmu/ChangeLog
+++ /dev/null
@@ -1,319 +0,0 @@
-# ChangeLog for app-emulation/qemu-softmmu
-# Copyright 1999-2010 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/app-emulation/qemu-softmmu/ChangeLog,v 1.67 2010/10/15 14:21:52 flameeyes Exp $
-
-  15 Oct 2010; Diego E. Pettenò <flameeyes@gentoo.org>
-  -qemu-softmmu-0.9.0.ebuild, -qemu-softmmu-0.9.0-r1.ebuild,
-  -files/qemu-softmmu-0.9.0-block-qcow2.patch,
-  -files/qemu-softmmu-0.9.0-ide-cd.patch, -qemu-softmmu-0.9.1.ebuild,
-  -qemu-softmmu-0.9.1-r1.ebuild, -qemu-softmmu-0.9.1-r2.ebuild,
-  -files/qemu-softmmu-0.9.1-block-device-address-range.patch,
-  -qemu-softmmu-0.10.0.ebuild, -qemu-softmmu-0.10.1.ebuild,
-  -files/qemu-softmmu-0.10.1-nopl-fix.patch, -files/qemu-ifdown,
-  -files/qemu-ifup, metadata.xml:
-  Belated spring cleaning of ebuilds and files.
-
-  24 Apr 2009; Luca Barbato <lu_zero@gentoo.org>
-  +files/qemu-softmmu-0.10.1-nopl-fix.patch, qemu-softmmu-0.10.1.ebuild:
-  Fix in_asm debugging, thanks to Mark Karpeles <mark@hell.ne.jp>
-
-  27 Mar 2009; Luca Barbato <lu_zero@gentoo.org> metadata.xml,
-  qemu-softmmu-0.10.1.ebuild:
-  Minor fixes and enabling kvm
-
-  24 Mar 2009; Luca Barbato <lu_zero@gentoo.org> qemu-softmmu-0.10.1.ebuild:
-  fix ifup/ifdown installation
-
-*qemu-softmmu-0.10.1 (22 Mar 2009)
-
-  22 Mar 2009; Luca Barbato <lu_zero@gentoo.org>
-  +qemu-softmmu-0.10.1.ebuild:
-  Bugfix release
-
-  21 Mar 2009; Luca Barbato <lu_zero@gentoo.org> qemu-softmmu-0.10.0.ebuild:
-  typo, thanks to Jonathan-Christofer Demay <jcdemay@gmail.com> for spotting
-  it
-
-  18 Mar 2009; Luca Barbato <lu_zero@gentoo.org> qemu-softmmu-0.10.0.ebuild:
-  disable fdt since the current one is broken...
-
-  17 Mar 2009; Luca Barbato <lu_zero@gentoo.org> qemu-softmmu-0.10.0.ebuild:
-  fdt is a fixed dep for now
-
-  12 Mar 2009; Luca Barbato <lu_zero@gentoo.org> qemu-softmmu-0.10.0.ebuild:
-  Simplify hardened support
-
-  12 Mar 2009; Diego E. Pettenò <flameeyes@gentoo.org>
-  qemu-softmmu-0.9.1.ebuild, qemu-softmmu-0.9.1-r1.ebuild,
-  qemu-softmmu-0.9.1-r2.ebuild, qemu-softmmu-0.9.1-r3.ebuild,
-  qemu-softmmu-0.10.0.ebuild:
-  Remove binchecks restriction (package installs binaries!).
-
-  09 Mar 2009; Luca Barbato <lu_zero@gentoo.org> qemu-softmmu-0.10.0.ebuild:
-  Fix leftover from kvm ebuild import
-
-*qemu-softmmu-0.10.0 (06 Mar 2009)
-
-  06 Mar 2009; Luca Barbato <lu_zero@gentoo.org> +files/qemu-ifdown,
-  +files/qemu-ifup, +qemu-softmmu-0.10.0.ebuild:
-  New release
-
-  28 Jul 2008; Doug Goldstein <cardoe@gentoo.org> metadata.xml:
-  add GLEP 56 USE flag desc from use.local.desc
-
-  14 May 2008; Markus Meier <maekke@gentoo.org>
-  qemu-softmmu-0.9.1-r3.ebuild:
-  amd64 stable, bug #221943
-
-  14 May 2008; Luca Barbato <lu_zero@gentoo.org>
-  qemu-softmmu-0.9.1-r3.ebuild:
-  Marked ppc
-
-  14 May 2008; Christian Faulhammer <opfer@gentoo.org>
-  qemu-softmmu-0.9.1-r3.ebuild:
-  stable x86, security bug 212351
-
-*qemu-softmmu-0.9.1-r3 (14 May 2008)
-
-  14 May 2008; Luca Barbato <lu_zero@gentoo.org>
-  +files/qemu-softmmu-0.9.1-CVE-2008-2004.patch,
-  +qemu-softmmu-0.9.1-r3.ebuild:
-  Address CVE-2008-2004, fix bug #221943, thanks to Celso Fernandes
-  (icezimm) <celso.fernandes@gmail.com>
-
-*qemu-softmmu-0.9.1-r2 (12 May 2008)
-
-  12 May 2008; Peter Volkov <pva@gentoo.org>
-  +files/qemu-softmmu-0.9.1-CVE-2008-0928.patch,
-  +qemu-softmmu-0.9.1-r2.ebuild:
-  Updated patch for security bug #212351 to avoid qcow2 image regression.
-  Filtering CFLAGS to allow building with gcc-3.4.
-
-  20 Apr 2008; Luca Barbato <lu_zero@gentoo.org>
-  qemu-softmmu-0.9.1-r1.ebuild:
-  Move the gcc check in src_unpack
-
-  09 Mar 2008; Luca Barbato <lu_zero@gentoo.org>
-  qemu-softmmu-0.9.1-r1.ebuild:
-  Marked ppc
-
-*qemu-softmmu-0.9.1-r1 (05 Mar 2008)
-
-  05 Mar 2008; Luca Barbato <lu_zero@gentoo.org>
-  +files/qemu-softmmu-0.9.1-block-device-address-range.patch,
-  +qemu-softmmu-0.9.1-r1.ebuild:
-  Fix CVE-2008-0928, patch from the red hat bugzilla
-
-  01 Feb 2008; Luca Barbato <lu_zero@gentoo.org>
-  -files/qemu-0.8.0-gcc4-hacks.patch, -files/qemu-0.8.0-gcc4-opts.patch,
-  -files/qemu-0.8.2-linux-headers.patch, -files/qemu-0.8.2-sparc-fp.patch,
-  -qemu-softmmu-0.8.0.ebuild, -qemu-softmmu-0.8.0.20060329.ebuild,
-  -qemu-softmmu-0.8.1.ebuild, -qemu-softmmu-0.8.1-r1.ebuild,
-  -qemu-softmmu-0.8.2.ebuild, -qemu-softmmu-0.8.2-r1.ebuild:
-  Remove qemu-0.8 series
-
-*qemu-softmmu-0.9.1 (25 Jan 2008)
-
-  25 Jan 2008; Luca Barbato <lu_zero@gentoo.org> +qemu-softmmu-0.9.1.ebuild:
-  New version, improved ebuild by Carlo Marcelo Arenas Belon
-  <carenas@sajinet.com.pe>, bugs #204675
-
-  13 Nov 2007; Luca Barbato <lu_zero@gentoo.org>
-  qemu-softmmu-0.9.0-r1.ebuild:
-  Mark the revision stable
-
-*qemu-softmmu-0.9.0-r1 (12 Nov 2007)
-
-  12 Nov 2007; Luca Barbato <lu_zero@gentoo.org>
-  +files/qemu-softmmu-0.9.0-block-qcow2.patch,
-  +qemu-softmmu-0.9.0-r1.ebuild:
-  address qcow2 corruption, thanks to Chris Williams <gentoo@psychogeeks.com>
-  for the patch, see bug #187075
-
-  09 Sep 2007; Luca Barbato <lu_zero@gentoo.org>
-  +files/qemu-softmmu-0.9.0-ide-cd.patch, qemu-softmmu-0.9.0.ebuild:
-  Address a glitch in the ide/cdrom emulation, thanks to Carlo Marcelo Arenas
-  Belon <carenas@sajinet.com.pe> for pointing the patch and reporting the
-  issue
-
-  02 Jul 2007; Piotr Jaroszyński <peper@gentoo.org>
-  qemu-softmmu-0.8.0.ebuild, qemu-softmmu-0.8.0.20060329.ebuild,
-  qemu-softmmu-0.8.1.ebuild, qemu-softmmu-0.8.1-r1.ebuild,
-  qemu-softmmu-0.8.2.ebuild, qemu-softmmu-0.8.2-r1.ebuild,
-  qemu-softmmu-0.9.0.ebuild:
-  (QA) RESTRICT clean up.
-
-  20 May 2007; Christian Faulhammer <opfer@gentoo.org>
-  qemu-softmmu-0.9.0.ebuild:
-  stable amd64, security bug 176674
-
-  16 May 2007; Luca Barbato <lu_zero@gentoo.org> qemu-softmmu-0.9.0.ebuild:
-  Marked ppc
-
-  08 May 2007; Markus Ullmann <jokey@gentoo.org> qemu-softmmu-0.9.0.ebuild:
-  Stable on x86 wrt security bug #176674
-
-  21 Feb 2007; Piotr Jaroszyński <peper@gentoo.org> ChangeLog:
-  Transition to Manifest2.
-
-  10 Feb 2007; Luca Barbato <lu_zero@gentoo.org> qemu-softmmu-0.9.0.ebuild:
-  Fix bug #164491
-
-  10 Feb 2007; Luca Barbato <lu_zero@gentoo.org> qemu-softmmu-0.9.0.ebuild:
-  Minor update
-
-*qemu-softmmu-0.9.0 (07 Feb 2007)
-
-  07 Feb 2007; Luca Barbato <lu_zero@gentoo.org> +qemu-softmmu-0.9.0.ebuild:
-  New version
-
-  06 Feb 2007; Simon Stelling <blubb@gentoo.org>
-  qemu-softmmu-0.8.2-r1.ebuild:
-  stable on amd64; bug 159522
-
-  02 Jan 2007; Christian Faulhammer <opfer@gentoo.org>
-  qemu-softmmu-0.8.2-r1.ebuild:
-  stable x86, bug #159522
-
-  31 Dec 2006; Mike Frysinger <vapier@gentoo.org>
-  +files/qemu-0.8.2-linux-headers.patch, qemu-softmmu-0.8.2-r1.ebuild:
-  Fix building with sanitized headers.
-
-  31 Dec 2006; Luca Barbato <lu_zero@gentoo.org>
-  qemu-softmmu-0.8.2-r1.ebuild:
-  Marked ppc
-
-  22 Nov 2006; Kevin F. Quinn <kevquinn@gentoo.org>
-  qemu-softmmu-0.8.2-r1.ebuild:
-  Add QA variables indicating which files contain textrels, require
-  execstack, and contain WX PT_LOAD segments.  The TEXTRELs are a feature of how
-  qemu works.  The execstack/wx_load markings are for a foreign binary.
-
-  18 Aug 2006; Luca Barbato <lu_zero@gentoo.org> qemu-softmmu-0.8.2.ebuild:
-  remove stray dep
-
-  17 Aug 2006; Luca Barbato <lu_zero@gentoo.org> qemu-softmmu-0.8.2.ebuild,
-  qemu-softmmu-0.8.2-r1.ebuild:
-  Remove stray bits from the older ebuild
-
-*qemu-softmmu-0.8.2-r1 (17 Aug 2006)
-
-  17 Aug 2006;  Luca Barbato <lu_zero@gentoo.org>
-  qemu-softmmu-0.8.2-r1.ebuild, files/digest-qemu-softmmu-0.8.2-r1:
-  Added alsa support as requested in bug #116599 by Ivan Yosifov <ivan@yosifov.net>
-  and adlib support as requested by Jan Simons <gentoo@onkos.de> on the same bug;
-  use tc-getCC, patch from Damien THEBAULT <damien.thebault@laposte.net> in
-  bug #132602, set correct kqemu deps, should solve bug #141721
-
-  01 Aug 2006; Luca Barbato <lu_zero@gentoo.org> qemu-softmmu-0.8.2.ebuild:
-  False hope, gcc-3 is still required.
-
-*qemu-softmmu-0.8.2 (01 Aug 2006)
-
-  01 Aug 2006; Luca Barbato <lu_zero@gentoo.org>
-  +files/qemu-0.8.2-sparc-fp.patch, +qemu-softmmu-0.8.2.ebuild:
-  New version, should work better with gcc-4
-
-*qemu-softmmu-0.8.1-r1 (12 Jul 2006)
-
-  12 Jul 2006; Luca Barbato <lu_zero@gentoo.org>
-  +files/qemu-0.8.0-gcc4-hacks.patch, +files/qemu-0.8.0-gcc4-opts.patch,
-  +qemu-softmmu-0.8.1-r1.ebuild:
-  Updated revision, with alsa and partial gcc4 support on x86 (phreak and
-  genstef found the patches)
-
-  09 Jun 2006; Michael Sterrett <mr_bones_@gentoo.org>
-  -files/qemu-softmmu-0.7.0-errno.patch, -files/kqemu-0.7.1-sysfs.patch,
-  -files/kqemu-sysfs.patch, -qemu-softmmu-0.7.0-r1.ebuild,
-  -qemu-softmmu-0.7.1.ebuild, -qemu-softmmu-0.7.1-r1.ebuild,
-  -qemu-softmmu-0.7.2.ebuild:
-  clean out old files
-
-*qemu-softmmu-0.8.1 (06 May 2006)
-
-  06 May 2006; Luca Barbato <lu_zero@gentoo.org> +qemu-softmmu-0.8.1.ebuild:
-  New version
-
-  28 Apr 2006; Luca Barbato <lu_zero@gentoo.org>
-  qemu-softmmu-0.8.0.20060329.ebuild:
-  Stray epatch removed
-
-  27 Apr 2006; Marien Zwart <marienz@gentoo.org>
-  files/digest-qemu-softmmu-0.7.0-r1, files/digest-qemu-softmmu-0.7.1,
-  files/digest-qemu-softmmu-0.7.1-r1, files/digest-qemu-softmmu-0.7.2,
-  files/digest-qemu-softmmu-0.8.0, files/digest-qemu-softmmu-0.8.0.20060329,
-  Manifest:
-  Fixing SHA256 digest for real, pass three...
-
-  27 Apr 2006; Marien Zwart <marienz@gentoo.org>
-  files/digest-qemu-softmmu-0.7.0-r1, files/digest-qemu-softmmu-0.7.1,
-  files/digest-qemu-softmmu-0.7.1-r1, files/digest-qemu-softmmu-0.7.2,
-  files/digest-qemu-softmmu-0.8.0, files/digest-qemu-softmmu-0.8.0.20060329,
-  Manifest:
-  Fixing SHA256 digest, pass two.
-
-  19 Apr 2006; Daniel Gryniewicz <dang@gentoo.org> ChangeLog:
-  Marked stable on amd64 per bug# 123972
-
-  16 Apr 2006; Michael Hanselmann <hansmi@gentoo.org>
-  qemu-softmmu-0.8.0.ebuild:
-  Stable on ppc.
-
-  01 Apr 2006; Luca Barbato <lu_zero@gentoo.org> qemu-softmmu-0.8.0.ebuild:
-  Restricted test feature
-
-  29 Mar 2006; Chris White <chriswhite@gentoo.org>
-  qemu-softmmu-0.8.0.ebuild:
-  x86 stable for qemu-softmmu-0.8.0 bug #123972.
-
-  08 Jan 2006; Luca Barbato <lu_zero@gentoo.org> qemu-softmmu-0.8.0.ebuild:
-  Disable gcc checks, thanks to Robert Führicht <the_master_of_disaster@gmx.at>
-
-*qemu-softmmu-0.8.0 (23 Dec 2005)
-
-  23 Dec 2005; Luca Barbato <lu_zero@gentoo.org> +qemu-softmmu-0.8.0.ebuild:
-  New version
-
-  01 Dec 2005; <dang@gentoo.org> qemu-softmmu-0.7.0-r1.ebuild,
-  qemu-softmmu-0.7.1.ebuild, qemu-softmmu-0.7.1-r1.ebuild,
-  qemu-softmmu-0.7.2.ebuild:
-  Mark 0.7.2 stable, with workign kqemu. Remove amd64 from older, nonworking
-  versions
-
-*qemu-softmmu-0.7.2 (11 Sep 2005)
-
-  11 Sep 2005; Luca Barbato <lu_zero@gentoo.org> +qemu-softmmu-0.7.2.ebuild:
-  New release
-
-  19 Aug 2005; Aron Griffis <agriffis@gentoo.org>
-  qemu-softmmu-0.7.1-r1.ebuild:
-  Minor ebuild fixups, particularly move MODULE_NAMES setting into pkg_setup.
-  The kqemu-sysfs patch is not compatible with 2.6.13-rc1+ because the new
-  interfaces are GPL-only, so refrain from applying the patch on those
-  versions; http://lkml.org/lkml/2005/7/4/5
-
-*qemu-softmmu-0.7.1-r1 (06 Aug 2005)
-
-  06 Aug 2005; Luca Barbato <lu_zero@gentoo.org>
-  +qemu-softmmu-0.7.1-r1.ebuild:
-  Fix bug #101524
-
-  26 Jul 2005; Luca Barbato <lu_zero@gentoo.org>
-  +files/kqemu-0.7.1-sysfs.patch, qemu-softmmu-0.7.1.ebuild:
-  updated the sysfs patch, thanks to Philippe Weibel <philippe.weibel@free.fr>
-
-  26 Jul 2005; Luca Barbato <lu_zero@gentoo.org> qemu-softmmu-0.7.1.ebuild:
-  Fixes and workarounds for the latest kernels.
-
-*qemu-softmmu-0.7.1 (25 Jul 2005)
-
-  25 Jul 2005; Luca Barbato <lu_zero@gentoo.org> +qemu-softmmu-0.7.1.ebuild:
-  New version
-
-*qemu-softmmu-0.7.0-r1 (18 Jun 2005)
-
-  18 Jun 2005; Luca Barbato <lu_zero@gentoo.org>
-  +files/qemu-softmmu-0.7.0-errno.patch, +files/kqemu-sysfs.patch,
-  +metadata.xml, +qemu-softmmu-0.7.0-r1.ebuild:
-  qemu split ebuild, system emulators
-
diff --git a/app-emulation/qemu-softmmu/Manifest b/app-emulation/qemu-softmmu/Manifest
deleted file mode 100644
index 68005e24622d..000000000000
--- a/app-emulation/qemu-softmmu/Manifest
+++ /dev/null
@@ -1,16 +0,0 @@
------BEGIN PGP SIGNED MESSAGE-----
-Hash: SHA1
-
-AUX qemu-softmmu-0.9.1-CVE-2008-0928.patch 9346 RMD160 79e4dbf7643d7057da4a74350833c907342fba1e SHA1 2ec9c89e6a995db97aa03cdab490fc0e5cef650c SHA256 ca040bdb401e6cdfe4f009e6874d25853103965370b19756724127b0fd4df559
-AUX qemu-softmmu-0.9.1-CVE-2008-2004.patch 2002 RMD160 88f121766426b1b564d829bf6287aa0b99733ca7 SHA1 208701bd008b119f80553ff4dc441de87ddc98aa SHA256 15918d0e46a23d9b7283088489ce08be41a6ec9ced5df0f55ce1f8bcaa50fac3
-DIST qemu-0.9.1.tar.gz 2804104 RMD160 ee7bdb55a4540df2082d4bde9ebfd2f4e6f201a5 SHA1 630ea20b5989f0df00128de7f7be661c573ed041 SHA256 4756d0b4a4dc7dd88354bc6b37d381e4462dd328d0feef94803e90c0455835a5
-EBUILD qemu-softmmu-0.9.1-r3.ebuild 3481 RMD160 7495f86f63f5e5fc8338127e1c45738877d8df8d SHA1 c6474aea7294a5ac17a1042349dd00f6cacba0dd SHA256 2197c56457a109a364c8cb983360378db538b038cba56df4bfb826b6953a28e6
-MISC ChangeLog 11735 RMD160 d5686f26af8027fac95e02ad5a2e830554d90347 SHA1 e34f71ca477f5b93ea843576f68f79636fa52f26 SHA256 2b4fc11d362a6a2a1164a31676cce94dcf98ae9a01b3b1055c9e0aea7949ed6a
-MISC metadata.xml 519 RMD160 60b79ff9946f1349995feab2daf71630974e9d43 SHA1 dcf0191cbd0b27836c6248cf29eb1718e7aa0f3f SHA256 21826ec13a6b2c5bd34e8e7a971bbc1b2432d275a0e4650ff8a54370c41a058d
------BEGIN PGP SIGNATURE-----
-Version: GnuPG v2.0.16 (GNU/Linux)
-
-iEYEARECAAYFAky4Y1QACgkQAiZjviIA2Xjg4wCg75U3aObW7xE7qgidgxbYQjjZ
-ABwAn0pGBrv5P3BlziXXijLXUFDQN1jm
-=pY9D
------END PGP SIGNATURE-----
diff --git a/app-emulation/qemu-softmmu/files/qemu-softmmu-0.9.1-CVE-2008-0928.patch b/app-emulation/qemu-softmmu/files/qemu-softmmu-0.9.1-CVE-2008-0928.patch
deleted file mode 100644
index ee410d64e713..000000000000
--- a/app-emulation/qemu-softmmu/files/qemu-softmmu-0.9.1-CVE-2008-0928.patch
+++ /dev/null
@@ -1,239 +0,0 @@
-https://bugzilla.redhat.com/show_bug.cgi?id=433560
-
-Revised block device address range patch
-
-The original patch adds checks to the main  bdrv_XXX apis to validate that
-the I/O operation does not exceed the bounds of the disk - ie beyond the
-total_sectors count. This works correctly for bdrv_XXX calls from the IDE
-driver.  With disk formats like QCow though,  bdrv_XXX is re-entrant,
-because the QCow driver uses the block APIs for dealing with its underlying
-file.  The problem is that QCow files are grow-on-demand, so writes will
-*explicitly* be beyond the end of the file. The original patch blocks any
-I/O operation which would cause the QCow file to grow, resulting it more
-or less catasatrophic data loss.
-
-Basically the bounds checking needs to distinguish between checking for
-the logical disk extents, vs the physical disk extents. For raw files
-these are the same so initial tests showed no problems, but for QCow
-format disks they are different & thus we see a problem
-
-What follows is a revised patch which introduces a flag BDRV_O_AUTOGROW
-which can be passed to bdrv_open to indicate that the files can be allowed
-to automatically extend their extents. This flag should only be used by
-internal block drivers such as block-qcow2.c, block-vmdk.c  In my testing
-this has fixed the qcow corruption, and still maintains the goal of Ian's
-original patch which was to prevent the guest VM writing beyond the logical
-disk extents.
-
-diff -rup kvm-60.orig/qemu/block.c kvm-60.new/qemu/block.c
---- kvm-60.orig/qemu/block.c	2008-02-26 18:44:28.000000000 -0500
-+++ kvm-60.new/qemu/block.c	2008-02-26 18:44:52.000000000 -0500
-@@ -124,6 +124,60 @@ void path_combine(char *dest, int dest_s
-     }
- }
- 
-+static int bdrv_rd_badreq_sectors(BlockDriverState *bs,
-+                                  int64_t sector_num, int nb_sectors)
-+{
-+    return
-+        nb_sectors < 0 ||
-+        sector_num < 0 ||
-+        nb_sectors > bs->total_sectors ||
-+        sector_num > bs->total_sectors - nb_sectors;
-+}
-+
-+static int bdrv_rd_badreq_bytes(BlockDriverState *bs,
-+                                int64_t offset, int count)
-+{
-+    int64_t size = bs->total_sectors << SECTOR_BITS;
-+    return
-+        count < 0 ||
-+        size < 0 ||
-+        count > size ||
-+        offset > size - count;
-+}
-+
-+static int bdrv_wr_badreq_sectors(BlockDriverState *bs,
-+                                  int64_t sector_num, int nb_sectors)
-+{
-+    if (sector_num < 0 ||
-+        nb_sectors < 0)
-+        return 1;
-+
-+    if (sector_num > bs->total_sectors - nb_sectors) {
-+        if (bs->autogrow)
-+            bs->total_sectors = sector_num + nb_sectors;
-+        else
-+            return 1;
-+    }
-+    return 0;
-+}
-+
-+static int bdrv_wr_badreq_bytes(BlockDriverState *bs,
-+                                int64_t offset, int count)
-+{
-+    int64_t size = bs->total_sectors << SECTOR_BITS;
-+    if (count < 0 ||
-+        offset < 0)
-+        return 1;
-+
-+    if (offset > size - count) {
-+        if (bs->autogrow)
-+            bs->total_sectors = (offset + count + SECTOR_SIZE - 1) >> SECTOR_BITS;
-+        else
-+            return 1;
-+    }
-+    return 0;
-+}
-+
- 
- static void bdrv_register(BlockDriver *bdrv)
- {
-@@ -332,6 +386,10 @@ int bdrv_open2(BlockDriverState *bs, con
-     bs->read_only = 0;
-     bs->is_temporary = 0;
-     bs->encrypted = 0;
-+    bs->autogrow = 0;
-+
-+    if (flags & BDRV_O_AUTOGROW)
-+        bs->autogrow = 1;
- 
-     if (flags & BDRV_O_SNAPSHOT) {
-         BlockDriverState *bs1;
-@@ -376,6 +434,7 @@ int bdrv_open2(BlockDriverState *bs, con
-     }
-     bs->drv = drv;
-     bs->opaque = qemu_mallocz(drv->instance_size);
-+    bs->total_sectors = 0; /* driver will set if it does not do getlength */
-     if (bs->opaque == NULL && drv->instance_size > 0)
-         return -1;
-     /* Note: for compatibility, we open disk image files as RDWR, and
-@@ -441,6 +500,7 @@ void bdrv_close(BlockDriverState *bs)
-         bs->drv = NULL;
- 
-         /* call the change callback */
-+        bs->total_sectors = 0;
-         bs->media_changed = 1;
-         if (bs->change_cb)
-             bs->change_cb(bs->change_opaque);
-@@ -506,6 +566,8 @@ int bdrv_read(BlockDriverState *bs, int6
-     if (!drv)
-         return -ENOMEDIUM;
- 
-+    if (bdrv_rd_badreq_sectors(bs, sector_num, nb_sectors))
-+        return -EDOM;
-     if (sector_num == 0 && bs->boot_sector_enabled && nb_sectors > 0) {
-             memcpy(buf, bs->boot_sector_data, 512);
-         sector_num++;
-@@ -546,6 +608,8 @@ int bdrv_write(BlockDriverState *bs, int
-         return -ENOMEDIUM;
-     if (bs->read_only)
-         return -EACCES;
-+    if (bdrv_wr_badreq_sectors(bs, sector_num, nb_sectors))
-+        return -EDOM;
-     if (sector_num == 0 && bs->boot_sector_enabled && nb_sectors > 0) {
-         memcpy(bs->boot_sector_data, buf, 512);
-     }
-@@ -671,6 +735,8 @@ int bdrv_pread(BlockDriverState *bs, int
-         return -ENOMEDIUM;
-     if (!drv->bdrv_pread)
-         return bdrv_pread_em(bs, offset, buf1, count1);
-+    if (bdrv_rd_badreq_bytes(bs, offset, count1))
-+        return -EDOM;
-     return drv->bdrv_pread(bs, offset, buf1, count1);
- }
- 
-@@ -686,6 +752,8 @@ int bdrv_pwrite(BlockDriverState *bs, in
-         return -ENOMEDIUM;
-     if (!drv->bdrv_pwrite)
-         return bdrv_pwrite_em(bs, offset, buf1, count1);
-+    if (bdrv_wr_badreq_bytes(bs, offset, count1))
-+        return -EDOM;
-     return drv->bdrv_pwrite(bs, offset, buf1, count1);
- }
- 
-@@ -1091,6 +1159,8 @@ int bdrv_write_compressed(BlockDriverSta
-         return -ENOMEDIUM;
-     if (!drv->bdrv_write_compressed)
-         return -ENOTSUP;
-+    if (bdrv_wr_badreq_sectors(bs, sector_num, nb_sectors))
-+        return -EDOM;
-     return drv->bdrv_write_compressed(bs, sector_num, buf, nb_sectors);
- }
- 
-@@ -1237,6 +1307,8 @@ BlockDriverAIOCB *bdrv_aio_read(BlockDri
- 
-     if (!drv)
-         return NULL;
-+    if (bdrv_rd_badreq_sectors(bs, sector_num, nb_sectors))
-+        return NULL;
- 
-     /* XXX: we assume that nb_sectors == 0 is suppored by the async read */
-     if (sector_num == 0 && bs->boot_sector_enabled && nb_sectors > 0) {
-@@ -1268,6 +1340,8 @@ BlockDriverAIOCB *bdrv_aio_write(BlockDr
-         return NULL;
-     if (bs->read_only)
-         return NULL;
-+    if (bdrv_wr_badreq_sectors(bs, sector_num, nb_sectors))
-+        return NULL;
-     if (sector_num == 0 && bs->boot_sector_enabled && nb_sectors > 0) {
-         memcpy(bs->boot_sector_data, buf, 512);
-     }
-diff -rup kvm-60.orig/qemu/block.h kvm-60.new/qemu/block.h
---- kvm-60.orig/qemu/block.h	2008-01-20 07:35:04.000000000 -0500
-+++ kvm-60.new/qemu/block.h	2008-02-26 18:44:52.000000000 -0500
-@@ -45,6 +45,7 @@ typedef struct QEMUSnapshotInfo {
-                                      it (default for
-                                      bdrv_file_open()) */
- #define BDRV_O_DIRECT      0x0020
-+#define BDRV_O_AUTOGROW    0x0040 /* Allow backing file to extend when writing past end of file */
- 
- #ifndef QEMU_IMG
- void bdrv_info(void);
-diff -rup kvm-60.orig/qemu/block_int.h kvm-60.new/qemu/block_int.h
---- kvm-60.orig/qemu/block_int.h	2008-01-20 07:35:04.000000000 -0500
-+++ kvm-60.new/qemu/block_int.h	2008-02-26 18:44:52.000000000 -0500
-@@ -97,6 +97,7 @@ struct BlockDriverState {
-     int locked;    /* if true, the media cannot temporarily be ejected */
-     int encrypted; /* if true, the media is encrypted */
-     int sg;        /* if true, the device is a /dev/sg* */
-+    int autogrow;  /* if true, the backing store can auto-extend to allocate new extents */
-     /* event callback when inserting/removing */
-     void (*change_cb)(void *opaque);
-     void *change_opaque;
-diff -rup kvm-60.orig/qemu/block-qcow2.c kvm-60.new/qemu/block-qcow2.c
---- kvm-60.orig/qemu/block-qcow2.c	2008-01-20 07:35:04.000000000 -0500
-+++ kvm-60.new/qemu/block-qcow2.c	2008-02-26 18:44:52.000000000 -0500
-@@ -191,7 +191,7 @@ static int qcow_open(BlockDriverState *b
-     int len, i, shift, ret;
-     QCowHeader header;
- 
--    ret = bdrv_file_open(&s->hd, filename, flags);
-+    ret = bdrv_file_open(&s->hd, filename, flags | BDRV_O_AUTOGROW);
-     if (ret < 0)
-         return ret;
-     if (bdrv_pread(s->hd, 0, &header, sizeof(header)) != sizeof(header))
-diff -rup kvm-60.orig/qemu/block-qcow.c kvm-60.new/qemu/block-qcow.c
---- kvm-60.orig/qemu/block-qcow.c	2008-01-20 07:35:04.000000000 -0500
-+++ kvm-60.new/qemu/block-qcow.c	2008-02-26 18:44:52.000000000 -0500
-@@ -95,7 +95,7 @@ static int qcow_open(BlockDriverState *b
-     int len, i, shift, ret;
-     QCowHeader header;
- 
--    ret = bdrv_file_open(&s->hd, filename, flags);
-+    ret = bdrv_file_open(&s->hd, filename, flags | BDRV_O_AUTOGROW);
-     if (ret < 0)
-         return ret;
-     if (bdrv_pread(s->hd, 0, &header, sizeof(header)) != sizeof(header))
-diff -rup kvm-60.orig/qemu/block-vmdk.c kvm-60.new/qemu/block-vmdk.c
---- kvm-60.orig/qemu/block-vmdk.c	2008-01-20 07:35:04.000000000 -0500
-+++ kvm-60.new/qemu/block-vmdk.c	2008-02-26 18:44:52.000000000 -0500
-@@ -375,7 +375,7 @@ static int vmdk_open(BlockDriverState *b
-         flags = BDRV_O_RDONLY;
-     fprintf(stderr, "(VMDK) image open: flags=0x%x filename=%s\n", flags, bs->filename);
- 
--    ret = bdrv_file_open(&s->hd, filename, flags);
-+    ret = bdrv_file_open(&s->hd, filename, flags | BDRV_O_AUTOGROW);
-     if (ret < 0)
-         return ret;
-     if (bdrv_pread(s->hd, 0, &magic, sizeof(magic)) != sizeof(magic))
diff --git a/app-emulation/qemu-softmmu/files/qemu-softmmu-0.9.1-CVE-2008-2004.patch b/app-emulation/qemu-softmmu/files/qemu-softmmu-0.9.1-CVE-2008-2004.patch
deleted file mode 100644
index c30a54dee74b..000000000000
--- a/app-emulation/qemu-softmmu/files/qemu-softmmu-0.9.1-CVE-2008-2004.patch
+++ /dev/null
@@ -1,55 +0,0 @@
---- vl.c	2008-01-06 14:38:42.000000000 -0500
-+++ vl.c	2008-05-13 09:56:45.000000000 -0400
-@@ -4877,13 +4877,14 @@
-     int bus_id, unit_id;
-     int cyls, heads, secs, translation;
-     BlockDriverState *bdrv;
-+    BlockDriver *drv = NULL;
-     int max_devs;
-     int index;
-     int cache;
-     int bdrv_flags;
-     char *params[] = { "bus", "unit", "if", "index", "cyls", "heads",
-                        "secs", "trans", "media", "snapshot", "file",
--                       "cache", NULL };
-+		       "cache", "format", NULL };
- 
-     if (check_params(buf, sizeof(buf), params, str) < 0) {
-          fprintf(stderr, "qemu: unknowm parameter '%s' in '%s'\n",
-@@ -5051,6 +5052,14 @@
-         }
-     }
- 
-+    if (get_param_value(buf, sizeof(buf), "format", str)) {
-+	 drv = bdrv_find_format(buf);
-+	 if (!drv) {
-+	    fprintf(stderr, "qemu: '%s' invalid format\n", buf);
-+	    return -1;
-+         }
-+    }
-+
-     get_param_value(file, sizeof(file), "file", str);
- 
-     /* compute bus and unit according index */
-@@ -5150,7 +5159,7 @@
-         bdrv_flags |= BDRV_O_SNAPSHOT;
-     if (!cache)
-         bdrv_flags |= BDRV_O_DIRECT;
--    if (bdrv_open(bdrv, file, bdrv_flags) < 0 || qemu_key_check(bdrv, file)) {
-+    if (bdrv_open2(bdrv, file, bdrv_flags, drv) < 0 || qemu_key_check(bdrv, file)) {
-         fprintf(stderr, "qemu: could not open disk image %s\n",
-                         file);
-         return -1;
---- qemu-doc.texi	2008-01-06 14:38:42.000000000 -0500
-+++ qemu-doc.texi	2008-05-13 09:57:57.000000000 -0400
-@@ -252,6 +252,10 @@
- @var{snapshot} is "on" or "off" and allows to enable snapshot for given drive (see @option{-snapshot}).
- @item cache=@var{cache}
- @var{cache} is "on" or "off" and allows to disable host cache to access data.
-+@item format=@var{format}
-+Specify which disk @var{format} will be used rather than detecting
-+the format.  Can be used to specifiy format=raw to avoid interpreting
-+an untrusted format header.
- @end table
- 
- Instead of @option{-cdrom} you can use:
diff --git a/app-emulation/qemu-softmmu/metadata.xml b/app-emulation/qemu-softmmu/metadata.xml
deleted file mode 100644
index 9f40bcb8f63d..000000000000
--- a/app-emulation/qemu-softmmu/metadata.xml
+++ /dev/null
@@ -1,14 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
-<pkgmetadata>
-<herd>no-herd</herd>
-<maintainer>
-  <email>lu_zero@gentoo.org</email>
-</maintainer>
-<use>
-		<flag name='kqemu'>Enables the kernel acceleration module on a x86/x86-64 cpu</flag>
-		<flag name='alsa'>Enable alsa output for sound emulation</flag>
-		<flag name='gnutls'>Enable TLS support for the VNC console server</flag>
-		<flag name='sdl'>Enable the SDL-based console</flag>
-</use>
-</pkgmetadata>
diff --git a/app-emulation/qemu-softmmu/qemu-softmmu-0.9.1-r3.ebuild b/app-emulation/qemu-softmmu/qemu-softmmu-0.9.1-r3.ebuild
deleted file mode 100644
index 2eb64b5b9464..000000000000
--- a/app-emulation/qemu-softmmu/qemu-softmmu-0.9.1-r3.ebuild
+++ /dev/null
@@ -1,128 +0,0 @@
-# Copyright 1999-2009 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/app-emulation/qemu-softmmu/qemu-softmmu-0.9.1-r3.ebuild,v 1.6 2009/09/23 15:35:55 patrick Exp $
-
-inherit eutils flag-o-matic toolchain-funcs
-
-DESCRIPTION="Multi-platform & multi-targets cpu emulator and dynamic translator"
-HOMEPAGE="http://fabrice.bellard.free.fr/qemu/"
-SRC_URI="${HOMEPAGE}${P/-softmmu/}.tar.gz"
-
-LICENSE="GPL-2 LGPL-2.1"
-SLOT="0"
-KEYWORDS="-alpha amd64 ppc -sparc x86"
-IUSE="sdl kqemu gnutls alsa"
-RESTRICT="test"
-
-DEPEND="sys-libs/zlib
-	sdl? ( media-libs/libsdl )
-	!<=app-emulation/qemu-0.7.0
-	kqemu? ( >=app-emulation/kqemu-1.3.0_pre10 )
-	gnutls? (
-		dev-util/pkgconfig
-		net-libs/gnutls
-	)
-	app-text/texi2html"
-RDEPEND="sys-libs/zlib
-	sdl? ( media-libs/libsdl )
-	gnutls? ( net-libs/gnutls )
-	alsa? ( media-libs/alsa-lib )"
-
-S=${WORKDIR}/${P/-softmmu/}
-
-pkg_setup() {
-	if [ "$(gcc-major-version)" == "4" ]; then
-		eerror "qemu requires gcc-3 in order to build and work correctly"
-		eerror "please compile it switching to gcc-3."
-		eerror "We are aware that qemu can guess a gcc-3 but this feature"
-		eerror "could be harmful."
-		die "gcc 4 cannot build qemu"
-	fi
-}
-
-src_unpack() {
-	unpack ${A}
-
-	cd "${S}"
-	epatch "${FILESDIR}/${P}-CVE-2008-0928.patch" #212351
-	epatch "${FILESDIR}/${P}-CVE-2008-2004.patch" #221943
-	# Alter target makefiles to accept CFLAGS set via flag-o.
-	sed -i 's/^\(C\|OP_C\|HELPER_C\)FLAGS=/\1FLAGS+=/' \
-		Makefile Makefile.target tests/Makefile
-	# Ensure mprotect restrictions are relaxed for emulator binaries
-	[[ -x /sbin/paxctl ]] && \
-		sed -i 's/^VL_LDFLAGS=$/VL_LDFLAGS=-Wl,-z,execheap/' \
-			Makefile.target
-	# Prevent install of kernel module by qemu's makefile
-	sed -i 's/\(.\/install.sh\)/#\1/' Makefile
-	# avoid strip
-	sed -i 's:$(INSTALL) -m 755 -s:$(INSTALL) -m 755:' Makefile Makefile.target
-}
-
-src_compile() {
-	if use x86 ; then
-		# Force -march=pentium-mmx or lower. Fixes bug #212351.
-		local march
-		march=$(echo "${CFLAGS}" | sed 's:^.*-march=\([[:alnum:]-]\+\)\([[:blank:]].*\)\?$:\1:p;d')
-		case ${march} in
-			i386|i486|i586|pentium) ;;
-			*) # Either march is not enough low or not exists at all
-			case ${CHOST} in
-				i486-*-*)	march=i486 ;;
-				i586-*-*)	march=i586 ;;
-				*)			march=pentium-mmx ;;
-			esac ;;
-		esac
-		#Let the application set its cflags
-		unset CFLAGS
-		append-flags -march=${march}
-	else
-		#Let the application set its cflags
-		unset CFLAGS
-	fi
-
-	# Switch off hardened tech
-	filter-flags -fpie -fstack-protector
-
-	myconf="--disable-gcc-check"
-	if use alsa; then
-		myconf="$myconf --enable-alsa"
-	fi
-	if ! use gnutls; then
-		myconf="$myconf --disable-vnc-tls"
-	fi
-	if ! use kqemu; then
-		myconf="$myconf --disable-kqemu"
-	fi
-	if ! use sdl ; then
-		myconf="$myconf --disable-sdl --disable-gfx-check"
-	fi
-	# econf does not work
-	./configure \
-		--prefix=/usr \
-		--enable-adlib \
-		--cc=$(tc-getCC) \
-		--host-cc=$(tc-getCC) \
-		--disable-linux-user \
-		--enable-system \
-		${myconf} \
-		|| die "could not configure"
-
-	emake OS_CFLAGS="${CFLAGS}" || die "make failed"
-}
-
-src_install() {
-	emake install \
-		prefix="${D}/usr" \
-		bindir="${D}/usr/bin" \
-		datadir="${D}/usr/share/qemu" \
-		docdir="${D}/usr/share/doc/${P}" \
-		mandir="${D}/usr/share/man" || die
-
-	chmod -x "${D}/usr/share/man/*/*"
-}
-
-pkg_postinst() {
-	einfo "You will need the Universal TUN/TAP driver compiled into"
-	einfo "kernel or as a module to use the virtual network device."
-}