ports/89816: update emulators/qemu to 2005-11-30 snapshot

[Juergen Lock]

>Number:         89816
>Category:       ports
>Synopsis:       update emulators/qemu to 2005-11-30 snapshot
>Confidential:   no
>Severity:       non-critical
>Priority:       low
>Responsible:    freebsd-ports-bugs
>State:          open
>Quarter:        
>Keywords:       
>Date-Required:
>Class:          maintainer-update
>Submitter-Id:   current-users
>Arrival-Date:   Thu Dec 01 21:00:11 GMT 2005
>Closed-Date:
>Last-Modified:
>Originator:     Juergen Lock
>Release:        FreeBSD 5.3-RELEASE-p20 i386
>Organization:
me?  organized??
>Environment:
System: FreeBSD saturn 5.3-RELEASE-p20 FreeBSD 5.3-RELEASE-p20 #1: Fri Jul 29 14:59:03 CEST 2005 nox at saturn:/usr/home/nox/src5/usr/src/sys/i386/compile/NEPTUN i386


>Description:

- update to 2005-11-30 snapshot - highlights: new network emulation
(see docs), smp guest support, arm system emulation
- small qemu-img usage fix (linux has a different getopt)

new network emulation, DOS 6.22 fix (Johannes Schindelin),
use direct jump only for jumps in the same page - stop translation
after mtsr[in], pcm endianness is now explicit (malc),
wav finalization fix (malc), workaround for atexit - buffer size
API change, audio merge (malc), added LF missing in logs (malc),
make the number of buffers settable (malc), SMP support,
APIC fixes - SIPI support, SMP support - cpu_single_env usage fix -
a20 helpers - dynamic Multi Processor BIOS table generation,
RTL8029 IDs support (Warner Losh), added HF_HALTED bit,
more generic serial port (initial patch by Jocelyn Mayer),
avoid generating useless exceptions (Jocelyn Mayer),
PS2 mouse and keyboard separation (Paul Brook),
use TARGET_PAGE_SIZE (Paul Brook), ARM system emulation (Paul Brook),
update boot sector when using -kernel (Magnus Damm),
fixed nips BLTZAL and BLTZALL insns - fixed regressions from jmp opts,
using _exit in fork() (Kamo Hiroyasu), fixed async signal support
for tb_phys_invalidate(), x86_64 lcall fix, x86_64 ldl fix,
PAGE_EXEC support in TLBs, NX support


>How-To-Repeat:
	n/a
>Fix:

New file: files/patch-qemu-img

Index: Makefile
===================================================================
RCS file: /home/ncvs/ports/emulators/qemu/Makefile,v
retrieving revision 1.37
diff -u -r1.37 Makefile
--- Makefile	16 Nov 2005 01:32:56 -0000	1.37
+++ Makefile	1 Dec 2005 19:49:20 -0000
@@ -6,14 +6,13 @@
 #
 
 PORTNAME=	qemu
-PORTVERSION=	0.7.2s.20051112
-PORTREVISION=	0
+PORTVERSION=	0.7.2s.20051130
 CATEGORIES=	emulators
 MASTER_SITES=	http://www.qemu.org/:release \
 		http://people.fruitsalad.org/nox/qemu/:snapshot \
 		http://www.volny.cz/xnavara/qemu/:snapshot \
 		http://qemu.dad-answers.com/download/qemu/:snapshot
-DISTNAME=	${PORTNAME}-snapshot-2005-11-12_23
+DISTNAME=	${PORTNAME}-snapshot-2005-11-30_23
 DISTFILES=	${DISTNAME}${EXTRACT_SUFX}:snapshot
 
 MAINTAINER=	nox at jelal.kn-bremen.de
