Date: Sun, 22 Jul 2018 02:27:08 +0000 (UTC) From: Muhammad Moinur Rahman <bofh@FreeBSD.org> To: ports-committers@freebsd.org, svn-ports-all@freebsd.org, svn-ports-head@freebsd.org Subject: svn commit: r475080 - in head/emulators/qemu: . files Message-ID: <201807220227.w6M2R8la007677@repo.freebsd.org>
next in thread | raw e-mail | index | archive | help
Author: bofh Date: Sun Jul 22 02:27:07 2018 New Revision: 475080 URL: https://svnweb.freebsd.org/changeset/ports/475080 Log: emulators/qemu: Update version 2.9.0>=2.12.0 - Pet portlint Relnotes: https://wiki.qemu.org/ChangeLog/2.12 Deleted: head/emulators/qemu/files/patch-ui_x__keymap.c Modified: head/emulators/qemu/Makefile head/emulators/qemu/distinfo head/emulators/qemu/files/patch-Makefile head/emulators/qemu/files/patch-configure head/emulators/qemu/files/pcap-patch head/emulators/qemu/files/pcap-patch-net_clients.h head/emulators/qemu/files/pcap-patch-net_net.c head/emulators/qemu/pkg-plist Modified: head/emulators/qemu/Makefile ============================================================================== --- head/emulators/qemu/Makefile Sun Jul 22 01:36:38 2018 (r475079) +++ head/emulators/qemu/Makefile Sun Jul 22 02:27:07 2018 (r475080) @@ -2,8 +2,7 @@ # $FreeBSD$ PORTNAME= qemu -PORTVERSION= 2.9.0 -PORTREVISION= 1 +PORTVERSION= 2.12.0 CATEGORIES= emulators MASTER_SITES= http://wiki.qemu.org/download/ DIST_SUBDIR= qemu/${PORTVERSION} @@ -13,6 +12,8 @@ COMMENT?= QEMU CPU Emulator LICENSE= GPLv2 +BROKEN_powerpc64= fails to compile: In function aio_bh_poll: internal compiler error: Segmentation fault + LIB_DEPENDS?= libnettle.so:security/nettle \ libfontconfig.so:x11-fonts/fontconfig \ libfreetype.so:print/freetype2 @@ -23,12 +24,10 @@ USE_PERL5= build MAKE_ENV+= BSD_MAKE="${MAKE}" V=1 .if !defined(PKGNAMESUFFIX) || ${PKGNAMESUFFIX} != "-utils" USE_XORG= pixman -USE_GNOME+= cairo glib20 -ONLY_FOR_ARCHS= amd64 i386 powerpc powerpc64 # XXX someone wants to debug sparc64 hosts? +USE_GNOME+= cairo glib20 libxml2 +ONLY_FOR_ARCHS= amd64 i386 powerpc powerpc64 .endif -BROKEN_powerpc64= fails to compile: In function aio_bh_poll: internal compiler error: Segmentation fault - OPTIONS_DEFINE= SAMBA X11 GTK2 OPENGL GNUTLS SASL JPEG PNG CURL \ VDE CDROM_DMA PCAP USBREDIR GNS3 X86_TARGETS \ STATIC_LINK DOCS NCURSES @@ -92,6 +91,7 @@ CONFIGURE_ARGS?=--localstatedir=/var --extra-ldflags=- --disable-linux-user --disable-linux-aio --disable-xen \ --enable-debug-info --python=${PYTHON_CMD} \ --extra-cflags=-I${WRKSRC}\ -I${LOCALBASE}/include\ -DPREFIX=\\\"\"${PREFIX}\\\"\" +MAKE_JOBS_UNSAFE=yes .include <bsd.port.options.mk> @@ -172,7 +172,6 @@ post-install: ${INSTALL_SCRIPT} ${FILESDIR}/qemu-ifup.sample ${STAGEDIR}${PREFIX}/etc ${INSTALL_SCRIPT} ${FILESDIR}/qemu-ifdown.sample ${STAGEDIR}${PREFIX}/etc @${STRIP_CMD} ${STAGEDIR}${PREFIX}/bin/qemu-* - @${STRIP_CMD} ${STAGEDIR}${PREFIX}/bin/ivshmem-* post-install-DOCS-on: @(cd ${WRKSRC} && ${COPYTREE_SHARE} docs ${STAGEDIR}${DOCSDIR}/) Modified: head/emulators/qemu/distinfo ============================================================================== --- head/emulators/qemu/distinfo Sun Jul 22 01:36:38 2018 (r475079) +++ head/emulators/qemu/distinfo Sun Jul 22 02:27:07 2018 (r475080) @@ -1,5 +1,3 @@ -TIMESTAMP = 1500663832 -SHA256 (qemu/2.9.0/qemu-2.9.0.tar.bz2) = 00bfb217b1bb03c7a6c3261b819cfccbfb5a58e3e2ceff546327d271773c6c14 -SIZE (qemu/2.9.0/qemu-2.9.0.tar.bz2) = 28720490 -SHA256 (qemu/2.9.0/dtc-v1.4.0.tar.gz) = 39d0713efd82a27adc065ecb9ef36401c53d5ee87ae1764e2bb243fcd97488e3 -SIZE (qemu/2.9.0/dtc-v1.4.0.tar.gz) = 131893 +TIMESTAMP = 1532111907 +SHA256 (qemu/2.12.0/qemu-2.12.0.tar.bz2) = c9f4a147bc915d24df9784affc611a115f42d24720a89210b479f1ba7a3f679c +SIZE (qemu/2.12.0/qemu-2.12.0.tar.bz2) = 41196232 Modified: head/emulators/qemu/files/patch-Makefile ============================================================================== --- head/emulators/qemu/files/patch-Makefile Sun Jul 22 01:36:38 2018 (r475079) +++ head/emulators/qemu/files/patch-Makefile Sun Jul 22 02:27:07 2018 (r475080) @@ -1,6 +1,6 @@ ---- Makefile.orig 2017-04-20 14:57:00 UTC +--- Makefile.orig 2018-04-24 16:30:46 UTC +++ Makefile -@@ -206,9 +206,14 @@ LIBS+=-lz $(LIBS_TOOLS) +@@ -350,10 +350,15 @@ LIBS+=-lz $(LIBS_TOOLS) HELPERS-$(CONFIG_LINUX) = qemu-bridge-helper$(EXESUF) ifdef BUILD_DOCS @@ -9,13 +9,14 @@ +DOCS+=docs/qemu-qmp-ref.7 docs/qemu-ga-ref.7 +else DOCS=qemu-doc.html qemu-doc.txt qemu.1 qemu-img.1 qemu-nbd.8 qemu-ga.8 - DOCS+=docs/qemu-qmp-ref.html docs/qemu-qmp-ref.txt docs/qemu-qmp-ref.7 - DOCS+=docs/qemu-ga-ref.html docs/qemu-ga-ref.txt docs/qemu-ga-ref.7 + DOCS+=docs/interop/qemu-qmp-ref.html docs/interop/qemu-qmp-ref.txt docs/interop/qemu-qmp-ref.7 + DOCS+=docs/interop/qemu-ga-ref.html docs/interop/qemu-ga-ref.txt docs/interop/qemu-ga-ref.7 + DOCS+=docs/qemu-block-drivers.7 +endif ifdef CONFIG_VIRTFS DOCS+=fsdev/virtfs-proxy-helper.1 endif -@@ -558,11 +563,13 @@ BLOBS= +@@ -797,11 +802,13 @@ BLOBS= endif install-doc: $(DOCS) @@ -23,20 +24,20 @@ $(INSTALL_DIR) "$(DESTDIR)$(qemu_docdir)" $(INSTALL_DATA) qemu-doc.html "$(DESTDIR)$(qemu_docdir)" $(INSTALL_DATA) qemu-doc.txt "$(DESTDIR)$(qemu_docdir)" - $(INSTALL_DATA) docs/qemu-qmp-ref.html "$(DESTDIR)$(qemu_docdir)" - $(INSTALL_DATA) docs/qemu-qmp-ref.txt "$(DESTDIR)$(qemu_docdir)" + $(INSTALL_DATA) docs/interop/qemu-qmp-ref.html "$(DESTDIR)$(qemu_docdir)" + $(INSTALL_DATA) docs/interop/qemu-qmp-ref.txt "$(DESTDIR)$(qemu_docdir)" +endif ifdef CONFIG_POSIX $(INSTALL_DIR) "$(DESTDIR)$(mandir)/man1" $(INSTALL_DATA) qemu.1 "$(DESTDIR)$(mandir)/man1" -@@ -575,8 +582,10 @@ ifneq ($(TOOLS),) +@@ -815,8 +822,10 @@ ifneq ($(TOOLS),) endif ifneq (,$(findstring qemu-ga,$(TOOLS))) $(INSTALL_DATA) qemu-ga.8 "$(DESTDIR)$(mandir)/man8" +ifndef NOPORTDOCS - $(INSTALL_DATA) docs/qemu-ga-ref.html "$(DESTDIR)$(qemu_docdir)" - $(INSTALL_DATA) docs/qemu-ga-ref.txt "$(DESTDIR)$(qemu_docdir)" + $(INSTALL_DATA) docs/interop/qemu-ga-ref.html "$(DESTDIR)$(qemu_docdir)" + $(INSTALL_DATA) docs/interop/qemu-ga-ref.txt "$(DESTDIR)$(qemu_docdir)" +endif - $(INSTALL_DATA) docs/qemu-ga-ref.7 "$(DESTDIR)$(mandir)/man7" + $(INSTALL_DATA) docs/interop/qemu-ga-ref.7 "$(DESTDIR)$(mandir)/man7" endif endif Modified: head/emulators/qemu/files/patch-configure ============================================================================== --- head/emulators/qemu/files/patch-configure Sun Jul 22 01:36:38 2018 (r475079) +++ head/emulators/qemu/files/patch-configure Sun Jul 22 02:27:07 2018 (r475080) @@ -1,26 +1,25 @@ ---- configure.orig 2017-04-20 14:57:00 UTC +--- configure.orig 2018-04-24 16:30:46 UTC +++ configure -@@ -247,7 +247,7 @@ +@@ -369,7 +369,7 @@ DSOSUF=".so" LDFLAGS_SHARED="-shared" modules="no" prefix="/usr/local" -mandir="\${prefix}/share/man" +mandir="\${prefix}/man" datadir="\${prefix}/share" + firmwarepath="\${prefix}/share/qemu-firmware" qemu_docdir="\${prefix}/share/doc/qemu" - bindir="\${prefix}/bin" -@@ -322,6 +322,10 @@ +@@ -449,6 +449,9 @@ numa="" tcmalloc="no" jemalloc="no" replication="yes" +pcap="no" +pcap_create="no" +bpf="no" -+ + vxhs="" + libxml2="" - # parse CC options first - for opt do -@@ -887,6 +891,10 @@ +@@ -1030,6 +1033,10 @@ for opt do ;; --enable-vnc-png) vnc_png="yes" ;; @@ -31,16 +30,7 @@ --disable-slirp) slirp="no" ;; --disable-vde) vde="no" -@@ -2266,7 +2274,7 @@ - gtk_cflags="$gtk_cflags $x11_cflags" - gtk_libs="$gtk_libs $x11_libs" - fi -- libs_softmmu="$gtk_libs $libs_softmmu" -+ libs_softmmu="$gtk_libs -lintl $libs_softmmu" - gtk="yes" - elif test "$gtk" = "yes"; then - feature_not_found "gtk" "Install gtk2 or gtk3 devel" -@@ -2485,6 +2493,14 @@ +@@ -2799,6 +2806,14 @@ if ! check_include "ifaddrs.h" ; then fi ########################################## @@ -55,13 +45,13 @@ # VTE probe if test "$vte" != "no"; then -@@ -2644,6 +2660,50 @@ +@@ -2969,7 +2984,51 @@ EOF fi fi +########################################## +# pcap probe -+ + +if test "$pcap" = "yes" -a "$pcap" != "no"; then + cat > $TMPC << EOF +#include <pcap.h> @@ -103,10 +93,11 @@ + fi + libs_softmmu="$libpcap $libs_softmmu" +fi # test "$pcap" - ++ ########################################## # VNC SASL detection -@@ -3970,14 +4030,7 @@ + if test "$vnc" = "yes" -a "$vnc_sasl" != "no" ; then +@@ -4331,14 +4390,7 @@ fi # Check if tools are available to build documentation. if test "$docs" != "no" ; then @@ -121,15 +112,15 @@ fi # Search for bswap_32 function -@@ -5026,6 +5079,7 @@ +@@ -5783,6 +5835,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" +echo "pcap support $pcap" + echo "Multipath support $mpath" echo "VNC support $vnc" if test "$vnc" = "yes" ; then - echo "VNC SASL support $vnc_sasl" -@@ -5204,6 +5258,15 @@ +@@ -6010,6 +6063,15 @@ fi if test "$profiler" = "yes" ; then echo "CONFIG_PROFILER=y" >> $config_host_mak fi @@ -145,13 +136,13 @@ if test "$slirp" = "yes" ; then echo "CONFIG_SLIRP=y" >> $config_host_mak echo "CONFIG_SMBD_COMMAND=\"$smbd\"" >> $config_host_mak -@@ -5415,6 +5478,9 @@ +@@ -6247,6 +6309,9 @@ fi + # if this macro is set. if test "$have_fsxattr" = "yes" ; then echo "HAVE_FSXATTR=y" >> $config_host_mak - fi ++fi +if test "$have_ifaddrs_h" = "yes" ; then + echo "HAVE_IFADDRS_H=y" >> $config_host_mak -+fi + fi if test "$vte" = "yes" ; then echo "CONFIG_VTE=y" >> $config_host_mak - echo "VTE_CFLAGS=$vte_cflags" >> $config_host_mak Modified: head/emulators/qemu/files/pcap-patch ============================================================================== --- head/emulators/qemu/files/pcap-patch Sun Jul 22 01:36:38 2018 (r475079) +++ head/emulators/qemu/files/pcap-patch Sun Jul 22 02:27:07 2018 (r475080) @@ -1,6 +1,6 @@ ---- qapi-schema.json.orig 2017-07-24 12:07:10 UTC -+++ qapi-schema.json -@@ -3882,6 +3882,19 @@ +--- qapi/net.json.orig 2018-04-24 16:30:47 UTC ++++ qapi/net.json +@@ -388,6 +388,19 @@ '*helper': 'str' } } ## @@ -20,37 +20,37 @@ # @NetdevHubPortOptions: # # Connect two or more net clients through a software hub. -@@ -3944,7 +3957,7 @@ +@@ -454,7 +467,7 @@ ## { 'enum': 'NetClientDriver', - 'data': [ 'none', 'nic', 'user', 'tap', 'l2tpv3', 'socket', 'vde', 'dump', + 'data': [ 'none', 'nic', 'user', 'tap', 'l2tpv3', 'socket', 'vde', - 'bridge', 'hubport', 'netmap', 'vhost-user' ] } + 'bridge', 'hubport', 'netmap', 'vhost-user', 'pcap' ] } ## # @Netdev: -@@ -3967,6 +3980,7 @@ - 'nic': 'NetLegacyNicOptions', +@@ -478,6 +491,7 @@ 'user': 'NetdevUserOptions', 'tap': 'NetdevTapOptions', -+ 'pcap': 'NetdevPcapOptions', 'l2tpv3': 'NetdevL2TPv3Options', ++ 'pcap': 'NetdevPcapOptions', 'socket': 'NetdevSocketOptions', 'vde': 'NetdevVdeOptions', -@@ -4005,7 +4019,7 @@ + 'bridge': 'NetdevBridgeOptions', +@@ -514,7 +528,7 @@ ## { 'enum': 'NetLegacyOptionsType', 'data': ['none', 'nic', 'user', 'tap', 'l2tpv3', 'socket', 'vde', -- 'dump', 'bridge', 'netmap', 'vhost-user'] } -+ 'dump', 'bridge', 'netmap', 'vhost-user', 'pcap' ] } +- 'bridge', 'netmap', 'vhost-user'] } ++ 'bridge', 'netmap', 'vhost-user', 'pcap'] } ## # @NetLegacyOptions: -@@ -4022,6 +4036,7 @@ - 'nic': 'NetLegacyNicOptions', +@@ -532,6 +546,7 @@ 'user': 'NetdevUserOptions', 'tap': 'NetdevTapOptions', -+ 'pcap': 'NetdevPcapOptions', 'l2tpv3': 'NetdevL2TPv3Options', ++ 'pcap': 'NetdevPcapOptions', 'socket': 'NetdevSocketOptions', 'vde': 'NetdevVdeOptions', + 'bridge': 'NetdevBridgeOptions', Modified: head/emulators/qemu/files/pcap-patch-net_clients.h ============================================================================== --- head/emulators/qemu/files/pcap-patch-net_clients.h Sun Jul 22 01:36:38 2018 (r475079) +++ head/emulators/qemu/files/pcap-patch-net_clients.h Sun Jul 22 02:27:07 2018 (r475080) @@ -1,13 +1,13 @@ ---- net/clients.h.orig 2017-03-05 10:36:13.475005000 -0700 -+++ net/clients.h 2017-03-05 10:35:30.412539000 -0700 -@@ -61,4 +61,10 @@ - +--- net/clients.h.orig 2018-04-24 16:30:47 UTC ++++ net/clients.h +@@ -61,4 +61,10 @@ int net_init_netmap(const Netdev *netdev, const char * int net_init_vhost_user(const Netdev *netdev, const char *name, NetClientState *peer, Error **errp); -+ + +#ifdef CONFIG_PCAP +int net_init_pcap(const Netdev *netdev, const char *name, + NetClientState *peer, Error **errp); +#endif ++ + #endif /* QEMU_NET_CLIENTS_H */ Modified: head/emulators/qemu/files/pcap-patch-net_net.c ============================================================================== --- head/emulators/qemu/files/pcap-patch-net_net.c Sun Jul 22 01:36:38 2018 (r475079) +++ head/emulators/qemu/files/pcap-patch-net_net.c Sun Jul 22 02:27:07 2018 (r475080) @@ -1,6 +1,6 @@ ---- net/net.c.orig 2016-12-20 13:16:48.000000000 -0700 -+++ net/net.c 2017-03-05 08:04:17.606428000 -0700 -@@ -48,6 +48,11 @@ +--- net/net.c.orig 2018-04-24 16:30:47 UTC ++++ net/net.c +@@ -52,6 +52,11 @@ #include "net/filter.h" #include "qapi/string-output-visitor.h" @@ -12,7 +12,7 @@ /* Net bridge is currently not supported for W32. */ #if !defined(_WIN32) # define CONFIG_NET_BRIDGE -@@ -933,7 +938,225 @@ +@@ -929,7 +934,225 @@ static int net_init_nic(const Netdev *netdev, const ch return idx; } @@ -22,7 +22,7 @@ +#include <net/bpf.h> +#endif +#include <pcap.h> -+ + +struct PCAPState { + NetClientState nc; + pcap_t *handle; @@ -221,7 +221,7 @@ + } + qemu_set_fd_handler(i, pcap_send, NULL, s); +#endif /* _WIN32 */ - ++ + return 0; + +fail: @@ -238,13 +238,13 @@ static int (* const net_client_init_fun[NET_CLIENT_DRIVER__MAX])( const Netdev *netdev, const char *name, -@@ -961,6 +1182,9 @@ +@@ -955,6 +1178,9 @@ static int (* const net_client_init_fun[NET_CLIENT_DRI + #endif #ifdef CONFIG_L2TPV3 [NET_CLIENT_DRIVER_L2TPV3] = net_init_l2tpv3, - #endif ++#endif +#ifdef CONFIG_PCAP + [NET_CLIENT_DRIVER_PCAP] = net_init_pcap, -+#endif + #endif }; - Modified: head/emulators/qemu/pkg-plist ============================================================================== --- head/emulators/qemu/pkg-plist Sun Jul 22 01:36:38 2018 (r475079) +++ head/emulators/qemu/pkg-plist Sun Jul 22 02:27:07 2018 (r475080) @@ -1,5 +1,3 @@ -bin/ivshmem-server -bin/ivshmem-client bin/qemu-ga bin/qemu-i386 bin/qemu-img @@ -11,6 +9,7 @@ bin/qemu-nbd %%NO_X86_TARGETS%%bin/qemu-system-alpha %%NO_X86_TARGETS%%bin/qemu-system-arm %%NO_X86_TARGETS%%bin/qemu-system-cris +%%NO_X86_TARGETS%%bin/qemu-system-hppa bin/qemu-system-i386 %%NO_X86_TARGETS%%bin/qemu-system-lm32 %%NO_X86_TARGETS%%bin/qemu-system-m68k @@ -26,6 +25,8 @@ bin/qemu-system-i386 %%NO_X86_TARGETS%%bin/qemu-system-ppc %%NO_X86_TARGETS%%bin/qemu-system-ppc64 %%NO_X86_TARGETS%%bin/qemu-system-ppcemb +%%NO_X86_TARGETS%%bin/qemu-system-riscv32 +%%NO_X86_TARGETS%%bin/qemu-system-riscv64 %%NO_X86_TARGETS%%bin/qemu-system-s390x %%NO_X86_TARGETS%%bin/qemu-system-sh4 %%NO_X86_TARGETS%%bin/qemu-system-sh4eb @@ -38,6 +39,7 @@ bin/qemu-system-x86_64 %%NO_X86_TARGETS%%bin/qemu-system-xtensaeb bin/qemu-x86_64 man/man1/qemu.1.gz +man/man7/qemu-block-drivers.7.gz man/man1/qemu-img.1.gz man/man7/qemu-ga-ref.7.gz man/man7/qemu-qmp-ref.7.gz @@ -47,9 +49,9 @@ man/man8/qemu-nbd.8.gz @sample etc/qemu-ifdown.sample %%DATADIR%%/QEMU,tcx.bin %%DATADIR%%/QEMU,cgthree.bin -%%DATADIR%%/acpi-dsdt.aml %%DATADIR%%/bios-256k.bin %%DATADIR%%/bios.bin +%%DATADIR%%/canyonlands.dtb %%DATADIR%%/efi-e1000.rom %%DATADIR%%/efi-e1000e.rom %%DATADIR%%/efi-eepro100.rom @@ -58,6 +60,10 @@ man/man8/qemu-nbd.8.gz %%DATADIR%%/efi-rtl8139.rom %%DATADIR%%/efi-virtio.rom %%DATADIR%%/efi-vmxnet3.rom +%%DATADIR%%/hppa-firmware.img +%%DATADIR%%/qemu_vga.ndrv +%%DATADIR%%/s390-netboot.img +%%DATADIR%%/u-boot-sam460-20100605.bin %%DATADIR%%/vgabios.bin %%DATADIR%%/vgabios-cirrus.bin %%DATADIR%%/vgabios-qxl.bin
Want to link to this message? Use this URL: <https://mail-archive.FreeBSD.org/cgi/mid.cgi?201807220227.w6M2R8la007677>