--- qemu-0.12.5+dfsg.orig/debian/qemu-make-debian-root +++ qemu-0.12.5+dfsg/debian/qemu-make-debian-root @@ -0,0 +1,157 @@ +#! /bin/sh -e +# +# $Id: qemu-make-debian-root 353 2008-10-16 20:28:22Z aurel32 $ +# +# Script to make a debian root image. +# + +set -e + +which uudecode >/dev/null || { + echo "error: missing sharutils package" >&2 + exit 1 +} + +which debootstrap >/dev/null || { + echo "error: missing debootstrap package" >&2 + exit 1 +} + +KEEPFS=0 +if [ "$1" = "-k" ] || [ "$2" = "-k" ]; then + KEEPFS=1 + shift +fi + +SPARSE=0 +if [ "$1" = "-s" ] || [ "$2" = "-s" ]; then + SPARSE=1 + shift +fi + +if [ $# -lt 4 ]; then + echo Usage: "$0 [-ks] size-in-MB distrib deburl image [files_to_copy_in_/root]" >&2 + echo "eg $0 150 sid http://proxy:10000/debian qemu" >&2 + echo "-k keep file system -s sparse image" >&2 + echo "$0 is normally run as root." >&2 + exit 1 +fi + +SIZE=$1 +DISTRO=$2 +URL=$3 +IMAGE=$4 +shift 4 + +# now files to copy are in "$@". We don't put them in a variable +# because that would coufuse spaces-in-filenames with +# whitespace-separation. + + +if [ $SIZE -lt 130 ]; then + echo 'Size must be at least 130 megabytes (Debian unstable takes 100)' >&2 + exit 1 +fi + +cleanup() +{ + echo Cleaning up... >&2 + umount -d $TMP_DIR || true + rm -f $IMAGE.ext2 $IMAGE +} + +trap cleanup EXIT + +HEADS=16 +SECTORS=63 +# 512 bytes in a sector: cancel the 512 with one of the 1024s... +CYLINDERS=$(( $SIZE * 1024 * 2 / ($HEADS * $SECTORS) )) + +# Create a filesystem: one track for partition table. +if [ "$SPARSE" = "1" ]; then + dd bs=$(($SECTORS * 512)) if=/dev/zero of=$IMAGE.ext2 count=1 seek=$(($CYLINDERS * $HEADS - 2)) +else + dd bs=$(($SECTORS * 512)) if=/dev/zero of=$IMAGE.ext2 count=$(($CYLINDERS * $HEADS - 1)) +fi + +mke2fs -q -m1 -F $IMAGE.ext2 + +TMP_DIR="$(mktemp -d /tmp/mount.XXXXXX)" || \ + { echo >&2 "Failed to create temporary directory"; exit 1; } + +# Mount it. +mount -o loop $IMAGE.ext2 $TMP_DIR + +# Do debian install on it. +#debootstrap --exclude=syslinux,at,exim,mailx,libstdc++2.10-glibc2.2,mbr,setserial,fdutils,info,ipchains,lilo,pcmcia-cs,ppp,pppoe,pppoeconf,pppconfig $DISTRO $TMP_DIR $URL +debootstrap --exclude=syslinux,at,exim,mailx,libstdc++2.10-glibc2.2,mbr,setserial,fdutils,info,ipchains,iptables,lilo,pcmcia-cs,ppp,pppoe,pppoeconf,pppconfig,wget,telnet,cron,logrotate,exim4,exim4-base,exim4-config,exim4-daemon-light,pciutils,modconf,tasksel $DISTRO $TMP_DIR $URL + +# Final configuration. +cat > $TMP_DIR/etc/fstab < $TMP_DIR/etc/inittab.new +mv $TMP_DIR/etc/inittab.new $TMP_DIR/etc/inittab + +# Set hostname to base of image name. +basename $IMAGE > $TMP_DIR/etc/hostname + +# Create /etc/shadow +chroot $TMP_DIR pwconv + +# Set root password to "root" +sed 's/^root:[^:]*/root:$1$aybpiIGf$cB7iFDNZvViQtQjEZ5HFQ0/' < $TMP_DIR/etc/shadow > $TMP_DIR/etc/shadow.new +mv $TMP_DIR/etc/shadow.new $TMP_DIR/etc/shadow + +# Remove packages we don't need +chroot $TMP_DIR /usr/bin/dpkg --remove console-common console-tools console-data base-config man-db manpages +# Try to remove all libraries: some won't be removable. +chroot $TMP_DIR dpkg --remove `chroot $TMP_DIR dpkg --get-selections | sed -n 's/^\(lib[^ \t]*\)[\t ]*install/\1/p'` 2>/dev/null || true + + +# Copy wanted files to /root if asked to +if [ $# -gt 0 ]; then + cp -a "$@" $TMP_DIR/root/ +fi +umount -d $TMP_DIR + +# Create file with partition table. +uudecode -o- << "EOF" | gunzip > $IMAGE +begin 664 partition-table.gz +M'XL("*_<##\"`W!A Mon, 14 Jan 2013 12:58:32 +0400 + +qemu (0.12.5+dfsg-3squeeze2) squeeze-security; urgency=low + + * block-prevent-snapshot-mode-TMPDIR-symlink-attack-CVE-2012-2652.patch + upstream fix for CVE-2012-2652, symlink attacks in snapshot mode. + (Closes: #678280) + * console-bounds-check-whenever-changing-the-cursor-CVE-2012-3515.patch + upstream fix for CVE-2012-3515, VT100 emulation vulnerability. + (Closes: #686973) + + -- Michael Tokarev Sat, 08 Sep 2012 10:05:17 +0400 + +qemu (0.12.5+dfsg-3squeeze1) squeeze-proposed-updates; urgency=low + + * Don't register qemu-mips(el) with binfmt on mips(el). Closes: + #618369. + * mips hosts: fix branch target change during code retranslation. + + -- Aurelien Jarno Thu, 17 Mar 2011 22:38:30 +0100 + +qemu (0.12.5+dfsg-3) unstable; urgency=medium + + * qemu-user-static: + - Drop binfmt support for emulating amd64 on i386, as it is broken and + including it interferes with environments capable of running amd64 + natively. Closes: #604712. + - Remove binfmt support for installed targets in postinst before installing + supported targets, to ensure no-longer-supported targets are actually + removed. + - Remove binfmt support for installed targets in prerm. + + -- Vagrant Cascadian Sun, 28 Nov 2010 15:57:11 -0800 + +qemu (0.12.5+dfsg-2) unstable; urgency=low + + * mips/mipsel binfmt registration: also match EI_ABIVERSION=1, used by + OpenWRT. Closes: #591543. + * Update 99_stable.diff from the stable branch: + - Fix windows XP boot with libvirt. Closes: bug#579166. + + -- Aurelien Jarno Tue, 17 Aug 2010 12:56:30 +0200 + +qemu (0.12.5+dfsg-1) unstable; urgency=low + + * New upstream stable version. + * qemu-system: don't suggests kqemu-source. Closes: bug#589217. + * qemu-keymaps: fix short description. + + -- Aurelien Jarno Fri, 23 Jul 2010 19:02:14 +0200 + +qemu (0.12.4+dfsg-4) unstable; urgency=high + + * Update debian/copyright. Closes: bug#588911. + * Update 99_stable.diff from the stable branch: + - Add documentation for the stdio signal option. Closes: bug#588514. + * Split out keymaps in the qemu-keymaps package. Closes: bug#559174. + * Bump Standards-Version to 3.9.0 (no changes). + + -- Aurelien Jarno Wed, 14 Jul 2010 15:13:04 +0200 + +qemu (0.12.4+dfsg-3) unstable; urgency=low + + * Update 99_stable.diff from the stable branch. + + -- Aurelien Jarno Wed, 16 Jun 2010 23:07:36 +0200 + +qemu (0.12.4+dfsg-2) unstable; urgency=low + + [ Vagrant Cascadian ] + * qemu-system: Depend on etherboot-qemu package for PXE roms. + Closes: #552406. + + [ Aurelien Jarno ] + * Add 99_stable.diff to update from the stable branch. + * Use --with-pkgversion to set the packaging version. + + -- Aurelien Jarno Wed, 02 Jun 2010 21:24:26 +0200 + +qemu (0.12.4+dfsg-1) unstable; urgency=low + + * New upstream stable version: + - remove debian/patches/01_redir_doc.patch + - remove debian/patches/04_cmd646.patch + - update debian/patches/06_sh4.diff + + -- Aurelien Jarno Fri, 07 May 2010 19:43:48 +0200 + +qemu (0.12.3+dfsg-4) unstable; urgency=low + + * Add 05_bochs_vbe.diff backported from uptream to support vgabios + 0.6c. + * Add 06_sh4.diff containing a few SH4 specific fixes backported from + upstream. + + -- Aurelien Jarno Fri, 09 Apr 2010 01:44:38 +0200 + +qemu (0.12.3+dfsg-3) unstable; urgency=low + + * Add symlink for seabios's multiboot.bin. + * Change configure-stamp depends to non-phony target $(QUILT_STAMPFN). + Closes: #574444. + * Fix a crash in cmd646 bmdma code that can be triggered by the guest. + Closes: #574539. + * Explain that KQEMU support has been removed in qemu-system.NEWS. + * Build-Conflicts with oss4-dev, as this package install a broken + header. Closes: #575320. + + -- Aurelien Jarno Sat, 03 Apr 2010 17:07:23 +0200 + +qemu (0.12.3+dfsg-2) unstable; urgency=low + + [ Aurelien Jarno ] + * Disable KVM support on PowerPC, as it needs at least 2.6.33 kernel + headers. + + [ Vagrant Cascadian ] + * Support pselect for linux-user arm target. Patch by Michael Casadevall. + * Add symlink for seabios's linuxboot.bin to fix -kernel option. Thanks to + Sami Liedes. Closes: #574174. + * qemu-system: Switch back to using versioned dependencies for vgabios, + bochsbios, openhackware, openbios-ppc and openbios-sparc rather than + recommends/conflicts, to ensure a proper upgrade path. Closes: #573397. + Reopens: #436094. + + -- Vagrant Cascadian Fri, 19 Mar 2010 09:31:29 -0700 + +qemu (0.12.3+dfsg-1) unstable; urgency=low + + [ Vagrant Cascadian ] + * New upstream version: + - Fix access to block devices on GNU/kFreeBSD. Closes: #558447. + - Correctly update clock when waking up from sleep. Closes: #414165. + - Slirp works with other network interfaces. Closes: #407702. + - Add the possibility to specify a host to bind to with the -redir + option. Closes: #366847. + - Fix cirrus graphics card with windows 98. Closes: #522124. + * Indicate repackaged upstream tarball by adding "+dfsg" to the version. + Closes: #388740. + * Remove second libgnutls-dev from build depends. + * Update debian/watch with current location of tarball releases. + * Drop binutils-gold patch, applied upstream. + * Switch from bochsbios to seabios. Update bios.bin symlink and + recommends/conflicts. + * Bump Standards-Version to 3.8.4 (no changes). + * Update my email address to vagrant@debian.org. + + [ Aurelien Jarno ] + * Create a kvm group in postinst and set the group of /dev/kvm to kvm. + Closes: #570544. + * Add mips and mipsel to the list of supported architectures. + * Add patches/01_redir_doc.patch to fix a mistake in the redirection + documentation. + * Add patches/02_kfreebsd.patch to use the legacy USB stack on + GNU/kFreeBSD. + * Force the depends from qemu on qemu-system, qemu-user and qemu-utils + to (>= {source:Version}). + * Update openbios related conflicts. + + -- Vagrant Cascadian Sun, 07 Mar 2010 09:20:43 -0800 + +qemu (0.11.1-2) unstable; urgency=low + + * Add versioned build-depends on etherboot. + * Add PXE boot support for virtio network adapters. + * Move qemu-make-debian-root to qemu-utils package, as it only produces disk + images not useable by qemu-user. Lower recommends on debootstrap to + suggests. Add Conflicts and Replaces on older versions of qemu-user. + * Register /usr/bin/qemu with the alternatives system. Closes: #413840. + * qemu: Add ${misc:Depends} so that debhelper can add dependencies if needed. + + -- Vagrant Cascadian Fri, 08 Jan 2010 09:26:11 -0800 + +qemu (0.11.1-1) unstable; urgency=low + + [ Aurelien Jarno ] + * New upstream version. + * Drop build-depends on libfreebsd-dev on GNU/kFreeBSD. + * qemu: suggests qemu-user-static. + * qemu-user-static: register QEMU with binfmt mecanism. Closes: + #306637. + * Bump conflicts on openbios-ppc to (<< 1.0+svn505-1). + * Add 01-binutils-gold.diff to fix FTBFS with binutils-gold. Closes: + #556301. + * Add sparc64 support. + * Use new roms location in etherboot package. + + [ Vagrant Cascadian ] + * qemu-utils, qemu-user, qemu-system: Set both Conflicts and Replaces for + older versions of qemu to ensure proper upgrade path. + * Add versioned build-dep on linux-libc-dev to ensure that KVM support is + enabled. + * qemu-system: Lower dependencies on vgabios, bochsbios, openhackware, + openbios-ppc and openbios-sparc to recommends. Conflict with versions that + are incompatible. Closes: #436094. + * qemu-utils: Tighten the versioned conflicts with kvm, as not all older + versions actually conflict. + * qemu-make-debian-root: Apply modified patch from Nicolas Boulenguez that + documents usage of -s, exits on error, and mentions that it is normally + run as root. Closes: #447034. + + -- Aurelien Jarno Sun, 27 Dec 2009 12:09:11 +0100 + +qemu (0.11.0-6) unstable; urgency=low + + * Update from stable-0.11 branch. + * qemu-utils: add Replaces: qemu (<< 0.11.0-2). Closes: #556627, + #556860. + + -- Aurelien Jarno Fri, 20 Nov 2009 08:24:32 +0100 + +qemu (0.11.0-5) unstable; urgency=low + + * Change the Conflicts: into Replaces: to handle the move of /etc/ifup + from one package to another correctly. Tighten the version. Closes: + #556627. + + -- Aurelien Jarno Wed, 18 Nov 2009 16:30:39 +0000 + +qemu (0.11.0-4) unstable; urgency=low + + [ Aurelien Jarno ] + * Update from stable-0.11 branch. + * Default to alsa before OSS. Closes: #451234. + + [ Vagrant Cascadian ] + * Updated Vcs-Git to a url more likely to work with debcommit. + + -- Aurelien Jarno Wed, 18 Nov 2009 16:26:17 +0100 + +qemu (0.11.0-3) unstable; urgency=low + + * qemu-system, qemu-user: fix conflicts version. Closes: #556627. + * qemu-utils: conflicts with kvm (<= 85+dfsg-4.1), as it also provides + qemu-io. + + -- Aurelien Jarno Tue, 17 Nov 2009 09:49:24 +0100 + +qemu (0.11.0-2) unstable; urgency=low + + * Update from stable-0.11 branch. + * Move qemu-user.1 and qemu-make-debian-root.8 to the qemu-user + package. + * Add build-depends on uuid-dev. + * Use a specific install file for qemu-utils on GNU/kFreeBSD. + * Call dh_install with -s. + + -- Aurelien Jarno Tue, 17 Nov 2009 09:11:29 +0100 + +qemu (0.11.0-1) unstable; urgency=low + + [ Aurelien Jarno ] + * New upstream version. + - Documents virtio NIC. Closes: #541182. + - Increase the maximum TCG op a target instruction op can expand to. + Closes: #530645, #542297. + - KVM is enabled by default. Closes: #520894. + - Fix CVE-2009-3616. Closes: #553589. + * Drop 65_kfreebsd.patch. + * Split the qemu package and use out of tree building. Based on a patch + from Vagrant Cascadian. Closes: #524774. + * Only recommends debootstrap for qemu-user and qemu-user static. Closes: + #543356. + * Remove /usr/share/qemu/proll.elf. Closes: bug#542247. + * Add build-depends on libcurl4-gnutls-dev, libgnutls-dev and libsasl2-dev + to enable new upstream features. + * Bump Standards-Version to 3.8.3 (no changes). + * Update Vcs-* fields to point to the new git repository. + * Add Vagrant Cascadian to uploaders, and set + DM-Upload-Allowed to yes. + + -- Aurelien Jarno Mon, 26 Oct 2009 10:17:57 +0000 + +qemu (0.10.50+git20090729-1) experimental; urgency=low + + [ Josh Triplett ] + * Remove myself from Uploaders. + + [ Riku Voipio ] + * new upstream RC version + * nuke all linux-user patches (applied upstream) + 06_exit_segfault + 12_signal_powerpc_support + 21_net_soopts + 30_syscall_ipc + 32_syscall_sysctl + 35_syscall_sockaddr + 48_signal_terminate + 55_unmux_socketcall + * nuke all other applied-upstream patches + 01_nostrip (better version upstream) + 07_i386_exec_name (can be reintroduced in debian/rules) + 50_linuxbios_isa_bios_ram (shouldn't be needed anymore) + 51_linuxbios_piix_ram_size (applied) + 56_dhcp (crap) + 60_ppc_ld (reintroduce if needed) + 64_ppc_asm_constraints (ditto) + 66_tls_ld.patch (ditto) + 81_compile_dtb.patch (applied upstream) + 82_qemu-img_decimal (ditto) + * move to git + * simplify build rules + * Correct my email address + + -- Riku Voipio Wed, 29 Jul 2009 13:28:05 +0300 + +qemu (0.10.6-1) unstable; urgency=low + + [ Josh Triplett ] + * Remove myself from Uploaders. + + [ Aurelien Jarno ] + * New upstream version. + * Bump Standards-Version to 3.8.2 (no changes). + * Update debian/watch (closes: bug#538781). + + -- Aurelien Jarno Fri, 31 Jul 2009 15:25:36 +0200 + +qemu (0.10.5-1) unstable; urgency=low + + * New upstream version. + + -- Aurelien Jarno Sun, 24 May 2009 16:15:35 +0200 + +qemu (0.10.4-1) unstable; urgency=low + + * New upstream version. + * debian/NEWS.Debian: new file, describing the cache policy options + (closes: bug#526832). + * debian/patches/70_versatile_memsize.patch: new patch to set a upper + limit on the memory size of the versatile boards (closes: + bug#527264). + + -- Aurelien Jarno Tue, 12 May 2009 18:31:29 +0200 + +qemu (0.10.3-1) unstable; urgency=low + + * New upstream version. + * Tighten dependency on bochsbios. + + -- Aurelien Jarno Sat, 02 May 2009 10:14:21 +0200 + +qemu (0.10.2-2) unstable; urgency=low + + * Add missing comma in build-depends (closes: bug#524207). + * Tighten dependency on vgabios. + + -- Aurelien Jarno Wed, 15 Apr 2009 22:30:43 +0200 + +qemu (0.10.2-1) unstable; urgency=low + + [ Aurelien Jarno ] + * New upstream stable release. + + -- Aurelien Jarno Tue, 07 Apr 2009 07:37:15 +0200 + +qemu (0.10.1-1) unstable; urgency=low + + [ Aurelien Jarno ] + * New upstream stable release: + - patches/80_stable-branch.patch: remove. + * debian/control: + - Remove depends on proll. + - Move depends on device-tree-compiler to build-depends. + - Bump Standards-Version to 3.8.1 (no changes). + * patches/82_qemu-img_decimal.patch: new patch from upstream to make + qemu-img accept sizes with decimal values (closes: bug#501400). + + -- Aurelien Jarno Sun, 22 Mar 2009 10:13:17 +0100 + +qemu (0.10.0-1) unstable; urgency=low + + [ Aurelien Jarno ] + * New upstream release: + - Fix fr-be keyboard mapping (closes: bug#514462). + - Fix stat64 structure on ppc-linux-user (closes: bug#470231). + - Add a chroot option (closes: bug#415996). + - Add evdev support (closes: bug#513210). + - Fix loop on symlinks in user mode (closes: bug#297572). + - Bump depends on openbios-sparc. + - Depends on openbios-ppc. + - Update 12_signal_powerpc_support.patch. + - Update 21_net_soopts.patch. + - Drop 44_socklen_t_check.patch (merged upstream). + - Drop 49_null_check.patch (merged upstream). + - Update 64_ppc_asm_constraints.patch. + - Drop security/CVE-2008-0928-fedora.patch (merged upstream). + - Drop security/CVE-2007-5730.patch (merged upstream). + * patches/80_stable-branch.patch: add patches from stable branch: + - Fix race condition between signal handler/execution loop (closes: + bug#474386, bug#501731). + * debian/copyright: update. + * Compile and install .dtb files: + - debian/control: build-depends on device-tree-compiler. + - debian/patches/81_compile_dtb.patch: new patch from upstream. + - debian/rules: compile and install bamboo.dtb and mpc8544.dtb. + + -- Aurelien Jarno Sat, 07 Mar 2009 06:20:34 +0100 + +qemu (0.9.1+svn20090104-1) experimental; urgency=low + + [ Aurelien Jarno ] + * New upstream snapshot. + * Disable security/CVE-2008-0928-fedora.patch, it still breaks qcow + format. + + -- Aurelien Jarno Sun, 04 Jan 2009 16:31:40 +0100 + +qemu (0.9.1+svn20081223-1) experimental; urgency=low + + [ Aurelien Jarno ] + * New upstream snapshot. + - Fix CVE-2008-2382 + * Update patches/48_signal_terminate.patch. + * debian/rules: remove upstream flags from CFLAGS. + + -- Aurelien Jarno Tue, 23 Dec 2008 14:51:25 +0100 + +qemu (0.9.1+svn20081214-1) experimental; urgency=low + + [ Aurelien Jarno ] + * New upstream snapshot. + - Fix jmp im on x86_64 when executing 32-bit code. Fix grub + installation (Closes: bug#467148). + + -- Aurelien Jarno Sun, 14 Dec 2008 23:26:04 +0100 + +qemu (0.9.1+svn20081207-1) experimental; urgency=low + + [ Aurelien Jarno ] + * New upstream snapshot. + - Do not depend on gcc-3.4 anymore (Closes: bug#440425, bug#463066). + - Fix broken display introduced by CVE-2007-1320 (Closes: bug#422578). + * debian/control: remove build-dependency on gcc-3.4. + * debian/rules: remove code for dyngen targets. + * Split 90_security.patch into + - security/CVE-2007-5730.patch + - security/leftover.patch + * Replace 91_security.patch by security/CVE-2008-0928-fedora.patch taken + from fedora repository and enable it (Closes: #469649). + + [ Riku Voipio ] + * 2 patches gone, 19 to go: + - 10_signal_jobs.patch: drop, merged upstream + - 11_signal_sigaction.patch: drop, merged upstream + - series: update + + -- Aurelien Jarno Sun, 07 Dec 2008 19:40:09 +0100 + +qemu (0.9.1+svn20081128-1) experimental; urgency=low + + [ Aurelien Jarno ] + * New upstream snapshot. + - Include documentation for network downscript option (Closes: + bug#506994). + - Drop 00_bios.patch and pass --disable-blobs instead. + - Update 12_signal_powerpc_support.patch. + + [ Riku Voipio ] + * Drop 31_syscalls.patch as it makes no sense using host uselib to + load target code into qemu's host memoryspace. + + -- Aurelien Jarno Sat, 29 Nov 2008 09:04:41 +0100 + +qemu (0.9.1+svn20081112-1) experimental; urgency=low + + [ Aurelien Jarno ] + * New upstream snapshot. + - does not need a disk image anymore (Closes: bug#260935). + - 53_openbios_size.patch: drop (merged upstream). + - 90_security: update. + * debian/control: depend on openbios-sparc (>= 1.0~alpha2+20081109) + (Closes: bug#502411, bug#502414). + + -- Aurelien Jarno Sun, 09 Nov 2008 14:42:37 +0100 + +qemu (0.9.1+svn20081101-1) experimental; urgency=low + + [ Aurelien Jarno ] + * New upstream snapshot. + - fix a heap overflow in Cirrus emulation (CVE-2008-4539). + - 50_linuxbios_isa_bios_ram.patch: update. + - 90_security.patch: update. + + -- Aurelien Jarno Sat, 01 Nov 2008 09:26:45 +0100 + +qemu (0.9.1+svn20081023-1) experimental; urgency=low + + [ Aurelien Jarno ] + * New upstream snapshot. + - 12_signal_powerpc_support.patch: update. + - 50_linuxbios_isa_bios_ram.patch: update. + + -- Aurelien Jarno Thu, 23 Oct 2008 21:34:26 +0200 + +qemu (0.9.1+svn20081016-1) experimental; urgency=low + + [ Aurelien Jarno ] + * New upstream snapshot. + * patches/31_syscalls.patch: remove parts merged upstream. + * debian/qemu-make-debian-root: + - Fix bug introduced when fixing bug#496394 (Closes: bug#502325). + + -- Aurelien Jarno Mon, 13 Oct 2008 23:11:15 +0200 + +qemu (0.9.1+svn20081012-1) experimental; urgency=low + + [ Riku Voipio ] + * Add a bunch of patches from scratchbox + - 44_socklen_t_check work better with badbehavin net apps + - 48_signal_terminate make qemu binary terminate on signals as expected + - 49_null_checks don't bother some syscalls when null/zero is passed + + [ Aurelien Jarno ] + * New upstream snapshot. + - alpha is now a TCG target. + - comma has been added to sendkey (closes: bug#414342). + * patches/31_syscalls.patch: remove parts merged upstream. + * patches/39_syscall_fadvise64.patch: remove (merged upstream). + * patches/90_security.patch: remove parts merged upstream. + * debian/control: build-depends on libbluetooth-dev. + + -- Aurelien Jarno Sun, 12 Oct 2008 18:46:54 +0200 + +qemu (0.9.1+svn20080905-1) experimental; urgency=low + + * New upstream snapshot. + - SH4 is now a TCG target. + * debian/watch: update URL location. + + -- Aurelien Jarno Tue, 02 Sep 2008 01:43:24 +0200 + +qemu (0.9.1+svn20080826-1) experimental; urgency=low + + * New upstream snapshot. + * debian/qemu-make-debian-root: + - Use mktemp instead of $$ to create temporary directories (Closes: + bug#496394). + * Ship a libqemu-dev package (Closes: bug#451618). + + -- Aurelien Jarno Tue, 26 Aug 2008 09:55:36 +0200 + +qemu (0.9.1+svn20080822-1) experimental; urgency=low + + * New upstream snapshot. + - Focus to monitor to ask password (Closes: bug#473240). + - TCG SPARC host support (Closes: bug#450817). + - Check KQEMU availability before allocating memory (Closes: bug#414566). + - Fix dead keys (Closes: bug#489594). + - Fix ES1370 emulation (Closes: bug#494462). + - New USB UHCI implemnation (Closes: bug#457651). + - Add debian/patches/00_bios.patch. + - Remove debian/patches/02_snapshot_use_tmpdir.patch (merged). + - Remove debian/patches/04_do_not_print_rtc_freq_if_ok.patch (merged). + - Remove patches/05_non-fatal_if_linux_hd_missing.patch (merged). + - Update debian/patches/07_i386_exec_name.patch + - Update debian/patches/12_signal_powerpc_support.patch + - Remove debian/patches/33_syscall_ppc_clone.patch (merged differently). + - Remove debian/patches/41_arm_fpa_sigfpe.patch (merged). + - Remove debian/patches/42_arm_tls.patch (merged differently). + - Update debian/patches/55_unmux_socketcall.patch. + - Remove debian/patches/63_sparc_build.patch (useless). + - Update debian/patches/65_kfreebsd.patch. + - Update debian/patches/66_tls_ld.patch. + - Remove debian/patches/70_manpage.patch (merged). + - Remove debian/patches/71_doc.patch (merged). + - Remove debian/patches/80_ui_curses.patch (merged). + - Remove debian/patches/81_mips32r2_fpu.patch (merged). + - Remove debian/patches/82_mips_abs.patch (merged). + - Remove debian/patches/83_usb-serial.patch (merged). + - Remove debian/patches/84_rtl8139.patch (merged). + - Remove debian/patches/85_vvfat.patch (merged). + - Remove debian/patches/86_df.patch (merged). + - Remove debian/patches/87_eoi.patch (merged). + - Remove debian/patches/88_dma.patch (merged). + - Remove debian/patches/89_braille.patch (merged). + - Remove debian/patches/92_no_shutdown.patch (merged). + - Remove debian/patches/93_tmpfs.patch (merged). + - Remove debian/patches/94_security.patch (merged). + * debian/README.source: new file. + * debian/patches/*: convert to patchlevel 1 (Closes: bug#484963). + * debian/control: + - Add build-depends on libesd0-dev. + - Add build-depends on libpulse-dev. + - Add build-depends on libvdeplug2-dev. + - Add build-depends on etherboot. + - Update list of supported targets (Closes: bug#488339). + - Suggests kqemu-source. + - Bump Standards-Version to 3.8.0. + * debian/links: + - Add missing manpage symlinks. + * debian/rules: + - Enable audio drivers depending on the system. + - Enable DYNGEN targets depending on the system. + - Install PXE bios from etherboot (Closes: bug#412010). + - Don't ignore make clean errors. + - Don't build DYNGEN targets on kfreebsd-amd64 (Closes: bug#494353). + * debian/patches/22_net_tuntap_stall.patch: remove (outdated). + + -- Aurelien Jarno Fri, 22 Aug 2008 01:00:54 +0200 + +qemu (0.9.1-5) unstable; urgency=high + + [ Guillem Jover ] + * Add Homepage field. + * Add Vcs-Browser and Vcs-Svn fields. + * Remove packaging repository information from debian/copyright. + * Add former package co-maintainers to debian/copyright. + * Serialize patch and configure steps in debian/rules to support parallel + builds, as we are patching configure. + * Remove myself from Uploaders. + + [ Aurelien Jarno ] + * debian/patches/70_manpage.patch: remove curses documentation, it is already + in debian/patches/80_ui_curses.patch (Closes: bug#477369). + * debian/patches/94_security.patch: add format= to drive options + (CVE-2008-2004). + + -- Aurelien Jarno Mon, 28 Apr 2008 21:54:12 +0200 + +qemu (0.9.1-4) unstable; urgency=high + + * debian/patches/52_ne2000_return.patch: drop, the patch is wrong. + * Backports from upstream: + - Typo in curses_keys.h + - Documentation for the -curses option + - Fix broken absoluteness check for cabs.d.*. + - USB-to-serial device. + - rtl8139: fix endianness on big endian targets + - restore rw support for vvfat + - x86-64: recompute DF after eflags has been modified when emulating + SYSCALL + - ignore reads to the EOI register + - IDE: Improve DMA transfers by increasing the buffer size + - Braille device support + - Add -no-shutdown option (Closes: #326406) + - Ask to use "mount -o remount" instead of "umount" and "mount" + /dev/shm (Closes: #476539). + * debian/qemu.doc-base: fix section. + + -- Aurelien Jarno Sun, 20 Apr 2008 23:29:42 +0200 + +qemu (0.9.1-3) unstable; urgency=low + + [ Aurelien Jarno ] + * debian/patches/42_arm_tls.patch: fix to get qemu-system-arm working + again. (Closes: #471722). + * debian/patches/56_dhcp.patch: fix DHCP server to correctly support + MS-Windows guests. (Closes: #471452). + + -- Aurelien Jarno Wed, 19 Mar 2008 18:58:29 +0100 + +qemu (0.9.1-2) unstable; urgency=low + + [ Aurelien Jarno ] + * debian/patches/80_ui_curses.patch: pull new patch from upstream CVS + (Closes: #442274). + * debian/patches/65_kfreebsd.patch: link with -lfreebsd. (Closes: + #465932). + * debian/patches/81_mips32r2_fpu.patch: patch pulled from upstream + to fix FPU issue on MIPS32R2. + * debian/patches/42_arm_tls.patch: reenable, mistakenly disabled in the + previous upload. (Closes: #469743). + * debian/rules: fix parallel building. (Closes: #469981). + * debian/patches/07_i386_exec_name.patch: install the i386 emulator as + qemu-system-i386, and change qemu into a link pointing to the i386 + version. + * debian/README.Debian: add notes about qemu-system-ppc and video.x + (Closes: #388735). + * debian/patches/70_manpage.patch: describe the -curses option. + (Closes: #433658). + * debian/patches/71_doc.patch: fix the monitor change option. (Closes: + #467106). + * debian/patches/35_syscall_sockaddr.patch: fix sockaddr (Closes: + #469351). + * debian/patches/43_arm_cpustate.patch: disable (Closes: #444171). + + -- Aurelien Jarno Mon, 17 Mar 2008 01:29:03 +0100 + +qemu (0.9.1-1) unstable; urgency=low + + [ Aurelien Jarno ] + * New upstream version. (Closes: #459801) + - Supports s390 host. (Closes: #441119) + - Fix PCI bar allocation. (Closes: #413315) + - Fix typo in keys name. (Closes: #426181) + - Fix segfault of qemu-i386 (Closes: #446868). + - debian/control: bump depends on openbios-sparc to + >= 1.0~alpha2+20080106. + - debian/patches/02_snapshot_use_tmpdir.patch: Refreshed. + - debian/patches/04_do_not_print_rtc_freq_if_ok.patch: Likewise. + - debian/patches/05_non-fatal_if_linux_hd_missing.patch: Likewise. + - debian/patches/06_exit_segfault.patch: Likewise. + - debian/patches/10_signal_jobs.patch: Likewise. + - debian/patches/11_signal_sigaction.patch: Likewise. + - debian/patches/12_signal_powerpc_support.patch: Likewise. + - debian/patches/21_net_soopts.patch: Likewise. + - debian/patches/30_syscall_ipc.patch: Likewise. + - debian/patches/31_syscalls.patch: Likewise. + - debian/patches/32_syscall_sysctl.patch: Likewise. + - debian/patches/33_syscall_ppc_clone.patch: Likewise. + - debian/patches/35_syscall_sockaddr.patch: Likewise. + - debian/patches/41_arm_fpa_sigfpe.patch: Likewise. + - debian/patches/42_arm_tls.patch: Likewise. + - debian/patches/50_linuxbios_isa_bios_ram.patch: Likewise + - debian/patches/51_linuxbios_piix_ram_size.patch: Likewise + - debian/patches/61_safe_64bit_int.patch: Removed, merged upstream. + - debian/patches/63_sparc_build.patch: Refreshed. + - debian/patches/80_ui_curses.patch: Likewise. + * debian/patches/90_security.patch: fix 64-bit overflow. (Closes: + #425634) + * debian/qemu-make-debian-root: add a -s option to create sparse + image. (Closes: #322325) + * debian/control: bump depends on bochsbios to >= 2.3.5-1. Use + BIOS-qemu-latest instead of BIOS-bochs-latest. (Closes: #402289, + #442822) + * debian/rules: build the non-dyngen part with default gcc. + * debian/rules: support DEB_BUILD_OPTIONS="parallel=n". + * debian/patches/70_manpage.patch: describe the arguments of the + -usbdevice option in the manpage. (Closes: #443801) + * debian/control: now using Standards-Version 3.7.3 (no changes needed). + * debian/control: build-depends on libgnutls-dev to enable TLS support + in VNC. + * debian/patches/01_nostrip.patch: don't strip binaries during make + install. (Closes: #437866) + * debian/patches/53_openbios_size.patch: increase maximum prom size to + support latest openbios. + + -- Aurelien Jarno Mon, 28 Jan 2008 21:24:14 +0100 + +qemu (0.9.0+20070816-1) unstable; urgency=low + + [ Guillem Jover ] + * New upstream snapshot. + - Fix hang on ARM during Etch installation. (Closes: #430164) + - Fix data corruption with qcow 2. (Closes: #440296) + - Fix errors with raw images > 4 GiB. (Closes: #425634) + - debian/patches/01_typo_qemu-img.patch: Removed, merged upstream. + - debian/patches/03_machines_list_no_error.patch: Likewise. + - debian/patches/36_syscall_prctl.patch: Likewise. + - debian/patches/37_syscall_mount.patch: Likewise. + - debian/patches/38_syscall_semctl.patch: Likewise. + - debian/patches/40_sparc_fp_to_int.patch: Likewise. + - debian/patches/44_arm_eabi_built_on_64bit_arches.patch: Likewise. + - debian/patches/62_linux_boot_nasm.patch: Likewise. + - debian/patches/04_do_not_print_rtc_freq_if_ok.patch: Synced. + - debian/patches/05_non-fatal_if_linux_hd_missing.patch: Likewise. + - debian/patches/31_syscalls.patch: Likewise. + - debian/patches/35_syscall_sockaddr.patch: Likewise. + - debian/patches/42_arm_tls.patch: Likewise. + - debian/patches/43_arm_cpustate.patch: Likewise. + - debian/patches/51_linuxbios_piix_ram_size.patch: Likewise. + - debian/patches/55_unmux_socketcall.patch: Likewise. + - debian/patches/60_ppc_ld.patch: Likewise. + - debian/patches/65_kfreebsd.patch: Likewise. + - debian/patches/80_ui_curses.patch: Likewise. + - debian/patches/90_security.patch: Likewise. + * Remove Elrond and Guilherme de S. Pastore from Uploaders, with their + permission, and add Aurelien Jarno and Riku Voipio. + * Remove Tag field, this is better maintained outside of the package. + * Add openbios-sparc64 to qemu_bios_files in debian/rules. + + [ Aurelien Jarno ] + * Fix FTBFS on amd64. (Closes: #434296) + - Drop debian/patches/34_syscalls_types.patch + * debian/control: + - Suggest samba. (Closes: #430368) + * Add OpenBIOS for sparc. (Closes: #407076) + - debian/control: depends on openbios-sparc. + - debian/links: provide symlinks in /usr/share/qemu. + + -- Guillem Jover Tue, 04 Sep 2007 04:04:47 +0300 + +qemu (0.9.0-2) unstable; urgency=high + + [ Guillem Jover ] + * Fix several security issues. (Closes: #424070) + Thanks to Tavis Ormandy . + - Cirrus LGD-54XX "bitblt" heap overflow. CVE-2007-1320 + - NE2000 "mtu" heap overflow. + - QEMU "net socket" heap overflow. + - QEMU NE2000 "receive" integer signedness error. CVE-2007-1321 + - Infinite loop in the emulated SB16 device. + - Unprivileged "aam" instruction does not correctly handle the + undocumented divisor operand. CVE-2007-1322 + - Unprivileged "icebp" instruction will halt emulation. CVE-2007-1322 + - debian/patches/90_security.patch: New file. + * Enable adlib audio emulation. (Closes: #419170) + * Fix structure padding for target_eabi_flock64 when built for a 64 bit + architecture. (Closes: #414799) + Thanks to Stuart Anderson . + - debian/patches/44_arm_eabi_built_on_64bit_arches.patch: New file. + * Fix qemu to be able to use LinuxBios. (Closes: #412212) + Thanks to Ed Swierk . + - debian/patches/50_linuxbios_isa_bios_ram.patch: New file. + - 51_linuxbios_piix_ram_size.patch: Likewise. + * Fix segfault when booting a Linux kernel w/o a disk image, by exiting but + clarifying the message, as to use '/dev/null'. (Closes: #409817, #411780) + Thanks to Robert Millan . + - debian/patches/05_non-fatal_if_linux_hd_missing.patch: Updated. + * Fix segfault by using addrlen instead of target_addrlen in + do_getpeername()/do_getsockname(). (Closes: #411910) + Thanks to Stuart Anderson . + - debian/patches/35_syscall_sockaddr.patch: Updated. + * Fix semctl() for 32 bit targets on 64 bit hosts. (Closes: #414809) + Thanks to Stuart Anderson . + - debian/patches/38_syscall_semctl.patch: New file. + * Remove Elrond from Uploaders with consent, always welcome to join + back anytime. + + -- Guillem Jover Wed, 16 May 2007 08:08:31 +0300 + +qemu (0.9.0-1) experimental; urgency=low + + [ Guillem Jover ] + * New upstream release. (Closes: #409989) + - Support for relative paths in backing files for disk images. + (Closes: #390446) + - debian/patches/01_doc_typos.patch: Removed, merged upstream. + - debian/patches/38_syscall_arm_statfs64.patch: Likewise. + - debian/patches/51_serial_small_divider.patch: Likewise. + - debian/patches/67_ppc_ftbfs.patch: Likewise. + - debian/patches/21_net_soopts.patch: Synced. + - debian/patches/30_syscall_ipc.patch: Likewise. + - debian/patches/31_syscalls.patch: Likewise. + - debian/patches/35_syscall_sockaddr.patch: Likewise. + - debian/patches/39_syscall_fadvise64.patch: Likewise. + - debian/patches/42_arm_tls.patch: Likewise. + - debian/patches/55_unmux_socketcall.patch: Likewise. + - debian/patches/80_ui_curses.patch: Likewise. + * Update the copyright information. + * The ACPI initialization code has been moved to bochsbios. + - debian/patches/acpi-dsdt.hex: Removed. + - debian/rules: Do not install acpi-dsdt.hex. + * Add more files to the list of roms removed from the tarball needed to + be touched so that upstream 'make install' does not fail. + * Added armeb and armel to Architecture fields and libgpmg1-dev + Build-Depends. + * Recommend vde2 instead of the transitional vde package. (Closes: #407251) + * Fix typo in qemu-img output. (Closes: #408542) + - debian/patches/01_typo_qemu-img.patch: New file. + Thanks to Adam Buchbinder . + * Symlink qemu-user(1) to qemu-m68k(1). + * Reduce redundancy in qemu-user(1) synopsis. + * Fix rounding in sparc floating point to integer conversions. + - debian/patches/40_sparc_fp_to_int.patch: New file. + Thanks to Aurelien Jarno . + + -- Guillem Jover Thu, 8 Feb 2007 01:01:29 +0200 + +qemu (0.8.2-5) unstable; urgency=low + + [ Guillem Jover ] + * Added a missing part to the ARM NPTL support patch, initially lost. + - debian/patches/42_arm_tls.patch: Updated. + + -- Guillem Jover Tue, 16 Jan 2007 11:44:00 +0200 + +qemu (0.8.2-4) unstable; urgency=medium + + [ Guillem Jover ] + * Disable using iasl for now until it's ported to big-endian systems and + include a locally built acpi-dsdt.hex file. + + -- Guillem Jover Sun, 3 Dec 2006 21:10:23 +0200 + +qemu (0.8.2-3) unstable; urgency=low + + [ Guillem Jover ] + * Hopefully really fix powerpc FTBFS. + + -- Guillem Jover Sun, 5 Nov 2006 17:09:53 +0200 + +qemu (0.8.2-2) unstable; urgency=low + + [ Guillem Jover ] + * Update Tag field to match new debtags vocabulary. + * Clean properly. (Closes: #390166) + - Remove the acpi generated files and the docs. + - Revert the docs regeneration forcing logic. + Thanks to Anderson Lizardo . + * On install use DESTDIR instead of specifying all paths. (Closes: #396139) + Thanks to Anderson Lizardo . + * Port to GNU/kFreeBSD. (Closes: #327622) + - Disable ALSA on non-linux systems. + - Add a Build-Depends on libfreebsd-dev on kfreebsd systems. + - Add kfreebsd-i386 and kfreebsd-amd64 to the Architecture field. + - debian/patches/65_kfreebsd.patch: New file. + Thanks Petr Salinger . + * In qemu-make-debian-root do not explicitely install in aptitude and + libsigc++-1.2-5c102, they are pulled now by default. And do not remove + aptitude afterwards. (Closes: #392481) + Thanks to Ted Percival . + * Add experimental ncurses ui support. (Closes: #369462) + - debian/patches/80_ui_curses.patch: New file. + Thanks to Andrzej Zaborowski . + * Add SO_PEERCRED and SO_SNDTIMEO support, and fix accept syscall when + being passed NULL pointers. + - debian/patches/21_net_sockopts.patch: Renamed to ... + - debian/patches/21_net_soopts.patch: ... here. Modify. + Thanks to Pablo Virolainen. + * Add a fadvise64 syscall stub. + - debian/patches/39_syscall_fadvise64.patch: New file. + Thanks to Pablo Virolainen. + * Add EABI unmuxed socket syscalls. + - debian/patches/55_unmux_socketcall.patch: New file. + Thanks to Riku Voipio. + * Add TLS sections to the ARM and x86 linker scripts so that qemu user + emulators can be linked statically. + - debian/patches/66_tls_ld.patch: New file. + * Move the documentation of the binary blob removals from the original + upstream tarball from README.Debian to debian/copyright. + * Reword the emphasis on "FAST!" from the package description. + * Fix FTBFS on powerpc by adding the missing fp_status variable to the + int32_to_float32 function calls. + - debian/patches/67_ppc_ftbfs.patch: New file. + + -- Guillem Jover Sun, 5 Nov 2006 08:48:27 +0200 + +qemu (0.8.2-1) unstable; urgency=low + + [ Guillem Jover ] + * New upstream release. (Closes: #379461, #385029, #388810) + - Add ACPI BIOS emulation support. (Closes: #372533) + - Fix mouse invisible wall when using Windows XP. (Closes: #384666) + - debian/patches/01_doc_typos.patch: Sync. + - debian/patches/03_machines_list_no_error.patch: Likewise. + - debian/patches/04_do_not_print_rtc_freq_if_ok.patch: Likewise. + - debian/patches/05_non-fatal_if_linux_hd_missing.patch: Likewise. + - debian/patches/06_exit_segfault.patch: Likewise. + - debian/patches/12_signal_powerpc_support.patch: Likewise. + - debian/patches/21_net_sockopt.patch: Likewise. + - debian/patches/22_net_tuntap_stall.patch: Likewise. + - debian/patches/30_syscall_ipc.patch: Likewise. + - debian/patches/31_syscalls.patch: Likewise. + - debian/patches/32_syscall_sysctl.patch: Likewise. + - debian/patches/33_syscall_ppc_clone.patch: Likewise. + - debian/patches/35_syscall_sockaddr.patch: Likewise. + - debian/patches/36_syscall_prctl.patch: Likewise. + - debian/patches/37_syscall_mount.patch: Likewise. + - debian/patches/41_arm_fpa_sigfpe.patch: Likewise. + - debian/patches/42_arm_tls.patch: Likewise. + - debian/patches/61_safe_64bit_int.patch: Likewise. + - debian/patches/63_sparc_build.patch: Likewise. + - debian/patches/50_missing_keycodes.patch: Removed, integrated upstream. + * Switch to quilt: + - debian/control: Add quilt (>= 0.40) to Build-Depends. + - debian/patches/series: New file. + - debian/patch.mk: Removed. + - debian/rules: Include '/usr/share/quilt/quilt.make' instead of + 'debian/patch.mk'. + * Build the ACPI Source Language files with iasl. + * Add a Tag field to the binary package, using data from debtags. + * Add 2006 to the debian/copyright years. + * Add a Recommends on vde. (Closes: #386780) + * Fix spelling error in package description (peripherials -> peripherals). + (Closes: #388700) + Thanks to Rakesh 'arky' Ambati . + * Fix ne2000_can_receive return code to 0 when the command is STOP. + (Closes: #386209) + - debian/patches/52_ne2000_return.patch: New file. + Thanks to Samuel Thibault . + * Document the binary blob removals from the original upstream tarball in + README.Debian. (Closes: #388740) + + -- Guillem Jover Mon, 25 Sep 2006 04:16:25 +0300 + +qemu (0.8.1-1) unstable; urgency=low + + [ Guillem Jover ] + * New upstream release. (Closes: #366955, #366637) + - debian/patches/01_doc_typos.patch: Sync. + - debian/patches/04_do_not_print_rtc_freq_if_ok.patch: Likewise. + - debian/patches/05_non-fatal_if_linux_hd_missing.patch: Likewise. + - debian/patches/12_signal_powerpc_support.patch: Likewise. + - debian/patches/21_net_sockopt.patch: Likewise. + - debian/patches/22_net_tuntap_stall.patch: Likewise. + - debian/patches/30_syscall_ipc.patch: Likewise. + - debian/patches/31_syscalls.patch: Likewise. + - debian/patches/32_syscall_sysctl.patch: Likewise. + - debian/patches/33_syscall_ppc_clone.patch: Likewise. + - debian/patches/35_syscall_sockaddr.patch: Likewise. + - debian/patches/36_syscall_prctl.patch: Likewise. + - debian/patches/37_syscall_mount.patch: Likewise. + - debian/patches/41_arm_fpa_sigfpe.patch: Likewise. + - debian/patches/42_arm_tls.patch: Likewise. + - debian/patches/43_arm_cpustate.patch: Likewise. + - debian/patches/50_missing_keycodes.patch: Likewise. + - debian/patches/51_serial_small_divider.patch: Likewise. + - debian/patches/61_safe_64bit_int.patch: Likewise. + - debian/patches/63_sparc_build.patch: Likewise. + - debian/patches/40_arm_nwfpe_cpsr.patch: Removed, integrated upstream. + * Make the patch system apply the patch on the first run. + - debian/patches/64_ppc_asm_constraints.patch: Add DPATCHLEVEL. + * Document how to use the images created with qemu-make-debian-root in the + man page. Thanks to Jacobo . (Closes: #343450) + * Add support for the -snapshot option to use the TMPDIR evironment + variable. (Closes: #353880) + - debian/patches/02_snapshot_use_tmpdir.patch: New file. + * Do not exit with an error when using '-M ?'. (Closes: #365209) + - debian/patches/03_machines_list_no_error.patch: New file. + * Added symlink for system-mipsel emulator man page. + * Build and clean the pc-bios directory. + * Avoid segfaulting by using _exit(2) instead of exit(3) in qemu user + emulators. (Closes: #338289) + - debian/patches/06_exit_segfault.patch: New file. + * Enable ALSA audio support and add libasound2-dev to the Build-Depends. + * Now using Standards-Version 3.7.2 (no changes needed). + + -- Guillem Jover Sun, 28 May 2006 20:51:10 +0300 + +qemu (0.8.0-3) unstable; urgency=low + + [ Josh Triplett ] + * Fix FTBFS on PowerPC caused by asm constraint problem. (Closes: #361727) + - debian/patches/64_ppc_asm_constraints.patch. + + [ Guillem Jover ] + * Clamp addrlen from host to target when using AF_UNIX. This fixes + socket problems when using EABI. + - debian/patches/35_syscall_sockaddr.patch: New file. + * Fix floating point comparison on ARM NWFPE, due to glue code missmatch. + (Closes: #356287) + - debian/patches/40_arm_nwfpe_cpsr.patch: New file. + - debian/patches/40_fpu_arm_sigfpe.patch: Rename to ... + - debian/patches/41_arm_fpa_sigfpe.patch: ... this. Resync. + Thanks to Ulrich Hecht. + * Fix POSIX threads creation on ARM hanging when initializing the cpu + structure being it cyclic. + - debian/patches/43_arm_cpustate.patch: New file. + * Add TLS support for ARM. Stolen from Scratchbox. + - debian/patches/42_arm_tls.patch: New file. + * Fix sysctl endian problem. + - debian/patches/32_syscall_sysctl.patch: Update. + Thanks to Timo Savola . + * Remove now default '--enable-slirp' build option. (Closes: #356284) + Thanks to Anderson Lizardo . + * Remove unused sharedir to 'make install'. (Closes: #356418) + Thanks to Anderson Lizardo . + * Fix package not cleaning properly. (Closes: #356279) + Thanks to Anderson Lizardo for the initial + patch. + * Add needed syscalls to make debootstrap work. (Closes: #356291) + - debian/patches/36_syscall_prctl.patch: New file. + - debian/patches/37_syscall_mount.patch: Likewise. + - debian/patches/38_syscall_arm_statfs64.patch: Likewise. + Thanks to Anderson Lizardo . + * Remove obsolete Build-Dependency xlibs-dev. + + -- Guillem Jover Thu, 13 Apr 2006 11:53:00 +0300 + +qemu (0.8.0-2) unstable; urgency=low + + [ Guillem Jover ] + * Switch away from cdbs to plain debhelper. + * Upgrade to debhelper compat level 5. + * Allow overriding CC compiler variable. (Closes: #345772) + * Do not redefine 64 bit types on 64 bit arches. + - debian/patches/61_safe_64bit_int.patch: New file. + * Allow linux_boot.bin to be built on any arch by switching to nasm, + and Build-Depending on it. + - debian/patches/62_linux_boot_nasm.patch: New file. + * The serial hw driver uses a small divider that gets zeroed when shifting + bits to the right. (Closes: #276276, #348098) + - debian/patches/51_serial_small_divider.patch: New file. + Thanks to Samuel Thibault . + * Escaped hyphens in qemu-user manpage, use italics for filenames and + parameters and bold for options. + * Partial build failure fix for Sparc. (Bugs: #317145, #336970) + Thanks to Jurij Smakov . + + -- Guillem Jover Mon, 20 Feb 2006 09:17:46 +0200 + +qemu (0.8.0-1) unstable; urgency=low + + [ Guillem Jover ] + * New upstream release. (Closes: #344339) + - Added support for Virtual FAT. (Closes: #313123) + - Emulate repeated keystrokes when holding a key. (Closes: #298864) + - debian/patches/01_doc_typos.patch: Sync. + - debian/patches/04_do_not_print_rtc_freq_if_ok.patch: Likewise. + - debian/patches/05_non-fatal_if_linux_hd_missing.patch: Likewise. + - debian/patches/12_signal_powerpc_support.patch: Likewise. + - debian/patches/21_net_sockopt.patch: Likewise. + - debian/patches/22_net_tuntap_stall.patch: Likewise. + - debian/patches/30_syscall_ipc.patch: Likewise. + - debian/patches/31_syscalls.patch: Likewise. + - debian/patches/32_syscall_sysctl.patch: Likewise. + - debian/patches/33_syscall_ppc_clone.patch: Likewise. + - debian/patches/40_fpu_arm_sigfpe.patch: Likewise. + - debian/patches/50_missing_keycodes.patch: Likewise. + * Added mips and mipsel to the lintian overrides for the user emulators + being shlib-with-non-pic-code. + * Added symlinks for mips, mipsel and system-arm emulator manpages. + + -- Guillem Jover Fri, 30 Dec 2005 05:44:53 +0200 + +qemu (0.7.2-2) unstable; urgency=low + + [ Josh Triplett ] + * Add support for signal handling on PowerPC. (Closes: #335509) + - debian/patches/12_signal_powerpc_support.patch: New file. + + [ Guillem Jover ] + * Add Josh Triplett to Uploaders and packaging team. + * Fix PowerPC build failure by reintroducing the ppc linker script and + adding the missing _SDA_BASE_ and _SDA2_BASE_ symbols. (Closes: #336983) + * Remove invalid patch making X11 fail at runtime. + - debian/patches/20_net_socket.patch: Remove. + - debian/patches/32_syscall_sysctl.patch: Sync. + Thanks to Daniel Gimpelevich . + * Avoid the patch system to try until it applies. + - debian/patches/05_non-fatal_if_linux_hd_missing.patch: Added patch level. + - debian/patches/12_signal_powerpc_support.patch: Likewise. + + -- Guillem Jover Wed, 21 Dec 2005 22:11:34 +0200 + +qemu (0.7.2-1) unstable; urgency=low + + [ Guillem Jover ] + * New upstream release. (Closes: #321232, #327168) + - debian/patches/12_signal_silent.patch: Integrated upstream, remove. + - debian/patches/50_ppc_ldscript.patch: Likewise. + - debian/patches/33_syscall_truncate64.patch: Likewise. + - debian/patches/01_doc_typos.patch: Resync with upstream. + - debian/patches/04_do_not_print_rtc_freq_if_ok.patch: Likewise. + - debian/patches/05_non-fatal_if_linux_hd_missing.patch: Likewise. + - debian/patches/10_signal_jobs.patch: Likewise. + - debian/patches/11_signal_sigaction.patch: Likewise. + - debian/patches/20_net_socket.patch: Likewise. + - debian/patches/21_net_sockopt.patch: Likewise. + - debian/patches/22_net_tuntap_stall.patch: Likewise. + - debian/patches/30_syscall_ipc.patch: Likewise. + - debian/patches/31_syscalls.patch: Likewise. + - debian/patches/32_syscall_sysctl.patch: Likewise. + - debian/patches/40_fpu_arm_sigfpe.patch: Likewise. + * Repackaged upstream source to deal with binaries w/o sources. + - pc-bios/video.x: New file removed. + * Create a new qemu-user(1) manpage and link all user emulator manpages + to it. (Closes: #335163) + * Add missing '-' and '=' keycodes for sendkey command. + - debian/patches/50_missing_keycodes.patch: New file. (Closes: #334071) + Thanks to Robert Millan . + * Add manpage link for qemu-system-mips. + * Make sysctl byte-swap the name values. + - debian/patches/32_syscall_sysctl.patch: Merge patch. (Closes: #334458) + Thanks to Josh Triplett . + * Change documentation menu section to "Apps/Emulators". (Closes: #335062) + Thanks to Frans Pop . + * On PowerPC, do not zero registers r7-r31 in do_fork and zero register r3. + Fixing segfaults on programs using the clone syscall. + - debian/patches/33_syscall_ppc_clone.patch: New file. (Closes: #335159) + Thanks to Josh Triplett + and Paul Brook . + * Tighten vgabios and bochsbios versioned Depends. + * Add video.x to the list of roms to touch to make qemu Makefile happy. + * Add lintian overrides for the user emulators being shlib-with-non-pic-code. + * Wrap lines in debian/control fields (knowingly breaking policy). + + [ Guilherme de S. Pastore ] + * debian/control: + - Updated my e-mail address. + * debian/copyright: + - Dropped André from team members list, not a single contribution ever. + + -- Guillem Jover Mon, 31 Oct 2005 05:01:45 +0200 + +qemu (0.7.0-4) unstable; urgency=low + + [ Guillem Jover ] + * Rebuild source with locally deborked dpkg-source. (Closes: #321019) + * Added the location of the Subversion repo used for the packages and + fixed the upstream URL in debian/copyright. + * Lower case title header in qemu-make-debian-root man page. + * Use dd instead of cat to generate the qemu debian root image. + (Closes: #315952) + + -- Guillem Jover Wed, 3 Aug 2005 05:53:30 +0300 + +qemu (0.7.0-3) unstable; urgency=low + + [ Guillem Jover ] + * Update watch file to version 3, use perlre and new upstream site. + * Now using Standards-Version 3.6.2 (no changes needed). + * Fix TUN/TAP network interface stalling the connection. (Closes: #290569) + Thanks to Vitaly Belostotsky . + * Link against librt, needed by the new clock_gettime syscall. + - debian/patches/31_syscalls.patch: Update. (Closes: #315388) + Thanks to Timo Savola for noticing. + * Force Build-Dependency on binutils >= 2.16-1 needed by the amd64 and + powerpc linker scripts. (Closes: #262655) + * Force usage of gcc-3.4. (Closes: #319527) + * Add missing Build-Dependency on zlib1g-dev. + Thanks to Reinhard Tartler . + * Include in syscall.c to avoid the broken headers in + linux-kernel-headers 2.6.12. + - debian/patches/34_syscalls_types.patch: New file. + Thanks to Octavian Cerna . + * Fix powerpc linker script. + - debian/patches/50_ppc_ldscript.patch: New file. + Thanks to Octavian Cerna . + + -- Guillem Jover Mon, 1 Aug 2005 02:48:09 +0300 + +qemu (0.7.0-2) unstable; urgency=low + + [ Guillem Jover ] + * Add alpha, sparc, arm and s390 to Architectures (and to the + libgpmg1-dev Build-Depends). + + * Forward SIGSTOP and SIGCONT sent to QEMU to the emulated application. + - debian/patches/10_signal_jobs.patch: New file. + Thanks to Ulrich Hecht. + * Return EINVAL on emulated sigaction when given invalid signal + parameters SIGKILL and SIGSTOP. + - debian/patches/11_signal_sigaction.patch: New fle. + Thanks to Valtteri Rahkonen. + * Do not print messsages for uncaught signal, thus fixing the case + were some applications want to kill their siblings. + - debian/patches/12_signal_silent.patch: New file. + Thanks to Valtteri Rahkonen + + * Fix Unix sockets by handling correctly AF_UNIX socket address + structure length. + - debian/patches/20_net_socket.patch: New file. + Thanks to Timo Savola. + * Implement SO_LINGER, SO_RCVTIMEO, SO_SNDTIMEO, SO_PEERNAME and + SO_PEERCRED getsockoptions. + - debian/patches/21_net_sockopt.patch: New file. + Thanks to Valtteri Rahkonen. + + * Implement SysV IPC message and semaphore syscalls. + - debian/patches/30_syscall_ipc.patch: New file. + Thanks to Valtteri Rahkonen. + * Implement acct, umount2, uselib, swapon, syslog, ftruncate64, + mincore, madvise, readahead and clock_gettime syscalls. + - debian/patches/31_syscalls.patch: New file. + Thanks to Ulrich Hecht. + * Implement sysctl CTL_KERN/KERN_VERSION + - debian/patches/32_syscall_sysctl.patch: New file. + Thanks to Timo Savola. + * Implement truncate64 syscall. + - debian/patches/33_syscall_truncate64.patch: New file. + Thanks to Valtteri Rahkonen. + + * Implement ARM floating point exeption emulation. + - debian/patches/40_fpu_arm_sigfpe.patch: New file. + Thanks to Ulrich Hecht. + + -- Guillem Jover Sun, 19 Jun 2005 15:05:37 +0300 + +qemu (0.7.0-1) experimental; urgency=low + + [ Guillem Jover ] + * New upstream release. (Closes: #308459, #308494) + * Do not require a disk image when booting a Linux kernel. (Closes: #260935) + Thanks to Jonas Smedegaard . + + [ Guilherme de S. Pastore ] + * Rewrote README.Debian for more clarity + * Add support for amd64 as a host architecture. (Closes: #262655) + - Add build-depend on libgpmg1-dev on amd64. + * Fixed qemu-make-debian-root so that it shows the name by which + it was called on the usage notice, not "%s". (Closes: #303507) + Thanks to Micah Anderson . + + [ Elrond ] + * Clean up more files, so they don't end up in the final .diff.gz + * Switch to external proll and openhackware: + - Instead of patching qemu's Makefile, trick it by giving it empty + files to install and remove them straight after install. + - Don't ship the roms in debian/roms any more! + - Instead add more symlinks. + - Update Depends: apropiately. + + -- Guillem Jover Fri, 27 May 2005 02:06:20 +0300 + +qemu (0.6.1+20050407-1) unstable; urgency=low + + [ Guillem Jover ] + * New upstream snapshot. + - Fix -user-net. (Closes: #295019) + - Fix win2k and winxp image booting. (Closes: #285170, #292707) + - Fix installation of outdated documentation. (Closes: #286931) + - Provide qemu-img instead of qemu-mkcow. (Closes: #290713) + - Remove debian/patches/05_fix_openpic_timer_test.patch, integrated + upstream. + - Remove debian/patches/02_selectable_sdl_keyboard.patch, superseded + by new keyboard implementation. (Closes: #284510, #299432) + - Remove debian/patches/01_mkcow_section_and_hyphens.patch. + - Conditionalize qemu -g option for some architectures. (Closes: #298988) + * Added new copyright year to debian/copyright. + * Added initial qemu-make-debian-root man page. (Closes: #286932) + * Fixed typos in qemu documentation. (Closes: #301933) + Thanks to A Costa . + * Added Elrond to Uploaders and packaging team. + * Use the default target list: + - Do not build qemu-fast anymore as it is deprecated upstream anyway. + (Closes: #278602, #281510) + - New targets armeb and system-x86_64. + * Updated ROM images under debian/roms/: + - OpenHackWare 0.4. + - Proll 18 with qemu specific patches. + * Remove uudecoded files from pc-bios/ on clean. + * Fix qemu-make-debian-root to behave correctly even if the needed + Recommends are not installed. + + [ Guilherme de S. Pastore ] + * Create a doc-base entry for the package (Closes: #290669) + * debian/control: + - Add debootstrap to the 'Recommends: ' line, as needed by + qemu-make-debian-root (Closes: #302848) + - Moved sharutils from dependency to recommendation, as it is only + needed by qemu-make-debian-root + * debian/docs: + - Do not include README.distrib in the binary package (Closes: #302853) + + [ Elrond ] + * Replace "libgpmg1-dev | not+linux-gnu" by "libgpmg1-dev [i386 powerpc]" + in Build-Depends. qemu should not need to build-depend on it anyway, the + real problem is described in Bug#267174. When it is solved, we can + remove our dependency. Until then please remember to add any arch, which + we will build on and that has gpm. This change hopefully calms: + + * Add versions to the dependencies on bochsbios and vgabios + (Closes: #288997): + - vgabios: Use the current version from testing/unstable (0.4c+20041014-1), + according to Frans Pop , this fixed those + "blank screen" problems. + - bochsbios: Use the current version from unstable (2.1.1+20041109-3), as + Guillem Jover fixed the networking in that version. + + -- Guillem Jover Thu, 7 Apr 2005 01:26:01 +0300 + +qemu (0.6.1-1) unstable; urgency=low + + [ Guillem Jover ] + * New upstream release. (Closes: #281626) + - Booting from drive b is not supported anymore. (Closes: #275679) + - Fix ne2k network interface that was not working in some situations. + (Closes: #281862) + - Remove debian/patches/06_build_gcc3.4.patch, fixed upstream. + - Remove debian/patches/04_lfs.patch, fixed upstream. + - Remove debian/patches/02_fix_powerpc_FTBFS.patch, fixed upstream. + - Remove debian/patches/00_escape_manpage_hyphens.patch, not needed. + - Sync debian/patches/03_use_external_bios.patch. + * Include uuencoded source for proll 18, some build fixes and its binary + proll.bin on debian/roms/. + * Suggests sudo to be used by the qemu-ifup script. + Thanks to Elrond . + * Make sudo in qemu-ifup explain what the password is for. (Closes: #281380) + * Add an option to select the method to convert keyevent to keycode + in the SDL keyboard handling code. Added support for Right Shift in the + generic handler. (Closes: #282658) + Thanks to Elrond . + * Do not set RTC frequency to 1024 or warn about this if it has already + the correct value. (Closes: #281403) + * Enabled sparc-softmmu support. + + -- Guillem Jover Sat, 27 Nov 2004 23:23:49 +0100 + +qemu (0.6.0.dfsg.2-1) unstable; urgency=low + + [ Guillem Jover ] + * Repackaged upstream source to remove external included files. + - pc-bios/ppc-rom.bin: Removed. + - pc-bios/OpenHackWare_0.3.tar.bz2: Likewise. + - pc-bios/vgabios.bin: Likewise. + - pc-bios/vgabios-cirrus.bin: Likewise. + - pc-bios/vgabios-cvs-2004-06-17.tgz: Likewise. + * Include uuencoded source for OpenHackWare 0.3.1 and its binary + ppc-rom.bin on debian/roms/. Add a Build-Depends on sharutils. + * Update tundev.c. Pass -tun-dev to qemu without the equal sign. + Thanks to Isaac Clerencia . + * Fix README.Debian to point to the renamed qemu-make-debian-root. + * Add Depends on sharutils needed by qemu-make-debian-root. + (Closes: #272130) + * Use and depend on vgabios package, which is in sync with bochsbios + that checks for rom bios checksums. (Closes: #281202) + * Enable LFS globally, thus fixing problems with qemu-mkcow when using + an existing large image. + (Closes: #279925) + * Fix openpic timer write test, catched from a warning about a constant + value larger than the type it was casted to. + * Fix build failure with gcc 3.4. Patch stolen from Gentoo BTS. + + -- Guillem Jover Mon, 15 Nov 2004 10:46:54 +0100 + +qemu (0.6.0.dfsg.1-1) unstable; urgency=high + + [ Guillem Jover ] + * Repackaged upstream source to deal with binaries w/o sources. + (Closes: #268780) + - pc-bios/bios.bin: Removed binary without source. Now using + bochsbios package. + - pc-bios/vgabios.bin: Rebuilt from vgabios cvs 2004-06-17 snapshot, + source included. + - pc-bios/vgabios-cirrus.bin: Likewise. + - pc-bios/ppc-rom.bin: Rebuilt on voltaire, source included. + - pc-bios/linux_boot.bin: Rebuilt from source. + * Move make-debian-root.sh to /usr/sbin/qemu-make-debian-root. + (Closes: #268705) + + -- Guillem Jover Mon, 13 Sep 2004 01:28:54 +0200 + +qemu (0.6.0-2) unstable; urgency=high + + [ Guilherme de S. Pastore ] + * Fixed dangling symlinks under /usr/share/man/man1. (Closes: #264764) + + [ Guillem Jover ] + * Fix FTBFS on powerpc. + - debian/patches/02_fix_powerpc_FTBFS.patch: New file. + + -- Guillem Jover Wed, 18 Aug 2004 15:50:43 +0200 + +qemu (0.6.0-1) unstable; urgency=medium + + * New maintainers. (Closes: #258900) + * New upstream release. (Closes: #258732) + - Installs ppc BIOS ROM file. (Closes: #257492) + - Builds with -fno-strict-aliasing. (Closes: #257123) + + [ Guilherme de S. Pastore ] + * debian/rules: + - Cleaned up. + - Ported to use CDBS. + * 00_escape_manpage_hyphens.patch: + - Correct a little typo and escape hyphens in upstream manpage. + * 01_mkcow_section_and_hyphens.patch: + - Fix section mismatch and escape hyphens in the qemu-mkcow manpage. + * Added simple /etc/qemu-ifup helper script. (Closes: #245281) + Thanks to Martin Michlmayr . + * Cleaned debian/watch. + * UTF-8'ed debian/changelog. + * Updated Standards-Version to 3.6.1.1. + * Removed outdated and unnecessary debian/qemu-i386.sgml. + - Removed build dependency on docbook-to-man. + * Removed "x86" part from the description (hey, qemu is not x86-only + in any way). Deserves a complete rewrite, shall be done soon. + + [ Guillem Jover ] + * Lower-case package short description. + * Added missing CPU emulations to the description. + * Cleaned and updated debian/copyright. + * Removed manually added libx11-6 dependency. + * Only Build-Depends on libgpmg1-dev on GNU/Linux systems. + * Cosmetic unification to debian/changelog. + * debian/rules: + - Remove generated files. + - Give exec perms to qemu-ifup. + + -- Guillem Jover Sun, 8 Aug 2004 17:24:08 +0200 + +qemu (0.5.5-2) unstable; urgency=low + + * Re-enable SDL disabled while I was bugchasing. (Closes: #255014) + * Yes, this is really 0.5.5. (Closes: #254655) + * Enable slirp networking. (Closes: #253573) + * Add Build-Depends on libgpmg1-dev (found by Bastian Blank, probably breaks + Hurd but that's a problem for another day). + + -- Paul Russell Thu, 24 Jun 2004 06:26:42 +0200 + +qemu (0.5.5-1) unstable; urgency=low + + * New upstream release. (Closes: #237556, #237556) + * Applied patch to add options to make_debian_root.sh. (Closes: #238787) + * Applied patch for other archs: hmmm... (Closes: #251420) + * Do umount -d in make_debian_root.sh. (Closes: #251775) + + -- Paul Russell Tue, 1 Jun 2004 03:50:05 +0200 + +qemu (0.5.4-1) unstable; urgency=low + + * New upstream release. (Closes: #246634) + * qemu-mkcow included in upstream. + * Added tundev program source in doc, to see if people find it useful. + + -- Paul Russell Mon, 3 May 2004 08:14:49 +0200 + +qemu (0.5.3-1) unstable; urgency=low + + * New upstream release. (Closes: #237556) + * Use aalib-config --static-libs. (Closes: #243325) + * Document Control-Shift to release mouse pointer. (Closes: #238074) + + -- Paul Russell Tue, 13 Apr 2004 02:58:49 +0200 + +qemu (0.5.2-4) unstable; urgency=low + + * Fix PPC install (Michel Daenzer patch). (Closes: #238431) + * Simplify deps (might be wrong, but it's neater). (Closes: #238430) + + -- Paul Russell Wed, 17 Mar 2004 01:35:47 +0100 + +qemu (0.5.2-3) unstable; urgency=low + + * Make compile on woody. (Closes: #238163) + * Include qemu-doc.html. (Closes: #238076) + * Wrote qemu-i386 man page. (Closes: #238077) + + -- Paul Russell Mon, 15 Mar 2004 23:56:25 +0100 + +qemu (0.5.2-2) unstable; urgency=low + + * Fix build problem so bios.bin etc. can be found. (Closes: #237553) + + -- Paul Russell Fri, 12 Mar 2004 05:43:00 +0100 + +qemu (0.5.2-1) unstable; urgency=low + + * Initial Release. (Closes: #187407) + + -- Paul Russell Wed, 3 Mar 2004 02:18:54 +0100 + --- qemu-0.12.5+dfsg.orig/debian/qemu-system.udev +++ qemu-0.12.5+dfsg/debian/qemu-system.udev @@ -0,0 +1 @@ +KERNEL=="kvm", GROUP="kvm", MODE="0660" --- qemu-0.12.5+dfsg.orig/debian/qemu.docs +++ qemu-0.12.5+dfsg/debian/qemu.docs @@ -0,0 +1,4 @@ +README +TODO +debian/tmp/usr/share/doc/qemu/qemu-doc.html +debian/tmp/usr/share/doc/qemu/qemu-tech.html --- qemu-0.12.5+dfsg.orig/debian/qemu-user.manpages +++ qemu-0.12.5+dfsg/debian/qemu-user.manpages @@ -0,0 +1 @@ +debian/qemu-user.1 --- qemu-0.12.5+dfsg.orig/debian/qemu-system.install +++ qemu-0.12.5+dfsg/debian/qemu-system.install @@ -0,0 +1,20 @@ +debian/qemu-ifup etc/ +debian/tmp/usr/bin/qemu-system-arm +debian/tmp/usr/bin/qemu-system-cris +debian/tmp/usr/bin/qemu-system-i386 +debian/tmp/usr/bin/qemu-system-m68k +debian/tmp/usr/bin/qemu-system-microblaze +debian/tmp/usr/bin/qemu-system-mips +debian/tmp/usr/bin/qemu-system-mips64 +debian/tmp/usr/bin/qemu-system-mips64el +debian/tmp/usr/bin/qemu-system-mipsel +debian/tmp/usr/bin/qemu-system-ppc +debian/tmp/usr/bin/qemu-system-ppc64 +debian/tmp/usr/bin/qemu-system-ppcemb +debian/tmp/usr/bin/qemu-system-sh4 +debian/tmp/usr/bin/qemu-system-sh4eb +debian/tmp/usr/bin/qemu-system-sparc +debian/tmp/usr/bin/qemu-system-sparc64 +debian/tmp/usr/bin/qemu-system-x86_64 +debian/tmp/usr/share/man/man1/qemu.1 +debian/tmp/usr/share/qemu/*.dtb --- qemu-0.12.5+dfsg.orig/debian/qemu-system.NEWS +++ qemu-0.12.5+dfsg/debian/qemu-system.NEWS @@ -0,0 +1,33 @@ +qemu (0.12.3+dfsg-3) unstable; urgency=low + + Starting with QEMU 0.12.0, KQEMU support has been removed from + upstream, as it has not seen active development for a few years now, + while causing regressions or limitations for non-KQEMU users. + + -- Aurelien Jarno Wed, 24 Mar 2010 23:14:35 +0100 + +qemu (0.10.3-2) unstable; urgency=low + + Starting with QEMU 0.10.0, it is possible to control how the host + cache is used to access block data, using the cache= suboption of the + -drive option. The following suboptions are available: + * none: The host page cache is entirely avoided. + * writeback (default in QEMU 0.9.x): Writeback caching reports data + writes as completed as soon as the data is present in the host page + cache. This is safe as long as you trust your host. If your host + crashes or loses power, then the guest may experience data + corruption. + * writethrough (default in QEMU 0.10.x): The host page cache is used + to read and write data but write notification is sent to the guest + only when the data has been reported as written by the storage + subsystem. + + Note that depending on your configuration (filesystem, encryption, + kernel version, etc.), disk accesses can be very slow with the default + cache policy (writethrough). You can use the writeback cache policy + instead, but the data integrity is not assured anymore. + + See qemu(1) for more details. + + -- Aurelien Jarno Sun, 03 May 2009 23:22:29 +0200 + --- qemu-0.12.5+dfsg.orig/debian/README.source +++ qemu-0.12.5+dfsg/debian/README.source @@ -0,0 +1,57 @@ +This package uses quilt to manage all modifications to the upstream +source. Changes are stored in the source package as diffs in +debian/patches and applied during the build. + +To configure quilt to use debian/patches instead of patches, you want +either to export QUILT_PATCHES=debian/patches in your environment +or use this snippet in your ~/.quiltrc: + + for where in ./ ../ ../../ ../../../ ../../../../ ../../../../../; do + if [ -e ${where}debian/rules -a -d ${where}debian/patches ]; then + export QUILT_PATCHES=debian/patches + fi + done + +To get the fully patched source after unpacking the source package, cd to +the root level of the source package and run: + + quilt push -a + +The last patch listed in debian/patches/series will become the current +patch. + +To add a new set of changes, first run quilt push -a, and then run: + + quilt new + +where is a descriptive name for the patch, used as the filename in +debian/patches. Then, for every file that will be modified by this patch, +run: + + quilt add + +before editing those files. You must tell quilt with quilt add what files +will be part of the patch before making changes or quilt will not work +properly. After editing the files, run: + + quilt refresh + +to save the results as a patch. + +Alternately, if you already have an external patch and you just want to +add it to the build system, run quilt push -a and then: + + quilt import -P /path/to/patch + quilt push -a + +(add -p 0 to quilt import if needed). as above is the filename to +use in debian/patches. The last quilt push -a will apply the patch to +make sure it works properly. + +To remove an existing patch from the list of patches that will be applied, +run: + + quilt delete + +You may need to run quilt pop -a to unapply patches first before running +this command. --- qemu-0.12.5+dfsg.orig/debian/qemu-utils.install.kfreebsd +++ qemu-0.12.5+dfsg/debian/qemu-utils.install.kfreebsd @@ -0,0 +1,2 @@ +debian/tmp/usr/bin/qemu-img +debian/tmp/usr/share/man/man1/qemu-img.1 --- qemu-0.12.5+dfsg.orig/debian/qemu-user-static.install +++ qemu-0.12.5+dfsg/debian/qemu-user-static.install @@ -0,0 +1,18 @@ +debian/tmp/usr/bin/qemu-alpha-static +debian/tmp/usr/bin/qemu-armeb-static +debian/tmp/usr/bin/qemu-arm-static +debian/tmp/usr/bin/qemu-cris-static +debian/tmp/usr/bin/qemu-i386-static +debian/tmp/usr/bin/qemu-m68k-static +debian/tmp/usr/bin/qemu-microblaze-static +debian/tmp/usr/bin/qemu-mipsel-static +debian/tmp/usr/bin/qemu-mips-static +debian/tmp/usr/bin/qemu-ppc64abi32-static +debian/tmp/usr/bin/qemu-ppc64-static +debian/tmp/usr/bin/qemu-ppc-static +debian/tmp/usr/bin/qemu-sh4eb-static +debian/tmp/usr/bin/qemu-sh4-static +debian/tmp/usr/bin/qemu-sparc32plus-static +debian/tmp/usr/bin/qemu-sparc64-static +debian/tmp/usr/bin/qemu-sparc-static +debian/tmp/usr/bin/qemu-x86_64-static --- qemu-0.12.5+dfsg.orig/debian/qemu-user-static.manpages +++ qemu-0.12.5+dfsg/debian/qemu-user-static.manpages @@ -0,0 +1 @@ +debian/qemu-user-static.1 --- qemu-0.12.5+dfsg.orig/debian/qemu-user-static.1 +++ qemu-0.12.5+dfsg/debian/qemu-user-static.1 @@ -0,0 +1,37 @@ +.TH qemu\-user\-static 1 2007-02-08 "0.9.0" Debian +.SH NAME +qemu\-user\-static \- QEMU User Emulator (static version) +.SH SYNOPSIS +.B qemu\-user\-static +.RI [ options ] +.I program +.RI [ program-arguments... ] +.SH DESCRIPTION +The +.B qemu\-user\-static +emulator can run binaries for other architectures but with the same operating +system as the current one. +.SH OPTIONS +.TP +.BR \-h +Print this help. +.TP +.BR \-g +Wait gdb connection to port 1234. +.TP +.BR \-L " \fI\fP" +Set the elf interpreter prefix (default=\fI/usr/gnemul/qemu\-arm\fP). +.TP +.BR \-s " \fI\fP" +Set the stack size in bytes (default=\fI524288\fP). +.TP +.BR \-d " \fI\fP" +Activate log (logfile=\fI/tmp/qemu.log\fP) +.TP +.BR \-p " \fI\fP" +Set the host page size to 'pagesize'. +.SH SEE ALSO +.BR qemu (1), +.BR qemu\-img (1). +.SH AUTHOR +This manual page was written by Guillem Jover . --- qemu-0.12.5+dfsg.orig/debian/tundev.c +++ qemu-0.12.5+dfsg/debian/tundev.c @@ -0,0 +1,90 @@ +/* + * $Id: tundev.c 116 2005-10-30 14:18:08Z guillem $ + */ + +#define _GNU_SOURCE /* asprintf */ +#include +#include +#include +#include +#include +#include +#include +#include +#include +#include +#include +#include + +/* Tiny code to open tap/tun device, and hand the fd to qemu. + Run as root, drops to given user. */ +int main(int argc, char *argv[]) +{ + struct ifreq ifr; + struct passwd *p; + unsigned int i; + char *newargs[argc + 1]; + int fd; + + if (argc < 4) { + fprintf(stderr, + "Usage: tundev user logfile qemu ...\n"); + exit(1); + } + + fd = open("/dev/net/tun", O_RDWR); + if (fd < 0) { + perror("Could not open /dev/net/tun"); + exit(1); + } + + memset(&ifr, 0, sizeof(ifr)); + ifr.ifr_flags = IFF_TAP | IFF_NO_PI; + strncpy(ifr.ifr_name, "tun%d", IFNAMSIZ); + if (ioctl(fd, TUNSETIFF, (void *) &ifr) != 0) { + perror("Could not get tun device"); + exit(1); + } + + /* Set userid. */ + p = getpwnam(argv[1]); + if (!p) { + fprintf(stderr, "No user '%s'\n", argv[1]); + exit(1); + } + setgroups(0, NULL); + setgid(p->pw_gid); + if (setuid(p->pw_uid) != 0) { + perror("setting uid"); + exit(1); + } + + /* Insert -tun-fd */ + newargs[0] = argv[3]; + newargs[1] = "-tun-fd"; + asprintf(&newargs[2], "%d", fd); + for (i = 4; i <= argc; i++) + newargs[i-1] = argv[i]; + + if (strcmp(argv[2], "-") == 0) { + execvp(newargs[0], newargs); + exit(1); + } + + switch (fork()) { + case 0: { + close(1); + close(2); + open(argv[2], O_WRONLY|O_APPEND); + open(argv[2], O_WRONLY|O_APPEND); + close(0); + execvp(newargs[0], newargs); + exit(1); + } + case -1: + perror("fork failed"); + exit(1); + } + printf("%s\n", ifr.ifr_name); + exit(0); +} --- qemu-0.12.5+dfsg.orig/debian/control +++ qemu-0.12.5+dfsg/debian/control @@ -0,0 +1,137 @@ +Source: qemu +Section: misc +Priority: optional +Maintainer: Debian QEMU Team +Uploaders: Aurelien Jarno , Riku Voipio , Vagrant Cascadian +DM-Upload-Allowed: yes +Build-Depends: debhelper (>= 5), quilt (>= 0.40), nasm, device-tree-compiler, + libx11-dev, libsdl1.2-dev (>> 1.2.1), libncurses5-dev, zlib1g-dev, + texi2html, sharutils, libesd0-dev, libbrlapi-dev, + libpulse-dev, libcurl4-gnutls-dev, libgnutls-dev, libsasl2-dev, uuid-dev, + libvdeplug2-dev [!kfreebsd-i386 !kfreebsd-amd64], + libasound2-dev [!kfreebsd-i386 !kfreebsd-amd64], + libbluetooth-dev [!kfreebsd-i386 !kfreebsd-amd64], + libgpmg1-dev [amd64 arm armel hppa i386 powerpc sparc sparc64 ppc64], + linux-libc-dev (>= 2.6.30) [amd64 i386 powerpc ppc64] +Build-Conflicts: oss4-dev +Standards-Version: 3.9.0 +Homepage: http://www.qemu.org/ +Vcs-Browser: http://git.debian.org/?p=pkg-qemu/qemu.git +Vcs-Git: git://git.debian.org/git/pkg-qemu/qemu.git + +Package: qemu +Architecture: amd64 arm armel hppa i386 mips mipsel powerpc sparc sparc64 kfreebsd-i386 kfreebsd-amd64 ppc64 +Depends: ${misc:Depends}, qemu-system (>= ${source:Version}), qemu-user (>= ${source:Version}) [linux-any], qemu-utils (>= ${source:Version}) +Suggests: qemu-user-static [linux-any] +Description: fast processor emulator + QEMU is a fast processor emulator: currently the package supports + ARM, CRIS, i386, M68k (ColdFire), MicroBlaze, MIPS, PowerPC, SH4, + SPARC and x86-64 emulation. By using dynamic translation it achieves + reasonable speed while being easy to port on new host CPUs. QEMU has + two operating modes: + . + * User mode emulation: QEMU can launch Linux processes compiled for + one CPU on another CPU. + * Full system emulation: QEMU emulates a full system, including a + processor and various peripherals. It enables easier testing and + debugging of system code. It can also be used to provide virtual + hosting of several virtual machines on a single server. + . + As QEMU requires no host kernel patches to run, it is very safe and + easy to use. + . + This package is a metapackage depending on all qemu-related packages. + +Package: qemu-keymaps +Architecture: all +Depends: ${misc:Depends} +Breaks: qemu (<< 0.11.0-2), qemu-system (<< 0.12.4+dfsg-4) +Replaces: qemu (<< 0.11.0-2), qemu-system (<< 0.12.4+dfsg-4) +Description: QEMU keyboard maps + QEMU is a fast processor emulator: currently the package supports + ARM, CRIS, i386, M68k (ColdFire), MicroBlaze, MIPS, PowerPC, SH4, + SPARC and x86-64 emulation. By using dynamic translation it achieves + reasonable speed while being easy to port on new host CPUs. + . + This package provides keyboard maps to be used by the qemu-system + package or QEMU derivatives. + +Package: qemu-system +Architecture: amd64 arm armel hppa i386 mips mipsel powerpc sparc sparc64 kfreebsd-i386 kfreebsd-amd64 ppc64 +Depends: ${shlibs:Depends}, ${misc:Depends}, qemu-keymaps (>= ${source:Version}), vgabios (>= 0.6c-1), seabios (>= 0.5.1-2), openbios-ppc (>= 1.0+svn640), openbios-sparc (>= 1.0+svn640), openhackware, etherboot-qemu +Recommends: vde2, qemu-utils +Breaks: qemu (<< 0.11.0-2) +Replaces: qemu (<< 0.11.0-2) +Suggests: samba +Description: QEMU full system emulation binaries + QEMU is a fast processor emulator: currently the package supports + ARM, CRIS, i386, M68k (ColdFire), MicroBlaze, MIPS, PowerPC, SH4, + SPARC and x86-64 emulation. By using dynamic translation it achieves + reasonable speed while being easy to port on new host CPUs. + . + This package provides the full system emulation binaries. In this mode + QEMU emulates a full system, including a processor and various + peripherals. It enables easier testing and debugging of system code. + It can also be used to provide virtual hosting of several virtual + machines on a single server. + +Package: qemu-user +Architecture: amd64 arm armel hppa i386 mips mipsel powerpc sparc sparc64 ppc64 +Depends: ${shlibs:Depends}, ${misc:Depends} +Breaks: qemu (<< 0.11.0-2) +Replaces: qemu (<< 0.11.0-2) +Suggests: sudo +Description: QEMU user mode emulation binaries + QEMU is a fast processor emulator: currently the package supports + ARM, CRIS, i386, M68k (ColdFire), MicroBlaze, MIPS, PowerPC, SH4, + SPARC and x86-64 emulation. By using dynamic translation it achieves + reasonable speed while being easy to port on new host CPUs. + . + This package provides the user mode emulation binaries. In this mode + QEMU can launch Linux processes compiled for one CPU on another CPU. + +Package: qemu-user-static +Architecture: amd64 arm armel hppa i386 mips mipsel powerpc sparc sparc64 ppc64 +Depends: ${shlibs:Depends}, ${misc:Depends} +Recommends: binfmt-support +Suggests: sudo +Description: QEMU user mode emulation binaries (static version) + QEMU is a fast processor emulator: currently the package supports + ARM, CRIS, i386, M68k (ColdFire), MicroBlaze, MIPS, PowerPC, SH4, + SPARC and x86-64 emulation. By using dynamic translation it achieves + reasonable speed while being easy to port on new host CPUs. + . + This package provides the user mode emulation binaries, built + statically. In this mode QEMU can launch Linux processes compiled for + one CPU on another CPU. + +Package: qemu-utils +Architecture: amd64 arm armel hppa i386 mips mipsel powerpc sparc sparc64 kfreebsd-i386 kfreebsd-amd64 ppc64 +Depends: ${shlibs:Depends}, ${misc:Depends} +Suggests: debootstrap +Conflicts: kvm (= 85+dfsg-4.1) +Breaks: qemu (<< 0.11.0-2), qemu-user (<< 0.11.1-2) +Replaces: qemu (<< 0.11.0-2), qemu-user (<< 0.11.1-2) +Description: QEMU utilities + QEMU is a fast processor emulator: currently the package supports + ARM, CRIS, i386, M68k (ColdFire), MicroBlaze, MIPS, PowerPC, SH4, + SPARC and x86-64 emulation. By using dynamic translation it achieves + reasonable speed while being easy to port on new host CPUs. + . + This package provides QEMU related utilities: + * qemu-img: QEMU disk image utility + * qemu-io: QEMU disk exerciser + * qemu-nbd: QEMU disk network block device server + +Package: libqemu-dev +Architecture: amd64 arm armel hppa i386 mips mipsel powerpc sparc sparc64 kfreebsd-i386 kfreebsd-amd64 ppc64 +Section: libdevel +Depends: ${shlibs:Depends}, ${misc:Depends} +Description: static libraries and headers for QEMU + QEMU is a fast processor emulator: currently the package supports + ARM, CRIS, i386, M68k (ColdFire), MicroBlaze, MIPS, PowerPC, SH4, + SPARC and x86-64 emulation. By using dynamic translation it achieves + reasonable speed while being easy to port on new host CPUs. + . + This package provides header files and static libraries suitable to + emulate the various CPU supported by QEMU directly in an application. --- qemu-0.12.5+dfsg.orig/debian/qemu-system.README.Debian +++ qemu-0.12.5+dfsg/debian/qemu-system.README.Debian @@ -0,0 +1,13 @@ +qemu-system for Debian +---------------------- + +The qemu-system package does not include the video.x file, which is +needed by qemu-system-ppc for some systems. The file is available from +the mac-on-linux project, and the sources are available on: + http://mac-on-linux.svn.sourceforge.net/viewvc/mac-on-linux/mac-drivers/video_driver/Makefile?revision=HEAD&view=markup + +They are not buildable on a Debian system though, hence video.x is not +present in the package. The qemu-system-ppc binary is still useful for +emulating a PReP platform, which does not need video.x. + + -- Aurelien Jarno Sun, 16 Mar 2008 19:17:39 +0100 --- qemu-0.12.5+dfsg.orig/debian/qemu-system.prerm +++ qemu-0.12.5+dfsg/debian/qemu-system.prerm @@ -0,0 +1,14 @@ +#! /bin/sh +set -e + +#DEBHELPER# + +if [ "$1" = remove ] || [ "$1" = deconfigure ] || [ "$1" = failed-upgrade ]; then + if [ -x /usr/sbin/update-alternatives ]; then + # remove alternatives for qemu-system binaries + arches="arm cris m68k microblaze mips mips64 mips64el mipsel ppc ppc64 ppcemb sh4 sh4eb sparc sparc64 x86_64 i386" + for arch in $arches ; do + update-alternatives --remove qemu /usr/bin/qemu-system-"$arch" + done + fi +fi --- qemu-0.12.5+dfsg.orig/debian/qemu-keymaps.install +++ qemu-0.12.5+dfsg/debian/qemu-keymaps.install @@ -0,0 +1 @@ +debian/tmp/usr/share/qemu/keymaps --- qemu-0.12.5+dfsg.orig/debian/qemu-user.links +++ qemu-0.12.5+dfsg/debian/qemu-user.links @@ -0,0 +1,18 @@ +usr/share/man/man1/qemu-user.1 usr/share/man/man1/qemu-alpha.1 +usr/share/man/man1/qemu-user.1 usr/share/man/man1/qemu-cris.1 +usr/share/man/man1/qemu-user.1 usr/share/man/man1/qemu-arm.1 +usr/share/man/man1/qemu-user.1 usr/share/man/man1/qemu-armeb.1 +usr/share/man/man1/qemu-user.1 usr/share/man/man1/qemu-i386.1 +usr/share/man/man1/qemu-user.1 usr/share/man/man1/qemu-m68k.1 +usr/share/man/man1/qemu-user.1 usr/share/man/man1/qemu-microblaze.1 +usr/share/man/man1/qemu-user.1 usr/share/man/man1/qemu-mips.1 +usr/share/man/man1/qemu-user.1 usr/share/man/man1/qemu-mipsel.1 +usr/share/man/man1/qemu-user.1 usr/share/man/man1/qemu-ppc.1 +usr/share/man/man1/qemu-user.1 usr/share/man/man1/qemu-ppc64.1 +usr/share/man/man1/qemu-user.1 usr/share/man/man1/qemu-ppc64abi32.1 +usr/share/man/man1/qemu-user.1 usr/share/man/man1/qemu-sh4.1 +usr/share/man/man1/qemu-user.1 usr/share/man/man1/qemu-sh4eb.1 +usr/share/man/man1/qemu-user.1 usr/share/man/man1/qemu-sparc.1 +usr/share/man/man1/qemu-user.1 usr/share/man/man1/qemu-sparc32plus.1 +usr/share/man/man1/qemu-user.1 usr/share/man/man1/qemu-sparc64.1 +usr/share/man/man1/qemu-user.1 usr/share/man/man1/qemu-x86_64.1 --- qemu-0.12.5+dfsg.orig/debian/TODO +++ qemu-0.12.5+dfsg/debian/TODO @@ -0,0 +1,9 @@ +Just a small list of things not to forget for any new (upstream) release: + +* Make sure it works with the BIOS files in testing or otherwise raise the + dependency versions + +* If adding support for a new (host, not guest) arch: + Make sure to add it to the gpm Build-Dep (if that arch has gpm of course) + until Bug#267174 is solved. + --- qemu-0.12.5+dfsg.orig/debian/compat +++ qemu-0.12.5+dfsg/debian/compat @@ -0,0 +1 @@ +5 --- qemu-0.12.5+dfsg.orig/debian/qemu-user.install +++ qemu-0.12.5+dfsg/debian/qemu-user.install @@ -0,0 +1,18 @@ +debian/tmp/usr/bin/qemu-alpha +debian/tmp/usr/bin/qemu-armeb +debian/tmp/usr/bin/qemu-arm +debian/tmp/usr/bin/qemu-cris +debian/tmp/usr/bin/qemu-i386 +debian/tmp/usr/bin/qemu-m68k +debian/tmp/usr/bin/qemu-microblaze +debian/tmp/usr/bin/qemu-mipsel +debian/tmp/usr/bin/qemu-mips +debian/tmp/usr/bin/qemu-ppc64abi32 +debian/tmp/usr/bin/qemu-ppc64 +debian/tmp/usr/bin/qemu-ppc +debian/tmp/usr/bin/qemu-sh4eb +debian/tmp/usr/bin/qemu-sh4 +debian/tmp/usr/bin/qemu-sparc32plus +debian/tmp/usr/bin/qemu-sparc64 +debian/tmp/usr/bin/qemu-sparc +debian/tmp/usr/bin/qemu-x86_64 --- qemu-0.12.5+dfsg.orig/debian/qemu-make-debian-root.8 +++ qemu-0.12.5+dfsg/debian/qemu-make-debian-root.8 @@ -0,0 +1,44 @@ +.\" $Id: qemu-make-debian-root.8 266 2008-01-06 20:29:04Z aurel32 $ +.TH qemu\-make\-debian\-root 8 2006-05-28 "0.0" Debian +.\" Please adjust this date whenever revising the manpage. +.\" +.\" Some roff macros, for reference: +.\" .nh disable hyphenation +.\" .hy enable hyphenation +.\" .ad l left justify +.\" .ad b justify to both left and right margins +.\" .nf disable filling +.\" .fi enable filling +.\" .br insert line break +.\" .sp insert n+1 empty lines +.\" for manpage-specific macros, see man(7) +.SH NAME +qemu\-make\-debian\-root \- Create a debian root image for qemu +.SH SYNOPSIS +.B qemu\-make\-debian\-root +.RI [ -k "] " +.RI [ -s "] " +.I size-in-MiB distrib deburl image +.RI [ files-to-copy-in-/root ] +.SH DESCRIPTION +.B qemu\-make\-debian\-root +is a command to ease the creation of a debian root image for qemu. +The generated image is not bootable by itself, and an external kernel +is needed. It can be run with a command like: +.IP +.nf +.B qemu disk.img -kernel /boot/vmlinuz +.fi +.PP +.SH OPTIONS +.TP +.BR \-k +Keep file system. +.TP +.BR \-s +Create a sparse image. +.SH SEE ALSO +.BR qemu (1), +.BR qemu\-img (1). +.SH AUTHOR +This manual page was written by Guillem Jover . --- qemu-0.12.5+dfsg.orig/debian/qemu-user-static.postinst +++ qemu-0.12.5+dfsg/debian/qemu-user-static.postinst @@ -0,0 +1,18 @@ +#!/bin/sh -e + +BINFMT_TARGETS= # list of architectures is autogenerated from debian/rules + +if [ configure = "$1" ] && [ -x /usr/sbin/update-binfmts ]; then + for target in $BINFMT_TARGETS ; do + if [ -f /var/lib/binfmts/qemu-$target ]; then + # remove format, in case the current version no longer supports it. + update-binfmts --package qemu-user-static --remove qemu-$target /usr/bin/qemu-$target-static + fi + if [ -f /usr/share/binfmts/qemu-$target ]; then + # install currently supported format. + update-binfmts --import qemu-$target + fi + done +fi + +#DEBHELPER# --- qemu-0.12.5+dfsg.orig/debian/copyright +++ qemu-0.12.5+dfsg/debian/copyright @@ -0,0 +1,224 @@ +This package was debianized by Paul Russell on +Wed, 3 Mar 2004 02:18:54 +0100. + +Then maintained as part of the team by: + + Guilherme de S. Pastore + Elrond + Guillem Jover + +Now maintained as a team by: + + Aurelien Jarno + Riku Voipio + Vagrant Cascadian + +The upstream source was downloaded from: + + + + All the binary blobs without sources contained in the pc-bios/ directory + in the original upstream tarball have been removed starting from Debian + package version 0.6.0.dfsg.1-1. Those roms which are free can be found + in split packages of their own, represented accordingly in the dependecy + relationships. + +Upstream Author: + + Fabrice Bellard + +Copyright: + + Copyright (C) 1982, 1986, 1988-1994 The Regents of the University of California + Copyright (C) 1986-2007 Free Software Foundation Inc. + Copyright (C) 1988-1992 Richard Outerbridge + Copyright (C) 1991-1992, 1996 Linus Torvalds + Copyright (C) 1992 Graven Imagery + Copyright (C) 1995 Danny Gasparovski + Copyright (C) 1996-1999 Eduardo Horvath + Copyright (C) 1996 Paul Mackerras + Copyright (C) 1997-1999, 2001, 2006-2009 Red Hat Inc. + Copyright (C) 1998-1999 Philip Blundell + Copyright (C) 1998-2001, 2003, 2006 Thomas Sailer + Copyright (C) 1998, 2003-2008 Fabrice Bellard + Copyright (C) 1998-2004 Samuel Rydh + Copyright (C) 1998 Kenneth Albanowski + Copyright (C) 1998 The Silver Hammer Group Ltd. + Copyright (C) 1999-2000, 2002-2003 Maxim Krasnyansky + Copyright (C) 1999-2000 Tatsuyuki Satoh + Copyright (C) 1999-2006, 2008 Intel Corporation + Copyright (C) 1999 AT&T Laboratories Cambridge + Copyright (C) 2000-2001 Qualcomm Incorporated + Copyright (C) 2000-2002, 2004-2009 Axis Communications AB. + Copyright (C) 2000-2003, 2005 Martin Schwidefsky + Copyright (C) 2000-2003 David McCullough + Copyright (C) 2000-2005 All Rights Reserved. + Copyright (C) 2000-2005 DENX Software Engineering + Copyright (C) 2000-2005 Silicon Graphics Inc. + Copyright (C) 2000-2005 Wolfgang Denk + Copyright (C) 2000-2007 Tibor "TS" Schütz + Copyright (C) 2001 OKTET Ltd. + Copyright (C) 2001 Xilinx Inc. + Copyright (C) 2002-2005 Vassili Karpov + Copyright (C) 2002-2006 Marcel Holtmann + Copyright (C) 2002 Greg Ungerer + Copyright (C) 2002 Paul Dale + Copyright (C) 2003-2004 James Yonan + Copyright (C) 2003-2007 Jocelyn Mayer + Copyright (C) 2003 Damion K. Wilson + Copyright (C) 2003 Thomas M. Ogrisegg + Copyright (C) 2004-2005 Johannes E. Schindelin + Copyright (C) 2004, 2007 Magnus Damm + Copyright (C) 2004 Antony T Curtis + Copyright (C) 2004 Gianni Tedesco + Copyright (C) 2004 Johannes Schindelin + Copyright (C) 2004 Makoto Suzuki + Copyright (C) 2005, 2007 Alex Beregszaszi + Copyright (C) 2005-2007 Anthony Liguori + Copyright (C) 2005-2008 Andrzej Zaborowski + Copyright (C) 2005-2009 Paul Brook + Copyright (C) 2005 Author(s): Anthony Liguori + Copyright (C) 2005 Filip Navara + Copyright (C) 2005 International Business Machines Corp. + Copyright (C) 2005 LLC. Written + Copyright (C) 2005 Mike Kronenberg + Copyright (C) 2005 Samuel Tardieu + Copyright (C) 2006-2007, 2009 Aurelien Jarno + Copyright (C) 2006-2007, 2009 Stefan Weil + Copyright (C) 2006-2007 Thiemo Seufer + Copyright (C) 2006-2007 Thorsten Zitterell + Copyright (C) 2006-2008 Openedhand Ltd. + Copyright (C) 2006-2008 Qumranet Technologies + Copyright (C) 2006 Frederick Reeve + Copyright (C) 2006 Igor Kovalenko + Copyright (C) 2006 InnoTek Systemberatung GmbH + Copyright (C) 2006 Joachim Henke + Copyright (C) 2006 Lonnie Mendez + Copyright (C) 2006 Marius Groeger + Copyright (C) 2007-2008 Bull S.A.S. + Copyright (C) 2007-2008 IBM Corporation + Copyright (C) 2007-2008 Lauro Ramos Venancio + Copyright (C) 2007-2008 Nokia Corporation + Copyright (C) 2007-2008 OpenMoko Inc. + Copyright (C) 2007, 2009 Alexander Graf + Copyright (C) 2007-2009 Edgar E. Iglesias + Copyright (C) 2007-2009 Herve Poussineau + Copyright (C) 2007 Arastra Inc. + Copyright (C) 2007 Armin Kuster + Copyright (C) 2007 Dan Aloni + Copyright (C) 2007 Marko Kohtala + Copyright (C) 2007 MontaVista Software Inc. + Copyright (C) 2007 Robert Reif + Copyright (C) 2007 Vladimir Ananiev + Copyright (C) 2008-2009 Arnaud Patard + Copyright (C) 2008-2009 Citrix Systems Inc. + Copyright (C) 2008-2009 Gerd Hoffmann + Copyright (C) 2008 Dell MessageOne + Copyright (C) 2008 Dmitry Baryshkov + Copyright (C) 2008 Gleb Natapov + Copyright (C) 2008 Jean-Christophe PLAGNIOL-VILLARD + Copyright (C) 2008 Lubomir Rintel + Copyright (C) 2008 Max Krasnyansky + Copyright (C) 2008 Paul Mundt + Copyright (C) 2008 Samuel Thibault + Copyright (C) 2008 Shin-ichiro KAWASAKI + Copyright (C) 2008 Takashi YOSHII + Copyright (C) 2008 TJ + Copyright (C) 2009 CodeSourcery + Copyright (C) 2009 Freescale Semiconductor Inc. + Copyright (C) 2009 Hewlett-Packard Development Company + Copyright (C) 2009 Isaku Yamahata + Copyright (C) 2009 Kevin Wolf + Copyright (C) 2009 Laurent Vivier + Copyright (C) 2009 Michael S. Tsirkin + Copyright (C) 2009 Novell Inc. + Copyright (C) 2009 Ulrich Hecht + Copyright (C) 2009 VA Linux Systems Japan + + +License: + + QEMU as a whole is released under the GNU General Public License version 2. + On Debian systems, the complete text of the GNU General Public License + version 2 can be found in the file /usr/share/common-licenses/GPL-2. + + + Parts of QEMU have specific licenses which are compatible with the + GNU General Public License. Hence each source file contains its own + licensing information. + + + In particular, the QEMU virtual CPU core library (libqemu.a) is + released under the GNU Lesser General Public License version 2 or later. + On Debian systems, the complete text of the GNU Lesser General Public + License can be found in the file /usr/share/common-licenses/LGPL-2. + + + The BSD emulator is released under the following BSD license: + + Redistribution and use in source and binary forms, with or without + modification, are permitted provided that the following conditions + are met: + 1. Redistributions of source code must retain the above copyright + notice, this list of conditions and the following disclaimer. + + THIS SOFTWARE IS PROVIDED BY THE AUTHOR ``AS IS'' AND + ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE + IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE + ARE DISCLAIMED. IN NO EVENT SHALL THE AUTHOR BE LIABLE + FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL + DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS + OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) + HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT + LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY + OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF + SUCH DAMAGE. + + + The slirp code is released under the following BSD license: + + Redistribution and use in source and binary forms, with or without + modification, are permitted provided that the following conditions + are met: + 1. Redistributions of source code must retain the above copyright + notice, this list of conditions and the following disclaimer. + 2. Redistributions in binary form must reproduce the above copyright + notice, this list of conditions and the following disclaimer in the + documentation and/or other materials provided with the distribution. + 3. Neither the name of the University nor the names of its contributors + may be used to endorse or promote products derived from this software + without specific prior written permission. + + THIS SOFTWARE IS PROVIDED BY THE REGENTS AND CONTRIBUTORS ``AS IS'' AND + ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE + IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE + ARE DISCLAIMED. IN NO EVENT SHALL THE REGENTS OR CONTRIBUTORS BE LIABLE + FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL + DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS + OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) + HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT + LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY + OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF + SUCH DAMAGE. + + + The TCG code and many hardware device emulation sources are released under the + following MIT license: + + Permission is hereby granted, free of charge, to any person obtaining a copy + of this software and associated documentation files (the "Software"), to deal + in the Software without restriction, including without limitation the rights + to use, copy, modify, merge, publish, distribute, sublicense, and/or sell + copies of the Software, and to permit persons to whom the Software is + furnished to do so, subject to the following conditions: + + The above copyright notice and this permission notice shall be included in + all copies or substantial portions of the Software. + + THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR + IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY, + FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL + THE AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER + LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, + OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN + THE SOFTWARE. --- qemu-0.12.5+dfsg.orig/debian/qemu.doc-base +++ qemu-0.12.5+dfsg/debian/qemu.doc-base @@ -0,0 +1,12 @@ +Document: qemu-doc +Title: QEMU User Manual +Author: Fabrice Bellard +Abstract: The QEMU user manual intends to make the user understand what + qemu is/does, and to guide them through the first steps of getting + the emulator to work, documenting parameters and commands, among other + useful things. +Section: Emulators + +Format: HTML +Index: /usr/share/doc/qemu/qemu-doc.html +Files: /usr/share/doc/qemu/qemu-doc.html --- qemu-0.12.5+dfsg.orig/debian/qemu-user-static.dirs +++ qemu-0.12.5+dfsg/debian/qemu-user-static.dirs @@ -0,0 +1,2 @@ +etc/qemu-binfmt +usr/share/binfmts --- qemu-0.12.5+dfsg.orig/debian/libqemu-dev.dirs +++ qemu-0.12.5+dfsg/debian/libqemu-dev.dirs @@ -0,0 +1,50 @@ +usr/include/qemu/audio/ +usr/include/qemu/fpu/ +usr/include/qemu/hw/ + +usr/include/qemu/target-alpha/ +usr/include/qemu/target-arm/ +usr/include/qemu/target-cris/ +usr/include/qemu/target-i386/ +usr/include/qemu/target-m68k/ +usr/include/qemu/target-microblaze/ +usr/include/qemu/target-mips/ +usr/include/qemu/target-ppc/ +usr/include/qemu/target-sh4/ +usr/include/qemu/target-sparc/ + +usr/include/qemu/arm-softmmu/ +usr/include/qemu/cris-softmmu/ +usr/include/qemu/i386-softmmu/ +usr/include/qemu/m68k-softmmu/ +usr/include/qemu/microblaze-softmmu/ +usr/include/qemu/mips-softmmu/ +usr/include/qemu/mips64-softmmu/ +usr/include/qemu/mips64el-softmmu/ +usr/include/qemu/mipsel-softmmu/ +usr/include/qemu/ppc-softmmu/ +usr/include/qemu/ppc64-softmmu/ +usr/include/qemu/ppcemb-softmmu/ +usr/include/qemu/sh4-softmmu/ +usr/include/qemu/sh4eb-softmmu/ +usr/include/qemu/sparc-softmmu/ +usr/include/qemu/sparc64-softmmu/ +usr/include/qemu/x86_64-softmmu/ + +usr/lib/qemu/arm-softmmu/ +usr/lib/qemu/cris-softmmu/ +usr/lib/qemu/i386-softmmu/ +usr/lib/qemu/m68k-softmmu/ +usr/lib/qemu/microblaze-softmmu/ +usr/lib/qemu/mips-softmmu/ +usr/lib/qemu/mips64-softmmu/ +usr/lib/qemu/mips64el-softmmu/ +usr/lib/qemu/mipsel-softmmu/ +usr/lib/qemu/ppc-softmmu/ +usr/lib/qemu/ppc64-softmmu/ +usr/lib/qemu/ppcemb-softmmu/ +usr/lib/qemu/sh4-softmmu/ +usr/lib/qemu/sh4eb-softmmu/ +usr/lib/qemu/sparc-softmmu/ +usr/lib/qemu/sparc64-softmmu/ +usr/lib/qemu/x86_64-softmmu/ --- qemu-0.12.5+dfsg.orig/debian/qemu-system.links +++ qemu-0.12.5+dfsg/debian/qemu-system.links @@ -0,0 +1,32 @@ +usr/share/man/man1/qemu.1 usr/share/man/man1/qemu-system-arm.1 +usr/share/man/man1/qemu.1 usr/share/man/man1/qemu-system-cris.1 +usr/share/man/man1/qemu.1 usr/share/man/man1/qemu-system-i386.1 +usr/share/man/man1/qemu.1 usr/share/man/man1/qemu-system-m68k.1 +usr/share/man/man1/qemu.1 usr/share/man/man1/qemu-system-microblaze.1 +usr/share/man/man1/qemu.1 usr/share/man/man1/qemu-system-mips.1 +usr/share/man/man1/qemu.1 usr/share/man/man1/qemu-system-mips64.1 +usr/share/man/man1/qemu.1 usr/share/man/man1/qemu-system-mips64el.1 +usr/share/man/man1/qemu.1 usr/share/man/man1/qemu-system-mipsel.1 +usr/share/man/man1/qemu.1 usr/share/man/man1/qemu-system-ppc.1 +usr/share/man/man1/qemu.1 usr/share/man/man1/qemu-system-ppc64.1 +usr/share/man/man1/qemu.1 usr/share/man/man1/qemu-system-ppcemb.1 +usr/share/man/man1/qemu.1 usr/share/man/man1/qemu-system-sh4.1 +usr/share/man/man1/qemu.1 usr/share/man/man1/qemu-system-sh4eb.1 +usr/share/man/man1/qemu.1 usr/share/man/man1/qemu-system-sparc.1 +usr/share/man/man1/qemu.1 usr/share/man/man1/qemu-system-sparc64.1 +usr/share/man/man1/qemu.1 usr/share/man/man1/qemu-system-x86_64.1 +usr/share/seabios/bios.bin usr/share/qemu/bios.bin +usr/share/seabios/optionrom/linuxboot.bin usr/share/qemu/linuxboot.bin +usr/share/seabios/optionrom/multiboot.bin usr/share/qemu/multiboot.bin +usr/share/vgabios/vgabios.bin usr/share/qemu/vgabios.bin +usr/share/vgabios/vgabios.cirrus.bin usr/share/qemu/vgabios-cirrus.bin +usr/share/openhackware/ppc_rom.bin usr/share/qemu/ppc_rom.bin +usr/share/openbios/openbios-ppc usr/share/qemu/openbios-ppc +usr/share/openbios/openbios-sparc32 usr/share/qemu/openbios-sparc32 +usr/share/openbios/openbios-sparc64 usr/share/qemu/openbios-sparc64 +usr/lib/etherboot/rtl8139.rom usr/share/qemu/pxe-rtl8139.bin +usr/lib/etherboot/e1000-82540em.rom usr/share/qemu/pxe-e1000.bin +usr/lib/etherboot/ne.rom usr/share/qemu/pxe-ne2k_isa.bin +usr/lib/etherboot/virtio-net.rom usr/share/qemu/pxe-virtio.bin +usr/lib/etherboot/rtl8029.rom usr/share/qemu/pxe-ne2k_pci.bin +usr/lib/etherboot/pcnet32.rom usr/share/qemu/pxe-pcnet.bin --- qemu-0.12.5+dfsg.orig/debian/qemu-user-static.prerm +++ qemu-0.12.5+dfsg/debian/qemu-user-static.prerm @@ -0,0 +1,13 @@ +#!/bin/sh -e + +BINFMT_TARGETS= # list of architectures is autogenerated from debian/rules + +if [ "$1" = remove ] && [ -x /usr/sbin/update-binfmts ]; then + for target in $BINFMT_TARGETS ; do + if [ -f /var/lib/binfmts/qemu-"$target" ]; then + update-binfmts --package qemu-user-static --remove qemu-$target /usr/bin/qemu-$target-static + fi + done +fi + +#DEBHELPER# --- qemu-0.12.5+dfsg.orig/debian/qemu-user-static.README.Debian +++ qemu-0.12.5+dfsg/debian/qemu-user-static.README.Debian @@ -0,0 +1,17 @@ +qemu-user-static for Debian +--------------------------- + +* Configuring qemu-user-static to execute foreign binaries with binfmt + qemu-user-ARCH-static can be configured to run foreign binaries with + binfmt. qemu-user-ARCH-static has been built to prefix all paths to + the file system with /etc/qemu-binfmt/ARCH. When using non-static + binaries, a symlink pointing to the foreign libraries should be + installed in this directory. + +* Configuring qemu-user-static to use in a foreign chroot + When used with binfmt, qemu-user-ARCH-static can be configured to run + a foreign chroot. The qemu-user-ARCH-static binary should be copied + (or better hard linked) into the chroot in /usr/bin. Then the chroot + can be entered and used like a normal chroot. + + -- Aurelien Jarno Sun, 27 Dec 2009 00:35:15 +0100 --- qemu-0.12.5+dfsg.orig/debian/qemu-utils.manpages +++ qemu-0.12.5+dfsg/debian/qemu-utils.manpages @@ -0,0 +1 @@ +debian/qemu-make-debian-root.8 --- qemu-0.12.5+dfsg.orig/debian/qemu-user-static.links +++ qemu-0.12.5+dfsg/debian/qemu-user-static.links @@ -0,0 +1,18 @@ +usr/share/man/man1/qemu-user-static.1 usr/share/man/man1/qemu-alpha-static.1 +usr/share/man/man1/qemu-user-static.1 usr/share/man/man1/qemu-cris-static.1 +usr/share/man/man1/qemu-user-static.1 usr/share/man/man1/qemu-arm-static.1 +usr/share/man/man1/qemu-user-static.1 usr/share/man/man1/qemu-armeb-static.1 +usr/share/man/man1/qemu-user-static.1 usr/share/man/man1/qemu-i386-static.1 +usr/share/man/man1/qemu-user-static.1 usr/share/man/man1/qemu-m68k-static.1 +usr/share/man/man1/qemu-user-static.1 usr/share/man/man1/qemu-microblaze-static.1 +usr/share/man/man1/qemu-user-static.1 usr/share/man/man1/qemu-mips-static.1 +usr/share/man/man1/qemu-user-static.1 usr/share/man/man1/qemu-mipsel-static.1 +usr/share/man/man1/qemu-user-static.1 usr/share/man/man1/qemu-ppc-static.1 +usr/share/man/man1/qemu-user-static.1 usr/share/man/man1/qemu-ppc64-static.1 +usr/share/man/man1/qemu-user-static.1 usr/share/man/man1/qemu-ppc64abi32-static.1 +usr/share/man/man1/qemu-user-static.1 usr/share/man/man1/qemu-sh4-static.1 +usr/share/man/man1/qemu-user-static.1 usr/share/man/man1/qemu-sh4eb-static.1 +usr/share/man/man1/qemu-user-static.1 usr/share/man/man1/qemu-sparc-static.1 +usr/share/man/man1/qemu-user-static.1 usr/share/man/man1/qemu-sparc32plus-static.1 +usr/share/man/man1/qemu-user-static.1 usr/share/man/man1/qemu-sparc64-static.1 +usr/share/man/man1/qemu-user-static.1 usr/share/man/man1/qemu-x86_64-static.1 --- qemu-0.12.5+dfsg.orig/debian/qemu-system.docs +++ qemu-0.12.5+dfsg/debian/qemu-system.docs @@ -0,0 +1 @@ +debian/tundev.c --- qemu-0.12.5+dfsg.orig/debian/watch +++ qemu-0.12.5+dfsg/debian/watch @@ -0,0 +1,4 @@ +version=3 + +opts=dversionmangle=s/\+dfsg.*$// \ + http://download.savannah.gnu.org/releases/qemu/qemu-(.*).tar.gz debian uupdate --- qemu-0.12.5+dfsg.orig/debian/qemu-ifup +++ qemu-0.12.5+dfsg/debian/qemu-ifup @@ -0,0 +1,2 @@ +#!/bin/sh +sudo -p "Password for $0:" /sbin/ifconfig $1 172.20.0.1 --- qemu-0.12.5+dfsg.orig/debian/rules +++ qemu-0.12.5+dfsg/debian/rules @@ -0,0 +1,225 @@ +#!/usr/bin/make -f +# +# $Id: rules 391 2009-03-07 05:21:19Z aurel32 $ +# + +# Packaging version +DEB_VERSION := $(shell dpkg-parsechangelog | egrep '^Version:' | cut -f 2 -d ' ') + +# Compiler flags +LDFLAGS = -Wl,--as-needed +ifneq (,$(findstring noopt,$(DEB_BUILD_OPTIONS))) + CFLAGS = -O0 +endif + +# Support multiple makes at once +ifneq (,$(filter parallel=%,$(DEB_BUILD_OPTIONS))) +NJOBS := -j $(patsubst parallel=%,%,$(filter parallel=%,$(DEB_BUILD_OPTIONS))) +endif + +# Architecture/system specific configuration +DEB_HOST_ARCH = $(shell dpkg-architecture -qDEB_HOST_ARCH) +DEB_HOST_ARCH_OS = $(shell dpkg-architecture -qDEB_HOST_ARCH_OS) +DEB_HOST_ARCH_CPU = $(shell dpkg-architecture -qDEB_HOST_ARCH_CPU) + +ifeq ($(DEB_HOST_ARCH_OS),linux) + conf_arch += --audio-drv-list=alsa,oss,sdl,esd,pa +endif +ifeq ($(DEB_HOST_ARCH_OS),kfreebsd) + conf_arch += --audio-drv-list=oss,sdl,esd,pa +endif +# KVM on PowerPC needs at least 2.6.33 kernel headers +ifeq ($(DEB_HOST_ARCH_CPU),powerpc) + conf_arch += --disable-kvm +endif + +# binfmt support +ALL_BINFMT_TARGETS=alpha arm armeb cris i386 m68k microblaze mips mipsel ppc ppc64 ppc64abi32 sh4 sh4eb sparc sparc32plus sparc64 x86_64 +ifeq ($(DEB_HOST_ARCH),amd64) +BINFMT_TARGETS=$(filter-out i386 x86_64, $(ALL_BINFMT_TARGETS)) +endif +ifneq (,$(findstring $(DEB_HOST_ARCH), arm armel)) +BINFMT_TARGETS=$(filter-out arm, $(ALL_BINFMT_TARGETS)) +endif +ifeq ($(DEB_HOST_ARCH),i386) +# Drop support for emulating amd64 on i386, as it is broken and including it +# interferes with environments capable of running amd64 natively. +# http://bugs.debian.org/604712 +BINFMT_TARGETS=$(filter-out i386 x86_64, $(ALL_BINFMT_TARGETS)) +endif +ifeq ($(DEB_HOST_ARCH),mips) +BINFMT_TARGETS=$(filter-out mips, $(ALL_BINFMT_TARGETS)) +endif +ifeq ($(DEB_HOST_ARCH),mipsel) +BINFMT_TARGETS=$(filter-out mipsel, $(ALL_BINFMT_TARGETS)) +endif +ifeq ($(DEB_HOST_ARCH),powerpc) +BINFMT_TARGETS=$(filter-out ppc, $(ALL_BINFMT_TARGETS)) +endif +ifeq ($(DEB_HOST_ARCH),ppc64) +BINFMT_TARGETS=$(filter-out ppc ppc64 ppc64abi32 , $(ALL_BINFMT_TARGETS)) +endif +ifeq ($(DEB_HOST_ARCH),sparc) +BINFMT_TARGETS=$(filter-out sparc sparc32plus sparc64, $(ALL_BINFMT_TARGETS)) +endif +ifeq ($(DEB_HOST_ARCH),sparc64) +BINFMT_TARGETS=$(filter-out sparc sparc32plus sparc64, $(ALL_BINFMT_TARGETS)) +endif +ifeq ($(BINFMT_TARGETS),) +BINFMT_TARGETS=$(ALL_BINFMT_TARGETS) +endif + +include /usr/share/quilt/quilt.make + +configure-stamp: configure $(QUILT_STAMPFN) + dh_testdir + + # system build + mkdir -p $(CURDIR)/system-build + cd $(CURDIR)/system-build && \ + ../configure \ + --with-pkgversion="Debian $(DEB_VERSION)" \ + --extra-cflags="$(CFLAGS)" \ + --extra-ldflags="$(LDFLAGS)" \ + --prefix=/usr \ + --disable-blobs \ + --disable-strip \ + --disable-linux-user \ + --disable-bsd-user \ + --disable-darwin-user \ + $(conf_arch) + +ifeq ($(DEB_HOST_ARCH_OS),linux) + # user build + mkdir -p $(CURDIR)/user-build + cd $(CURDIR)/user-build && \ + ../configure \ + --with-pkgversion="Debian $(DEB_VERSION)" \ + --extra-cflags="$(CFLAGS)" \ + --extra-ldflags="$(LDFLAGS)" \ + --prefix=/usr \ + --interp-prefix=/etc/qemu-binfmt/%M \ + --disable-blobs \ + --disable-strip \ + --disable-system \ + $(conf_arch) + + # static user build + mkdir -p $(CURDIR)/user-static-build + cd $(CURDIR)/user-static-build && \ + ../configure \ + --with-pkgversion="Debian $(DEB_VERSION)" \ + --extra-cflags="$(CFLAGS)" \ + --extra-ldflags="$(LDFLAGS)" \ + --prefix=/usr \ + --interp-prefix=/etc/qemu-binfmt/%M \ + --disable-blobs \ + --disable-strip \ + --disable-system \ + --static \ + $(conf_arch) +endif + touch $@ + +build: build-stamp +build-stamp: configure-stamp + dh_testdir + + # system build + $(MAKE) -C $(CURDIR)/system-build $(NJOBS) + +ifeq ($(DEB_HOST_ARCH_OS),linux) + # user build + $(MAKE) -C $(CURDIR)/user-build $(NJOBS) + + # static user build + $(MAKE) -C $(CURDIR)/user-static-build $(NJOBS) +endif + touch $@ + +clean: unpatch + dh_testdir + dh_testroot + + rm -rf $(CURDIR)/*-build + rm -f $(CURDIR)/*-stamp + + dh_clean + +install: build + dh_testdir + dh_testroot + dh_clean -k + dh_installdirs -a + + # system build + $(MAKE) -C $(CURDIR)/system-build DESTDIR=$(CURDIR)/debian/tmp install + + mv $(CURDIR)/debian/tmp/usr/bin/qemu $(CURDIR)/debian/tmp/usr/bin/qemu-system-i386 + + for i in bamboo mpc8544ds ; do \ + dtc -o $(CURDIR)/debian/tmp/usr/share/qemu/$$i.dtb pc-bios/$$i.dts ; \ + done + +ifeq ($(DEB_HOST_ARCH_OS),linux) + # user build + $(MAKE) -C $(CURDIR)/user-build DESTDIR=$(CURDIR)/debian/tmp install + + # static user build + for target in $(CURDIR)/user-static-build/*-*-user/qemu-* ; do \ + install -m 755 $$target $(CURDIR)/debian/tmp/usr/bin/$$(basename $$target)-static ; \ + done + + # binfmt support + sed -i -e 's/^BINFMT_TARGETS=.*/BINFMT_TARGETS=\"$(ALL_BINFMT_TARGETS)\"/g' \ + $(CURDIR)/debian/qemu-user-static.prerm \ + $(CURDIR)/debian/qemu-user-static.postinst + + for target in $(BINFMT_TARGETS) ; do \ + install -m 644 $(CURDIR)/debian/binfmts/qemu-$$target \ + $(CURDIR)/debian/qemu-user-static/usr/share/binfmts ; \ + done +endif + + # Install files in the various packages + dh_install -s --list-missing + +binary-indep: build install + dh_testdir + dh_testroot + dh_install -i + dh_installdocs -i + dh_installman -i + dh_installchangelogs -i Changelog + dh_link -i + dh_strip -i + dh_compress -i + dh_fixperms -i + dh_installdeb -i + dh_gencontrol -i + dh_md5sums -i + dh_builddeb -i + +binary-arch: build install + dh_testdir + dh_testroot + dh_install -a + dh_installdocs -a + dh_installman -a + dh_installudev -a + dh_installchangelogs -a Changelog + dh_link -a + dh_strip -a + dh_compress -a + dh_fixperms -a + chmod a+x $(CURDIR)/debian/qemu-system/etc/qemu-ifup + dh_installdeb -a + dh_shlibdeps -a + dh_gencontrol -a + dh_md5sums -a + dh_builddeb -a + +binary: binary-indep binary-arch + +.PHONY: build clean binary-indep binary-arch binary install + --- qemu-0.12.5+dfsg.orig/debian/qemu-system.postinst +++ qemu-0.12.5+dfsg/debian/qemu-system.postinst @@ -0,0 +1,29 @@ +#! /bin/sh + +set -e + +if [ "$1" = configure ] ; then + # Add the kvm group unless it's already there + if ! getent group kvm >/dev/null; then + addgroup --quiet --system kvm || true + fi + + if [ -x /usr/sbin/update-alternatives ]; then + # Install alternatives for all qemu-system binaries. Set i386 as highest + # priority, as it has been the default qemu for quite some time. + update-alternatives --install /usr/bin/qemu qemu \ + /usr/bin/qemu-system-i386 20 + arches="arm cris m68k microblaze mips mips64 mips64el mipsel ppc ppc64 ppcemb sh4 sh4eb sparc sparc64 x86_64" + for arch in $arches ; do + update-alternatives --install /usr/bin/qemu qemu \ + /usr/bin/qemu-system-"$arch" 10 + done + fi +fi + +# dh_installdeb will replace this with shell code automatically +# generated by other debhelper scripts. + +#DEBHELPER# + +exit 0 --- qemu-0.12.5+dfsg.orig/debian/qemu-user.1 +++ qemu-0.12.5+dfsg/debian/qemu-user.1 @@ -0,0 +1,38 @@ +.\" $Id: qemu-user.1 234 2007-02-07 22:57:18Z guillem $ +.TH qemu\-user 1 2007-02-08 "0.9.0" Debian +.SH NAME +qemu\-user \- QEMU User Emulator +.SH SYNOPSIS +.B qemu\-user +.RI [ options ] +.I program +.RI [ program-arguments... ] +.SH DESCRIPTION +The +.B qemu\-user +emulator can run binaries for other architectures but with the same operating +system as the current one. +.SH OPTIONS +.TP +.BR \-h +Print this help. +.TP +.BR \-g +Wait gdb connection to port 1234. +.TP +.BR \-L " \fI\fP" +Set the elf interpreter prefix (default=\fI/usr/gnemul/qemu\-arm\fP). +.TP +.BR \-s " \fI\fP" +Set the stack size in bytes (default=\fI524288\fP). +.TP +.BR \-d " \fI\fP" +Activate log (logfile=\fI/tmp/qemu.log\fP) +.TP +.BR \-p " \fI\fP" +Set the host page size to 'pagesize'. +.SH SEE ALSO +.BR qemu (1), +.BR qemu\-img (1). +.SH AUTHOR +This manual page was written by Guillem Jover . --- qemu-0.12.5+dfsg.orig/debian/libqemu-dev.install +++ qemu-0.12.5+dfsg/debian/libqemu-dev.install @@ -0,0 +1,51 @@ +*.h usr/include/qemu/ +audio/*.h usr/include/qemu/audio/ +fpu/*.h usr/include/qemu/fpu/ +hw/*.h usr/include/qemu/hw/ + +target-alpha/*.h usr/include/qemu/target-alpha/ +target-arm/*.h usr/include/qemu/target-arm +target-cris/*.h usr/include/qemu/target-cris +target-i386/*.h usr/include/qemu/target-i386 +target-m68k/*.h usr/include/qemu/target-m68k +target-microblaze/*.h usr/include/qemu/target-microblaze +target-mips/*.h usr/include/qemu/target-mips +target-ppc/*.h usr/include/qemu/target-ppc +target-sh4/*.h usr/include/qemu/target-sh4 +target-sparc/*.h usr/include/qemu/target-sparc + +system-build/arm-softmmu/libqemu.a usr/lib/qemu/arm-softmmu +system-build/cris-softmmu/libqemu.a usr/lib/qemu/cris-softmmu +system-build/i386-softmmu/libqemu.a usr/lib/qemu/i386-softmmu +system-build/m68k-softmmu/libqemu.a usr/lib/qemu/m68k-softmmu +system-build/microblaze-softmmu/libqemu.a usr/lib/qemu/microblaze-softmmu +system-build/mips64el-softmmu/libqemu.a usr/lib/qemu/mips64el-softmmu +system-build/mips64-softmmu/libqemu.a usr/lib/qemu/mips64-softmmu +system-build/mipsel-softmmu/libqemu.a usr/lib/qemu/mipsel-softmmu +system-build/mips-softmmu/libqemu.a usr/lib/qemu/mips-softmmu +system-build/ppc64-softmmu/libqemu.a usr/lib/qemu/ppc64-softmmu +system-build/ppcemb-softmmu/libqemu.a usr/lib/qemu/ppcemb-softmmu +system-build/ppc-softmmu/libqemu.a usr/lib/qemu/ppc-softmmu +system-build/sh4eb-softmmu/libqemu.a usr/lib/qemu/sh4eb-softmmu +system-build/sh4-softmmu/libqemu.a usr/lib/qemu/sh4-softmmu +system-build/sparc64-softmmu/libqemu.a usr/lib/qemu/sparc64-softmmu +system-build/sparc-softmmu/libqemu.a usr/lib/qemu/sparc-softmmu +system-build/x86_64-softmmu/libqemu.a usr/lib/qemu/x86_64-softmmu + +system-build/arm-softmmu/*.h usr/include/qemu/arm-softmmu +system-build/cris-softmmu/*.h usr/include/qemu/cris-softmmu +system-build/i386-softmmu/*.h usr/include/qemu/i386-softmmu +system-build/m68k-softmmu/*.h usr/include/qemu/m68k-softmmu +system-build/microblaze-softmmu/*.h usr/include/qemu/microblaze-softmmu +system-build/mips64el-softmmu/*.h usr/include/qemu/mips64el-softmmu +system-build/mips64-softmmu/*.h usr/include/qemu/mips64-softmmu +system-build/mipsel-softmmu/*.h usr/include/qemu/mipsel-softmmu +system-build/mips-softmmu/*.h usr/include/qemu/mips-softmmu +system-build/ppc64-softmmu/*.h usr/include/qemu/ppc64-softmmu +system-build/ppcemb-softmmu/*.h usr/include/qemu/ppcemb-softmmu +system-build/ppc-softmmu/*.h usr/include/qemu/ppc-softmmu +system-build/sh4eb-softmmu/*.h usr/include/qemu/sh4eb-softmmu +system-build/sh4-softmmu/*.h usr/include/qemu/sh4-softmmu +system-build/sparc64-softmmu/*.h usr/include/qemu/sparc64-softmmu +system-build/sparc-softmmu/*.h usr/include/qemu/sparc-softmmu +system-build/x86_64-softmmu/*.h usr/include/qemu/x86_64-softmmu --- qemu-0.12.5+dfsg.orig/debian/qemu-utils.install +++ qemu-0.12.5+dfsg/debian/qemu-utils.install @@ -0,0 +1,6 @@ +debian/tmp/usr/bin/qemu-img +debian/tmp/usr/bin/qemu-io +debian/tmp/usr/bin/qemu-nbd +debian/tmp/usr/share/man/man1/qemu-img.1 +debian/tmp/usr/share/man/man8/qemu-nbd.8 +debian/qemu-make-debian-root usr/sbin/ --- qemu-0.12.5+dfsg.orig/debian/qemu-utils.README.Debian +++ qemu-0.12.5+dfsg/debian/qemu-utils.README.Debian @@ -0,0 +1,13 @@ +qemu-utils for Debian +-------------------- + +The qemu-utils package includes a simple script called qemu-make-debian-root +under /usr/sbin, which uses debootstrap to create an image suitable for qemu +with a fresh Debian installation inside. + +If you just want a test system, not wanting to go through any installation +process, that might be just ideal. Take a look at the manual page +qemu-make-debian-root (8) for further usage instructions. + + -- Guilherme de S. Pastore , Sun May 15 09:49:11 2005 + --- qemu-0.12.5+dfsg.orig/debian/overrides/qemu +++ qemu-0.12.5+dfsg/debian/overrides/qemu @@ -0,0 +1,7 @@ +qemu: shlib-with-non-pic-code usr/bin/qemu-ppc +qemu: shlib-with-non-pic-code usr/bin/qemu-sparc +qemu: shlib-with-non-pic-code usr/bin/qemu-i386 +qemu: shlib-with-non-pic-code usr/bin/qemu-arm +qemu: shlib-with-non-pic-code usr/bin/qemu-armeb +qemu: shlib-with-non-pic-code usr/bin/qemu-mips +qemu: shlib-with-non-pic-code usr/bin/qemu-mipsel --- qemu-0.12.5+dfsg.orig/debian/binfmts/qemu-arm +++ qemu-0.12.5+dfsg/debian/binfmts/qemu-arm @@ -0,0 +1,6 @@ +package qemu-user-static +interpreter /usr/bin/qemu-arm-static +flags: OC +offset 0 +magic \x7fELF\x01\x01\x01\x00\x00\x00\x00\x00\x00\x00\x00\x00\x02\x00\x28\x00 +mask \xff\xff\xff\xff\xff\xff\xff\x00\xff\xff\xff\xff\xff\xff\xff\xff\xfe\xff\xff\xff --- qemu-0.12.5+dfsg.orig/debian/binfmts/qemu-cris +++ qemu-0.12.5+dfsg/debian/binfmts/qemu-cris @@ -0,0 +1,6 @@ +package qemu-user-static +interpreter /usr/bin/qemu-cris-static +flags: OC +offset 0 +magic \x7fELF\x01\x01\x01\x00\x00\x00\x00\x00\x00\x00\x00\x00\x02\x00\x4c\x00 +mask \xff\xff\xff\xff\xff\xff\xff\x00\xff\xff\xff\xff\xff\xff\xff\xff\xfe\xff\xff\xff --- qemu-0.12.5+dfsg.orig/debian/binfmts/qemu-sh4eb +++ qemu-0.12.5+dfsg/debian/binfmts/qemu-sh4eb @@ -0,0 +1,7 @@ +package qemu-user-static +interpreter /usr/bin/qemu-sh4eb-static +flags: OC +offset 0 +magic \x7fELF\x01\x02\x01\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x02\x00\x2a +mask \xff\xff\xff\xff\xff\xff\xff\x00\xff\xff\xff\xff\xff\xff\xff\xff\xff\xfe\xff\xff + --- qemu-0.12.5+dfsg.orig/debian/binfmts/qemu-sparc +++ qemu-0.12.5+dfsg/debian/binfmts/qemu-sparc @@ -0,0 +1,6 @@ +package qemu-user-static +interpreter /usr/bin/qemu-sparc-static +flags: OC +offset 0 +magic \x7fELF\x01\x02\x01\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x02\x00\x02 +mask \xff\xff\xff\xff\xff\xff\xff\xff\xff\xff\xff\xff\xff\xff\xff\xff\xff\xfe\xff\xff --- qemu-0.12.5+dfsg.orig/debian/binfmts/qemu-sparc64 +++ qemu-0.12.5+dfsg/debian/binfmts/qemu-sparc64 @@ -0,0 +1,6 @@ +package qemu-user-static +interpreter /usr/bin/qemu-sparc64-static +flags: OC +offset 0 +magic \x7fELF\x02\x02\x01\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x02\x00\x2b +mask \xff\xff\xff\xff\xff\xff\xff\xff\xff\xff\xff\xff\xff\xff\xff\xff\xff\xfe\xff\xff --- qemu-0.12.5+dfsg.orig/debian/binfmts/qemu-i386 +++ qemu-0.12.5+dfsg/debian/binfmts/qemu-i386 @@ -0,0 +1,6 @@ +package qemu-user-static +interpreter /usr/bin/qemu-i386-static +flags: OC +offset 0 +magic \x7fELF\x01\x01\x01\x00\x00\x00\x00\x00\x00\x00\x00\x00\x02\x00\x03\x00 +mask \xff\xff\xff\xff\xff\xfe\xfe\xff\xff\xff\xff\xff\xff\xff\xff\xff\xfe\xff\xff\xff --- qemu-0.12.5+dfsg.orig/debian/binfmts/qemu-mipsel +++ qemu-0.12.5+dfsg/debian/binfmts/qemu-mipsel @@ -0,0 +1,6 @@ +package qemu-user-static +interpreter /usr/bin/qemu-mipsel-static +flags: OC +offset 0 +magic \x7fELF\x01\x01\x01\x00\x00\x00\x00\x00\x00\x00\x00\x00\x02\x00\x08\x00 +mask \xff\xff\xff\xff\xff\xff\xff\x00\xfe\xff\xff\xff\xff\xff\xff\xff\xfe\xff\xff\xff --- qemu-0.12.5+dfsg.orig/debian/binfmts/qemu-alpha +++ qemu-0.12.5+dfsg/debian/binfmts/qemu-alpha @@ -0,0 +1,6 @@ +package qemu-user-static +interpreter /usr/bin/qemu-alpha-static +flags: OC +offset 0 +magic \x7fELF\x02\x01\x01\x00\x00\x00\x00\x00\x00\x00\x00\x00\x02\x00\x26\x90 +mask \xff\xff\xff\xff\xff\xff\xff\x00\xff\xff\xff\xff\xff\xff\xff\xff\xfe\xff\xff\xff --- qemu-0.12.5+dfsg.orig/debian/binfmts/qemu-ppc64 +++ qemu-0.12.5+dfsg/debian/binfmts/qemu-ppc64 @@ -0,0 +1,6 @@ +package qemu-user-static +interpreter /usr/bin/qemu-ppc64-static +flags: OC +offset 0 +magic \x7fELF\x02\x02\x01\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x02\x00\x15 +mask \xff\xff\xff\xff\xff\xff\xff\xff\xff\xff\xff\xff\xff\xff\xff\xff\xff\xfe\xff\xff --- qemu-0.12.5+dfsg.orig/debian/binfmts/qemu-sparc32plus +++ qemu-0.12.5+dfsg/debian/binfmts/qemu-sparc32plus @@ -0,0 +1,6 @@ +package qemu-user-static +interpreter /usr/bin/qemu-sparc32plus-static +flags: OC +offset 0 +magic \x7fELF\x01\x02\x01\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x02\x00\x12 +mask \xff\xff\xff\xff\xff\xff\xff\xff\xff\xff\xff\xff\xff\xff\xff\xff\xff\xfe\xff\xff --- qemu-0.12.5+dfsg.orig/debian/binfmts/qemu-mips +++ qemu-0.12.5+dfsg/debian/binfmts/qemu-mips @@ -0,0 +1,7 @@ +package qemu-user-static +interpreter /usr/bin/qemu-mips-static +flags: OC +offset 0 +magic \x7fELF\x01\x02\x01\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x02\x00\x08 +mask \xff\xff\xff\xff\xff\xff\xff\x00\xfe\xff\xff\xff\xff\xff\xff\xff\xff\xfe\xff\xff + --- qemu-0.12.5+dfsg.orig/debian/binfmts/qemu-ppc64abi32 +++ qemu-0.12.5+dfsg/debian/binfmts/qemu-ppc64abi32 @@ -0,0 +1,6 @@ +package qemu-user-static +interpreter /usr/bin/qemu-ppc64abi32-static +flags: OC +offset 0 +magic \x7fELF\x01\x02\x01\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x02\x00\x15 +mask \xff\xff\xff\xff\xff\xff\xff\xff\xff\xff\xff\xff\xff\xff\xff\xff\xff\xfe\xff\xff --- qemu-0.12.5+dfsg.orig/debian/binfmts/qemu-m68k +++ qemu-0.12.5+dfsg/debian/binfmts/qemu-m68k @@ -0,0 +1,7 @@ +package qemu-user-static +interpreter /usr/bin/qemu-m68k-static +flags: OC +offset 0 +magic \x7fELF\x01\x02\x01\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x02\x00\x04 +mask \xff\xff\xff\xff\xff\xff\xff\x00\xff\xff\xff\xff\xff\xff\xff\xff\xff\xfe\xff\xff + --- qemu-0.12.5+dfsg.orig/debian/binfmts/qemu-microblaze +++ qemu-0.12.5+dfsg/debian/binfmts/qemu-microblaze @@ -0,0 +1,7 @@ +package qemu-user-static +interpreter /usr/bin/qemu-microblaze-static +flags: OC +offset 0 +magic \x7fELF\x01\x02\x01\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x02\xba\xab +mask \xff\xff\xff\xff\xff\xff\xff\x00\xff\xff\xff\xff\xff\xff\xff\xff\xff\xfe\xff\xff + --- qemu-0.12.5+dfsg.orig/debian/binfmts/qemu-ppc +++ qemu-0.12.5+dfsg/debian/binfmts/qemu-ppc @@ -0,0 +1,6 @@ +package qemu-user-static +interpreter /usr/bin/qemu-ppc-static +flags: OC +offset 0 +magic \x7fELF\x01\x02\x01\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x02\x00\x14 +mask \xff\xff\xff\xff\xff\xff\xff\xff\xff\xff\xff\xff\xff\xff\xff\xff\xff\xfe\xff\xff --- qemu-0.12.5+dfsg.orig/debian/binfmts/qemu-armeb +++ qemu-0.12.5+dfsg/debian/binfmts/qemu-armeb @@ -0,0 +1,7 @@ +package qemu-user-static +interpreter /usr/bin/qemu-arm-static +flags: OC +offset 0 +magic \x7fELF\x01\x02\x01\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x02\x00\x28 +mask \xff\xff\xff\xff\xff\xff\xff\x00\xff\xff\xff\xff\xff\xff\xff\xff\xff\xfe\xff\xff + --- qemu-0.12.5+dfsg.orig/debian/binfmts/qemu-sh4 +++ qemu-0.12.5+dfsg/debian/binfmts/qemu-sh4 @@ -0,0 +1,6 @@ +package qemu-user-static +interpreter /usr/bin/qemu-sh4-static +flags: OC +offset 0 +magic \x7fELF\x01\x01\x01\x00\x00\x00\x00\x00\x00\x00\x00\x00\x02\x00\x2a\x00 +mask \xff\xff\xff\xff\xff\xff\xff\x00\xff\xff\xff\xff\xff\xff\xff\xff\xfe\xff\xff\xff --- qemu-0.12.5+dfsg.orig/debian/binfmts/qemu-x86_64 +++ qemu-0.12.5+dfsg/debian/binfmts/qemu-x86_64 @@ -0,0 +1,6 @@ +package qemu-user-static +interpreter /usr/bin/qemu-x86_64-static +flags: OC +offset 0 +magic \x7fELF\x02\x01\x01\x00\x00\x00\x00\x00\x00\x00\x00\x00\x02\x00\x3e\x00 +mask \xff\xff\xff\xff\xff\xfe\xfe\xff\xff\xff\xff\xff\xff\xff\xff\xff\xfe\xff\xff\xff --- qemu-0.12.5+dfsg.orig/debian/patches/02_kfreebsd.patch +++ qemu-0.12.5+dfsg/debian/patches/02_kfreebsd.patch @@ -0,0 +1,13 @@ +diff --git a/usb-bsd.c b/usb-bsd.c +index 48567a3..a761b61 100644 +--- a/usb-bsd.c ++++ b/usb-bsd.c +@@ -35,7 +35,7 @@ + + #include + #ifndef __DragonFly__ +-#include ++#include + #else + #include + #endif --- qemu-0.12.5+dfsg.orig/debian/patches/07_tcg-mips-fix-branch-target-change-during-code-retran.patch +++ qemu-0.12.5+dfsg/debian/patches/07_tcg-mips-fix-branch-target-change-during-code-retran.patch @@ -0,0 +1,26 @@ +From d43ffce14023df871d6065eb864d1f41eb441f37 Mon Sep 17 00:00:00 2001 +From: Aurelien Jarno +Date: Thu, 6 Jan 2011 22:43:14 +0100 +Subject: [PATCH] tcg/mips: fix branch target change during code retranslation + +TCG on MIPS was trying to avoid changing the branch offset, but didn't +due to a stupid typo. Fix it. + +Signed-off-by: Aurelien Jarno +--- + tcg/mips/tcg-target.c | 2 +- + 1 files changed, 1 insertions(+), 1 deletions(-) + +diff --git a/tcg/mips/tcg-target.c b/tcg/mips/tcg-target.c +index 2af7a2e..4e92a50 100644 +--- a/tcg/mips/tcg-target.c ++++ b/tcg/mips/tcg-target.c +@@ -352,7 +352,7 @@ static inline void tcg_out_opc_imm(TCGContext *s, int opc, int rt, int rs, int i + static inline void tcg_out_opc_br(TCGContext *s, int opc, int rt, int rs) + { + /* We need to keep the offset unchanged for retranslation */ +- uint16_t offset = (uint16_t)(*(uint32_t *) &s->code_ptr); ++ uint16_t offset = (uint16_t)(*(uint32_t *) s->code_ptr); + + tcg_out_opc_imm(s, opc, rt, rs, offset); + } --- qemu-0.12.5+dfsg.orig/debian/patches/series +++ qemu-0.12.5+dfsg/debian/patches/series @@ -0,0 +1,11 @@ +02_kfreebsd.patch +03_support_pselect_in_linux_user_arm.patch +05_bochs_vbe.diff +06_sh4.diff +07_tcg-mips-fix-branch-target-change-during-code-retran.patch +99_stable.diff +security/leftover.patch +block-prevent-snapshot-mode-TMPDIR-symlink-attack-CVE-2012-2652.patch +console-bounds-check-whenever-changing-the-cursor-CVE-2012-3515.patch +e1000-discard-packets-that-are-too-long-if-not-SBP-and-not-LPE.patch +e1000-discard-oversized-packets-based-on-SBP_LPE.patch --- qemu-0.12.5+dfsg.orig/debian/patches/03_support_pselect_in_linux_user_arm.patch +++ qemu-0.12.5+dfsg/debian/patches/03_support_pselect_in_linux_user_arm.patch @@ -0,0 +1,175 @@ +downloaded from: http://bazaar.launchpad.net/%7Eubuntu-server-edgers/ubuntu/lucid/qemu-kvm/qemu-kvm-dailies-packaging.trunk/annotate/head%3A/debian/patches/This-patch-adds-support-for-the-pselect-syscall-in-l.patch + +see also: http://lists.gnu.org/archive/html/qemu-devel/2010-02/msg01026.html + +From 2c28192f9eb4a23cda0787c97cdb78c33735803e Mon Sep 17 00:00:00 2001 +From: Michael Casadevall +Date: Tue, 16 Feb 2010 05:31:19 -0500 +Subject: [PATCH] This patch adds support for the pselect syscall in linux-user emulation and also adds several support functions required to translate the timespec structs between the target and the host. + +Signed-off-by: Michael Casadevall +--- + linux-user/arm/syscall_nr.h | 2 +- + linux-user/syscall.c | 119 +++++++++++++++++++++++++++++++++++++++++++ + 2 files changed, 120 insertions(+), 1 deletions(-) + +diff --git a/linux-user/arm/syscall_nr.h b/linux-user/arm/syscall_nr.h +index b1db341..79a216a 100644 +--- a/linux-user/arm/syscall_nr.h ++++ b/linux-user/arm/syscall_nr.h +@@ -338,7 +338,7 @@ + #define TARGET_NR_readlinkat (332) + #define TARGET_NR_fchmodat (333) + #define TARGET_NR_faccessat (334) +- /* 335 for pselect6 */ ++#define TARGET_NR_pselect6 (335) + /* 336 for ppoll */ + #define TARGET_NR_unshare (337) + #define TARGET_NR_set_robust_list (338) +diff --git a/linux-user/syscall.c b/linux-user/syscall.c +index 9fb493f..3663451 100644 +--- a/linux-user/syscall.c ++++ b/linux-user/syscall.c +@@ -850,6 +850,38 @@ static inline abi_long copy_to_user_timeval(abi_ulong target_tv_addr, + return 0; + } + ++static inline abi_long copy_from_user_timespec(struct timespec *ts, ++ abi_ulong target_ts_addr) ++{ ++ struct target_timespec *target_ts; ++ ++ if (!lock_user_struct(VERIFY_READ, target_ts, target_ts_addr, 1)) ++ return -TARGET_EFAULT; ++ ++ __get_user(ts->tv_sec, &target_ts->tv_sec); ++ __get_user(ts->tv_nsec, &target_ts->tv_nsec); ++ ++ unlock_user_struct(target_ts, target_ts_addr, 0); ++ ++ return 0; ++} ++ ++ ++static inline abi_long copy_to_user_timespec(abi_ulong target_ts_addr, ++ const struct timespec *ts) ++{ ++ struct target_timespec *target_ts; ++ ++ if (!lock_user_struct(VERIFY_WRITE, target_ts, target_ts_addr, 0)) ++ return -TARGET_EFAULT; ++ ++ __put_user(ts->tv_sec, &target_ts->tv_sec); ++ __put_user(ts->tv_nsec, &target_ts->tv_nsec); ++ ++ unlock_user_struct(target_ts, target_ts_addr, 1); ++ ++ return 0; ++} + #if defined(TARGET_NR_mq_open) && defined(__NR_mq_open) + #include + +@@ -949,6 +981,75 @@ static abi_long do_select(int n, + return ret; + } + ++#ifdef TARGET_NR_pselect6 ++/* do_pselect() must return target values and target errnos. */ ++static abi_long do_pselect(int n, ++ abi_ulong rfd_addr, abi_ulong wfd_addr, ++ abi_ulong efd_addr, abi_ulong target_tv_addr, ++ abi_ulong set_addr) ++{ ++ fd_set rfds, wfds, efds; ++ fd_set *rfds_ptr, *wfds_ptr, *efds_ptr; ++ struct timespec tv, *tv_ptr; ++ sigset_t set, *set_ptr; ++ abi_long ret; ++ ++ if (rfd_addr) { ++ if (copy_from_user_fdset(&rfds, rfd_addr, n)) ++ return -TARGET_EFAULT; ++ rfds_ptr = &rfds; ++ } else { ++ rfds_ptr = NULL; ++ } ++ if (wfd_addr) { ++ if (copy_from_user_fdset(&wfds, wfd_addr, n)) ++ return -TARGET_EFAULT; ++ wfds_ptr = &wfds; ++ } else { ++ wfds_ptr = NULL; ++ } ++ if (efd_addr) { ++ if (copy_from_user_fdset(&efds, efd_addr, n)) ++ return -TARGET_EFAULT; ++ efds_ptr = &efds; ++ } else { ++ efds_ptr = NULL; ++ } ++ ++ if (target_tv_addr) { ++ if (copy_from_user_timespec(&tv, target_tv_addr)) ++ return -TARGET_EFAULT; ++ tv_ptr = &tv; ++ } else { ++ tv_ptr = NULL; ++ } ++ ++ /* We don't need to return sigmask to target */ ++ if (set_addr) { ++ target_to_host_old_sigset(&set, &set_addr); ++ set_ptr = &set; ++ } else { ++ set_ptr = NULL; ++ } ++ ++ ret = get_errno(pselect(n, rfds_ptr, wfds_ptr, efds_ptr, tv_ptr, set_ptr)); ++ ++ if (!is_error(ret)) { ++ if (rfd_addr && copy_to_user_fdset(rfd_addr, &rfds, n)) ++ return -TARGET_EFAULT; ++ if (wfd_addr && copy_to_user_fdset(wfd_addr, &wfds, n)) ++ return -TARGET_EFAULT; ++ if (efd_addr && copy_to_user_fdset(efd_addr, &efds, n)) ++ return -TARGET_EFAULT; ++ ++ if (target_tv_addr && copy_to_user_timespec(target_tv_addr, &tv)) ++ return -TARGET_EFAULT; ++ } ++ ++ return ret; ++} ++#endif ++ + static abi_long do_pipe2(int host_pipe[], int flags) + { + #ifdef CONFIG_PIPE2 +@@ -5136,6 +5237,24 @@ abi_long do_syscall(void *cpu_env, int num, abi_long arg1, + } + break; + #endif ++ ++#ifdef TARGET_NR_pselect6 ++ case TARGET_NR_pselect6: ++ { ++ abi_ulong inp, outp, exp, tvp, set; ++ long nsel; ++ ++ nsel = tswapl(arg1); ++ inp = tswapl(arg2); ++ outp = tswapl(arg3); ++ exp = tswapl(arg4); ++ tvp = tswapl(arg5); ++ set = tswapl(arg6); ++ ++ ret = do_pselect(nsel, inp, outp, exp, tvp, set); ++ } ++ break; ++#endif + case TARGET_NR_symlink: + { + void *p2; +-- +1.6.6.1 + --- qemu-0.12.5+dfsg.orig/debian/patches/block-prevent-snapshot-mode-TMPDIR-symlink-attack-CVE-2012-2652.patch +++ qemu-0.12.5+dfsg/debian/patches/block-prevent-snapshot-mode-TMPDIR-symlink-attack-CVE-2012-2652.patch @@ -0,0 +1,128 @@ +Commit: eba25057b9a5e19d10ace2bc7716667a31297169 +Author: Jim Meyering +Date: Mon May 28 09:27:54 2012 +0200 +Subject: block: prevent snapshot mode $TMPDIR symlink attack +Bug-Debian: http://bugs.debian.org/678280 +Comment: backported to 0.12 by Michael Tokarev + + In snapshot mode, bdrv_open creates an empty temporary file without + checking for mkstemp or close failure, and ignoring the possibility + of a buffer overrun given a surprisingly long $TMPDIR. + Change the get_tmp_filename function to return int (not void), + so that it can inform its two callers of those failures. + Also avoid the risk of buffer overrun and do not ignore mkstemp + or close failure. + Update both callers (in block.c and vvfat.c) to propagate + temp-file-creation failure to their callers. + + get_tmp_filename creates and closes an empty file, while its + callers later open that presumed-existing file with O_CREAT. + The problem was that a malicious user could provoke mkstemp failure + and race to create a symlink with the selected temporary file name, + thus causing the qemu process (usually root owned) to open through + the symlink, overwriting an attacker-chosen file. + + This addresses CVE-2012-2652. + http://bugzilla.redhat.com/CVE-2012-2652 + + Reviewed-by: Stefan Hajnoczi + Signed-off-by: Jim Meyering + Signed-off-by: Anthony Liguori + +--- a/block.c ++++ b/block.c +@@ -205,28 +205,36 @@ int bdrv_create(BlockDriver *drv, const + return drv->bdrv_create(filename, options); + } + +-#ifdef _WIN32 +-void get_tmp_filename(char *filename, int size) ++/* ++ * Create a uniquely-named empty temporary file. ++ * Return 0 upon success, otherwise a negative errno value. ++ */ ++int get_tmp_filename(char *filename, int size) + { ++#ifdef _WIN32 + char temp_dir[MAX_PATH]; +- +- GetTempPath(MAX_PATH, temp_dir); +- GetTempFileName(temp_dir, "qem", 0, filename); +-} ++ /* GetTempFileName requires that its output buffer (4th param) ++ have length MAX_PATH or greater. */ ++ assert(size >= MAX_PATH); ++ return (GetTempPath(MAX_PATH, temp_dir) ++ && GetTempFileName(temp_dir, "qem", 0, filename) ++ ? 0 : -GetLastError()); + #else +-void get_tmp_filename(char *filename, int size) +-{ + int fd; + const char *tmpdir; +- /* XXX: race condition possible */ + tmpdir = getenv("TMPDIR"); + if (!tmpdir) + tmpdir = "/tmp"; +- snprintf(filename, size, "%s/vl.XXXXXX", tmpdir); ++ if (snprintf(filename, size, "%s/vl.XXXXXX", tmpdir) >= size) { ++ return -EOVERFLOW; ++ } + fd = mkstemp(filename); +- close(fd); +-} ++ if (fd < 0 || close(fd)) { ++ return -errno; ++ } ++ return 0; + #endif ++} + + #ifdef _WIN32 + static int is_windows_drive_prefix(const char *filename) +@@ -390,7 +398,10 @@ int bdrv_open2(BlockDriverState *bs, con + + bdrv_delete(bs1); + +- get_tmp_filename(tmp_filename, sizeof(tmp_filename)); ++ ret = get_tmp_filename(tmp_filename, sizeof(tmp_filename)); ++ if (ret < 0) { ++ return ret; ++ } + + /* Real path is meaningless for protocols */ + if (is_protocol) +--- a/block/vvfat.c ++++ b/block/vvfat.c +@@ -2776,13 +2776,19 @@ static int enable_write_target(BDRVVVFAT + { + BlockDriver *bdrv_qcow; + QEMUOptionParameter *options; ++ int ret; + int size = sector2cluster(s, s->sector_count); + s->used_clusters = calloc(size, 1); + + array_init(&(s->commits), sizeof(commit_t)); + + s->qcow_filename = qemu_malloc(1024); +- get_tmp_filename(s->qcow_filename, 1024); ++ ret = get_tmp_filename(s->qcow_filename, 1024); ++ if (ret < 0) { ++ qemu_free(s->qcow_filename); ++ s->qcow_filename = NULL; ++ return ret; ++ } + + bdrv_qcow = bdrv_find_format("qcow"); + options = parse_option_parameters("", bdrv_qcow->create_options, NULL); +--- a/block_int.h ++++ b/block_int.h +@@ -184,7 +184,7 @@ struct BlockDriverAIOCB { + BlockDriverAIOCB *next; + }; + +-void get_tmp_filename(char *filename, int size); ++int get_tmp_filename(char *filename, int size); + + void *qemu_aio_get(AIOPool *pool, BlockDriverState *bs, + BlockDriverCompletionFunc *cb, void *opaque); --- qemu-0.12.5+dfsg.orig/debian/patches/console-bounds-check-whenever-changing-the-cursor-CVE-2012-3515.patch +++ qemu-0.12.5+dfsg/debian/patches/console-bounds-check-whenever-changing-the-cursor-CVE-2012-3515.patch @@ -0,0 +1,118 @@ +Commit: 3eea5498ca501922520b3447ba94815bfc109743 +Author: Ian Campbell +Date: Tue Sep 4 10:26:09 2012 -0500 +Subject: console: bounds check whenever changing the cursor due to an escape code +Bug-Debian: http://bugs.debian.org/686973 + + This is XSA-17 / CVE-2012-3515 + + Signed-off-by: Ian Campbell + Signed-off-by: Anthony Liguori + +diff --git a/console.c b/console.c +index f5e8814..3b5cabb 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,8 @@ 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 +956,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]) { --- qemu-0.12.5+dfsg.orig/debian/patches/05_bochs_vbe.diff +++ qemu-0.12.5+dfsg/debian/patches/05_bochs_vbe.diff @@ -0,0 +1,66 @@ +commit af92284bec7ddbd76ddd105c40718627dda3407e +Author: Gerd Hoffmann +Date: Thu Mar 25 11:38:52 2010 +0100 + + update bochs vbe interface + + The bochs vbe interface got a new register a while back, which specifies + the linear framebuffer size in 64k units. This patch adds support for + the new register to qemu. With this patch applied vgabios 0.6c works + with qemu. + + Signed-off-by: Gerd Hoffmann + Signed-off-by: Aurelien Jarno + +diff --git a/hw/vga.c b/hw/vga.c +index 6a1a059..bb65677 100644 +--- a/hw/vga.c ++++ b/hw/vga.c +@@ -522,7 +522,7 @@ static uint32_t vbe_ioport_read_data(void *opaque, uint32_t addr) + VGACommonState *s = opaque; + uint32_t val; + +- if (s->vbe_index <= VBE_DISPI_INDEX_NB) { ++ if (s->vbe_index < VBE_DISPI_INDEX_NB) { + if (s->vbe_regs[VBE_DISPI_INDEX_ENABLE] & VBE_DISPI_GETCAPS) { + switch(s->vbe_index) { + /* XXX: do not hardcode ? */ +@@ -542,6 +542,8 @@ static uint32_t vbe_ioport_read_data(void *opaque, uint32_t addr) + } else { + val = s->vbe_regs[s->vbe_index]; + } ++ } else if (s->vbe_index == VBE_DISPI_INDEX_VIDEO_MEMORY_64K) { ++ val = s->vram_size / (64 * 1024); + } else { + val = 0; + } +@@ -1955,7 +1957,7 @@ void vga_common_reset(VGACommonState *s) + #ifdef CONFIG_BOCHS_VBE + s->vbe_index = 0; + memset(s->vbe_regs, '\0', sizeof(s->vbe_regs)); +- s->vbe_regs[VBE_DISPI_INDEX_ID] = VBE_DISPI_ID0; ++ s->vbe_regs[VBE_DISPI_INDEX_ID] = VBE_DISPI_ID5; + s->vbe_start_addr = 0; + s->vbe_line_offset = 0; + s->vbe_bank_mask = (s->vram_size >> 16) - 1; +diff --git a/hw/vga_int.h b/hw/vga_int.h +index 23a42ef..6a46a43 100644 +--- a/hw/vga_int.h ++++ b/hw/vga_int.h +@@ -47,13 +47,15 @@ + #define VBE_DISPI_INDEX_VIRT_HEIGHT 0x7 + #define VBE_DISPI_INDEX_X_OFFSET 0x8 + #define VBE_DISPI_INDEX_Y_OFFSET 0x9 +-#define VBE_DISPI_INDEX_NB 0xa ++#define VBE_DISPI_INDEX_NB 0xa /* size of vbe_regs[] */ ++#define VBE_DISPI_INDEX_VIDEO_MEMORY_64K 0xa /* read-only, not in vbe_regs */ + + #define VBE_DISPI_ID0 0xB0C0 + #define VBE_DISPI_ID1 0xB0C1 + #define VBE_DISPI_ID2 0xB0C2 + #define VBE_DISPI_ID3 0xB0C3 + #define VBE_DISPI_ID4 0xB0C4 ++#define VBE_DISPI_ID5 0xB0C5 + + #define VBE_DISPI_DISABLED 0x00 + #define VBE_DISPI_ENABLED 0x01 --- qemu-0.12.5+dfsg.orig/debian/patches/99_stable.diff +++ qemu-0.12.5+dfsg/debian/patches/99_stable.diff @@ -0,0 +1,276 @@ +diff --git a/hw/ide.h b/hw/ide.h +index 0e7d540..4ccb580 100644 +--- a/hw/ide.h ++++ b/hw/ide.h +@@ -1,17 +1,18 @@ + #ifndef HW_IDE_H + #define HW_IDE_H + +-#include "qdev.h" ++#include "isa.h" ++#include "pci.h" + + /* ide-isa.c */ +-int isa_ide_init(int iobase, int iobase2, int isairq, +- DriveInfo *hd0, DriveInfo *hd1); ++ISADevice *isa_ide_init(int iobase, int iobase2, int isairq, ++ DriveInfo *hd0, DriveInfo *hd1); + + /* ide-pci.c */ + void pci_cmd646_ide_init(PCIBus *bus, DriveInfo **hd_table, + int secondary_ide_enabled); +-void pci_piix3_ide_init(PCIBus *bus, DriveInfo **hd_table, int devfn); +-void pci_piix4_ide_init(PCIBus *bus, DriveInfo **hd_table, int devfn); ++PCIDevice *pci_piix3_ide_init(PCIBus *bus, DriveInfo **hd_table, int devfn); ++PCIDevice *pci_piix4_ide_init(PCIBus *bus, DriveInfo **hd_table, int devfn); + + /* ide-macio.c */ + int pmac_ide_init (DriveInfo **hd_table, qemu_irq irq, +@@ -22,4 +23,6 @@ void mmio_ide_init (target_phys_addr_t membase, target_phys_addr_t membase2, + qemu_irq irq, int shift, + DriveInfo *hd0, DriveInfo *hd1); + ++void ide_get_bs(BlockDriverState *bs[], BusState *qbus); ++ + #endif /* HW_IDE_H */ +diff --git a/hw/ide/isa.c b/hw/ide/isa.c +index dff7c79..95189d6 100644 +--- a/hw/ide/isa.c ++++ b/hw/ide/isa.c +@@ -75,8 +75,8 @@ static int isa_ide_initfn(ISADevice *dev) + return 0; + }; + +-int isa_ide_init(int iobase, int iobase2, int isairq, +- DriveInfo *hd0, DriveInfo *hd1) ++ISADevice *isa_ide_init(int iobase, int iobase2, int isairq, ++ DriveInfo *hd0, DriveInfo *hd1) + { + ISADevice *dev; + ISAIDEState *s; +@@ -86,14 +86,14 @@ int isa_ide_init(int iobase, int iobase2, int isairq, + qdev_prop_set_uint32(&dev->qdev, "iobase2", iobase2); + qdev_prop_set_uint32(&dev->qdev, "irq", isairq); + if (qdev_init(&dev->qdev) < 0) +- return -1; ++ return NULL; + + s = DO_UPCAST(ISAIDEState, dev, dev); + if (hd0) + ide_create_drive(&s->bus, 0, hd0); + if (hd1) + ide_create_drive(&s->bus, 1, hd1); +- return 0; ++ return dev; + } + + static ISADeviceInfo isa_ide_info = { +diff --git a/hw/ide/piix.c b/hw/ide/piix.c +index 2776ac3..eab346a 100644 +--- a/hw/ide/piix.c ++++ b/hw/ide/piix.c +@@ -158,22 +158,24 @@ static int pci_piix4_ide_initfn(PCIDevice *dev) + + /* hd_table must contain 4 block drivers */ + /* NOTE: for the PIIX3, the IRQs and IOports are hardcoded */ +-void pci_piix3_ide_init(PCIBus *bus, DriveInfo **hd_table, int devfn) ++PCIDevice *pci_piix3_ide_init(PCIBus *bus, DriveInfo **hd_table, int devfn) + { + PCIDevice *dev; + + dev = pci_create_simple(bus, devfn, "piix3-ide"); + pci_ide_create_devs(dev, hd_table); ++ return dev; + } + + /* hd_table must contain 4 block drivers */ + /* NOTE: for the PIIX4, the IRQs and IOports are hardcoded */ +-void pci_piix4_ide_init(PCIBus *bus, DriveInfo **hd_table, int devfn) ++PCIDevice *pci_piix4_ide_init(PCIBus *bus, DriveInfo **hd_table, int devfn) + { + PCIDevice *dev; + + dev = pci_create_simple(bus, devfn, "piix4-ide"); + pci_ide_create_devs(dev, hd_table); ++ return dev; + } + + static PCIDeviceInfo piix_ide_info[] = { +diff --git a/hw/ide/qdev.c b/hw/ide/qdev.c +index 0b84a4f..a621d5e 100644 +--- a/hw/ide/qdev.c ++++ b/hw/ide/qdev.c +@@ -90,6 +90,13 @@ IDEDevice *ide_create_drive(IDEBus *bus, int unit, DriveInfo *drive) + return DO_UPCAST(IDEDevice, qdev, dev); + } + ++void ide_get_bs(BlockDriverState *bs[], BusState *qbus) ++{ ++ IDEBus *bus = DO_UPCAST(IDEBus, qbus, qbus); ++ bs[0] = bus->master ? bus->master->dinfo->bdrv : NULL; ++ bs[1] = bus->slave ? bus->slave->dinfo->bdrv : NULL; ++} ++ + /* --------------------------------- */ + + typedef struct IDEDrive { +diff --git a/hw/pc.c b/hw/pc.c +index 04ff78d..685b2ff 100644 +--- a/hw/pc.c ++++ b/hw/pc.c +@@ -24,6 +24,7 @@ + #include "hw.h" + #include "pc.h" + #include "fdc.h" ++#include "ide.h" + #include "pci.h" + #include "vmware_vga.h" + #include "usb-uhci.h" +@@ -244,15 +245,66 @@ static int pc_boot_set(void *opaque, const char *boot_device) + return(0); + } + +-/* hd_table must contain 4 block drivers */ ++typedef struct pc_cmos_init_late_arg { ++ BusState *idebus0, *idebus1; ++} pc_cmos_init_late_arg; ++ ++static void pc_cmos_init_late(void *opaque) ++{ ++ pc_cmos_init_late_arg *arg = opaque; ++ RTCState *s = rtc_state; ++ int val; ++ BlockDriverState *hd_table[4]; ++ int i; ++ ++ ide_get_bs(hd_table, arg->idebus0); ++ ide_get_bs(hd_table + 2, arg->idebus1); ++ ++ rtc_set_memory(s, 0x12, (hd_table[0] ? 0xf0 : 0) | (hd_table[1] ? 0x0f : 0)); ++ if (hd_table[0]) ++ cmos_init_hd(0x19, 0x1b, hd_table[0]); ++ if (hd_table[1]) ++ cmos_init_hd(0x1a, 0x24, hd_table[1]); ++ ++ val = 0; ++ for (i = 0; i < 4; i++) { ++ if (hd_table[i]) { ++ int cylinders, heads, sectors, translation; ++ /* NOTE: bdrv_get_geometry_hint() returns the physical ++ geometry. It is always such that: 1 <= sects <= 63, 1 ++ <= heads <= 16, 1 <= cylinders <= 16383. The BIOS ++ geometry can be different if a translation is done. */ ++ translation = bdrv_get_translation_hint(hd_table[i]); ++ if (translation == BIOS_ATA_TRANSLATION_AUTO) { ++ bdrv_get_geometry_hint(hd_table[i], &cylinders, &heads, §ors); ++ if (cylinders <= 1024 && heads <= 16 && sectors <= 63) { ++ /* No translation. */ ++ translation = 0; ++ } else { ++ /* LBA translation. */ ++ translation = 1; ++ } ++ } else { ++ translation--; ++ } ++ val |= translation << (i * 2); ++ } ++ } ++ rtc_set_memory(s, 0x39, val); ++ ++ qemu_unregister_reset(pc_cmos_init_late, opaque); ++} ++ + static void cmos_init(ram_addr_t ram_size, ram_addr_t above_4g_mem_size, +- const char *boot_device, DriveInfo **hd_table) ++ const char *boot_device, ++ BusState *idebus0, BusState *idebus1) + { + RTCState *s = rtc_state; + int nbds, bds[3] = { 0, }; + int val; + int fd0, fd1, nb; + int i; ++ static pc_cmos_init_late_arg arg; + + /* various important CMOS locations needed by PC/Bochs bios */ + +@@ -335,37 +387,9 @@ static void cmos_init(ram_addr_t ram_size, ram_addr_t above_4g_mem_size, + + /* hard drives */ + +- rtc_set_memory(s, 0x12, (hd_table[0] ? 0xf0 : 0) | (hd_table[1] ? 0x0f : 0)); +- if (hd_table[0]) +- cmos_init_hd(0x19, 0x1b, hd_table[0]->bdrv); +- if (hd_table[1]) +- cmos_init_hd(0x1a, 0x24, hd_table[1]->bdrv); +- +- val = 0; +- for (i = 0; i < 4; i++) { +- if (hd_table[i]) { +- int cylinders, heads, sectors, translation; +- /* NOTE: bdrv_get_geometry_hint() returns the physical +- geometry. It is always such that: 1 <= sects <= 63, 1 +- <= heads <= 16, 1 <= cylinders <= 16383. The BIOS +- geometry can be different if a translation is done. */ +- translation = bdrv_get_translation_hint(hd_table[i]->bdrv); +- if (translation == BIOS_ATA_TRANSLATION_AUTO) { +- bdrv_get_geometry_hint(hd_table[i]->bdrv, &cylinders, &heads, §ors); +- if (cylinders <= 1024 && heads <= 16 && sectors <= 63) { +- /* No translation. */ +- translation = 0; +- } else { +- /* LBA translation. */ +- translation = 1; +- } +- } else { +- translation--; +- } +- val |= translation << (i * 2); +- } +- } +- rtc_set_memory(s, 0x39, val); ++ arg.idebus0 = idebus0; ++ arg.idebus1 = idebus1; ++ qemu_register_reset(pc_cmos_init_late, &arg); + } + + void ioport_set_a20(int enable) +@@ -994,6 +1018,7 @@ static void pc_init1(ram_addr_t ram_size, + qemu_irq *i8259; + IsaIrqState *isa_irq_state; + DriveInfo *hd[MAX_IDE_BUS * MAX_IDE_DEVS]; ++ BusState *idebus[MAX_IDE_BUS]; + DriveInfo *fd[MAX_FD]; + void *fw_cfg; + +@@ -1187,11 +1212,16 @@ static void pc_init1(ram_addr_t ram_size, + } + + if (pci_enabled) { +- pci_piix3_ide_init(pci_bus, hd, piix3_devfn + 1); ++ PCIDevice *dev; ++ dev = pci_piix3_ide_init(pci_bus, hd, piix3_devfn + 1); ++ idebus[0] = qdev_get_child_bus(&dev->qdev, "ide.0"); ++ idebus[1] = qdev_get_child_bus(&dev->qdev, "ide.1"); + } else { + for(i = 0; i < MAX_IDE_BUS; i++) { +- isa_ide_init(ide_iobase[i], ide_iobase2[i], ide_irq[i], +- hd[MAX_IDE_DEVS * i], hd[MAX_IDE_DEVS * i + 1]); ++ ISADevice *dev; ++ dev = isa_ide_init(ide_iobase[i], ide_iobase2[i], ide_irq[i], ++ hd[MAX_IDE_DEVS * i], hd[MAX_IDE_DEVS * i + 1]); ++ idebus[i] = qdev_get_child_bus(&dev->qdev, "ide.0"); + } + } + +@@ -1206,7 +1236,8 @@ static void pc_init1(ram_addr_t ram_size, + } + floppy_controller = fdctrl_init_isa(fd); + +- cmos_init(below_4g_mem_size, above_4g_mem_size, boot_device, hd); ++ cmos_init(below_4g_mem_size, above_4g_mem_size, boot_device, ++ idebus[0], idebus[1]); + + if (pci_enabled && usb_enabled) { + usb_uhci_piix3_init(pci_bus, piix3_devfn + 2); --- qemu-0.12.5+dfsg.orig/debian/patches/06_sh4.diff +++ qemu-0.12.5+dfsg/debian/patches/06_sh4.diff @@ -0,0 +1,287 @@ +commit 507dd07316e8b529def4f0f429c72b98e37d13d5 +Author: Aurelien Jarno +Date: Sat Jan 30 20:41:33 2010 +0100 + + SH4/R2D: fix poweroff + + The write the the PA_POWOFF register is currently ignored. Fix that by + calling qemu_system_shutdown_request() when a poweroff is requested. + + Signed-off-by: Aurelien Jarno + +diff --git a/hw/r2d.c b/hw/r2d.c +index e4c02f0..8769a12 100644 +--- a/hw/r2d.c ++++ b/hw/r2d.c +@@ -66,7 +66,6 @@ typedef struct { + uint16_t keyctlclr; + uint16_t pad0; + uint16_t pad1; +- uint16_t powoff; + uint16_t verreg; + uint16_t inport; + uint16_t outport; +@@ -128,7 +127,7 @@ static uint32_t r2d_fpga_read(void *opaque, target_phys_addr_t addr) + case PA_OUTPORT: + return s->outport; + case PA_POWOFF: +- return s->powoff; ++ return 0x00; + case PA_VERREG: + return 0x10; + } +@@ -150,8 +149,10 @@ r2d_fpga_write(void *opaque, target_phys_addr_t addr, uint32_t value) + s->outport = value; + break; + case PA_POWOFF: +- s->powoff = value; +- break; ++ if (value & 1) { ++ qemu_system_shutdown_request(); ++ } ++ break; + case PA_VERREG: + /* Discard writes */ + break; + + +commit e6df0efdf7d4e304fe4a099cef625d8e4f60b320 +Author: Aurelien Jarno +Date: Mon Feb 1 20:02:23 2010 +0100 + + target-sh4: MMU: simplify call to tlb_set_page() + + tlb_set_page() doesn't need addresses with offset, but simply the + page aligned addresses. + + Signed-off-by: Aurelien Jarno + +diff --git a/target-sh4/helper.c b/target-sh4/helper.c +index e7c494f..f9bf5e2 100644 +--- a/target-sh4/helper.c ++++ b/target-sh4/helper.c +@@ -464,7 +464,7 @@ static int get_physical_address(CPUState * env, target_ulong * physical, + int cpu_sh4_handle_mmu_fault(CPUState * env, target_ulong address, int rw, + int mmu_idx, int is_softmmu) + { +- target_ulong physical, page_offset, page_size; ++ target_ulong physical; + int prot, ret, access_type; + + access_type = ACCESS_INT; +@@ -511,11 +511,8 @@ int cpu_sh4_handle_mmu_fault(CPUState * env, target_ulong address, int rw, + return 1; + } + +- page_size = TARGET_PAGE_SIZE; +- page_offset = +- (address - (address & TARGET_PAGE_MASK)) & ~(page_size - 1); +- address = (address & TARGET_PAGE_MASK) + page_offset; +- physical = (physical & TARGET_PAGE_MASK) + page_offset; ++ address &= TARGET_PAGE_MASK; ++ physical &= TARGET_PAGE_MASK; + + return tlb_set_page(env, address, physical, prot, mmu_idx, is_softmmu); + } + + +commit fc1a70eb8792472b7d18ad21f40763d4b32f9413 +Author: Aurelien Jarno +Date: Tue Feb 2 19:50:51 2010 +0100 + + target-sh4: MMU: optimize UTLB accesses + + With the current code, the QEMU TLB is setup to match the read/write + mode of the MMU fault. This means when read access is done, the page + is setup in read-only mode. When the page is later accessed in write + mode, an MMU fault happened, and the page is switch in write-only + mode. This flip-flop causes a lot of calls to the MMU code and slow + down the emulation. + + This patch changes the MMU emulation, so that the QEMU TLB is setup + to match the UTLB protection key. This impressively increase the + speed of the emulation. + + Signed-off-by: Aurelien Jarno + +diff --git a/target-sh4/helper.c b/target-sh4/helper.c +index 589efe4..2d00dfa 100644 +--- a/target-sh4/helper.c ++++ b/target-sh4/helper.c +@@ -386,38 +386,28 @@ static int get_mmu_address(CPUState * env, target_ulong * physical, + n = find_utlb_entry(env, address, use_asid); + if (n >= 0) { + matching = &env->utlb[n]; +- switch ((matching->pr << 1) | ((env->sr & SR_MD) ? 1 : 0)) { +- case 0: /* 000 */ +- case 2: /* 010 */ +- n = (rw == 1) ? MMU_DTLB_VIOLATION_WRITE : +- MMU_DTLB_VIOLATION_READ; +- break; +- case 1: /* 001 */ +- case 4: /* 100 */ +- case 5: /* 101 */ +- if (rw == 1) +- n = MMU_DTLB_VIOLATION_WRITE; +- else +- *prot = PAGE_READ; +- break; +- case 3: /* 011 */ +- case 6: /* 110 */ +- case 7: /* 111 */ +- *prot = (rw == 1)? PAGE_WRITE : PAGE_READ; +- break; +- } ++ if (!(env->sr & SR_MD) && !(matching->pr & 2)) { ++ n = (rw == 1) ? MMU_DTLB_VIOLATION_WRITE : ++ MMU_DTLB_VIOLATION_READ; ++ } else if ((rw == 1) && !(matching->pr & 1)) { ++ n = MMU_DTLB_VIOLATION_WRITE; ++ } else if ((rw == 1) & !matching->d) { ++ n = MMU_DTLB_INITIAL_WRITE; ++ } else { ++ *prot = PAGE_READ; ++ if ((matching->pr & 1) && matching->d) { ++ *prot |= PAGE_WRITE; ++ } ++ } + } else if (n == MMU_DTLB_MISS) { + n = (rw == 1) ? MMU_DTLB_MISS_WRITE : + MMU_DTLB_MISS_READ; + } + } + if (n >= 0) { ++ n = MMU_OK; + *physical = ((matching->ppn << 10) & ~(matching->size - 1)) | + (address & (matching->size - 1)); +- if ((rw == 1) & !matching->d) +- n = MMU_DTLB_INITIAL_WRITE; +- else +- n = MMU_OK; + } + return n; + } + + +commit d7b30bf685e88c3cac4a5f470ef42b0b3c37aed9 +Author: Aurelien Jarno +Date: Wed Feb 3 02:32:49 2010 +0100 + + target-sh4: MMU: reduce the size of a TLB entry + + Reduce the size of the TLB entry from 32 to 16 bytes, reorganising + members and using a bit field. + + Signed-off-by: Aurelien Jarno + +diff --git a/target-sh4/cpu.h b/target-sh4/cpu.h +index 015d598..85f221d 100644 +--- a/target-sh4/cpu.h ++++ b/target-sh4/cpu.h +@@ -72,21 +72,20 @@ + * The use of DELAY_SLOT_TRUE flag makes us accept such SR_T modification. + */ + +-/* XXXXX The structure could be made more compact */ + typedef struct tlb_t { +- uint8_t asid; /* address space identifier */ + uint32_t vpn; /* virtual page number */ +- uint8_t v; /* validity */ + uint32_t ppn; /* physical page number */ +- uint8_t sz; /* page size */ +- uint32_t size; /* cached page size in bytes */ +- uint8_t sh; /* share status */ +- uint8_t c; /* cacheability */ +- uint8_t pr; /* protection key */ +- uint8_t d; /* dirty */ +- uint8_t wt; /* write through */ +- uint8_t sa; /* space attribute (PCMCIA) */ +- uint8_t tc; /* timing control */ ++ uint32_t size; /* mapped page size in bytes */ ++ uint8_t asid; /* address space identifier */ ++ uint8_t v:1; /* validity */ ++ uint8_t sz:2; /* page size */ ++ uint8_t sh:1; /* share status */ ++ uint8_t c:1; /* cacheability */ ++ uint8_t pr:2; /* protection key */ ++ uint8_t d:1; /* dirty */ ++ uint8_t wt:1; /* write through */ ++ uint8_t sa:3; /* space attribute (PCMCIA) */ ++ uint8_t tc:1; /* timing control */ + } tlb_t; + + #define UTLB_SIZE 64 + + +commit efcf683080924841f7ef32920fb79019a04dc681 +Author: Aurelien Jarno +Date: Wed Feb 3 02:33:00 2010 +0100 + + target-sh4: MMU: remove dead code + + Signed-off-by: Aurelien Jarno + +diff --git a/target-sh4/helper.c b/target-sh4/helper.c +index 2d00dfa..9b3a259 100644 +--- a/target-sh4/helper.c ++++ b/target-sh4/helper.c +@@ -261,24 +261,6 @@ static int find_tlb_entry(CPUState * env, target_ulong address, + continue; /* Invalid entry */ + if (!entries[i].sh && use_asid && entries[i].asid != asid) + continue; /* Bad ASID */ +-#if 0 +- switch (entries[i].sz) { +- case 0: +- size = 1024; /* 1kB */ +- break; +- case 1: +- size = 4 * 1024; /* 4kB */ +- break; +- case 2: +- size = 64 * 1024; /* 64kB */ +- break; +- case 3: +- size = 1024 * 1024; /* 1MB */ +- break; +- default: +- assert(0); +- } +-#endif + start = (entries[i].vpn << 10) & ~(entries[i].size - 1); + end = start + entries[i].size - 1; + if (address >= start && address <= end) { /* Match */ + + +commit 2c8bbb9fabadf3687017694bae1008bee7fedc7c +Author: Aurelien Jarno +Date: Fri Apr 2 12:16:04 2010 +0200 + + hw/r2d: add a USB keyboard + + The R2D board does not have a PS/2 port, and only support a keyboard on + the USB bus. + + Signed-off-by: Aurelien Jarno + +diff --git a/hw/r2d.c b/hw/r2d.c +index 8769a12..ec075db 100644 +--- a/hw/r2d.c ++++ b/hw/r2d.c +@@ -34,6 +34,7 @@ + #include "sh7750_regs.h" + #include "ide.h" + #include "loader.h" ++#include "usb.h" + + #define SDRAM_BASE 0x0c000000 /* Physical location of SDRAM: Area 3 */ + #define SDRAM_SIZE 0x04000000 +@@ -240,6 +241,9 @@ static void r2d_init(ram_addr_t ram_size, + for (i = 0; i < nb_nics; i++) + pci_nic_init_nofail(&nd_table[i], "rtl8139", i==0 ? "2" : NULL); + ++ /* USB keyboard */ ++ usbdevice_create("keyboard"); ++ + /* Todo: register on board registers */ + if (kernel_filename) { + int kernel_size; --- qemu-0.12.5+dfsg.orig/debian/patches/e1000-discard-oversized-packets-based-on-SBP_LPE.patch +++ qemu-0.12.5+dfsg/debian/patches/e1000-discard-oversized-packets-based-on-SBP_LPE.patch @@ -0,0 +1,45 @@ +From 3b6ec9f2c61a265067b66bd282a7a1d263409e2b Mon Sep 17 00:00:00 2001 +From: Michael Contreras +Date: Wed, 5 Dec 2012 13:31:30 -0500 +Subject: e1000: Discard oversized packets based on SBP|LPE +Bug-Debian: http://bugs.debian.org/696051 +Comment: second half of the fix for CVE-2012-6075 +Comment: see also e1000-discard-packets-that-are-too-long-if-not-SBP-and-not-LPE.patch +Comment: cherry-picked to 0.12 by mjt + +Discard packets longer than 16384 when !SBP to match the hardware behavior. + +Signed-off-by: Michael Contreras +Signed-off-by: Stefan Hajnoczi +--- + hw/e1000.c | 7 +++++-- + 1 file changed, 5 insertions(+), 2 deletions(-) + +diff --git a/hw/e1000.c b/hw/e1000.c +index 07120ff..4cd9d6e 100644 +--- a/hw/e1000.c ++++ b/hw/e1000.c +@@ -55,6 +55,8 @@ static int debugflags = DBGBIT(TXERR) | DBGBIT(GENERAL); + + /* this is the size past which hardware will drop packets when setting LPE=0 */ + #define MAXIMUM_ETHERNET_VLAN_SIZE 1522 ++/* this is the size past which hardware will drop packets when setting LPE=1 */ ++#define MAXIMUM_ETHERNET_LPE_SIZE 16384 + + /* + * HW models: +@@ -638,8 +640,9 @@ e1000_receive(VLANClientState *nc, const uint8_t *buf, size_t size) + } + + /* Discard oversized packets if !LPE and !SBP. */ +- if (size > MAXIMUM_ETHERNET_VLAN_SIZE +- && !(s->mac_reg[RCTL] & E1000_RCTL_LPE) ++ if ((size > MAXIMUM_ETHERNET_LPE_SIZE || ++ (size > MAXIMUM_ETHERNET_VLAN_SIZE ++ && !(s->mac_reg[RCTL] & E1000_RCTL_LPE))) + && !(s->mac_reg[RCTL] & E1000_RCTL_SBP)) { + return size; + } +-- +1.7.10.4 + --- qemu-0.12.5+dfsg.orig/debian/patches/e1000-discard-packets-that-are-too-long-if-not-SBP-and-not-LPE.patch +++ qemu-0.12.5+dfsg/debian/patches/e1000-discard-packets-that-are-too-long-if-not-SBP-and-not-LPE.patch @@ -0,0 +1,59 @@ +From 7e495277496496d8f658c053cd0860e4f4300c94 Mon Sep 17 00:00:00 2001 +From: Michael Contreras +Date: Sun, 2 Dec 2012 20:11:22 -0800 +Subject: e1000: Discard packets that are too long if !SBP and !LPE +Bug-Debian: http://bugs.debian.org/696051 +Comment: first half of the fix for CVE-2012-6075 +Comment: see also e1000-discard-oversized-packets-based-on-SBP_LPE.patch +Comment: http://patchwork.ozlabs.org/patch/203291/ +Comment: Michael Contreras: +Comment: Tested with linux guest. This error can potentially be exploited. At the very +Comment: least it can cause a DoS to a guest system, and in the worse case it could +Comment: allow remote code execution on the guest system with kernel level privilege. +Comment: Risk seems low, as the network would need to be configured to allow large +Comment: packets. + +The e1000_receive function for the e1000 needs to discard packets longer than +1522 bytes if the SBP and LPE flags are disabled. The linux driver assumes +this behavior and allocates memory based on this assumption. + +Signed-off-by: Michael Contreras +Signed-off-by: Anthony Liguori +(cherry picked from commit b0d9ffcd0251161c7c92f94804dcf599dfa3edeb) + +Signed-off-by: Michael Tokarev +--- + hw/e1000.c | 10 ++++++++++ + 1 file changed, 10 insertions(+) + +diff --git a/hw/e1000.c b/hw/e1000.c +index a0faf5e..07120ff 100644 +--- a/hw/e1000.c ++++ b/hw/e1000.c +@@ -53,6 +53,9 @@ static int debugflags = DBGBIT(TXERR) | DBGBIT(GENERAL); + #define IOPORT_SIZE 0x40 + #define PNPMMIO_SIZE 0x20000 + ++/* this is the size past which hardware will drop packets when setting LPE=0 */ ++#define MAXIMUM_ETHERNET_VLAN_SIZE 1522 ++ + /* + * HW models: + * E1000_DEV_ID_82540EM works with Windows and Linux +@@ -634,6 +637,13 @@ e1000_receive(VLANClientState *nc, const uint8_t *buf, size_t size) + return -1; + } + ++ /* Discard oversized packets if !LPE and !SBP. */ ++ if (size > MAXIMUM_ETHERNET_VLAN_SIZE ++ && !(s->mac_reg[RCTL] & E1000_RCTL_LPE) ++ && !(s->mac_reg[RCTL] & E1000_RCTL_SBP)) { ++ return size; ++ } ++ + if (!receive_filter(s, buf, size)) + return size; + +-- +1.7.10.4 + --- qemu-0.12.5+dfsg.orig/debian/patches/security/leftover.patch +++ qemu-0.12.5+dfsg/debian/patches/security/leftover.patch @@ -0,0 +1,25 @@ +Index: qemu-0.10.0/hw/pc.c +=================================================================== +--- qemu-0.10.0.orig/hw/pc.c 2009-03-07 13:47:27.000000000 +0100 ++++ qemu-0.10.0/hw/pc.c 2009-03-07 13:47:30.000000000 +0100 +@@ -390,7 +390,8 @@ + case 0x400: + case 0x401: + fprintf(stderr, "BIOS panic at rombios.c, line %d\n", val); +- exit(1); ++ /* according to documentation, these can be safely ignored */ ++ break; + case 0x402: + case 0x403: + #ifdef DEBUG_BIOS +@@ -413,8 +414,9 @@ + /* LGPL'ed VGA BIOS messages */ + case 0x501: + case 0x502: ++ /* according to documentation, these can be safely ignored */ + fprintf(stderr, "VGA BIOS panic, line %d\n", val); +- exit(1); ++ break; + case 0x500: + case 0x503: + #ifdef DEBUG_BIOS