Sat Aug 27 03:16:40 2016 UTC ()
qemu: update to 2.6.1

mark more things as not mprotect-safe


(maya)
diff -r1.152 -r1.153 pkgsrc/emulators/qemu/Makefile
diff -r1.115 -r1.116 pkgsrc/emulators/qemu/distinfo

cvs diff -r1.152 -r1.153 pkgsrc/emulators/qemu/Makefile (expand / switch to unified diff)

--- pkgsrc/emulators/qemu/Makefile 2016/07/09 13:03:46 1.152
+++ pkgsrc/emulators/qemu/Makefile 2016/08/27 03:16:40 1.153
@@ -1,17 +1,16 @@ @@ -1,17 +1,16 @@
1# $NetBSD: Makefile,v 1.152 2016/07/09 13:03:46 wiz Exp $ 1# $NetBSD: Makefile,v 1.153 2016/08/27 03:16:40 maya Exp $
2 2
3DISTNAME= qemu-2.6.0 3DISTNAME= qemu-2.6.1
4PKGREVISION= 2 
5CATEGORIES= emulators 4CATEGORIES= emulators
6MASTER_SITES= http://wiki.qemu.org/download/ 5MASTER_SITES= http://wiki.qemu.org/download/
7EXTRACT_SUFX= .tar.bz2 6EXTRACT_SUFX= .tar.bz2
8 7
9MAINTAINER= pkgsrc-users@NetBSD.org 8MAINTAINER= pkgsrc-users@NetBSD.org
10HOMEPAGE= http://www.qemu.org/ 9HOMEPAGE= http://www.qemu.org/
11COMMENT= CPU emulator using dynamic translation 10COMMENT= CPU emulator using dynamic translation
12LICENSE= gnu-gpl-v2 AND gnu-lgpl-v2.1 AND mit AND modified-bsd 11LICENSE= gnu-gpl-v2 AND gnu-lgpl-v2.1 AND mit AND modified-bsd
13 12
14CONFLICTS+= qemu-bin-[0-9]* 13CONFLICTS+= qemu-bin-[0-9]*
15NOT_FOR_PLATFORM+= NetBSD-1.[0-6]*-* 14NOT_FOR_PLATFORM+= NetBSD-1.[0-6]*-*
16# qemu 1 does not work on NetBSD-5; see http://gnats.netbsd.org/46565. 15# qemu 1 does not work on NetBSD-5; see http://gnats.netbsd.org/46565.
17# As a workaround, use emulators/qemu0. 16# As a workaround, use emulators/qemu0.
@@ -29,27 +28,54 @@ BUILD_DEPENDS+= texi2html-[0-9]*:../../ @@ -29,27 +28,54 @@ BUILD_DEPENDS+= texi2html-[0-9]*:../../
29.include "../../mk/bsd.prefs.mk" 28.include "../../mk/bsd.prefs.mk"
30 29
31CONFIGURE_ARGS+= --prefix=${PREFIX} 30CONFIGURE_ARGS+= --prefix=${PREFIX}
32CONFIGURE_ARGS+= --interp-prefix=${PREFIX}/share/qemu 31CONFIGURE_ARGS+= --interp-prefix=${PREFIX}/share/qemu
33CONFIGURE_ARGS+= --sysconfdir=${PKG_SYSCONFDIR} 32CONFIGURE_ARGS+= --sysconfdir=${PKG_SYSCONFDIR}
34CONFIGURE_ARGS+= --python=${PYTHONBIN} 33CONFIGURE_ARGS+= --python=${PYTHONBIN}
35CONFIGURE_ARGS+= --smbd=${PREFIX}/sbin/smbd 34CONFIGURE_ARGS+= --smbd=${PREFIX}/sbin/smbd
36CONFIGURE_ARGS+= --mandir=${PREFIX}/${PKGMANDIR} 35CONFIGURE_ARGS+= --mandir=${PREFIX}/${PKGMANDIR}
37CONFIGURE_ARGS+= --enable-curses 36CONFIGURE_ARGS+= --enable-curses
38#HF#CONFIGURE_ARGS+= --disable-fdt # HF: build on OS X 37#HF#CONFIGURE_ARGS+= --disable-fdt # HF: build on OS X
39CONFIGURE_ARGS+= --disable-opengl 38CONFIGURE_ARGS+= --disable-opengl
40CONFIGURE_ENV+= mansuffix=/${PKGMANDIR} 39CONFIGURE_ENV+= mansuffix=/${PKGMANDIR}
41 40
 41NOT_PAX_MPROTECT_SAFE+= bin/qemu-system-aarch64
 42NOT_PAX_MPROTECT_SAFE+= bin/qemu-system-alpha
 43NOT_PAX_MPROTECT_SAFE+= bin/qemu-system-arm
 44NOT_PAX_MPROTECT_SAFE+= bin/qemu-system-cris
 45NOT_PAX_MPROTECT_SAFE+= bin/qemu-system-i386
 46NOT_PAX_MPROTECT_SAFE+= bin/qemu-system-lm32
 47NOT_PAX_MPROTECT_SAFE+= bin/qemu-system-m68k
 48NOT_PAX_MPROTECT_SAFE+= bin/qemu-system-microblaze
 49NOT_PAX_MPROTECT_SAFE+= bin/qemu-system-microblazeel
 50NOT_PAX_MPROTECT_SAFE+= bin/qemu-system-mips
 51NOT_PAX_MPROTECT_SAFE+= bin/qemu-system-mips64
 52NOT_PAX_MPROTECT_SAFE+= bin/qemu-system-mips64el
 53NOT_PAX_MPROTECT_SAFE+= bin/qemu-system-mipsel
 54NOT_PAX_MPROTECT_SAFE+= bin/qemu-system-moxie
 55NOT_PAX_MPROTECT_SAFE+= bin/qemu-system-or32
 56NOT_PAX_MPROTECT_SAFE+= bin/qemu-system-ppc
 57NOT_PAX_MPROTECT_SAFE+= bin/qemu-system-ppc64
 58NOT_PAX_MPROTECT_SAFE+= bin/qemu-system-ppcemb
 59NOT_PAX_MPROTECT_SAFE+= bin/qemu-system-s390x
 60NOT_PAX_MPROTECT_SAFE+= bin/qemu-system-sh4
 61NOT_PAX_MPROTECT_SAFE+= bin/qemu-system-sh4eb
 62NOT_PAX_MPROTECT_SAFE+= bin/qemu-system-sparc
 63NOT_PAX_MPROTECT_SAFE+= bin/qemu-system-sparc64
 64NOT_PAX_MPROTECT_SAFE+= bin/qemu-system-tricore
 65NOT_PAX_MPROTECT_SAFE+= bin/qemu-system-unicore32
42NOT_PAX_MPROTECT_SAFE+= bin/qemu-system-x86_64 66NOT_PAX_MPROTECT_SAFE+= bin/qemu-system-x86_64
 67NOT_PAX_MPROTECT_SAFE+= bin/qemu-system-xtensa
 68NOT_PAX_MPROTECT_SAFE+= bin/qemu-system-xtensaeb
43 69
44PKG_SYSCONFSUBDIR= qemu 70PKG_SYSCONFSUBDIR= qemu
45 71
46REPLACE_PERL+= scripts/texi2pod.pl 72REPLACE_PERL+= scripts/texi2pod.pl
47 73
48PYTHON_VERSIONS_INCOMPATIBLE= 34 35 # not yet ported yet as of 1.7.0 74PYTHON_VERSIONS_INCOMPATIBLE= 34 35 # not yet ported yet as of 1.7.0
49 75
50BUILDLINK_PASSTHRU_DIRS+= /usr/lib 76BUILDLINK_PASSTHRU_DIRS+= /usr/lib
51BUILDLINK_PASSTHRU_RPATHDIRS+= /usr/lib 77BUILDLINK_PASSTHRU_RPATHDIRS+= /usr/lib
52 78
53INSTALLATION_DIRS= ${PKGMANDIR}/man1 share/doc/qemu 79INSTALLATION_DIRS= ${PKGMANDIR}/man1 share/doc/qemu
54 80
55UE_ARCHS+= alpha arm armeb cris i386 m68k microblaze mips mipsel 81UE_ARCHS+= alpha arm armeb cris i386 m68k microblaze mips mipsel

cvs diff -r1.115 -r1.116 pkgsrc/emulators/qemu/distinfo (expand / switch to unified diff)