Index: distinfo
===================================================================
RCS file: /home/ncvs/ports/emulators/qemu/distinfo,v
retrieving revision 1.23
diff -u -r1.23 distinfo
--- distinfo	14 Nov 2005 05:17:09 -0000	1.23
+++ distinfo	1 Dec 2005 19:38:45 -0000
@@ -1,2 +1,2 @@
-MD5 (qemu-snapshot-2005-11-12_23.tar.bz2) = 27673ed3a6bc78b4be2933ddc63f8276
-SIZE (qemu-snapshot-2005-11-12_23.tar.bz2) = 1219984
+MD5 (qemu-snapshot-2005-11-30_23.tar.bz2) = 40b6eca5be9c491aafa6c1edea750835
+SIZE (qemu-snapshot-2005-11-30_23.tar.bz2) = 1241259
Index: pkg-message
===================================================================
RCS file: /home/ncvs/ports/emulators/qemu/pkg-message,v
retrieving revision 1.10
diff -u -r1.10 pkg-message
--- pkg-message	14 Oct 2005 23:47:48 -0000	1.10
+++ pkg-message	1 Dec 2005 19:52:50 -0000
@@ -25,7 +25,7 @@
 (see kern/84102, http://www.freebsd.org/cgi/query-pr.cgi?pr=kern/84102),
 using a kernel without PREEMPTION has been reported to fix this problem.
 (or do an ftp install instead of installing from the emulated cdrom, and
-then make a new kernel.)  [now fixed in cvs.]
+then make a new kernel.)  [fixed since 6.0-R.]
 - 6.0-RC1 was released with an ed driver that doesn't like qemu's emulated
 RTL8029 nic, this has been fixed in the meantime but if for some reason
 you need to use that version as a guest you can temporarily add the patch
Index: pkg-plist
===================================================================
RCS file: /home/ncvs/ports/emulators/qemu/pkg-plist,v
retrieving revision 1.13
diff -u -r1.13 pkg-plist
--- pkg-plist	31 Oct 2005 13:43:13 -0000	1.13
+++ pkg-plist	1 Dec 2005 19:48:43 -0000
@@ -1,5 +1,6 @@
 bin/qemu
 bin/qemu-img
+bin/qemu-system-arm
 bin/qemu-system-mips
 bin/qemu-system-ppc
 bin/qemu-system-sparc
Index: files/patch-vl.c
===================================================================
RCS file: /home/ncvs/ports/emulators/qemu/files/patch-vl.c,v
retrieving revision 1.2
diff -u -r1.2 patch-vl.c
--- files/patch-vl.c	14 Nov 2005 05:17:09 -0000	1.2
+++ files/patch-vl.c	1 Dec 2005 19:40:47 -0000
@@ -1,16 +1,5 @@
 --- vl.c.orig	Mon Nov 14 15:55:56 2005
 +++ vl.c	Mon Nov 14 15:57:25 2005
-@@ -40,6 +40,10 @@
- #include <sys/socket.h>
- #include <netinet/in.h>
- #include <dirent.h>
-+#ifdef __FreeBSD__
-+#include <sys/types.h>
-+#include <libutil.h>
-+#endif
- #ifdef _BSD
- #include <sys/stat.h>
- #ifndef __APPLE__
 @@ -1363,7 +1367,7 @@
      return chr;
  }
Index: files/patch-qemu-img
@@ -0,0 +1,22 @@
+Index: qemu/qemu-img.c
+@@ -134,7 +134,7 @@
+            "Command syntax:\n"
+            "  create [-e] [-b base_image] [-f fmt] filename [size]\n"
+            "  commit [-f fmt] filename\n"
+-           "  convert [-c] [-e] [-f fmt] filename [-O output_fmt] output_filename\n"
++           "  convert [-c] [-e] [-f fmt] [-O output_fmt] filename output_filename\n"
+            "  info [-f fmt] filename\n"
+            "\n"
+            "Command parameters:\n"
+Index: qemu/qemu-img.1
+@@ -143,8 +143,8 @@
+ .PD 0
+ .IP "\fBcommit [\-f\fR \fIfmt\fR\fB]\fR \fIfilename\fR" 4
+ .IX Item "commit [-f fmt] filename"
+-.IP "\fBconvert [\-c] [\-e] [\-f\fR \fIfmt\fR\fB]\fR \fIfilename\fR \fB[\-O\fR \fIoutput_fmt\fR\fB]\fR \fIoutput_filename\fR" 4
+-.IX Item "convert [-c] [-e] [-f fmt] filename [-O output_fmt] output_filename"
++.IP "\fBconvert [\-c] [\-e] [\-f\fR \fIfmt\fR\fB]\fR \fB[\-O\fR \fIoutput_fmt\fR\fB]\fR \fIfilename\fR \fIoutput_filename\fR" 4
++.IX Item "convert [-c] [-e] [-f fmt] [-O output_fmt] filename output_filename"
+ .IP "\fBinfo [\-f\fR \fIfmt\fR\fB]\fR \fIfilename\fR" 4
+ .IX Item "info [-f fmt] filename"
+ .PD
>Release-Note:
>Audit-Trail:
>Unformatted: