Sat Dec 26 22:51:12 2015 UTC ()
Part 2 of pullup ticket #4876 - requested by ryoon
emulators/qemu: security fix

Revisions pulled up:
- emulators/qemu/distinfo                                       1.111
- emulators/qemu/patches/patch-configure                        1.9

---
   Module Name:	pkgsrc
   Committed By:	ryoon
   Date:		Tue Dec 22 23:52:00 UTC 2015

   Modified Files:
   	pkgsrc/emulators/qemu: distinfo
   	pkgsrc/emulators/qemu/patches: patch-configure

   Log Message:
   Build ivshmem* conditionally, fix broken if conditional


(bsiegert)
diff -r1.105.2.2 -r1.105.2.3 pkgsrc/emulators/qemu/distinfo
diff -r1.6.6.1 -r1.6.6.2 pkgsrc/emulators/qemu/patches/patch-configure
cvs diff -r1.105.2.2 -r1.105.2.3 pkgsrc/emulators/qemu/distinfo (expand / switch to unified diff)

--- pkgsrc/emulators/qemu/distinfo 2015/12/22 20:21:43 1.105.2.2
+++ pkgsrc/emulators/qemu/distinfo 2015/12/26 22:51:12 1.105.2.3
@@ -1,19 +1,19 @@ @@ -1,19 +1,19 @@
1$NetBSD: distinfo,v 1.105.2.2 2015/12/22 20:21:43 bsiegert Exp $ 1$NetBSD: distinfo,v 1.105.2.3 2015/12/26 22:51:12 bsiegert Exp $
2 2
3SHA1 (qemu-2.5.0.tar.bz2) = ed6c02a267f9edf98058743f0f76a25743a0dfe7 3SHA1 (qemu-2.5.0.tar.bz2) = ed6c02a267f9edf98058743f0f76a25743a0dfe7
4RMD160 (qemu-2.5.0.tar.bz2) = 51007a50ddbeae1ba2c986e0cb0b110efeae2dc9 4RMD160 (qemu-2.5.0.tar.bz2) = 51007a50ddbeae1ba2c986e0cb0b110efeae2dc9
5SHA512 (qemu-2.5.0.tar.bz2) = 12153f94cc7f834fd6a85f25690c36f2331d88d414426fb8b9ac20a34e6f9222b1eda30b727674af583580fae90dfd6d0614a905dce1567d94cd049d426b9dd3 5SHA512 (qemu-2.5.0.tar.bz2) = 12153f94cc7f834fd6a85f25690c36f2331d88d414426fb8b9ac20a34e6f9222b1eda30b727674af583580fae90dfd6d0614a905dce1567d94cd049d426b9dd3
6Size (qemu-2.5.0.tar.bz2) = 25464996 bytes 6Size (qemu-2.5.0.tar.bz2) = 25464996 bytes
7SHA1 (patch-Makefile.objs) = 81274d0dde593a8379428df1f974d6c50a65dd92 7SHA1 (patch-Makefile.objs) = 81274d0dde593a8379428df1f974d6c50a65dd92
8SHA1 (patch-configure) = 7ef7a8e1071edc56b317d214ec285ceecf08a68c 8SHA1 (patch-configure) = fac9d221ced61d15c037bcf9ec0f13a0eb8229a2
9SHA1 (patch-default-configs_pci.mak) = 09567d0d56cdee3d72ae93c0609dee7ca749ef18 9SHA1 (patch-default-configs_pci.mak) = 09567d0d56cdee3d72ae93c0609dee7ca749ef18
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_net_etraxfs__eth.c) = e5dd1661d60dbcd27b332403e0843500ba9544bc 13SHA1 (patch-hw_net_etraxfs__eth.c) = e5dd1661d60dbcd27b332403e0843500ba9544bc
14SHA1 (patch-hw_net_xilinx__axienet.c) = ebcd2676d64ce6f31e4a8c976d4fdf530ad5e8b7 14SHA1 (patch-hw_net_xilinx__axienet.c) = ebcd2676d64ce6f31e4a8c976d4fdf530ad5e8b7
15SHA1 (patch-hw_ppc_mac__newworld.c) = 9a0ec3ba0b6da2879fdaba6a7937fb16a02685f5 15SHA1 (patch-hw_ppc_mac__newworld.c) = 9a0ec3ba0b6da2879fdaba6a7937fb16a02685f5
16SHA1 (patch-hw_ppc_mac__oldworld.c) = 46322c77c87be6d517c43466325c344db99cd463 16SHA1 (patch-hw_ppc_mac__oldworld.c) = 46322c77c87be6d517c43466325c344db99cd463
17SHA1 (patch-memory.c) = f5193fb86a6fad5864477dafc4651d3d51147cc8 17SHA1 (patch-memory.c) = f5193fb86a6fad5864477dafc4651d3d51147cc8
18SHA1 (patch-slirp_tcp__subr.c) = cfc8289384fa987289e32b64532c13a83a890820 18SHA1 (patch-slirp_tcp__subr.c) = cfc8289384fa987289e32b64532c13a83a890820
19SHA1 (patch-tests_Makefile) = bd8997ea00eea05489335020ccae0e33dbcb84f9 19SHA1 (patch-tests_Makefile) = bd8997ea00eea05489335020ccae0e33dbcb84f9
cvs diff -r1.6.6.1 -r1.6.6.2 pkgsrc/emulators/qemu/patches/Attic/patch-configure (expand / switch to unified diff)

