fix bug #187075

Package-Manager: portage-2.1.3.19

5 files changed, 153 insertions, 15 deletions

diff --git a/app-emulation/qemu-softmmu/ChangeLog b/app-emulation/qemu-softmmu/ChangeLog
index d72250ce0334..adfc3ab9b22e 100644
--- a/app-emulation/qemu-softmmu/ChangeLog
+++ b/app-emulation/qemu-softmmu/ChangeLog
@@ -1,6 +1,14 @@
 # ChangeLog for app-emulation/qemu-softmmu
 # Copyright 1999-2007 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/app-emulation/qemu-softmmu/ChangeLog,v 1.42 2007/09/09 12:54:53 tove Exp $
+# $Header: /var/cvsroot/gentoo-x86/app-emulation/qemu-softmmu/ChangeLog,v 1.43 2007/11/13 00:04:24 lu_zero Exp $
+
+*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:
diff --git a/app-emulation/qemu-softmmu/Manifest b/app-emulation/qemu-softmmu/Manifest
index c1d8bdf45656..d2d732d73199 100644
--- a/app-emulation/qemu-softmmu/Manifest
+++ b/app-emulation/qemu-softmmu/Manifest
@@ -1,6 +1,3 @@
------BEGIN PGP SIGNED MESSAGE-----
-Hash: SHA1
-
 AUX qemu-0.8.0-gcc4-hacks.patch 4634 RMD160 1d9d3f188c7c94e86794db2aae1336472852cadf SHA1 d193cc7b5793d80ab4540c7e24e6e75a246babb6 SHA256 dad86d110f86f6edc307d0073546ed583d3f4109784ba06afebbd1126dba0f38
 MD5 5c525594aaac2ffa5e676a2b196ffd82 files/qemu-0.8.0-gcc4-hacks.patch 4634
 RMD160 1d9d3f188c7c94e86794db2aae1336472852cadf files/qemu-0.8.0-gcc4-hacks.patch 4634
@@ -17,6 +14,10 @@ AUX qemu-0.8.2-sparc-fp.patch 591 RMD160 bbce6e754d32e8e5cb4c28e534b7a8ae27bee4b
 MD5 b3e7fd1797acd3ca68ffa4a31750d518 files/qemu-0.8.2-sparc-fp.patch 591
 RMD160 bbce6e754d32e8e5cb4c28e534b7a8ae27bee4b7 files/qemu-0.8.2-sparc-fp.patch 591
 SHA256 839166847b3b39fa481b49e27110aaf207067cc5acecaf55131d2ec31d92ad59 files/qemu-0.8.2-sparc-fp.patch 591
+AUX qemu-softmmu-0.9.0-block-qcow2.patch 346 RMD160 d9c11c082fce158e5fbdaceb5e87a327877de58c SHA1 976bd2727f8bdbad999ea2c23112dcbe550bbf4c SHA256 bfea37a8fc718bcee6f31df02c3095094c58d3ace952a7e7789784d6b3471c5a
+MD5 4dc391ef655e021a5f4f246b6ade23f3 files/qemu-softmmu-0.9.0-block-qcow2.patch 346
+RMD160 d9c11c082fce158e5fbdaceb5e87a327877de58c files/qemu-softmmu-0.9.0-block-qcow2.patch 346
+SHA256 bfea37a8fc718bcee6f31df02c3095094c58d3ace952a7e7789784d6b3471c5a files/qemu-softmmu-0.9.0-block-qcow2.patch 346
 AUX qemu-softmmu-0.9.0-ide-cd.patch 1764 RMD160 5d19bd67c74734c4e66f67dc136adb6f08fa418f SHA1 152fd0403c0644c275ac4aee539139ee5bffd262 SHA256 1f0d9d52e3ead71f0f250902993d1a7d3fb9c88be23870f5559a1596c42bdaf5
 MD5 2d1cb9b1a1f632bbe58d484b0a26e731 files/qemu-softmmu-0.9.0-ide-cd.patch 1764
 RMD160 5d19bd67c74734c4e66f67dc136adb6f08fa418f files/qemu-softmmu-0.9.0-ide-cd.patch 1764
@@ -51,14 +52,18 @@ EBUILD qemu-softmmu-0.8.2.ebuild 2593 RMD160 7fb7c01942585ff2fbf50f06083e6a67914
 MD5 f60a727b51a3a9b186f99ae917701ea4 qemu-softmmu-0.8.2.ebuild 2593
 RMD160 7fb7c01942585ff2fbf50f06083e6a67914558d4 qemu-softmmu-0.8.2.ebuild 2593
 SHA256 e94c8502bbed833a99c5c685e735aadc3f88f664cfdf55345d7ad994589a705d qemu-softmmu-0.8.2.ebuild 2593