--- pkgsrc/emulators/qemu/distinfo 2016/05/15 01:25:15 1.115
+++ pkgsrc/emulators/qemu/distinfo 2016/08/27 03:16:40 1.116
@@ -1,19 +1,19 @@ @@ -1,19 +1,19 @@
1$NetBSD: distinfo,v 1.115 2016/05/15 01:25:15 ryoon Exp $ 1$NetBSD: distinfo,v 1.116 2016/08/27 03:16:40 maya Exp $
2 2
3SHA1 (qemu-2.6.0.tar.bz2) = d558a11d681dd095b1d7cb03c5b723c9d3045020 3SHA1 (qemu-2.6.1.tar.bz2) = 8551c8424d14917f6d2af78fe20565fbcaffb768
4RMD160 (qemu-2.6.0.tar.bz2) = 97e41fab12ad15ba05e63229bf57a51a1564bd32 4RMD160 (qemu-2.6.1.tar.bz2) = ba651541ebd7ab3920843c6fb94928c5ca574549
5SHA512 (qemu-2.6.0.tar.bz2) = 0d17075e52f7688cc05776ad7a76509d1f22ae8eda896fddb06c1fd6dea6da485422c8efb3ba118b054d9a413b7b02baba656a9131658dabdb71def50c92b215 5SHA512 (qemu-2.6.1.tar.bz2) = adb55d0774618c9cd02d376222814f2047977bfbca73248841275084ae537db583db4ac6cfa5cc65c3182941d5f4b40f2f7f4661b2cd93cbb3796e2f325bc919
6Size (qemu-2.6.0.tar.bz2) = 25755267 bytes 6Size (qemu-2.6.1.tar.bz2) = 25762855 bytes
7SHA1 (patch-Makefile.objs) = 81274d0dde593a8379428df1f974d6c50a65dd92 7SHA1 (patch-Makefile.objs) = 81274d0dde593a8379428df1f974d6c50a65dd92
8SHA1 (patch-configure) = a24c31f005ee12ab56f19e3e8594b0a3bad955fc 8SHA1 (patch-configure) = a24c31f005ee12ab56f19e3e8594b0a3bad955fc
9SHA1 (patch-default-configs_pci.mak) = 2162550a68de514c8fe9e255df88f8a0a07ee6c7 9SHA1 (patch-default-configs_pci.mak) = 2162550a68de514c8fe9e255df88f8a0a07ee6c7
10SHA1 (patch-ef) = 6e57de87f91067e8a9a1388c91133a31b3582b3a 10SHA1 (patch-ef) = 6e57de87f91067e8a9a1388c91133a31b3582b3a
11SHA1 (patch-et) = e9b850ac5985cbe934b541acbfdb330cce421d50 11SHA1 (patch-et) = e9b850ac5985cbe934b541acbfdb330cce421d50
12SHA1 (patch-hw_display_omap__dss.c) = 6b13242f28e32346bc70548c216c578d98fd3420 12SHA1 (patch-hw_display_omap__dss.c) = 6b13242f28e32346bc70548c216c578d98fd3420
13SHA1 (patch-hw_misc_ivshmem.c) = c1fdc8111286f2c760512189db4a854bfc6129d0 13SHA1 (patch-hw_misc_ivshmem.c) = c1fdc8111286f2c760512189db4a854bfc6129d0
14SHA1 (patch-hw_net_etraxfs__eth.c) = e5dd1661d60dbcd27b332403e0843500ba9544bc 14SHA1 (patch-hw_net_etraxfs__eth.c) = e5dd1661d60dbcd27b332403e0843500ba9544bc
15SHA1 (patch-hw_net_xilinx__axienet.c) = ebcd2676d64ce6f31e4a8c976d4fdf530ad5e8b7 15SHA1 (patch-hw_net_xilinx__axienet.c) = ebcd2676d64ce6f31e4a8c976d4fdf530ad5e8b7
16SHA1 (patch-hw_ppc_mac__newworld.c) = 5131bb6edf8b0acf6e7ed3b6bc7be962dc71eca6 16SHA1 (patch-hw_ppc_mac__newworld.c) = 5131bb6edf8b0acf6e7ed3b6bc7be962dc71eca6
17SHA1 (patch-hw_ppc_mac__oldworld.c) = b71667ab281dc23c9d971dc8754eeefc879bd1d7 17SHA1 (patch-hw_ppc_mac__oldworld.c) = b71667ab281dc23c9d971dc8754eeefc879bd1d7
18SHA1 (patch-memory.c) = 9f94de7799ef80931fb1de572e5603894f3fb328 18SHA1 (patch-memory.c) = 9f94de7799ef80931fb1de572e5603894f3fb328
19SHA1 (patch-slirp_tcp__subr.c) = f011c9dc58282e61b26017547a9884f30a6e6154 19SHA1 (patch-slirp_tcp__subr.c) = f011c9dc58282e61b26017547a9884f30a6e6154