Here is an update to QEMU 1.3.1. The only thing this buys us over the 1.3.0 update I sent out a little while ago is an update to SeaBIOS which fixes some ACPI issues which affected booting some FreeBSD releases and possibly some other OS's.
Index: Makefile =================================================================== RCS file: /cvs/ports/emulators/qemu/Makefile,v retrieving revision 1.97 diff -u -p -r1.97 Makefile --- Makefile 29 Jan 2013 10:57:03 -0000 1.97 +++ Makefile 29 Jan 2013 10:59:04 -0000 @@ -4,8 +4,7 @@ ONLY_FOR_ARCHS= amd64 i386 powerpc sparc COMMENT= multi system emulator -DISTNAME= qemu-1.2.2 -REVISION= 2 +DISTNAME= qemu-1.3.1 CATEGORIES= emulators MASTER_SITES= http://wiki.qemu.org/download/ EXTRACT_SUFX= .tar.bz2 @@ -21,7 +20,7 @@ PERMIT_DISTFILES_CDROM= Yes PERMIT_DISTFILES_FTP= Yes WANTLIB= GL SDL X11 c curl glib-2.0 gthread-2.0 jpeg m ncurses \ - png pthread util z + pixman-1 png pthread pthread-stubs util z MODULES= devel/gettext \ lang/python Index: distinfo =================================================================== RCS file: /cvs/ports/emulators/qemu/distinfo,v retrieving revision 1.24 diff -u -p -r1.24 distinfo --- distinfo 12 Dec 2012 18:01:08 -0000 1.24 +++ distinfo 29 Jan 2013 10:59:04 -0000 @@ -1,2 +1,2 @@ -SHA256 (qemu-1.2.2.tar.bz2) = J6ZmKRNs9s7+SHWl1vzgTrUhz8ngyiUjM1ynLEW+hiU= -SIZE (qemu-1.2.2.tar.bz2) = 9871919 +SHA256 (qemu-1.3.1.tar.bz2) = N3Ln7wybQXgZXtz5DnEfEroSP0Zfzwn7Q7Vr2srKDq8= +SIZE (qemu-1.3.1.tar.bz2) = 10283677 Index: patches/patch-configure =================================================================== RCS file: /cvs/ports/emulators/qemu/patches/patch-configure,v retrieving revision 1.27 diff -u -p -r1.27 patch-configure --- patches/patch-configure 12 Dec 2012 18:01:08 -0000 1.27 +++ patches/patch-configure 29 Jan 2013 10:59:04 -0000 @@ -1,7 +1,7 @@ $OpenBSD: patch-configure,v 1.27 2012/12/12 18:01:08 brad Exp $ ---- configure.orig Tue Dec 11 17:04:49 2012 -+++ configure Tue Dec 11 19:47:53 2012 -@@ -2990,10 +2990,6 @@ fi +--- configure.orig Mon Dec 3 14:37:05 2012 ++++ configure Mon Dec 3 15:59:33 2012 +@@ -3066,10 +3066,6 @@ fi # End of CC checks # After here, no more $cc or $ld runs Index: patches/patch-hw_e1000_c =================================================================== RCS file: patches/patch-hw_e1000_c diff -N patches/patch-hw_e1000_c --- patches/patch-hw_e1000_c 30 Dec 2012 08:49:15 -0000 1.7 +++ /dev/null 1 Jan 1970 00:00:00 -0000 @@ -1,27 +0,0 @@ -$OpenBSD: patch-hw_e1000_c,v 1.7 2012/12/30 08:49:15 brad Exp $ - -Discard oversized packets based on SBP|LPE. CVE-2012-6075 - ---- hw/e1000.c.orig Wed Dec 19 23:14:16 2012 -+++ hw/e1000.c Wed Dec 19 23:15:08 2012 -@@ -61,6 +61,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: -@@ -799,8 +801,9 @@ e1000_receive(NetClientState *nc, const uint8_t *buf, - } - - /* 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; - } Index: pkg/PLIST =================================================================== RCS file: /cvs/ports/emulators/qemu/pkg/PLIST,v retrieving revision 1.23 diff -u -p -r1.23 PLIST --- pkg/PLIST 24 Sep 2012 17:55:36 -0000 1.23 +++ pkg/PLIST 29 Jan 2013 10:59:04 -0000 @@ -56,7 +56,6 @@ share/examples/qemu/target-x86_64.conf share/qemu/ share/qemu/bamboo.dtb share/qemu/bios.bin -share/qemu/cpus-x86_64.conf share/qemu/keymaps/ share/qemu/keymaps/ar share/qemu/keymaps/bepo -- This message has been scanned for viruses and dangerous content by MailScanner, and is believed to be clean.