+EBUILD qemu-softmmu-0.9.0-r1.ebuild 3178 RMD160 7d8b9fbd4ec8c34dd5ea3fbed7fe65ec679cfb77 SHA1 86d63406bc380330022d270ca772bbd14f7925b8 SHA256 506f3603dd937fbe69bc3660f5f67e28a0e4aaedf916a82d5e5ca7f388d1cb79
+MD5 6ab6db392d5284b6af16a17d8a53c889 qemu-softmmu-0.9.0-r1.ebuild 3178
+RMD160 7d8b9fbd4ec8c34dd5ea3fbed7fe65ec679cfb77 qemu-softmmu-0.9.0-r1.ebuild 3178
+SHA256 506f3603dd937fbe69bc3660f5f67e28a0e4aaedf916a82d5e5ca7f388d1cb79 qemu-softmmu-0.9.0-r1.ebuild 3178
 EBUILD qemu-softmmu-0.9.0.ebuild 3129 RMD160 dc0666aa7499db65af3f78d0d94a4253750927d5 SHA1 7493550b324f11ee72aa5ca994cdd207eb383c6f SHA256 ddd4eb920698c27d70a27d20eb1877b37a7824689340821f8cfe16698100942c
 MD5 6fb80563a1841195b1fb63a0bac13c9f qemu-softmmu-0.9.0.ebuild 3129
 RMD160 dc0666aa7499db65af3f78d0d94a4253750927d5 qemu-softmmu-0.9.0.ebuild 3129
 SHA256 ddd4eb920698c27d70a27d20eb1877b37a7824689340821f8cfe16698100942c qemu-softmmu-0.9.0.ebuild 3129
-MISC ChangeLog 7080 RMD160 e14b84f526671ecad8ce4d6a75914da49d5d757c SHA1 ba73c15ec0e6039e6aa33208c62d02f1928b6528 SHA256 0591f6405630228677ceb29ad587cf1ed64ae458a7dc9b331fee460546b8b180
-MD5 3643f824d03f8fd7f7be6f3faa4058a7 ChangeLog 7080
-RMD160 e14b84f526671ecad8ce4d6a75914da49d5d757c ChangeLog 7080
-SHA256 0591f6405630228677ceb29ad587cf1ed64ae458a7dc9b331fee460546b8b180 ChangeLog 7080
+MISC ChangeLog 7362 RMD160 a295ab3d2ad6a5db2f7c987169ad2e30d299fb1e SHA1 3e06217a78353b083f399269a61caedcaec3088e SHA256 2e7f5306983fcbb792daeb0cc9ad43e309038602371db76fe69108de128d86a1
+MD5 4019e7f20c7c41b89abb63b528762710 ChangeLog 7362
+RMD160 a295ab3d2ad6a5db2f7c987169ad2e30d299fb1e ChangeLog 7362
+SHA256 2e7f5306983fcbb792daeb0cc9ad43e309038602371db76fe69108de128d86a1 ChangeLog 7362
 MISC metadata.xml 223 RMD160 f054e67dff10c87ea1d0b5753124445be6bd4610 SHA1 fcf66d2b271369d296150dde06603d850623ed27 SHA256 64a96c3c9929aec46b50a63ae1fd8c46cef4a8423f448d6f6fff09e20510c98b
 MD5 898131aae735c3477ff2f9c6882f1178 metadata.xml 223
 RMD160 f054e67dff10c87ea1d0b5753124445be6bd4610 metadata.xml 223
@@ -84,10 +89,6 @@ SHA256 f29c0addbe47b46f7c4ab7d2cb4965bac24abdaa456bc0815d5d07a407f7450b files/di
 MD5 12025e3368dd7e9e6733b070be908e8e files/digest-qemu-softmmu-0.9.0 235
 RMD160 eed187813ce9061522dda5880b31158450d6a8a6 files/digest-qemu-softmmu-0.9.0 235
 SHA256 a4e31d23c1853b51c7fef0c61c6721243b5c949069578679b6b35d0d88fe90c5 files/digest-qemu-softmmu-0.9.0 235
