diff options
| author | bsiegert <bsiegert> | 2015-12-26 22:51:12 +0000 |
|---|---|---|
| committer | bsiegert <bsiegert> | 2015-12-26 22:51:12 +0000 |
| commit | cb77df5200e1f64c03a0cd5e9f9fa1b701a8d1b6 (patch) | |
| tree | e05e3c8a86c6f907182ec57124c0c52df3a572ee | |
| parent | 39d0603cebb41b8ebb22024089a5576fdc42f65c (diff) | |
| download | pkgsrc-cb77df5200e1f64c03a0cd5e9f9fa1b701a8d1b6.tar.gz | |
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
| -rw-r--r-- | emulators/qemu/distinfo | 4 | ||||
| -rw-r--r-- | emulators/qemu/patches/patch-configure | 6 |
2 files changed, 5 insertions, 5 deletions
diff --git a/emulators/qemu/distinfo b/emulators/qemu/distinfo index d6801979580..514a134d644 100644 --- a/emulators/qemu/distinfo +++ b/emulators/qemu/distinfo @@ -1,11 +1,11 @@ -$NetBSD: distinfo,v 1.105.2.2 2015/12/22 20:21:43 bsiegert Exp $ +$NetBSD: distinfo,v 1.105.2.3 2015/12/26 22:51:12 bsiegert Exp $ SHA1 (qemu-2.5.0.tar.bz2) = ed6c02a267f9edf98058743f0f76a25743a0dfe7 RMD160 (qemu-2.5.0.tar.bz2) = 51007a50ddbeae1ba2c986e0cb0b110efeae2dc9 SHA512 (qemu-2.5.0.tar.bz2) = 12153f94cc7f834fd6a85f25690c36f2331d88d414426fb8b9ac20a34e6f9222b1eda30b727674af583580fae90dfd6d0614a905dce1567d94cd049d426b9dd3 Size (qemu-2.5.0.tar.bz2) = 25464996 bytes SHA1 (patch-Makefile.objs) = 81274d0dde593a8379428df1f974d6c50a65dd92 -SHA1 (patch-configure) = 7ef7a8e1071edc56b317d214ec285ceecf08a68c +SHA1 (patch-configure) = fac9d221ced61d15c037bcf9ec0f13a0eb8229a2 SHA1 (patch-default-configs_pci.mak) = 09567d0d56cdee3d72ae93c0609dee7ca749ef18 SHA1 (patch-ef) = 6e57de87f91067e8a9a1388c91133a31b3582b3a SHA1 (patch-et) = e9b850ac5985cbe934b541acbfdb330cce421d50 diff --git a/emulators/qemu/patches/patch-configure b/emulators/qemu/patches/patch-configure index 8971a64b084..58f7b7fd26c 100644 --- a/emulators/qemu/patches/patch-configure +++ b/emulators/qemu/patches/patch-configure @@ -1,4 +1,4 @@ -$NetBSD: patch-configure,v 1.6.6.1 2015/12/22 20:21:43 bsiegert Exp $ +$NetBSD: patch-configure,v 1.6.6.2 2015/12/26 22:51:12 bsiegert Exp $ Don't use gld on SunOS --- configure.orig 2015-12-16 22:04:48.000000000 +0000 @@ -54,7 +54,7 @@ Don't use gld on SunOS if [ "$linux" = "yes" -o "$bsd" = "yes" -o "$solaris" = "yes" ] ; then tools="qemu-nbd\$(EXESUF) $tools" - tools="ivshmem-client\$(EXESUF) ivshmem-server\$(EXESUF) $tools" -+ if ["$shm_open" = "yes" ] ; then ++ if test "$shm_open" = "yes" ; then + tools="ivshmem-client\$(EXESUF) ivshmem-server\$(EXESUF) $tools" + fi fi @@ -64,7 +64,7 @@ Don't use gld on SunOS if test "$fallocate_zero_range" = "yes" ; then echo "CONFIG_FALLOCATE_ZERO_RANGE=y" >> $config_host_mak fi -+if test "$shm_open" = "yes" ; then ++if [ "$shm_open" = "yes" ] ; then + echo "CONFIG_SHM_OPEN=y" >> $config_host_mak +fi if test "$posix_fallocate" = "yes" ; then |