cpet/openbsd-ports
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Update to QEMU 1.3.1.

Browse Source 
ok sthen@
This commit is contained in:
brad 2013-02-02 11:30:34 +00:00
parent 9afb0f80e4
commit 1b2028a51c
5 changed files with 10 additions and 39 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

7
emulators/qemu/Makefile
View File

@ -1,11 +1,10 @@
# $OpenBSD: Makefile,v 1.97 2013/01/29 10:57:03 sthen Exp $
# $OpenBSD: Makefile,v 1.98 2013/02/02 11:30:34 brad Exp $
ONLY_FOR_ARCHS= amd64 i386 powerpc sparc64
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

4
emulators/qemu/distinfo
View File

@ -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

8
emulators/qemu/patches/patch-configure
View File

@ -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
$OpenBSD: patch-configure,v 1.28 2013/02/02 11:30:34 brad Exp $
--- 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

27
emulators/qemu/patches/patch-hw_e1000_c
View File

@ -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;
}

3
emulators/qemu/pkg/PLIST
View File

@ -1,4 +1,4 @@
@comment $OpenBSD: PLIST,v 1.23 2012/09/24 17:55:36 brad Exp $
@comment $OpenBSD: PLIST,v 1.24 2013/02/02 11:30:34 brad Exp $
@conflict kqemu-*
@conflict qemu-*
@pkgpath emulators/kqemu
@ -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