------BEGIN PGP SIGNATURE-----
-Version: GnuPG v2.0.6 (GNU/Linux)
-
-iD8DBQFG4+0jV3J2n04EauwRAutFAKCplL04MR2RtHuswSEjQMT6runYQgCggdLs
-7bCRNyINVuF2FCUoImV0bEw=
-=OD/E
------END PGP SIGNATURE-----
+MD5 12025e3368dd7e9e6733b070be908e8e files/digest-qemu-softmmu-0.9.0-r1 235
+RMD160 eed187813ce9061522dda5880b31158450d6a8a6 files/digest-qemu-softmmu-0.9.0-r1 235
+SHA256 a4e31d23c1853b51c7fef0c61c6721243b5c949069578679b6b35d0d88fe90c5 files/digest-qemu-softmmu-0.9.0-r1 235
diff --git a/app-emulation/qemu-softmmu/files/digest-qemu-softmmu-0.9.0-r1 b/app-emulation/qemu-softmmu/files/digest-qemu-softmmu-0.9.0-r1
new file mode 100644
index 000000000000..2079a38f6c73
--- /dev/null
+++ b/app-emulation/qemu-softmmu/files/digest-qemu-softmmu-0.9.0-r1
@@ -0,0 +1,3 @@
+MD5 ab11a03ba30cf4a70641f0f170473d69 qemu-0.9.0.tar.gz 1901741
+RMD160 4296542b6da18a6ac93d20787330d3c1c2ac0a19 qemu-0.9.0.tar.gz 1901741
+SHA256 491facf9335654967ee53d8fb3540a274bfcbdcc225506bd38c4ee8e9ab405c1 qemu-0.9.0.tar.gz 1901741
diff --git a/app-emulation/qemu-softmmu/files/qemu-softmmu-0.9.0-block-qcow2.patch b/app-emulation/qemu-softmmu/files/qemu-softmmu-0.9.0-block-qcow2.patch
new file mode 100644
index 000000000000..206480ddda45
--- /dev/null
+++ b/app-emulation/qemu-softmmu/files/qemu-softmmu-0.9.0-block-qcow2.patch
@@ -0,0 +1,10 @@
+--- block-qcow2.c	2006/08/07 02:38:06	1.4
++++ block-qcow2.c	2007/04/01 19:01:40	1.5
+@@ -1933,6 +1933,7 @@
+     qemu_free(s->refcount_table);
+     s->refcount_table = new_table;
+     s->refcount_table_size = new_table_size;
++    s->refcount_table_offset = table_offset;
+ 
+     update_refcount(bs, table_offset, new_table_size2, 1);
+     return 0;
diff --git a/app-emulation/qemu-softmmu/qemu-softmmu-0.9.0-r1.ebuild b/app-emulation/qemu-softmmu/qemu-softmmu-0.9.0-r1.ebuild
new file mode 100644
index 000000000000..a7a4f92468b5
--- /dev/null
+++ b/app-emulation/qemu-softmmu/qemu-softmmu-0.9.0-r1.ebuild
@@ -0,0 +1,116 @@
+# Copyright 1999-2007 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.0-r1.ebuild,v 1.1 2007/11/13 00:04:24 lu_zero 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 alsa"  #qvm86 debug nptl qemu-fast nptlonly"
+RESTRICT="strip test"
+
+DEPEND="virtual/libc
+	sdl? ( media-libs/libsdl )
+	!<=app-emulation/qemu-0.7.0
+	kqemu? ( >=app-emulation/kqemu-1.3.0_pre10 )
+	app-text/texi2html"
+RDEPEND="sdl? ( media-libs/libsdl )
+		 alsa? ( media-libs/alsa-lib )"
+
+S="${WORKDIR}/${P/-softmmu/}"
+
+QA_TEXTRELS="usr/bin/qemu
+	usr/bin/qemu-system-sparc
+	usr/bin/qemu-system-arm
+	usr/bin/qemu-system-ppc
+	usr/bin/qemu-system-mips
+	usr/bin/qemu-system-x86_64"
+QA_EXECSTACK="usr/share/qemu/openbios-sparc32"
+QA_WX_LOAD="usr/share/qemu/openbios-sparc32"
+
+#set_target_list() {
+#	TARGET_LIST="i386-softmmu ppc-softmmu sparc-softmmu x86_64-softmmu arm-softmmu mips-softmmu"
+#	export TARGET_LIST
+#}
+
+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
+}
+
+#RUNTIME_PATH="/emul/gnemul/"
+src_unpack() {
+	unpack ${A}
+
+	cd ${S}
+	# 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
+
+	epatch ${FILESDIR}/${P}-ide-cd.patch
+	epatch ${FILESDIR}/${P}-block-qcow2.patch
+}
+
+src_compile() {
+	#Let the application set its cflags
+	unset CFLAGS
+
+	# Switch off hardened tech
+	filter-flags -fpie -fstack-protector
+
+#	set_target_list
+
+	myconf="--disable-gcc-check"
+	if ! use sdl ; then
+		myconf="$myconf --disable-gfx-check"
+	fi
+	./configure \
+		--prefix=/usr \
+		--enable-slirp --enable-adlib \
+		--cc=$(tc-getCC) \
+		--host-cc=$(tc-getCC) \
+		--kernel-path=${KV_DIR} \
+		--disable-linux-user \
+		--enable-system \
+		$(use_enable sdl)\
+		$(use_enable kqemu) \
+		$(use_enable alsa) \
+		${myconf} \
+		|| die "could not configure"
+
+	emake || die "make failed"
+}
+
+src_install() {
+	make 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."
+}