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

update to qemu 0.15.0, from Brad (maintainer)

Browse Source 
- handle qemu-old/kqemu removal in PLISTs, allowing seamless updates to
the new version
This commit is contained in:
sthen 2011-08-16 21:24:42 +00:00
parent 03d5a3d278
commit 451c34ae0f
10 changed files with 102 additions and 119 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

49
emulators/qemu/Makefile
View File

@ -1,15 +1,14 @@
# $OpenBSD: Makefile,v 1.72 2011/07/19 06:05:42 ajacoutot Exp $
# $OpenBSD: Makefile,v 1.73 2011/08/16 21:24:42 sthen 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
CATEGORIES = emulators
MASTER_SITES = ${MASTER_SITE_SAVANNAH:=qemu/}
MASTER_SITES = http://wiki.qemu.org/download/ \
${MASTER_SITE_SAVANNAH:=qemu/}
HOMEPAGE = http://www.qemu.org/
@ -21,15 +20,21 @@ PERMIT_PACKAGE_FTP = Yes
PERMIT_DISTFILES_CDROM = Yes
PERMIT_DISTFILES_FTP = Yes
WANTLIB = c jpeg m ncurses ossaudio png pthread util z
WANTLIB = c curl jpeg m ncurses ossaudio png pthread util z
BUILD_DEPENDS = textproc/texi2html
LIB_DEPENDS = graphics/jpeg \
graphics/png
graphics/png \
net/curl
MAKE_ENV = V=1
FAKE_FLAGS = sysconfdir=${PREFIX}/share/examples
EXTRA_CFLAGS= -I${LOCALBASE}/include
EXTRA_LDFLAGS= -L${LOCALBASE}/lib
VMEM_WARNING = Yes
USE_GMAKE = Yes
CONFIGURE_STYLE = simple
CONFIGURE_ARGS = --prefix=${PREFIX} \
@ -37,32 +42,40 @@ 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 \
--disable-curl \
--extra-cflags="${EXTRA_CFLAGS}" \
--extra-ldflags="${EXTRA_LDFLAGS}" \
--disable-guest-agent \
--disable-smartcard-nss \
--disable-spice \
--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
# until the system headers are fixed properly.
EXTRA_CFLAGS += -Wno-redundant-decls
.if ${FLAVOR:L:Mdebug}
CONFIGURE_ARGS += --enable-debug
.endif

10
emulators/qemu/distinfo
View File

@ -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.tar.gz) = 28VbAUvNIbmONH9qkPf7bQ==
RMD160 (qemu-0.15.0.tar.gz) = 8zBIdl5I4dxkE+8HnfmZRLIykhE=
SHA1 (qemu-0.15.0.tar.gz) = V6cmm1hUQFSpCxWCJfzgX+HQSoU=
SHA256 (qemu-0.15.0.tar.gz) = AZflLboHrrbf4DQ7DCrgjtN00ssK87uexz/tW6oMt00=
SIZE (qemu-0.15.0.tar.gz) = 9577243

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

