Date: Fri, 4 Sep 2015 17:24:36 +0000 (UTC) From: Jason Unovitch <junovitch@FreeBSD.org> To: ports-committers@freebsd.org, svn-ports-all@freebsd.org, svn-ports-branches@freebsd.org Subject: svn commit: r396122 - in branches/2015Q3/emulators: qemu-devel qemu-devel/files qemu-sbruno qemu-sbruno/files Message-ID: <201509041724.t84HOaQs064611@repo.freebsd.org>
next in thread | raw e-mail | index | archive | help
Author: junovitch Date: Fri Sep 4 17:24:36 2015 New Revision: 396122 URL: https://svnweb.freebsd.org/changeset/ports/396122 Log: MFH: r395861 r396024 r394418 r395787 r396026 r395861 QEMU update to 2.4.0 - remove patch files accepted and merge upstream - Add new vgabios-virtio r396024 Build fixes for 2.4.0 - regenerate patch-pcap - Escape --extra-ldflags as it looks like the qemu builder is eating spaces or lines making it frustrating to use. PR: 202402 202536 202864 r394418 Update qemu-sbruno to track bsd-user branch on github. I *am* the upstream of this port and maintainer notified developers on 07/17/15 to update his ports while he is AFK. Sync's to pre-release 2.4.0 Differential Revision: https://reviews.freebsd.org/D3385 r395787 Build fix: - Remove etc/qemu/target-x86_64.conf.sample dropped by upstream - Add vgabios-virtio.bin r396026 Fix Makefile so that those who want to use this port directly can still build. PR: 202536 PR: 202402 Security: CVE-2015-5154 Security: CVE-2015-5165 Security: CVE-2015-5166 Security: da451130-365d-11e5-a4a5-002590263bf5 Security: f06f20dc-4347-11e5-93ad-002590263bf5 Security: ee99899d-4347-11e5-93ad-002590263bf5 Approved by: ports-secteam (feld), feld (mentor) Deleted: branches/2015Q3/emulators/qemu-devel/files/patch-90_security branches/2015Q3/emulators/qemu-devel/files/patch-CVE-2015-3209 branches/2015Q3/emulators/qemu-devel/files/patch-CVE-2015-3456 branches/2015Q3/emulators/qemu-devel/files/patch-include-qemu-aes.h branches/2015Q3/emulators/qemu-devel/files/patch-tapclose branches/2015Q3/emulators/qemu-sbruno/files/patch-CVE-2015-3209 branches/2015Q3/emulators/qemu-sbruno/files/patch-include-qemu-aes.h Modified: branches/2015Q3/emulators/qemu-devel/Makefile branches/2015Q3/emulators/qemu-devel/distinfo branches/2015Q3/emulators/qemu-devel/files/pcap-patch branches/2015Q3/emulators/qemu-devel/pkg-plist branches/2015Q3/emulators/qemu-sbruno/Makefile branches/2015Q3/emulators/qemu-sbruno/distinfo branches/2015Q3/emulators/qemu-sbruno/pkg-plist Directory Properties: branches/2015Q3/ (props changed) Modified: branches/2015Q3/emulators/qemu-devel/Makefile ============================================================================== --- branches/2015Q3/emulators/qemu-devel/Makefile Fri Sep 4 17:24:08 2015 (r396121) +++ branches/2015Q3/emulators/qemu-devel/Makefile Fri Sep 4 17:24:36 2015 (r396122) @@ -2,8 +2,7 @@ # $FreeBSD$ PORTNAME= qemu -PORTVERSION= 2.3.0 -PORTREVISION= 2 +PORTVERSION= 2.4.0 CATEGORIES= emulators MASTER_SITES= http://wiki.qemu.org/download/:release \ LOCAL/nox:snapshot @@ -47,7 +46,7 @@ CONFLICTS_INSTALL= qemu-[0-9]* qemu-sbru .include <bsd.port.options.mk> CONFIGURE_ARGS+= --localstatedir=/var -CONFIGURE_ARGS+= --extra-ldflags=-L${LOCALBASE}/lib +CONFIGURE_ARGS+= --extra-ldflags=-L\"${LOCALBASE}/lib\" CONFIGURE_ARGS+= --disable-smartcard-nss --disable-libssh2 PORTDOCS= docs qemu-doc.html qemu-tech.html qmp-commands.txt @@ -119,7 +118,7 @@ CONFIGURE_ARGS+= --prefix=${PREFIX} --cc --smbd=${LOCALBASE}/sbin/smbd \ --enable-debug \ --enable-debug-info \ - --extra-cflags=-I${WRKSRC}\ -I${LOCALBASE}/include\ -DPREFIX=\\\"${PREFIX}\\\" + --extra-cflags=-I${WRKSRC}\ -I${LOCALBASE}/include\ -DPREFIX=\\\"\"${PREFIX}\\\"\" .if empty(PORT_OPTIONS:MX11) CONFIGURE_ARGS+= --disable-sdl @@ -277,8 +276,6 @@ post-install: .endif ${INSTALL_SCRIPT} ${FILESDIR}/qemu-ifup.sample ${STAGEDIR}${PREFIX}/etc ${INSTALL_SCRIPT} ${FILESDIR}/qemu-ifdown.sample ${STAGEDIR}${PREFIX}/etc - @(cd ${STAGEDIR}${PREFIX}/etc/qemu && \ - ${MV} -i target-x86_64.conf target-x86_64.conf.sample) @${STRIP_CMD} ${STAGEDIR}${PREFIX}/bin/qemu-* .endif Modified: branches/2015Q3/emulators/qemu-devel/distinfo ============================================================================== --- branches/2015Q3/emulators/qemu-devel/distinfo Fri Sep 4 17:24:08 2015 (r396121) +++ branches/2015Q3/emulators/qemu-devel/distinfo Fri Sep 4 17:24:36 2015 (r396122) @@ -1,2 +1,2 @@ -SHA256 (qemu/2.3.0/qemu-2.3.0.tar.bz2) = b6bab7f763d5be73e7cb5ee7d4c8365b7a8df2972c52fa5ded18893bd8281588 -SIZE (qemu/2.3.0/qemu-2.3.0.tar.bz2) = 24683085 +SHA256 (qemu/2.4.0/qemu-2.4.0.tar.bz2) = 72b0b991bbcc540663a019e1e8c4f714053b691dda32c9b9ee80b25f367e6620 +SIZE (qemu/2.4.0/qemu-2.4.0.tar.bz2) = 25070979 Modified: branches/2015Q3/emulators/qemu-devel/files/pcap-patch ============================================================================== --- branches/2015Q3/emulators/qemu-devel/files/pcap-patch Fri Sep 4 17:24:08 2015 (r396121) +++ branches/2015Q3/emulators/qemu-devel/files/pcap-patch Fri Sep 4 17:24:36 2015 (r396122) @@ -1,18 +1,18 @@ ---- configure.orig +--- configure.orig 2015-08-11 19:11:05 UTC +++ configure -@@ -335,6 +335,9 @@ libssh2="" +@@ -338,6 +338,9 @@ libssh2="" vhdx="" - quorum="" numa="" + tcmalloc="no" +pcap="no" +pcap_create="no" +bpf="no" # parse CC options first for opt do -@@ -888,6 +891,10 @@ for opt do +@@ -896,6 +899,10 @@ for opt do ;; - --enable-vnc-ws) vnc_ws="yes" + --enable-vnc-png) vnc_png="yes" ;; + --enable-pcap) pcap="yes" + ;; @@ -21,7 +21,7 @@ --disable-slirp) slirp="no" ;; --disable-uuid) uuid="no" -@@ -2216,6 +2223,51 @@ EOF +@@ -2354,6 +2361,51 @@ EOF fi ########################################## @@ -71,9 +71,9 @@ + +########################################## # VNC TLS/WS detection - if test "$vnc" = "yes" -a \( "$vnc_tls" != "no" -o "$vnc_ws" != "no" \) ; then + if test "$vnc" = "yes" -a "$vnc_tls" != "no" ; then cat > $TMPC <<EOF -@@ -4286,6 +4338,7 @@ echo "Audio drivers $audio_drv_list" +@@ -4515,6 +4567,7 @@ echo "Audio drivers $audio_drv_list" echo "Block whitelist (rw) $block_drv_rw_whitelist" echo "Block whitelist (ro) $block_drv_ro_whitelist" echo "VirtFS support $virtfs" @@ -81,7 +81,7 @@ echo "VNC support $vnc" if test "$vnc" = "yes" ; then echo "VNC TLS support $vnc_tls" -@@ -4447,6 +4500,15 @@ fi +@@ -4692,6 +4745,15 @@ fi if test "$profiler" = "yes" ; then echo "CONFIG_PROFILER=y" >> $config_host_mak fi @@ -97,11 +97,12 @@ if test "$slirp" = "yes" ; then echo "CONFIG_SLIRP=y" >> $config_host_mak echo "CONFIG_SMBD_COMMAND=\"$smbd\"" >> $config_host_mak -Index: net/clients.h +--- net/clients.h.orig 2015-08-11 19:11:09 UTC ++++ net/clients.h @@ -49,6 +49,12 @@ int net_init_bridge(const NetClientOptio int net_init_l2tpv3(const NetClientOptions *opts, const char *name, - NetClientState *peer); + NetClientState *peer, Error **errp); + +#ifdef CONFIG_PCAP +int net_init_pcap(const NetClientOptions *opts, const char *name, @@ -110,11 +111,22 @@ Index: net/clients.h + #ifdef CONFIG_VDE int net_init_vde(const NetClientOptions *opts, const char *name, - NetClientState *peer); -Index: net/net.c -@@ -40,6 +40,11 @@ - #include "qapi/opts-visitor.h" + NetClientState *peer, Error **errp); +--- net/hub.c.orig 2015-08-11 19:11:09 UTC ++++ net/hub.c +@@ -322,6 +322,7 @@ void net_hub_check_clients(void) + case NET_CLIENT_OPTIONS_KIND_SOCKET: + case NET_CLIENT_OPTIONS_KIND_VDE: + case NET_CLIENT_OPTIONS_KIND_VHOST_USER: ++ case NET_CLIENT_OPTIONS_KIND_PCAP: + has_host_dev = 1; + break; + default: +--- net/net.c.orig 2015-08-11 19:11:09 UTC ++++ net/net.c +@@ -45,6 +45,11 @@ #include "qapi/dealloc-visitor.h" + #include "sysemu/sysemu.h" +#include <sys/ioctl.h> +#ifdef __FreeBSD__ @@ -124,7 +136,7 @@ Index: net/net.c /* Net bridge is currently not supported for W32. */ #if !defined(_WIN32) # define CONFIG_NET_BRIDGE -@@ -704,6 +709,221 @@ static int net_init_nic(const NetClientO +@@ -880,6 +885,221 @@ static int net_init_nic(const NetClientO return idx; } @@ -346,7 +358,7 @@ Index: net/net.c static int (* const net_client_init_fun[NET_CLIENT_OPTIONS_KIND_MAX])( const NetClientOptions *opts, -@@ -722,6 +944,9 @@ static int (* const net_client_init_fun[ +@@ -901,6 +1121,9 @@ static int (* const net_client_init_fun[ #ifdef CONFIG_NET_BRIDGE [NET_CLIENT_OPTIONS_KIND_BRIDGE] = net_init_bridge, #endif @@ -354,22 +366,22 @@ Index: net/net.c + [NET_CLIENT_OPTIONS_KIND_PCAP] = net_init_pcap, +#endif [NET_CLIENT_OPTIONS_KIND_HUBPORT] = net_init_hubport, - }; - ---- qapi-schema.json.orig + #ifdef CONFIG_VHOST_NET_USED + [NET_CLIENT_OPTIONS_KIND_VHOST_USER] = net_init_vhost_user, +--- qapi-schema.json.orig 2015-08-11 19:11:09 UTC +++ qapi-schema.json -@@ -2165,6 +2165,10 @@ +@@ -2423,6 +2423,10 @@ '*br': 'str', '*helper': 'str' } } -+{ 'type': 'NetdevPcapOptions', ++{ 'struct': 'NetdevPcapOptions', + 'data': { + '*ifname': 'str' } } + ## # @NetdevHubPortOptions # -@@ -2232,6 +2236,7 @@ +@@ -2490,6 +2494,7 @@ 'user': 'NetdevUserOptions', 'tap': 'NetdevTapOptions', 'l2tpv3': 'NetdevL2TPv3Options', @@ -377,13 +389,3 @@ Index: net/net.c 'socket': 'NetdevSocketOptions', 'vde': 'NetdevVdeOptions', 'dump': 'NetdevDumpOptions', ---- net/hub.c.orig -+++ net/hub.c -@@ -325,6 +325,7 @@ void net_hub_check_clients(void) - case NET_CLIENT_OPTIONS_KIND_VHOST_USER: -+ case NET_CLIENT_OPTIONS_KIND_PCAP: - has_host_dev = 1; - break; - default: - break; - } Modified: branches/2015Q3/emulators/qemu-devel/pkg-plist ============================================================================== --- branches/2015Q3/emulators/qemu-devel/pkg-plist Fri Sep 4 17:24:08 2015 (r396121) +++ branches/2015Q3/emulators/qemu-devel/pkg-plist Fri Sep 4 17:24:36 2015 (r396122) @@ -44,7 +44,6 @@ %%SOFTMMU%%man/man8/qemu-nbd.8.gz %%SOFTMMU%%@sample etc/qemu-ifup.sample %%SOFTMMU%%@sample etc/qemu-ifdown.sample -%%SOFTMMU%%@sample etc/qemu/target-x86_64.conf.sample %%SOFTMMU%%%%DATADIR%%/QEMU,tcx.bin %%SOFTMMU%%%%DATADIR%%/QEMU,cgthree.bin %%SOFTMMU%%%%DATADIR%%/acpi-dsdt.aml @@ -62,6 +61,7 @@ %%SOFTMMU%%%%DATADIR%%/vgabios-cirrus.bin %%SOFTMMU%%%%DATADIR%%/vgabios-qxl.bin %%SOFTMMU%%%%DATADIR%%/vgabios-stdvga.bin +%%SOFTMMU%%%%DATADIR%%/vgabios-virtio.bin %%SOFTMMU%%%%DATADIR%%/vgabios-vmware.bin %%SOFTMMU%%%%DATADIR%%/palcode-clipper %%SOFTMMU%%%%DATADIR%%/ppc_rom.bin Modified: branches/2015Q3/emulators/qemu-sbruno/Makefile ============================================================================== --- branches/2015Q3/emulators/qemu-sbruno/Makefile Fri Sep 4 17:24:08 2015 (r396121) +++ branches/2015Q3/emulators/qemu-sbruno/Makefile Fri Sep 4 17:24:36 2015 (r396122) @@ -2,7 +2,7 @@ # $FreeBSD$ PORTNAME= qemu -PORTVERSION= 2.3.50.g20150628 +PORTVERSION= 2.4.50.g20150814 CATEGORIES= emulators MASTER_SITES= GH \ LOCAL/nox \ @@ -20,7 +20,7 @@ COMMENT?= QEMU CPU Emulator - github bsd USE_GITHUB= yes GH_ACCOUNT= seanbruno GH_PROJECT= ${PORTNAME}-bsd-user -GH_TAGNAME= f51f4da +GH_TAGNAME= 6764363 HAS_CONFIGURE= yes USES= gmake pkgconfig bison perl5 python:2,build USE_PERL5= build @@ -60,7 +60,7 @@ SUB_LIST= NAME=qemu_user_static .include <bsd.port.options.mk> CONFIGURE_ARGS+= --localstatedir=/var -CONFIGURE_ARGS+= --extra-ldflags=-L${LOCALBASE}/lib +CONFIGURE_ARGS+= --extra-ldflags=-L\"${LOCALBASE}/lib\" CONFIGURE_ARGS+= --disable-smartcard-nss --disable-libssh2 PORTDOCS= docs qemu-doc.html qemu-tech.html qmp-commands.txt @@ -292,8 +292,6 @@ post-install: .endif ${INSTALL_SCRIPT} ${FILESDIR}/qemu-ifup.sample ${STAGEDIR}${PREFIX}/etc ${INSTALL_SCRIPT} ${FILESDIR}/qemu-ifdown.sample ${STAGEDIR}${PREFIX}/etc - @(cd ${STAGEDIR}${PREFIX}/etc/qemu && \ - ${MV} -i target-x86_64.conf target-x86_64.conf.sample) @${STRIP_CMD} ${STAGEDIR}${PREFIX}/bin/qemu-* .endif Modified: branches/2015Q3/emulators/qemu-sbruno/distinfo ============================================================================== --- branches/2015Q3/emulators/qemu-sbruno/distinfo Fri Sep 4 17:24:08 2015 (r396121) +++ branches/2015Q3/emulators/qemu-sbruno/distinfo Fri Sep 4 17:24:36 2015 (r396122) @@ -1,4 +1,4 @@ -SHA256 (qemu/2.3.50.g20150628/seanbruno-qemu-bsd-user-2.3.50.g20150628-f51f4da_GH0.tar.gz) = f528de84970a72256fc087308b2aee2cb15e09090117c797d3548e76953515ea -SIZE (qemu/2.3.50.g20150628/seanbruno-qemu-bsd-user-2.3.50.g20150628-f51f4da_GH0.tar.gz) = 10991530 -SHA256 (qemu/2.3.50.g20150628/dtc-v1.4.0.tar.gz) = 39d0713efd82a27adc065ecb9ef36401c53d5ee87ae1764e2bb243fcd97488e3 -SIZE (qemu/2.3.50.g20150628/dtc-v1.4.0.tar.gz) = 131893 +SHA256 (qemu/2.4.50.g20150814/seanbruno-qemu-bsd-user-2.4.50.g20150814-6764363_GH0.tar.gz) = 6fef33fc642016ef762943e4327d6a88bff216121ec98157205ddcdc8c876870 +SIZE (qemu/2.4.50.g20150814/seanbruno-qemu-bsd-user-2.4.50.g20150814-6764363_GH0.tar.gz) = 11272282 +SHA256 (qemu/2.4.50.g20150814/dtc-v1.4.0.tar.gz) = 39d0713efd82a27adc065ecb9ef36401c53d5ee87ae1764e2bb243fcd97488e3 +SIZE (qemu/2.4.50.g20150814/dtc-v1.4.0.tar.gz) = 131893 Modified: branches/2015Q3/emulators/qemu-sbruno/pkg-plist ============================================================================== --- branches/2015Q3/emulators/qemu-sbruno/pkg-plist Fri Sep 4 17:24:08 2015 (r396121) +++ branches/2015Q3/emulators/qemu-sbruno/pkg-plist Fri Sep 4 17:24:36 2015 (r396122) @@ -47,7 +47,6 @@ %%SOFTMMU%%man/man8/qemu-nbd.8.gz %%SOFTMMU%%@sample etc/qemu-ifup.sample %%SOFTMMU%%@sample etc/qemu-ifdown.sample -%%SOFTMMU%%@sample etc/qemu/target-x86_64.conf.sample %%SOFTMMU%%%%DATADIR%%/QEMU,tcx.bin %%SOFTMMU%%%%DATADIR%%/QEMU,cgthree.bin %%SOFTMMU%%%%DATADIR%%/acpi-dsdt.aml @@ -66,6 +65,7 @@ %%SOFTMMU%%%%DATADIR%%/vgabios-cirrus.bin %%SOFTMMU%%%%DATADIR%%/vgabios-qxl.bin %%SOFTMMU%%%%DATADIR%%/vgabios-stdvga.bin +%%SOFTMMU%%%%DATADIR%%/vgabios-virtio.bin %%SOFTMMU%%%%DATADIR%%/vgabios-vmware.bin %%SOFTMMU%%%%DATADIR%%/palcode-clipper %%SOFTMMU%%%%DATADIR%%/ppc_rom.bin
Want to link to this message? Use this URL: <https://mail-archive.FreeBSD.org/cgi/mid.cgi?201509041724.t84HOaQs064611>