Here is a work in progress update to QEMU 0.15.0-rc0.
If you use QEMU please test the update, especially if you
use any of the non-amd64/i386 architectures supported by QEMU.
Index: Makefile
===================================================================
RCS file: /home/cvs/ports/emulators/qemu/Makefile,v
retrieving revision 1.72
diff -u -p -r1.72 Makefile
--- Makefile 19 Jul 2011 06:05:42 -0000 1.72
+++ Makefile 26 Jul 2011 20:58:33 -0000
@@ -1,13 +1,11 @@
# $OpenBSD: Makefile,v 1.72 2011/07/19 06:05:42 ajacoutot Exp $
# no success building on other archs yet
-ONLY_FOR_ARCHS = amd64 i386 mips64 mips64el powerpc sparc64
-VMEM_WARNING = yes
+ONLY_FOR_ARCHS = amd64 arm i386 mips64 mips64el powerpc sparc sparc64
COMMENT = multi system emulator
-DISTNAME = qemu-0.14.1
-REVISION = 4
+DISTNAME = qemu-0.15.0-rc0
CATEGORIES = emulators
MASTER_SITES = ${MASTER_SITE_SAVANNAH:=qemu/}
@@ -21,15 +19,26 @@ PERMIT_PACKAGE_FTP = Yes
PERMIT_DISTFILES_CDROM = Yes
PERMIT_DISTFILES_FTP = Yes
-WANTLIB = c jpeg m ncurses ossaudio png pthread util z
+WANTLIB = c gio-2.0 glib-2.0 gmodule-2.0 gobject-2.0 gthread-2.0 \
+ jpeg m ncurses ossaudio png pthread util z
+MODULES = devel/gettext \
+ lang/python
BUILD_DEPENDS = textproc/texi2html
-LIB_DEPENDS = graphics/jpeg \
+LIB_DEPENDS = devel/glib2 \
+ graphics/jpeg \
graphics/png
+MODPY_RUNDEP = No
+
MAKE_ENV = V=1
FAKE_FLAGS = sysconfdir=${PREFIX}/share/examples
+EXTRA_CFLAGS= -I${LOCALBASE}/include -I${LOCALBASE}/include/libpng
+EXTRA_LDFLAGS= -L${LOCALBASE}/lib
+
+VMEM_WARNING = Yes
+
USE_GMAKE = Yes
CONFIGURE_STYLE = simple
CONFIGURE_ARGS = --prefix=${PREFIX} \
@@ -37,30 +46,34 @@ CONFIGURE_ARGS = --prefix=${PREFIX} \
--mandir=${PREFIX}/man \
--cc="${CC}" \
--host-cc="${CC}" \
- --extra-cflags="-I${LOCALBASE}/include \
- -I${LOCALBASE}/include/libpng" \
- --extra-ldflags=-L${LOCALBASE}/lib \
+ --extra-cflags="${EXTRA_CFLAGS}" \
+ --extra-ldflags="${EXTRA_LDFLAGS}" \
--disable-curl \
+ --disable-smartcard-nss \
--disable-uuid \
+ --disable-usb-redir \
--disable-vnc-sasl \
--disable-vnc-tls
-.if ${MACHINE_ARCH:Mpowerpc} || ${MACHINE_ARCH:Mmips64*}
-CONFIGURE_ARGS += --disable-bsd-user
-PKG_ARGS+= -Dbsduser=0
+.if ${MACHINE_ARCH:Mamd64} || ${MACHINE_ARCH:Mi386} || ${MACHINE_ARCH:Msparc64}
+PKG_ARGS += -Dbsduser=1
.else
-PKG_ARGS+= -Dbsduser=1
+CONFIGURE_ARGS += --disable-bsd-user
+PKG_ARGS += -Dbsduser=0
.endif
FLAVORS = debug no_x11
FLAVOR ?=
.if ${FLAVOR:L:Mno_x11}
-CONFIGURE_ARGS += --disable-sdl
+CONFIGURE_ARGS += --disable-sdl --disable-opengl
.else
+WANTLIB += GL SDL X11
+
LIB_DEPENDS += devel/sdl
-WANTLIB += SDL X11
+EXTRA_CFLAGS += -I${X11BASE}/include
+EXTRA_LDFLAGS += -L${X11BASE}/lib
.endif
.if ${FLAVOR:L:Mdebug}
@@ -71,6 +84,7 @@ CONFIGURE_ARGS += --enable-debug
REGRESS_TARGET = test
pre-configure:
+ @cd ${WRKDIR}/bin && ln -sf ${MODPY_BIN} python
@${SUBST_CMD} ${WRKSRC}/net.h ${WRKSRC}/qemu-options.hx
@perl -pi -e 's|/dev/dsp|/dev/audio|g' ${WRKSRC}/audio/ossaudio.c
Index: distinfo
===================================================================
RCS file: /home/cvs/ports/emulators/qemu/distinfo,v
retrieving revision 1.15
diff -u -p -r1.15 distinfo
--- distinfo 12 May 2011 22:19:24 -0000 1.15
+++ distinfo 25 Jul 2011 22:58:29 -0000
@@ -1,5 +1,5 @@
-MD5 (qemu-0.14.1.tar.gz) = tscTqNtjjhc69Tpi1ReGQA==
-RMD160 (qemu-0.14.1.tar.gz) = BgH/TmE/6gps6AkH4r+hFwQEizY=
-SHA1 (qemu-0.14.1.tar.gz) = GlADoDAEtitSVi0cu49QxfE14Lg=
-SHA256 (qemu-0.14.1.tar.gz) = M86uP75Rbyy7FR3JjRbIzP7HSxBWZ0rXFedaL3/tRcM=
-SIZE (qemu-0.14.1.tar.gz) = 5439697
+MD5 (qemu-0.15.0-rc0.tar.gz) = ji2frjTiegjERhi5LWHqQA==
+RMD160 (qemu-0.15.0-rc0.tar.gz) = tTb8UzPYBVkKOIN7Y3KYEBSA7CA=
+SHA1 (qemu-0.15.0-rc0.tar.gz) = ft7XNKXbEfMtsJSNSH8O1dQFAvE=
+SHA256 (qemu-0.15.0-rc0.tar.gz) = V4fty9z24gPz6AOWyKuT5zMZxMfubY+S7S9nQ564QmI=
+SIZE (qemu-0.15.0-rc0.tar.gz) = 9577407
Index: patches/patch-configure
===================================================================
RCS file: /home/cvs/ports/emulators/qemu/patches/patch-configure,v
retrieving revision 1.17
diff -u -p -r1.17 patch-configure
--- patches/patch-configure 23 May 2011 23:43:28 -0000 1.17
+++ patches/patch-configure 25 Jul 2011 23:31:00 -0000
@@ -1,12 +1,12 @@
$OpenBSD: patch-configure,v 1.17 2011/05/23 23:43:28 sthen Exp $
---- configure.orig Fri May 6 15:01:43 2011
-+++ configure Mon May 23 12:58:28 2011
-@@ -223,13 +223,11 @@ sdl_config="${cross_prefix}${SDL_CONFIG-sdl-config}"
+--- configure.orig Sat Jul 23 13:05:22 2011
++++ configure Mon Jul 25 19:30:54 2011
+@@ -228,13 +228,11 @@ sdl_config="${cross_prefix}${SDL_CONFIG-sdl-config}"
# default flags for all hosts
QEMU_CFLAGS="-fno-strict-aliasing $QEMU_CFLAGS"
-CFLAGS="-g $CFLAGS"
- QEMU_CFLAGS="-Wall -Wundef -Wendif-labels -Wwrite-strings
-Wmissing-prototypes $QEMU_CFLAGS"
+ QEMU_CFLAGS="-Wall -Wundef -Wwrite-strings -Wmissing-prototypes $QEMU_CFLAGS"
QEMU_CFLAGS="-Wstrict-prototypes -Wredundant-decls $QEMU_CFLAGS"
QEMU_CFLAGS="-D_GNU_SOURCE -D_FILE_OFFSET_BITS=64 -D_LARGEFILE_SOURCE
$QEMU_CFLAGS"
QEMU_CFLAGS="-D_FORTIFY_SOURCE=2 $QEMU_CFLAGS"
@@ -15,7 +15,7 @@ $OpenBSD: patch-configure,v 1.17 2011/05
# make source path absolute
source_path=`cd "$source_path"; pwd`
-@@ -275,6 +273,12 @@ elif check_define __s390__ ; then
+@@ -280,6 +278,12 @@ elif check_define __s390__ ; then
else
cpu="s390"
fi
@@ -28,7 +28,7 @@ $OpenBSD: patch-configure,v 1.17 2011/05
else
cpu=`uname -m`
fi
-@@ -295,7 +299,7 @@ case "$cpu" in
+@@ -300,7 +304,7 @@ case "$cpu" in
armv*l)
cpu="armv4l"
;;
@@ -37,15 +37,16 @@ $OpenBSD: patch-configure,v 1.17 2011/05
cpu="hppa"
;;
mips*)
-@@ -934,7 +938,6 @@ fi
+@@ -1045,7 +1049,7 @@ fi
gcc_flags="-Wold-style-declaration -Wold-style-definition -Wtype-limits"
gcc_flags="-Wformat-security -Wformat-y2k -Winit-self -Wignored-qualifiers
$gcc_flags"
gcc_flags="-Wmissing-include-dirs -Wempty-body -Wnested-externs $gcc_flags"
--gcc_flags="-fstack-protector-all $gcc_flags"
+-gcc_flags="-fstack-protector-all -Wendif-labels $gcc_flags"
++gcc_flags="-Wendif-labels $gcc_flags"
cat > $TMPC << EOF
int main(void) { return 0; }
EOF
-@@ -1345,7 +1348,7 @@ int main(void) {
+@@ -1495,7 +1499,7 @@ int main(void) {
}
EOF
vnc_png_cflags=""
@@ -54,7 +55,7 @@ $OpenBSD: patch-configure,v 1.17 2011/05
if compile_prog "$vnc_png_cflags" "$vnc_png_libs" ; then
vnc_png=yes
libs_softmmu="$vnc_png_libs $libs_softmmu"
-@@ -1760,7 +1763,7 @@ fi
+@@ -1823,7 +1827,7 @@ fi
##########################################
# pthread probe
@@ -63,7 +64,7 @@ $OpenBSD: patch-configure,v 1.17 2011/05
pthread=no
cat > $TMPC << EOF
-@@ -2329,8 +2332,9 @@ fi
+@@ -2502,8 +2506,9 @@ fi
# End of CC checks
# After here, no more $cc or $ld runs
@@ -75,7 +76,7 @@ $OpenBSD: patch-configure,v 1.17 2011/05
fi
# Consult white-list to determine whether to enable werror
-@@ -2788,7 +2792,7 @@ echo "TOOLS=$tools" >> $config_host_mak
+@@ -3000,7 +3005,7 @@ echo "TOOLS=$tools" >> $config_host_mak
echo "ROMS=$roms" >> $config_host_mak
echo "MAKE=$make" >> $config_host_mak
echo "INSTALL=$install" >> $config_host_mak
@@ -84,7 +85,7 @@ $OpenBSD: patch-configure,v 1.17 2011/05
echo "INSTALL_DATA=$install -m0644 -p" >> $config_host_mak
echo "INSTALL_PROG=$install -m0755 -p" >> $config_host_mak
echo "CC=$cc" >> $config_host_mak
-@@ -3223,7 +3227,11 @@ if test "$gprof" = "yes" ; then
+@@ -3471,7 +3476,11 @@ if test "$gprof" = "yes" ; then
fi
fi
Index: patches/patch-net_h
===================================================================
RCS file: /home/cvs/ports/emulators/qemu/patches/patch-net_h,v
retrieving revision 1.2
diff -u -p -r1.2 patch-net_h
--- patches/patch-net_h 12 Mar 2011 23:28:39 -0000 1.2
+++ patches/patch-net_h 25 Jul 2011 23:31:00 -0000
@@ -1,7 +1,7 @@
$OpenBSD: patch-net_h,v 1.2 2011/03/12 23:28:39 sthen Exp $
---- net.h.orig Mon Feb 14 17:02:07 2011
-+++ net.h Tue Feb 15 20:40:23 2011
-@@ -174,7 +174,7 @@ int do_netdev_del(Monitor *mon, const QDict *qdict, QO
+--- net.h.orig Sat Jul 23 13:05:22 2011
++++ net.h Mon Jul 25 19:29:57 2011
+@@ -177,7 +177,7 @@ int do_netdev_del(Monitor *mon, const QDict *qdict, QO
#ifdef __sun__
#define SMBD_COMMAND "/usr/sfw/sbin/smbd"
#else
Index: patches/patch-os-posix_c
===================================================================
RCS file: patches/patch-os-posix_c
diff -N patches/patch-os-posix_c
--- patches/patch-os-posix_c 19 Jul 2011 06:05:42 -0000 1.1
+++ /dev/null 1 Jan 1970 00:00:00 -0000
@@ -1,31 +0,0 @@
-$OpenBSD: patch-os-posix_c,v 1.1 2011/07/19 06:05:42 ajacoutot Exp $
-
-Set groups properly for -runas.
-
--runas does not set supplementary group IDs. This means that gid 0 (root)
-is not dropped when switching to an unprivileged user.
-
-CVE-2011-2527
-
---- os-posix.c.orig Wed Jul 13 20:04:23 2011
-+++ os-posix.c Wed Jul 13 20:05:37 2011
-@@ -31,6 +31,7 @@
- /*needed for MAP_POPULATE before including qemu-options.h */
- #include <sys/mman.h>
- #include <pwd.h>
-+#include <grp.h>
- #include <libgen.h>
-
- /* Needed early for CONFIG_BSD etc. */
-@@ -204,6 +205,11 @@ static void change_process_uid(void)
- if (user_pwd) {
- if (setgid(user_pwd->pw_gid) < 0) {
- fprintf(stderr, "Failed to setgid(%d)\n", user_pwd->pw_gid);
-+ exit(1);
-+ }
-+ if (initgroups(user_pwd->pw_name, user_pwd->pw_gid) < 0) {
-+ fprintf(stderr, "Failed to initgroups(\"%s\", %d)\n",
-+ user_pwd->pw_name, user_pwd->pw_gid);
- exit(1);
- }
- if (setuid(user_pwd->pw_uid) < 0) {
Index: patches/patch-qemu-options_hx
===================================================================
RCS file: /home/cvs/ports/emulators/qemu/patches/patch-qemu-options_hx,v
retrieving revision 1.2
diff -u -p -r1.2 patch-qemu-options_hx
--- patches/patch-qemu-options_hx 12 Mar 2011 23:28:39 -0000 1.2
+++ patches/patch-qemu-options_hx 25 Jul 2011 23:31:00 -0000
@@ -1,7 +1,7 @@
$OpenBSD: patch-qemu-options_hx,v 1.2 2011/03/12 23:28:39 sthen Exp $
---- qemu-options.hx.orig Mon Feb 14 17:02:07 2011
-+++ qemu-options.hx Tue Feb 15 20:40:23 2011
-@@ -1179,7 +1179,7 @@ or @file{C:\WINNT\SYSTEM32\DRIVERS\ETC\LMHOSTS} (Windo
+--- qemu-options.hx.orig Sat Jul 23 13:05:22 2011
++++ qemu-options.hx Mon Jul 25 19:29:57 2011
+@@ -1257,7 +1257,7 @@ or @file{C:\WINNT\SYSTEM32\DRIVERS\ETC\LMHOSTS} (Windo
Then @file{@var{dir}} can be accessed in @file{\\smbserver\qemu}.
Note that a SAMBA server must be installed on the host OS in
Index: patches/patch-target-i386_translate_c
===================================================================
RCS file: /home/cvs/ports/emulators/qemu/patches/patch-target-i386_translate_c,v
retrieving revision 1.4
diff -u -p -r1.4 patch-target-i386_translate_c
--- patches/patch-target-i386_translate_c 12 Mar 2011 23:28:39 -0000
1.4
+++ patches/patch-target-i386_translate_c 25 Jul 2011 23:31:03 -0000
@@ -1,7 +1,7 @@
$OpenBSD: patch-target-i386_translate_c,v 1.4 2011/03/12 23:28:39 sthen Exp $
---- target-i386/translate.c.orig Mon Feb 14 17:02:07 2011
-+++ target-i386/translate.c Tue Feb 15 20:40:23 2011
-@@ -4857,20 +4857,24 @@ static target_ulong disas_insn(DisasContext *s, target
+--- target-i386/translate.c.orig Sat Jul 23 13:05:22 2011
++++ target-i386/translate.c Mon Jul 25 19:29:57 2011
+@@ -4856,20 +4856,24 @@ static target_ulong disas_insn(DisasContext *s, target
tcg_gen_sub_tl(t2, cpu_regs[R_EAX], t0);
gen_extu(ot, t2);
tcg_gen_brcondi_tl(TCG_COND_EQ, t2, 0, label1);
Index: patches/patch-tcg_mips_tcg-target_h
===================================================================
RCS file: patches/patch-tcg_mips_tcg-target_h
diff -N patches/patch-tcg_mips_tcg-target_h
--- patches/patch-tcg_mips_tcg-target_h 25 May 2011 07:43:48 -0000 1.1
+++ /dev/null 1 Jan 1970 00:00:00 -0000
@@ -1,15 +0,0 @@
-$OpenBSD: patch-tcg_mips_tcg-target_h,v 1.1 2011/05/25 07:43:48 sthen Exp $
---- tcg/mips/tcg-target.h.orig Mon May 23 13:36:13 2011
-+++ tcg/mips/tcg-target.h Mon May 23 15:33:43 2011
-@@ -102,7 +102,11 @@ enum {
- /* guest base is supported */
- #define TCG_TARGET_HAS_GUEST_BASE
-
-+#ifdef __OpenBSD__
-+#include <machine/sysarch.h>
-+#else
- #include <sys/cachectl.h>
-+#endif
-
- static inline void flush_icache_range(unsigned long start, unsigned long stop)
- {
Index: pkg/PLIST
===================================================================
RCS file: /home/cvs/ports/emulators/qemu/pkg/PLIST,v
retrieving revision 1.18
diff -u -p -r1.18 PLIST
--- pkg/PLIST 15 Jun 2011 21:13:33 -0000 1.18
+++ pkg/PLIST 26 Jul 2011 02:33:35 -0000
@@ -3,13 +3,17 @@
@pkgpath emulators/qemu,kqemu
%%bsduser%%
@bin bin/qemu
+@bin bin/qemu-ga
@bin bin/qemu-img
@bin bin/qemu-io
@bin bin/qemu-nbd
+@bin bin/qemu-system-alpha
@bin bin/qemu-system-arm
@bin bin/qemu-system-cris
+@bin bin/qemu-system-lm32
@bin bin/qemu-system-m68k
@bin bin/qemu-system-microblaze
+@bin bin/qemu-system-microblazeel
@bin bin/qemu-system-mips
@bin bin/qemu-system-mips64
@bin bin/qemu-system-mips64el
@@ -17,6 +21,7 @@
@bin bin/qemu-system-ppc
@bin bin/qemu-system-ppc64
@bin bin/qemu-system-ppcemb
+@bin bin/qemu-system-s390x
@bin bin/qemu-system-sh4
@bin bin/qemu-system-sh4eb
@bin bin/qemu-system-sparc
@@ -44,7 +49,6 @@ share/examples/qemu/target-x86_64.conf
share/qemu/
share/qemu/bamboo.dtb
share/qemu/bios.bin
-share/qemu/gpxe-eepro100-80861209.rom
share/qemu/keymaps/
share/qemu/keymaps/ar
share/qemu/keymaps/common
@@ -82,18 +86,23 @@ share/qemu/keymaps/sv
share/qemu/keymaps/th
share/qemu/keymaps/tr
share/qemu/linuxboot.bin
+share/qemu/mpc8544ds.dtb
share/qemu/multiboot.bin
share/qemu/openbios-ppc
share/qemu/openbios-sparc32
share/qemu/openbios-sparc64
+share/qemu/petalogix-ml605.dtb
share/qemu/petalogix-s3adsp1800.dtb
share/qemu/ppc_rom.bin
-share/qemu/pxe-e1000.bin
-share/qemu/pxe-ne2k_pci.bin
-share/qemu/pxe-pcnet.bin
-share/qemu/pxe-rtl8139.bin
-share/qemu/pxe-virtio.bin
+share/qemu/pxe-e1000.rom
+share/qemu/pxe-eepro100.rom
+share/qemu/pxe-ne2k_pci.rom
+share/qemu/pxe-pcnet.rom
+share/qemu/pxe-rtl8139.rom
+share/qemu/pxe-virtio.rom
share/qemu/s390-zipl.rom
+share/qemu/slof.bin
+share/qemu/spapr-rtas.bin
share/qemu/vgabios-cirrus.bin
share/qemu/vgabios-qxl.bin
share/qemu/vgabios-stdvga.bin
--
This message has been scanned for viruses and
dangerous content by MailScanner, and is
believed to be clean.