@ -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}"
$OpenBSD: patch-configure,v 1.18 2011/08/16 21:24:42 sthen Exp $
--- configure.orig Thu Aug 4 17:24:34 2011
+++ configure Sun Aug 7 21:47:00 2011
@@ -229,13 +229,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/23 23:43:28 sthen Exp $
# make source path absolute
source_path=`cd "$source_path"; pwd`
@@ -275,6 +273,12 @@ elif check_define __s390__ ; then
@@ -281,6 +279,12 @@ elif check_define __s390__ ; then
else
cpu="s390"
fi
@ -28,7 +28,7 @@ $OpenBSD: patch-configure,v 1.17 2011/05/23 23:43:28 sthen Exp $
else
cpu=`uname -m`
fi
@@ -295,7 +299,7 @@ case "$cpu" in
@@ -301,7 +305,7 @@ case "$cpu" in
armv*l)
cpu="armv4l"
;;
@ -37,24 +37,25 @@ $OpenBSD: patch-configure,v 1.17 2011/05/23 23:43:28 sthen Exp $
cpu="hppa"
;;
mips*)
@@ -934,7 +938,6 @@ 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"
cat > $TMPC << EOF
int main(void) { return 0; }
EOF
@@ -1345,7 +1348,7 @@ int main(void) {
@@ -1513,11 +1517,17 @@ int main(void) {
return 0;
}
EOF
+ if $pkg_config libpng --modversion >/dev/null 2>&1; then
+ vnc_png_cflags=`$pkg_config libpng --cflags 2> /dev/null`
+ vnc_png_libs=`$pkg_config libpng --libs 2> /dev/null`
+ else
vnc_png_cflags=""
- vnc_png_libs="-lpng"
+ vnc_png_libs="-lpng -lz -lm"
vnc_png_libs="-lpng"
+ fi
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
+ QEMU_CFLAGS="$QEMU_CFLAGS $vnc_png_cflags"
else
if test "$vnc_png" = "yes" ; then
feature_not_found "vnc-png"
@@ -1844,7 +1854,7 @@ fi
##########################################
# pthread probe
@ -63,19 +64,19 @@ $OpenBSD: patch-configure,v 1.17 2011/05/23 23:43:28 sthen Exp $
pthread=no
cat > $TMPC << EOF
@@ -2329,8 +2332,9 @@ fi
@@ -2546,8 +2556,9 @@ fi
# End of CC checks
# After here, no more $cc or $ld runs
-if test "$debug" = "no" ; then
- CFLAGS="-O2 $CFLAGS"
+if test "$debug" = "yes" ; then
+ CFLAGS="-O0 -g $CFLAGS"
+ LDFLAGS="-g $LDFLAGS"
+ CFLAGS="$CFLAGS -O0 -g"
+ LDFLAGS="$LDFLAGS -g"
fi
# Consult white-list to determine whether to enable werror
@@ -2788,7 +2792,7 @@ echo "TOOLS=$tools" >> $config_host_mak
@@ -3048,7 +3059,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
@ -83,8 +84,8 @@ $OpenBSD: patch-configure,v 1.17 2011/05/23 23:43:28 sthen Exp $
+echo "INSTALL_DIR=$install -d -m0755" >> $config_host_mak
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
echo "PYTHON=$python" >> $config_host_mak
@@ -3520,7 +3531,11 @@ if test "$gprof" = "yes" ; then
fi
fi

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

@ -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
$OpenBSD: patch-net_h,v 1.3 2011/08/16 21:24:42 sthen Exp $
--- 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

17
emulators/qemu/patches/patch-net_socket_c
View File

@ -1,15 +1,20 @@
$OpenBSD: patch-net_socket_c,v 1.2 2011/03/12 23:28:39 sthen Exp $
--- net/socket.c.orig Mon Feb 14 17:02:07 2011
+++ net/socket.c Tue Feb 15 20:40:23 2011
@@ -154,6 +154,7 @@ static int net_socket_mcast_create(struct sockaddr_in
$OpenBSD: patch-net_socket_c,v 1.3 2011/08/16 21:24:42 sthen Exp $
--- net/socket.c.orig Fri Jul 29 18:14:49 2011
+++ net/socket.c Sat Jul 30 15:32:58 2011
@@ -154,6 +154,12 @@ static int net_socket_mcast_create(struct sockaddr_in
struct ip_mreq imr;
int fd;
int val, ret;
+ u_char loop;
+#ifdef __OpenBSD__
+ unsigned char loop;
+#else
+ int loop;
+#endif
+
if (!IN_MULTICAST(ntohl(mcastaddr->sin_addr.s_addr))) {
fprintf(stderr, "qemu: error: specified mcastaddr \"%s\" (0x%08x) does not contain a multicast address\n",
inet_ntoa(mcastaddr->sin_addr),
@@ -197,9 +198,9 @@ static int net_socket_mcast_create(struct sockaddr_in
@@ -197,9 +203,9 @@ static int net_socket_mcast_create(struct sockaddr_in
}
/* Force mcast msgs to loopback (eg. several QEMUs in same host */

31
emulators/qemu/patches/patch-os-posix_c
View File

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

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

@ -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
$OpenBSD: patch-qemu-options_hx,v 1.3 2011/08/16 21:24:42 sthen Exp $
--- 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

8
emulators/qemu/patches/patch-target-i386_translate_c
View File

@ -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
$OpenBSD: patch-target-i386_translate_c,v 1.5 2011/08/16 21:24:42 sthen Exp $
--- 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);

15
emulators/qemu/patches/patch-tcg_mips_tcg-target_h
View File

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

24
emulators/qemu/pkg/PLIST
View File

@ -1,6 +1,9 @@
@comment $OpenBSD: PLIST,v 1.18 2011/06/15 21:13:33 sthen Exp $
@comment $OpenBSD: PLIST,v 1.19 2011/08/16 21:24:42 sthen Exp $
@conflict kqemu-*
@conflict qemu-*
@pkgpath emulators/kqemu
@pkgpath emulators/qemu,kqemu
@pkgpath emulators/qemu-old[,no_x11]
%%bsduser%%
@bin bin/qemu
@bin bin/qemu-img
@ -8,8 +11,10 @@
@bin bin/qemu-nbd
@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 +22,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 +50,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 +87,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