On Thu, Nov 28, 2013 at 09:30:08PM +0100, Robert Peichaer wrote: > The only thing I saw was a PLIST change: > > > --- PLIST.orig Thu Nov 28 00:39:19 2013 > +++ PLIST Thu Nov 28 00:57:32 2013 > @@ -64,6 +64,7 @@ > share/locale/it/LC_MESSAGES/qemu.mo > share/locale/tr/LC_MESSAGES/qemu.mo > share/qemu/ > +share/qemu/QEMU,tcx.bin > share/qemu/acpi-dsdt.aml > share/qemu/bamboo.dtb > share/qemu/bios.bin
Ah, lovely, nice last minute feature additions during release freeze. Index: Makefile =================================================================== RCS file: /home/cvs/ports/emulators/qemu/Makefile,v retrieving revision 1.112 diff -u -p -r1.112 Makefile --- Makefile 25 Nov 2013 14:16:22 -0000 1.112 +++ Makefile 28 Nov 2013 20:44:05 -0000 @@ -4,7 +4,7 @@ ONLY_FOR_ARCHS= amd64 i386 powerpc sparc COMMENT= multi system emulator -DISTNAME= qemu-1.6.1 +DISTNAME= qemu-1.7.0 CATEGORIES= emulators MASTER_SITES= http://wiki.qemu.org/download/ EXTRACT_SUFX= .tar.bz2 @@ -57,6 +57,7 @@ CONFIGURE_ARGS= --prefix=${PREFIX} \ --python=${MODPY_BIN} \ --smbd=${LOCALBASE}/libexec/smbd \ --cc="${CC}" \ + --cxx="${CXX}" \ --host-cc="${CC}" \ --extra-cflags="${EXTRA_CFLAGS}" \ --extra-ldflags="${EXTRA_LDFLAGS}" \ Index: distinfo =================================================================== RCS file: /home/cvs/ports/emulators/qemu/distinfo,v retrieving revision 1.32 diff -u -p -r1.32 distinfo --- distinfo 30 Oct 2013 19:53:29 -0000 1.32 +++ distinfo 27 Nov 2013 23:06:37 -0000 @@ -1,2 +1,2 @@ -SHA256 (qemu-1.6.1.tar.bz2) = /HNvRKoQR4IjyIExCn5A/IOGVH6crffQHKRoWVFgUpQ= -SIZE (qemu-1.6.1.tar.bz2) = 12041317 +SHA256 (qemu-1.7.0.tar.bz2) = MfMzqF8tFMYFp3Z5kEqWaOrrG23H2lOhZlIw9GvCExQ= +SIZE (qemu-1.7.0.tar.bz2) = 12248954 Index: patches/patch-configure =================================================================== RCS file: /home/cvs/ports/emulators/qemu/patches/patch-configure,v retrieving revision 1.37 diff -u -p -r1.37 patch-configure --- patches/patch-configure 30 Oct 2013 19:53:29 -0000 1.37 +++ patches/patch-configure 27 Nov 2013 23:17:10 -0000 @@ -1,12 +1,32 @@ $OpenBSD: patch-configure,v 1.37 2013/10/30 19:53:29 brad Exp $ ---- configure.orig Wed Oct 9 15:20:32 2013 -+++ configure Wed Oct 9 19:35:53 2013 -@@ -3397,8 +3397,6 @@ fi +--- configure.orig Tue Nov 26 12:47:18 2013 ++++ configure Wed Nov 27 00:04:27 2013 +@@ -1345,6 +1345,10 @@ EOF + if compile_prog "-fPIE -DPIE" "-pie"; then + QEMU_CFLAGS="-fPIE -DPIE $QEMU_CFLAGS" + LDFLAGS="-pie $LDFLAGS" ++ if test "$targetos" = OpenBSD; then ++ CC_NOPIE="-fno-pie" ++ LD_NOPIE="-nopie" ++ fi + pie="yes" + if compile_prog "" "-Wl,-z,relro -Wl,-z,now" ; then + LDFLAGS="-Wl,-z,relro -Wl,-z,now $LDFLAGS" +@@ -3549,8 +3553,6 @@ fi if test "$gcov" = "yes" ; then CFLAGS="-fprofile-arcs -ftest-coverage -g $CFLAGS" LDFLAGS="-fprofile-arcs -ftest-coverage $LDFLAGS" -elif test "$debug" = "no" ; then -- CFLAGS="-O2 -D_FORTIFY_SOURCE=2 $CFLAGS" +- CFLAGS="-O2 -U_FORTIFY_SOURCE -D_FORTIFY_SOURCE=2 $CFLAGS" fi +@@ -4312,6 +4314,8 @@ if test "$gcov" = "yes" ; then + echo "CONFIG_GCOV=y" >> $config_host_mak + echo "GCOV=$gcov_tool" >> $config_host_mak + fi ++echo "CC_NOPIE=$CC_NOPIE" >> $config_host_mak ++echo "LD_NOPIE=$LD_NOPIE" >> $config_host_mak + + # use included Linux headers + if test "$linux" = "yes" ; then Index: patches/patch-pc-bios_optionrom_Makefile =================================================================== RCS file: /home/cvs/ports/emulators/qemu/patches/patch-pc-bios_optionrom_Makefile,v retrieving revision 1.1 diff -u -p -r1.1 patch-pc-bios_optionrom_Makefile --- patches/patch-pc-bios_optionrom_Makefile 30 Aug 2012 20:57:03 -0000 1.1 +++ patches/patch-pc-bios_optionrom_Makefile 27 Nov 2013 05:05:51 -0000 @@ -1,21 +1,20 @@ $OpenBSD: patch-pc-bios_optionrom_Makefile,v 1.1 2012/08/30 20:57:03 pascal Exp $ ---- pc-bios/optionrom/Makefile.orig Thu Aug 30 17:41:17 2012 -+++ pc-bios/optionrom/Makefile Thu Aug 30 17:41:58 2012 -@@ -11,7 +11,7 @@ $(call set-vpath, $(SRC_PATH)/pc-bios/optionrom) - +--- pc-bios/optionrom/Makefile.orig Tue Nov 26 12:47:18 2013 ++++ pc-bios/optionrom/Makefile Wed Nov 27 00:05:28 2013 +@@ -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 += $(call cc-option, $(CFLAGS), -fno-stack-protector, -fno-pie) + CFLAGS += $(call cc-option, $(CFLAGS), -fno-stack-protector) ++CFLAGS += $(CC_NOPIE) QEMU_CFLAGS = $(CFLAGS) build-all: multiboot.bin linuxboot.bin kvmvapic.bin -@@ -20,7 +20,7 @@ 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) -nopie -Ttext 0 -e _start -s -o $@ $<," Building $(TARGET_DIR)$@") ++ $(call quiet-command,$(LD) $(LD_NOPIE) -Ttext 0 -e _start -s -o $@ $<," Building $(TARGET_DIR)$@") %.raw: %.img $(call quiet-command,$(OBJCOPY) -O binary -j .text $< $@," Building $(TARGET_DIR)$@") Index: pkg/PLIST =================================================================== RCS file: /home/cvs/ports/emulators/qemu/pkg/PLIST,v retrieving revision 1.27 diff -u -p -r1.27 PLIST --- pkg/PLIST 8 Sep 2013 14:15:01 -0000 1.27 +++ pkg/PLIST 29 Nov 2013 02:29:15 -0000 @@ -64,6 +64,7 @@ share/locale/hu/LC_MESSAGES/qemu.mo share/locale/it/LC_MESSAGES/qemu.mo share/locale/tr/LC_MESSAGES/qemu.mo share/qemu/ +share/qemu/QEMU,tcx.bin share/qemu/acpi-dsdt.aml share/qemu/bamboo.dtb share/qemu/bios.bin @@ -77,6 +78,7 @@ share/qemu/keymaps/ share/qemu/keymaps/ar share/qemu/keymaps/bepo share/qemu/keymaps/common +share/qemu/keymaps/cz share/qemu/keymaps/da share/qemu/keymaps/de share/qemu/keymaps/de-ch -- This message has been scanned for viruses and dangerous content by MailScanner, and is believed to be clean.