--- pkgsrc/emulators/qemu/patches/Attic/patch-configure 2015/12/22 20:21:43 1.6.6.1
+++ pkgsrc/emulators/qemu/patches/Attic/patch-configure 2015/12/26 22:51:12 1.6.6.2
@@ -1,14 +1,14 @@ @@ -1,14 +1,14 @@
1$NetBSD: patch-configure,v 1.6.6.1 2015/12/22 20:21:43 bsiegert Exp $ 1$NetBSD: patch-configure,v 1.6.6.2 2015/12/26 22:51:12 bsiegert Exp $
2Don't use gld on SunOS 2Don't use gld on SunOS
3 3
4--- configure.orig 2015-12-16 22:04:48.000000000 +0000 4--- configure.orig 2015-12-16 22:04:48.000000000 +0000
5+++ configure 5+++ configure
6@@ -650,7 +650,6 @@ SunOS) 6@@ -650,7 +650,6 @@ SunOS)
7 solaris="yes" 7 solaris="yes"
8 make="${MAKE-gmake}" 8 make="${MAKE-gmake}"
9 install="${INSTALL-ginstall}" 9 install="${INSTALL-ginstall}"
10- ld="gld" 10- ld="gld"
11 smbd="${SMBD-/usr/sfw/sbin/smbd}" 11 smbd="${SMBD-/usr/sfw/sbin/smbd}"
12 needs_libsunmath="no" 12 needs_libsunmath="no"
13 solarisrev=`uname -r | cut -f2 -d.` 13 solarisrev=`uname -r | cut -f2 -d.`
14@@ -3672,6 +3671,23 @@ if compile_prog "" "" ; then 14@@ -3672,6 +3671,23 @@ if compile_prog "" "" ; then
@@ -44,29 +44,29 @@ Don't use gld on SunOS @@ -44,29 +44,29 @@ Don't use gld on SunOS
44+#include <fcntl.h> 44+#include <fcntl.h>
45+ 45+
46 int main(void) { 46 int main(void) {
47 timer_create(CLOCK_REALTIME, NULL, NULL); 47 timer_create(CLOCK_REALTIME, NULL, NULL);
48+ shm_open(NULL, O_RDWR, 0644); 48+ shm_open(NULL, O_RDWR, 0644);
49 return clock_gettime(CLOCK_REALTIME, NULL); 49 return clock_gettime(CLOCK_REALTIME, NULL);
50 } 50 }
51 EOF 51 EOF
52@@ -4568,7 +4589,9 @@ if test "$want_tools" = "yes" ; then 52@@ -4568,7 +4589,9 @@ if test "$want_tools" = "yes" ; then
53 tools="qemu-img\$(EXESUF) qemu-io\$(EXESUF) $tools" 53 tools="qemu-img\$(EXESUF) qemu-io\$(EXESUF) $tools"
54 if [ "$linux" = "yes" -o "$bsd" = "yes" -o "$solaris" = "yes" ] ; then 54 if [ "$linux" = "yes" -o "$bsd" = "yes" -o "$solaris" = "yes" ] ; then
55 tools="qemu-nbd\$(EXESUF) $tools" 55 tools="qemu-nbd\$(EXESUF) $tools"
56- tools="ivshmem-client\$(EXESUF) ivshmem-server\$(EXESUF) $tools" 56- tools="ivshmem-client\$(EXESUF) ivshmem-server\$(EXESUF) $tools"
57+ if ["$shm_open" = "yes" ] ; then 57+ if test "$shm_open" = "yes" ; then
58+ tools="ivshmem-client\$(EXESUF) ivshmem-server\$(EXESUF) $tools" 58+ tools="ivshmem-client\$(EXESUF) ivshmem-server\$(EXESUF) $tools"
59+ fi 59+ fi
60 fi 60 fi
61 fi 61 fi
62 if test "$softmmu" = yes ; then 62 if test "$softmmu" = yes ; then
63@@ -5049,6 +5072,9 @@ fi 63@@ -5049,6 +5072,9 @@ fi
64 if test "$fallocate_zero_range" = "yes" ; then 64 if test "$fallocate_zero_range" = "yes" ; then
65 echo "CONFIG_FALLOCATE_ZERO_RANGE=y" >> $config_host_mak 65 echo "CONFIG_FALLOCATE_ZERO_RANGE=y" >> $config_host_mak
66 fi 66 fi
67+if test "$shm_open" = "yes" ; then 67+if [ "$shm_open" = "yes" ] ; then
68+ echo "CONFIG_SHM_OPEN=y" >> $config_host_mak 68+ echo "CONFIG_SHM_OPEN=y" >> $config_host_mak
69+fi 69+fi
70 if test "$posix_fallocate" = "yes" ; then 70 if test "$posix_fallocate" = "yes" ; then
71 echo "CONFIG_POSIX_FALLOCATE=y" >> $config_host_mak 71 echo "CONFIG_POSIX_FALLOCATE=y" >> $config_host_mak
72 fi 72 fi