Here is an update to the bug fix release of QEMU 1.7.1. OK?
Index: Makefile =================================================================== RCS file: /home/cvs/ports/emulators/qemu/Makefile,v retrieving revision 1.114 diff -u -p -u -p -r1.114 Makefile --- Makefile 9 Mar 2014 22:50:17 -0000 1.114 +++ Makefile 25 Mar 2014 21:41:53 -0000 @@ -4,8 +4,7 @@ ONLY_FOR_ARCHS= amd64 i386 powerpc sparc COMMENT= multi system emulator -DISTNAME= qemu-1.7.0 -REVISION= 0 +DISTNAME= qemu-1.7.1 CATEGORIES= emulators MASTER_SITES= http://wiki.qemu.org/download/ EXTRACT_SUFX= .tar.bz2 Index: distinfo =================================================================== RCS file: /home/cvs/ports/emulators/qemu/distinfo,v retrieving revision 1.33 diff -u -p -u -p -r1.33 distinfo --- distinfo 29 Nov 2013 21:21:38 -0000 1.33 +++ distinfo 25 Mar 2014 21:42:28 -0000 @@ -1,2 +1,2 @@ -SHA256 (qemu-1.7.0.tar.bz2) = MfMzqF8tFMYFp3Z5kEqWaOrrG23H2lOhZlIw9GvCExQ= -SIZE (qemu-1.7.0.tar.bz2) = 12248954 +SHA256 (qemu-1.7.1.tar.bz2) = 1olCoAQiLuuuXRVs7vswj6vZjtsoLR3eSeyBC78BvvQ= +SIZE (qemu-1.7.1.tar.bz2) = 12246206 Index: patches/patch-configure =================================================================== RCS file: /home/cvs/ports/emulators/qemu/patches/patch-configure,v retrieving revision 1.39 diff -u -p -u -p -r1.39 patch-configure --- patches/patch-configure 9 Mar 2014 22:50:17 -0000 1.39 +++ patches/patch-configure 25 Mar 2014 21:44:11 -0000 @@ -1,6 +1,6 @@ $OpenBSD: patch-configure,v 1.39 2014/03/09 22:50:17 brad Exp $ ---- configure.orig Wed Nov 27 17:15:55 2013 -+++ configure Sat Feb 1 23:04:03 2014 +--- configure.orig Tue Mar 25 10:01:10 2014 ++++ configure Tue Mar 25 17:44:02 2014 @@ -1290,9 +1290,9 @@ for flag in $gcc_flags; do fi done @@ -14,19 +14,7 @@ $OpenBSD: patch-configure,v 1.39 2014/03 fi # Workaround for http://gcc.gnu.org/PR55489. Happens with -fPIE/-fPIC and -@@ -1357,6 +1357,11 @@ EOF - pie="no" - fi - fi -+ -+ if compile_prog "-fno-pie" "-nopie"; then -+ CFLAGS_NOPIE="-fno-pie" -+ LDFLAGS_NOPIE="-nopie" -+ fi - fi - - ########################################## -@@ -3549,8 +3554,6 @@ fi +@@ -3554,8 +3554,6 @@ fi if test "$gcov" = "yes" ; then CFLAGS="-fprofile-arcs -ftest-coverage -g $CFLAGS" LDFLAGS="-fprofile-arcs -ftest-coverage $LDFLAGS" @@ -35,19 +23,3 @@ $OpenBSD: patch-configure,v 1.39 2014/03 fi -@@ -4288,6 +4291,7 @@ echo "LD=$ld" >> $config_host_mak - echo "WINDRES=$windres" >> $config_host_mak - echo "LIBTOOL=$libtool" >> $config_host_mak - echo "CFLAGS=$CFLAGS" >> $config_host_mak -+echo "CFLAGS_NOPIE=$CFLAGS_NOPIE" >> $config_host_mak - echo "QEMU_CFLAGS=$QEMU_CFLAGS" >> $config_host_mak - echo "QEMU_INCLUDES=$QEMU_INCLUDES" >> $config_host_mak - if test "$sparse" = "yes" ; then -@@ -4301,6 +4305,7 @@ else - echo "AUTOCONF_HOST := " >> $config_host_mak - fi - echo "LDFLAGS=$LDFLAGS" >> $config_host_mak -+echo "LDFLAGS_NOPIE=$LDFLAGS_NOPIE" >> $config_host_mak - echo "LIBTOOLFLAGS=$LIBTOOLFLAGS" >> $config_host_mak - echo "LIBS+=$LIBS" >> $config_host_mak - echo "LIBS_TOOLS+=$libs_tools" >> $config_host_mak Index: patches/patch-pc-bios_optionrom_Makefile =================================================================== RCS file: patches/patch-pc-bios_optionrom_Makefile diff -N patches/patch-pc-bios_optionrom_Makefile --- patches/patch-pc-bios_optionrom_Makefile 9 Mar 2014 22:50:17 -0000 1.3 +++ /dev/null 1 Jan 1970 00:00:00 -0000 @@ -1,20 +0,0 @@ -$OpenBSD: patch-pc-bios_optionrom_Makefile,v 1.3 2014/03/09 22:50:17 brad Exp $ ---- pc-bios/optionrom/Makefile.orig Wed Nov 27 17:15:55 2013 -+++ pc-bios/optionrom/Makefile Sat Feb 1 23:05:11 2014 -@@ -12,6 +12,7 @@ $(call set-vpath, $(SRC_PATH)/pc-bios/optionrom) - CFLAGS := -Wall -Wstrict-prototypes -Werror -fomit-frame-pointer -fno-builtin - CFLAGS += -I$(SRC_PATH) - CFLAGS += $(call cc-option, $(CFLAGS), -fno-stack-protector) -+CFLAGS += $(CFLAGS_NOPIE) - QEMU_CFLAGS = $(CFLAGS) - - build-all: multiboot.bin linuxboot.bin kvmvapic.bin -@@ -20,7 +21,7 @@ build-all: multiboot.bin linuxboot.bin kvmvapic.bin - .SECONDARY: - - %.img: %.o -- $(call quiet-command,$(LD) -Ttext 0 -e _start -s -o $@ $<," Building $(TARGET_DIR)$@") -+ $(call quiet-command,$(LD) $(LDFLAGS_NOPIE) -Ttext 0 -e _start -s -o $@ $<," Building $(TARGET_DIR)$@") - - %.raw: %.img - $(call quiet-command,$(OBJCOPY) -O binary -j .text $< $@," Building $(TARGET_DIR)$@") -- This message has been scanned for viruses and dangerous content by MailScanner, and is believed to be clean.
