From nobody Mon Jan 10 09:01:28 2022 X-Original-To: dev-commits-ports-main@mlmmj.nyi.freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2610:1c1:1:606c::19:1]) by mlmmj.nyi.freebsd.org (Postfix) with ESMTP id 6AAC11937B07; Mon, 10 Jan 2022 09:01:29 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from mxrelay.nyi.freebsd.org (mxrelay.nyi.freebsd.org [IPv6:2610:1c1:1:606c::19:3]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256 client-signature RSA-PSS (4096 bits) client-digest SHA256) (Client CN "mxrelay.nyi.freebsd.org", Issuer "R3" (verified OK)) by mx1.freebsd.org (Postfix) with ESMTPS id 4JXSVd0LjGz3NpX; Mon, 10 Jan 2022 09:01:29 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from gitrepo.freebsd.org (gitrepo.freebsd.org [IPv6:2610:1c1:1:6068::e6a:5]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256) (Client did not present a certificate) by mxrelay.nyi.freebsd.org (Postfix) with ESMTPS id DF5DA22919; Mon, 10 Jan 2022 09:01:28 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from gitrepo.freebsd.org ([127.0.1.44]) by gitrepo.freebsd.org (8.16.1/8.16.1) with ESMTP id 20A91SNL035198; Mon, 10 Jan 2022 09:01:28 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.16.1/8.16.1/Submit) id 20A91SB2035197; Mon, 10 Jan 2022 09:01:28 GMT (envelope-from git) Date: Mon, 10 Jan 2022 09:01:28 GMT Message-Id: <202201100901.20A91SB2035197@gitrepo.freebsd.org> To: ports-committers@FreeBSD.org, dev-commits-ports-all@FreeBSD.org, dev-commits-ports-main@FreeBSD.org From: Rene Ladan Subject: git: ff8ff0d5da0f - main - cleanup: Remove expired ports: List-Id: Commits to the main branch of the FreeBSD ports repository List-Archive: https://lists.freebsd.org/archives/dev-commits-ports-main List-Help: List-Post: List-Subscribe: List-Unsubscribe: Sender: owner-dev-commits-ports-main@freebsd.org X-BeenThere: dev-commits-ports-main@freebsd.org MIME-Version: 1.0 Content-Type: text/plain; charset=utf-8 Content-Transfer-Encoding: 8bit X-Git-Committer: rene X-Git-Repository: ports X-Git-Refname: refs/heads/main X-Git-Reftype: branch X-Git-Commit: ff8ff0d5da0f46e60fc9b6e0758e5e7be0194fa1 Auto-Submitted: auto-generated ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1641805289; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=kVKxWlsLf7rhY3lhbX3CkhFDE6YPBXQI+PpMW3cJrh8=; b=NmKC1857cXhuYBX8o631aWnhoS2g2bNo2y81/ehCD1h/pGu/JHYgHcFOOb+atyOrBYzu74 +1jwySGVQWjEK5PLa4IAiZRLZwzU5P7UceNZYldy9iDC754sX3CgwnUgIIzBS0g4TEXPAi tz69mD/6ty7ll07z8runJNwgPCoJ/r4fmPuUZcZeW/whPrvkJE6KvEp4LyLlIwRfnYGgdp y87rvp2gF1mlynB/qRk5UCZSeu+r41AEVcdHaIMozx84TCVK0IsyyV8EARBqKgoVclUPKs Yaf3/lHOAwii/mqCpUBzEerPLHKf9mHpw4pWZkakF4V9EX+/0FWogfBfSWN1SA== ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1641805289; a=rsa-sha256; cv=none; b=fZQWuFOKFK+ofsNItl4AZPeNZVIhZfREDZAKIHYBQgGWASG4i/kF/iHOXw16ooFoPbOwEX gKp02whFpCua+3KnE5tfqI9+1ygSBT68JseX+OEy2pNCEu3OVXuvY6XtdA0OG3DHk4yqfJ IG8V0HT6/EXZnDzXeEPVl+J8uHJTEnow/nlEAn6S8wFoPZuxwai6CLtC7G62W5jivu3kyz jFSb4b7wb/QU92QI5LtdyuWd1RUyB4CFE9xG+swpb0rGIRgeZCTBlbIel1sOrZbMy9HL5p 7MjXCFrHd6Adu6eGEpoTG+5mmH1HxcinjDN5NWn9CV2GDdXV+3C8qcLsNW3hgA== ARC-Authentication-Results: i=1; mx1.freebsd.org; none X-ThisMailContainsUnwantedMimeParts: N The branch main has been updated by rene: URL: https://cgit.FreeBSD.org/ports/commit/?id=ff8ff0d5da0f46e60fc9b6e0758e5e7be0194fa1 commit ff8ff0d5da0f46e60fc9b6e0758e5e7be0194fa1 Author: Rene Ladan AuthorDate: 2022-01-10 09:00:56 +0000 Commit: Rene Ladan CommitDate: 2022-01-10 09:00:56 +0000 cleanup: Remove expired ports: 2022-01-10 emulators/qemu-utils: Use emulators/qemu or emulators/qemu-devel 2022-01-10 emulators/qemu42: Use emulators/qemu or emulators/qemu-devel --- MOVED | 2 + emulators/Makefile | 2 - emulators/qemu-utils/Makefile | 91 -------- emulators/qemu-utils/files/patch-Makefile | 47 ---- emulators/qemu-utils/files/patch-configure | 21 -- emulators/qemu-utils/pkg-descr | 7 - emulators/qemu-utils/pkg-plist | 7 - emulators/qemu42/Makefile | 180 --------------- emulators/qemu42/distinfo | 3 - emulators/qemu42/files/patch-Makefile | 42 ---- emulators/qemu42/files/patch-configure | 213 ----------------- .../patch-disas_libvixl_vixl_a64_disasm-a64.cc | 11 - emulators/qemu42/files/patch-include_net_net.h | 13 -- emulators/qemu42/files/patch-include_qemu_atomic.h | 54 ----- emulators/qemu42/files/patch-net_tap-bsd.c | 10 - emulators/qemu42/files/patch-qemu-doc.texi | 21 -- emulators/qemu42/files/pcap-patch-net_clients.h | 13 -- emulators/qemu42/files/pcap-patch-net_net.c | 251 --------------------- emulators/qemu42/files/pcap-patch-qapi_net.json | 56 ----- emulators/qemu42/files/qemu-ifdown.sample | 2 - emulators/qemu42/files/qemu-ifup.sample | 2 - emulators/qemu42/pkg-descr | 16 -- emulators/qemu42/pkg-message | 188 --------------- emulators/qemu42/pkg-plist | 177 --------------- 24 files changed, 2 insertions(+), 1427 deletions(-) diff --git a/MOVED b/MOVED index d8bbf2825dba..af7cf73d4078 100644 --- a/MOVED +++ b/MOVED @@ -16759,3 +16759,5 @@ astro/google-earth||2022-01-01|Has expired: Needs newer version to connect to se net/tramp||2022-01-01|Has expired: Not updated in 5 years and now part of Emacs archivers/p7zip-codec-rar||2022-01-01|Has expired: Unmaintained for years and has known vulnerabilities textproc/askgit|textproc/mergestat|2022-01-03|Project renamed +emulators/qemu-utils||2022-01-10|Has expired: Use emulators/qemu or emulators/qemu-devel +emulators/qemu42||2022-01-10|Has expired: Use emulators/qemu or emulators/qemu-devel diff --git a/emulators/Makefile b/emulators/Makefile index a5926fd975fc..0575b24bfe1e 100644 --- a/emulators/Makefile +++ b/emulators/Makefile @@ -108,8 +108,6 @@ SUBDIR += qemu-powernv SUBDIR += qemu-user-static SUBDIR += qemu-user-static-devel - SUBDIR += qemu-utils - SUBDIR += qemu42 SUBDIR += qemu5 SUBDIR += qmc2 SUBDIR += quasi88 diff --git a/emulators/qemu-utils/Makefile b/emulators/qemu-utils/Makefile deleted file mode 100644 index f86f6dd9008c..000000000000 --- a/emulators/qemu-utils/Makefile +++ /dev/null @@ -1,91 +0,0 @@ -PKGNAMESUFFIX= -utils - -MAINTAINER= ken@FreeBSD.org -COMMENT= QEMU userland utilities - -DEPRECATED?= Use emulators/qemu@tools -EXPIRATION_DATE?=2022-01-09 - -HAS_CONFIGURE= yes -USES= compiler:c11 cpe gettext-runtime gmake gnome perl5 pkgconfig \ - python:build tar:xz -USE_GNOME+= glib20 -MAKE_ENV+= BSD_MAKE="${MAKE}" PREFIX=${PREFIX} -CONFLICTS_INSTALL= qemu qemu-devel qemu-sbruno - -OPTIONS_SLAVE= DOCS -OPTIONS_EXCLUDE= SAMBA X11 GTK3 OPENGL GNUTLS SASL JPEG PNG CURL \ - CDROM_DMA PCAP USBREDIR GNS3 X86_TARGETS \ - STATIC_LINK NCURSES VDE -MASTERDIR= ${.CURDIR}/../qemu42 -PLIST= ${.CURDIR}/pkg-plist -DESCR= ${.CURDIR}/pkg-descr -EXTRA_PATCHES= ${.CURDIR}/files/patch-configure -PKGMESSAGE= - -PORTDOCS= interop/* specs/* - -CONFIGURE_ARGS?=--localstatedir=/var --extra-ldflags=-L\"${LOCALBASE}/lib\" \ - --mandir=${MANPREFIX}/man \ - --prefix=${PREFIX} --cc=${CC} --disable-kvm \ - --disable-linux-user --disable-linux-aio --disable-xen \ - --python=${PYTHON_CMD} \ - --extra-cflags=-I${WRKSRC}\ -I${LOCALBASE}/include\ -DPREFIX=\\\"\"${PREFIX}\\\"\" \ - --disable-curl \ - --disable-gnutls \ - --disable-gtk \ - --disable-vte \ - --disable-vnc-jpeg \ - --disable-opengl \ - --disable-usb-redir \ - --disable-sdl \ - --disable-system \ - --disable-user \ - --disable-guest-agent \ - --disable-nettle \ - --disable-gcrypt \ - --disable-curses \ - --disable-vnc \ - --disable-virtfs \ - --disable-brlapi \ - --disable-fdt \ - --disable-bluez \ - --disable-kvm \ - --disable-rdma \ - --disable-vde \ - --disable-netmap \ - --disable-cap-ng \ - --disable-attr \ - --disable-vhost-net \ - --disable-spice \ - --disable-rbd \ - --disable-libiscsi \ - --disable-libnfs \ - --disable-smartcard \ - --disable-libusb \ - --disable-usb-redir \ - --disable-lzo \ - --disable-snappy \ - --disable-bzip2 \ - --disable-seccomp \ - --disable-coroutine-pool \ - --disable-glusterfs \ - --disable-tpm \ - --disable-numa \ - --disable-blobs - -LIB_DEPENDS= - -# qemu-utils must patch Makefile during pre-configure, because the master port -# also patches Makefile. We can't use EXTRA_PATCHES, because that happens -# before do-patch, and causes a conflict with the master port's patch. And we -# can't use post-patch, because the master port also defines that target. -pre-configure: - ${PATCH} ${WRKSRC}/Makefile ${.CURDIR}/files/patch-Makefile - -post-install: - @${STRIP_CMD} ${STAGEDIR}${PREFIX}/bin/qemu-* - @${RMDIR} ${STAGEDIR}${DATADIR} - @${RM} -rf ${STAGEDIR}${PREFIX}/share - -.include "${MASTERDIR}/Makefile" diff --git a/emulators/qemu-utils/files/patch-Makefile b/emulators/qemu-utils/files/patch-Makefile deleted file mode 100644 index 3890728f9992..000000000000 --- a/emulators/qemu-utils/files/patch-Makefile +++ /dev/null @@ -1,47 +0,0 @@ ---- Makefile.orig 2020-09-18 12:03:57 UTC -+++ Makefile -@@ -344,14 +344,11 @@ endif - ifdef BUILD_DOCS - ifdef NOPORTDOCS - DOCS=qemu.1 qemu-img.1 qemu-nbd.8 $(MANUAL_BUILDDIR)/interop/qemu-ga.8 --DOCS+=docs/interop/qemu-qmp-ref.7 docs/interop/qemu-ga-ref.7 -+DOCS+=docs/interop/qemu-ga-ref.7 - else - DOCS=qemu-doc.html qemu-doc.txt qemu.1 qemu-img.1 qemu-nbd.8 $(MANUAL_BUILDDIR)/interop/qemu-ga.8 --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 - endif --DOCS+=docs/qemu-block-drivers.7 --DOCS+=docs/qemu-cpu-models.7 - ifdef CONFIG_VIRTFS - DOCS+=fsdev/virtfs-proxy-helper.1 - endif -@@ -828,16 +825,10 @@ ifndef NOPORTDOCS - $(INSTALL_DIR) "$(DESTDIR)$(qemu_docdir)" - $(INSTALL_DATA) qemu-doc.html "$(DESTDIR)$(qemu_docdir)" - $(INSTALL_DATA) qemu-doc.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" -- $(INSTALL_DIR) "$(DESTDIR)$(mandir)/man7" -- $(INSTALL_DATA) docs/interop/qemu-qmp-ref.7 "$(DESTDIR)$(mandir)/man7" -- $(INSTALL_DATA) docs/qemu-block-drivers.7 "$(DESTDIR)$(mandir)/man7" -- $(INSTALL_DATA) docs/qemu-cpu-models.7 "$(DESTDIR)$(mandir)/man7" - ifeq ($(CONFIG_TOOLS),y) - $(INSTALL_DATA) qemu-img.1 "$(DESTDIR)$(mandir)/man1" - $(INSTALL_DIR) "$(DESTDIR)$(mandir)/man8" -@@ -942,11 +933,6 @@ endif - ifeq ($(CONFIG_PLUGIN),y) - $(INSTALL_DATA) $(SRC_PATH)/include/qemu/qemu-plugin.h "$(DESTDIR)$(includedir)/qemu-plugin.h" - endif -- $(INSTALL_DIR) "$(DESTDIR)$(qemu_datadir)/keymaps" -- set -e; for x in $(KEYMAPS); do \ -- $(INSTALL_DATA) $(SRC_PATH)/pc-bios/keymaps/$$x "$(DESTDIR)$(qemu_datadir)/keymaps"; \ -- done -- $(INSTALL_DATA) $(BUILD_DIR)/trace-events-all "$(DESTDIR)$(qemu_datadir)/trace-events-all" - - .PHONY: ctags - ctags: diff --git a/emulators/qemu-utils/files/patch-configure b/emulators/qemu-utils/files/patch-configure deleted file mode 100644 index a4ffd8f03a38..000000000000 --- a/emulators/qemu-utils/files/patch-configure +++ /dev/null @@ -1,21 +0,0 @@ ---- configure.orig 2018-04-24 16:30:46 UTC -+++ configure -@@ -3452,7 +3452,7 @@ fi - ########################################## - # pixman support probe - --if test "$want_tools" = "no" && test "$softmmu" = "no"; then -+if test "$softmmu" = "no"; then - pixman_cflags= - pixman_libs= - elif $pkg_config --atleast-version=0.21.8 pixman-1 > /dev/null 2>&1; then -@@ -5498,9 +5498,6 @@ if test "$want_tools" = "yes" ; then - tools="qemu-img\$(EXESUF) qemu-io\$(EXESUF) $tools" - if [ "$linux" = "yes" -o "$bsd" = "yes" -o "$solaris" = "yes" ] ; then - tools="qemu-nbd\$(EXESUF) $tools" -- fi -- if [ "$ivshmem" = "yes" ]; then -- tools="ivshmem-client\$(EXESUF) ivshmem-server\$(EXESUF) $tools" - fi - fi - if test "$softmmu" = yes ; then diff --git a/emulators/qemu-utils/pkg-descr b/emulators/qemu-utils/pkg-descr deleted file mode 100644 index f1914609c286..000000000000 --- a/emulators/qemu-utils/pkg-descr +++ /dev/null @@ -1,7 +0,0 @@ -Miscellaneous tools that can be used without the rest of QEMU - -* qemu-img: QEMU disk image utility -* qemu-io: QEMU disk exerciser -* qemu-nbd: QEMU disk network block device server - -WWW: http://wiki.qemu.org/Main_Page diff --git a/emulators/qemu-utils/pkg-plist b/emulators/qemu-utils/pkg-plist deleted file mode 100644 index fa481bcfe95d..000000000000 --- a/emulators/qemu-utils/pkg-plist +++ /dev/null @@ -1,7 +0,0 @@ -bin/qemu-edid -bin/qemu-img -bin/qemu-io -bin/qemu-nbd -man/man1/qemu-img.1.gz -man/man1/qemu.1.gz -man/man8/qemu-nbd.8.gz diff --git a/emulators/qemu42/Makefile b/emulators/qemu42/Makefile deleted file mode 100644 index 115a7f874528..000000000000 --- a/emulators/qemu42/Makefile +++ /dev/null @@ -1,180 +0,0 @@ -# Created by: Juergen Lock - -PORTNAME= qemu -PORTVERSION= 4.2.1 -PORTREVISION= 1 -CATEGORIES= emulators -MASTER_SITES= https://download.qemu.org/ -PKGNAMESUFFIX?= 42 -DIST_SUBDIR= qemu/${PORTVERSION} - -MAINTAINER?= bofh@FreeBSD.org -COMMENT?= QEMU CPU Emulator - 4.2.X branch - -LICENSE= GPLv2 - -DEPRECATED= Use emulators/qemu or emulators/qemu-devel -EXPIRATION_DATE=2022-01-10 - -BUILD_DEPENDS= sphinx-build:textproc/py-sphinx@${PY_FLAVOR} -LIB_DEPENDS?= libepoxy.so:graphics/libepoxy \ - libfdt.so:sysutils/dtc \ - libfontconfig.so:x11-fonts/fontconfig \ - libfreetype.so:print/freetype2 \ - libnettle.so:security/nettle \ - libpcre2-8.so:devel/pcre2 - -.if !defined(PKGNAMESUFFIX) || (${PKGNAMESUFFIX} != "-utils" && ${PKGNAMESUFFIX} != "-guest-agent") -ONLY_FOR_ARCHS= amd64 i386 powerpc powerpc64 powerpc64le -USES= bison compiler:c11 cpe gmake gnome iconv:wchar_t perl5 \ - pkgconfig python:build tar:xz xorg -USE_XORG= pixman -USE_GNOME= cairo glib20 libxml2 -.endif - -USE_PERL5= build - -PORTSCOUT= limit:^4\.2\. - -HAS_CONFIGURE= yes -MAKE_ENV+= BSD_MAKE="${MAKE}" V=1 - -OPTIONS_DEFINE= SAMBA X11 GTK3 OPENGL GNUTLS SASL JPEG PNG CURL \ - VDE CDROM_DMA PCAP USBREDIR X86_TARGETS \ - STATIC_LINK DOCS ISCSI CAPSTONE DEBUG -OPTIONS_SINGLE= NCURSES -OPTIONS_SINGLE_NCURSES= NCURSES_DEFAULT NCURSES_BASE NCURSES_PORT -CAPSTONE_DESC= Disassembly framework support -CDROM_DMA_DESC= IDE CDROM DMA -GNUTLS_DESC= gnutls dependency (vnc encryption) -ISCSI_DESC= libiscsi dependency (iSCSI client for emulated drives) -JPEG_DESC= jpeg dependency (vnc lossy compression) -NCURSES_DEFAULT_DESC= Depend on ncurses (ports if installed, otherwise base) -NCURSES_BASE_DESC= Depend on ncurses in base -NCURSES_PORT_DESC= Depend on devel/ncurses in ports -PCAP_DESC= pcap dependency (networking with bpf) -PNG_DESC= png dependency (vnc compression) -SAMBA_DESC= samba dependency (for -smb) -SASL_DESC= cyrus-sasl dependency (vnc encryption) -STATIC_LINK_DESC= Statically link the executables -USBREDIR_DESC= usb device network redirection (experimental!) -VDE_DESC= vde dependency (for vde networking) -X86_TARGETS_DESC= Build only x86 system targets -OPTIONS_DEFAULT=X11 GTK3 OPENGL GNUTLS SASL JPEG PNG CDROM_DMA CURL PCAP NCURSES_DEFAULT VDE -OPTIONS_SUB= yes -CAPSTONE_CONFIGURE_ON= --enable-capstone=system --extra-cflags=-I${LOCALBASE}/include/capstone -CAPSTONE_CONFIGURE_OFF= --disable-capstone -CAPSTONE_LIB_DEPENDS= libcapstone.so:devel/capstone4 -CURL_CONFIGURE_OFF= --disable-curl -CURL_LIB_DEPENDS= libcurl.so:ftp/curl -DEBUG_CONFIGURE_ON= --enable-debug --enable-debug-info -DEBUG_CONFIGURE_OFF= --disable-debug-info -DOCS_BUILD_DEPENDS= texi2html:textproc/texi2html -DOCS_MAKE_ARGS_OFF= NOPORTDOCS=1 -DOCS_USES= makeinfo -GNUTLS_CONFIGURE_OFF= --disable-gnutls -GNUTLS_LIB_DEPENDS= libgnutls.so:security/gnutls -GTK3_CONFIGURE_OFF= --disable-gtk --disable-vte -GTK3_LIB_DEPENDS= libxkbcommon.so:x11/libxkbcommon -GTK3_USE= GNOME=gdkpixbuf2,gtk30,vte3 XORG=x11,xext -GTK3_USES= gettext gl -ISCSI_LIB_DEPENDS= libiscsi.so:net/libiscsi -ISCSI_CONFIGURE_OFF= --disable-libiscsi -JPEG_CONFIGURE_OFF= --disable-vnc-jpeg -JPEG_USES= jpeg -NCURSES_DEFAULT_USES= ncurses -NCURSES_BASE_USES= ncurses:base -NCURSES_PORT_USES= ncurses:port -OPENGL_CONFIGURE_OFF= --disable-opengl -OPENGL_USE= GL=gl -OPENGL_USES= gl -PCAP_CONFIGURE_ON= --enable-pcap -PCAP_EXTRA_PATCHES= ${FILESDIR}/pcap-patch-qapi_net.json ${FILESDIR}/pcap-patch-net_net.c \ - ${FILESDIR}/pcap-patch-net_clients.h -PNG_CONFIGURE_OFF= --disable-vnc-png -PNG_LIB_DEPENDS= libpng.so:graphics/png -SAMBA_CONFIGURE_ON= --smbd=${LOCALBASE}/sbin/smbd -SAMBA_USES= samba:run # smbd -SASL_CONFIGURE_OFF= --disable-vnc-sasl -SASL_LIB_DEPENDS= libsasl2.so:security/cyrus-sasl2 -STATIC_LINK_CONFIGURE_ON= --static -STATIC_LINK_PREVENTS= GTK3 X11 -STATIC_LINK_PREVENTS_MSG= X11 ui cannot be built static -USBREDIR_BUILD_DEPENDS= usbredir>=0.6:net/usbredir -USBREDIR_CONFIGURE_OFF= --disable-usb-redir -USBREDIR_RUN_DEPENDS= usbredir>=0.6:net/usbredir -VDE_CONFIGURE_OFF= --disable-vde -VDE_LIB_DEPENDS= libvdeplug.so:net/vde2 -X11_CONFIGURE_ENABLE= sdl -X11_USE= SDL=sdl2 XORG=x11,xext GNOME=gdkpixbuf2 -X11_USES= sdl -.if !defined(PKGNAMESUFFIX) || (${PKGNAMESUFFIX} != "-utils" && ${PKGNAMESUFFIX} != "-guest-agent") -X86_TARGETS_LIB_DEPENDS_OFF= libharfbuzz.so:print/harfbuzz -X86_TARGETS_USE_OFF= GL=gbm XORG=pixman,x11 -X86_TARGETS_USES_OFF= xorg -.endif - -PORTDOCS?= docs interop/.buildinfo interop/* qemu-doc.html qemu-doc.txt qemu-ga-ref.html qemu-ga-ref.txt \ - qemu-qmp-ref.html qemu-qmp-ref.txt specs/.buildinfo specs/* - -WITHOUT_CPU_CFLAGS=yes #to avoid problems with register allocation -CFLAGS:= ${CFLAGS:C/-fno-tree-vrp//} -CFLAGS_powerpc= -D_CALL_SYSV -CONFIGURE_ARGS?=--localstatedir=/var --extra-ldflags=-L\"/usr/lib\" \ - --extra-ldflags=-L\"${LOCALBASE}/lib\" --disable-libssh \ - --prefix=${PREFIX} --cc=${CC} --enable-netmap --enable-docs --disable-kvm \ - --disable-linux-user --disable-linux-aio --disable-xen \ - --python=${PYTHON_CMD} \ - --extra-cflags=-I${WRKSRC}\ -I${LOCALBASE}/include\ -DPREFIX=\\\"\"${PREFIX}\\\"\" - -.include - -.if !defined(STRIP) || ${STRIP} == "" -CONFIGURE_ARGS+=--disable-strip -.endif - -.if ${ARCH} == "amd64" -MAKE_ARGS+= ARCH=x86_64 -.endif - -.if ${ARCH} == "powerpc" -MAKE_ARGS+= ARCH=ppc -.endif - -.if ${ARCH} == "powerpc64" -MAKE_ARGS+= ARCH=ppc64 -.endif - -.if ${ARCH} == "sparc64" -CONFIGURE_ARGS+= --sparc_cpu=v9 -.endif - -.if ${OPSYS} == FreeBSD && ${OSVERSION} >= 1300000 -PLIST_SUB+= IVSHMEM="" -.else -PLIST_SUB+= IVSHMEM="@comment " -.endif - -PLIST_SUB+= LINUXBOOT_DMA="" - -post-patch-CDROM_DMA-off: - @${REINPLACE_CMD} -e '/USE_DMA_CDROM/d' ${WRKSRC}/include/hw/ide/internal.h - -# XXX need to disable usb host code on head while it's not ported to the -# new usb stack yet -post-configure: - @${REINPLACE_CMD} -E \ - -e "s|^(HOST_USB=)bsd|\1stub|" \ - ${WRKSRC}/config-host.mak - -.if !target(post-install) -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-* - -post-install-DOCS-on: - @(cd ${WRKSRC} && ${COPYTREE_SHARE} docs ${STAGEDIR}${DOCSDIR}/) -.endif - -.include diff --git a/emulators/qemu42/distinfo b/emulators/qemu42/distinfo deleted file mode 100644 index e728598d2052..000000000000 --- a/emulators/qemu42/distinfo +++ /dev/null @@ -1,3 +0,0 @@ -TIMESTAMP = 1594330010 -SHA256 (qemu/4.2.1/qemu-4.2.1.tar.xz) = 7e331163b72e7bcf63bd35cb85cba87b48d12fab3f264b94c23f7d3991094207 -SIZE (qemu/4.2.1/qemu-4.2.1.tar.xz) = 62225124 diff --git a/emulators/qemu42/files/patch-Makefile b/emulators/qemu42/files/patch-Makefile deleted file mode 100644 index 909ac1e5beb7..000000000000 --- a/emulators/qemu42/files/patch-Makefile +++ /dev/null @@ -1,42 +0,0 @@ ---- Makefile.orig 2019-12-12 18:20:47 UTC -+++ Makefile -@@ -342,9 +342,14 @@ MANUAL_BUILDDIR := docs - endif - - ifdef BUILD_DOCS -+ifdef NOPORTDOCS -+DOCS=qemu.1 qemu-img.1 qemu-nbd.8 $(MANUAL_BUILDDIR)/interop/qemu-ga.8 -+DOCS+=docs/interop/qemu-qmp-ref.7 docs/interop/qemu-ga-ref.7 -+else - DOCS=qemu-doc.html qemu-doc.txt qemu.1 qemu-img.1 qemu-nbd.8 $(MANUAL_BUILDDIR)/interop/qemu-ga.8 - 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 -+endif - DOCS+=docs/qemu-block-drivers.7 - DOCS+=docs/qemu-cpu-models.7 - ifdef CONFIG_VIRTFS -@@ -819,11 +824,13 @@ install-sphinxdocs: sphinxdocs - $(call install-manual,specs) - - install-doc: $(DOCS) install-sphinxdocs -+ifndef NOPORTDOCS - $(INSTALL_DIR) "$(DESTDIR)$(qemu_docdir)" - $(INSTALL_DATA) qemu-doc.html "$(DESTDIR)$(qemu_docdir)" - $(INSTALL_DATA) qemu-doc.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" -@@ -841,8 +848,10 @@ ifdef CONFIG_TRACE_SYSTEMTAP - endif - ifneq (,$(findstring qemu-ga,$(TOOLS))) - $(INSTALL_DATA) $(MANUAL_BUILDDIR)/interop/qemu-ga.8 "$(DESTDIR)$(mandir)/man8" -+ifndef NOPORTDOCS - $(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/interop/qemu-ga-ref.7 "$(DESTDIR)$(mandir)/man7" - endif - endif diff --git a/emulators/qemu42/files/patch-configure b/emulators/qemu42/files/patch-configure deleted file mode 100644 index d62730814b28..000000000000 --- a/emulators/qemu42/files/patch-configure +++ /dev/null @@ -1,213 +0,0 @@ ---- configure.orig 2019-12-12 18:20:47 UTC -+++ configure -@@ -405,7 +405,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" -@@ -489,6 +489,9 @@ numa="" - tcmalloc="no" - jemalloc="no" - replication="yes" -+pcap="no" -+pcap_create="no" -+bpf="no" - vxhs="" - bochs="yes" - cloop="yes" -@@ -1125,6 +1128,10 @@ for opt do - ;; - --enable-vnc-png) vnc_png="yes" - ;; -+ --enable-pcap) pcap="yes" -+ ;; -+ --disable-pcap) pcap="no" -+ ;; - --disable-slirp) slirp="no" - ;; - --enable-slirp=git) slirp="git" -@@ -3023,6 +3030,14 @@ if ! check_include "ifaddrs.h" ; then - fi - - ########################################## -+# getifaddrs (for tests/test-io-channel-socket ) -+ -+have_ifaddrs_h=yes -+if ! check_include "ifaddrs.h" ; then -+ have_ifaddrs_h=no -+fi -+ -+########################################## - # VTE probe - - if test "$vte" != "no"; then -@@ -3710,7 +3725,7 @@ for i in $glib_modules; do - glib_libs=$($pkg_config --libs $i) - QEMU_CFLAGS="$glib_cflags $QEMU_CFLAGS" - LIBS="$glib_libs $LIBS" -- libs_qga="$glib_libs $libs_qga" -+ libs_qga="$glib_libs -lintl $libs_qga" - else - error_exit "glib-$glib_req_ver $i is required to compile QEMU" - fi -@@ -4802,11 +4817,6 @@ has_sphinx_build() { - if test "$docs" != "no" ; then - if has makeinfo && has pod2man && has_sphinx_build; then - docs=yes -- else -- if test "$docs" = "yes" ; then -- feature_not_found "docs" "Install texinfo, Perl/perl-podlators and python-sphinx" -- fi -- docs=no - fi - fi - -@@ -4940,7 +4950,7 @@ fi - - # check for libusb - if test "$libusb" != "no" ; then -- if $pkg_config --atleast-version=1.0.13 libusb-1.0; then -+ if $pkg_config libusb-1.0; then - libusb="yes" - libusb_cflags=$($pkg_config --cflags libusb-1.0) - libusb_libs=$($pkg_config --libs libusb-1.0) -@@ -5330,7 +5340,51 @@ if test "$debug_stack_usage" = "yes"; then - fi - fi - -+########################################## -+# pcap probe - -+if test "$pcap" = "yes" -a "$pcap" != "no"; then -+ cat > $TMPC << EOF -+#include -+int main(void) { return (pcap_lib_version() == (char *)0 ? 1 : 0); } -+EOF -+ if test "$mingw32" = "no" ; then -+ libpcap=-lpcap -+ else -+ libpcap=-lwpcap -+ fi -+ if compile_prog "" "$libpcap" ; then -+ : -+ else -+ echo -+ echo "Error: Could not find pcap" -+ echo "Make sure to have the pcap libs and headers installed." -+ echo -+ exit 1 -+ fi -+ cat > $TMPC << EOF -+#include -+int main(void) -+{ -+ char errbuf[PCAP_ERRBUF_SIZE]; -+ return (pcap_create("foo", errbuf) == (pcap_t *)0 ? 1 : 0); -+} -+EOF -+ if compile_prog "" "$libpcap" ; then -+ pcap_create="yes" -+ fi -+ cat > $TMPC << EOF -+#define PCAP_DONT_INCLUDE_PCAP_BPF_H -+#include -+#include -+int main(void) { return (BPF_MAJOR_VERSION); } -+EOF -+ if compile_prog ; then -+ bpf="yes" -+ fi -+ libs_softmmu="$libpcap $libs_softmmu" -+fi # test "$pcap" -+ - ########################################## - # check if we have open_by_handle_at - -@@ -6352,27 +6406,30 @@ if ( [ "$linux_user" = yes ] || [ "$bsd_user" = yes ] - cat > $TMPC </dev/null 2>&1; then -- error_exit \ -- "We need to link the QEMU user mode binaries at a" \ -- "specific text address. Unfortunately your linker" \ -- "doesn't support either the -Ttext-segment option or" \ -- "printing the default linker script with --verbose." \ -- "If you don't want the user mode binaries, pass the" \ -- "--disable-user option to configure." -- fi -+ textseg_ldflags="-Wl,-Ttext-segment=$textseg_addr" -+ if ! compile_prog "" "$textseg_ldflags"; then -+ # In case ld does not support -Ttext-segment, edit the default linker -+ # script via sed to set the .text start addr. This is needed on FreeBSD -+ # at least. -+ if ! $ld --verbose >/dev/null 2>&1; then -+ error_exit \ -+ "We need to link the QEMU user mode binaries at a" \ -+ "specific text address. Unfortunately your linker" \ -+ "doesn't support either the -Ttext-segment option or" \ -+ "printing the default linker script with --verbose." \ -+ "If you don't want the user mode binaries, pass the" \ -+ "--disable-user option to configure." -+ fi - -- $ld --verbose | sed \ -- -e '1,/==================================================/d' \ -- -e '/==================================================/,$d' \ -- -e "s/[.] = [0-9a-fx]* [+] SIZEOF_HEADERS/. = $textseg_addr + SIZEOF_HEADERS/" \ -- -e "s/__executable_start = [0-9a-fx]*/__executable_start = $textseg_addr/" > config-host.ld -- textseg_ldflags="-Wl,-T../config-host.ld" -+ $ld --verbose | sed \ -+ -e '1,/==================================================/d' \ -+ -e '/==================================================/,$d' \ -+ -e "s/[.] = [0-9a-fx]* [+] SIZEOF_HEADERS/. = $textseg_addr + SIZEOF_HEADERS/" \ -+ -e "s/__executable_start = [0-9a-fx]*/__executable_start = $textseg_addr/" > config-host.ld -+ textseg_ldflags="-Wl,-T../config-host.ld" -+ fi - fi - fi - fi -@@ -6497,6 +6554,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 -@@ -6739,6 +6797,15 @@ fi - if test "$want_tools" = "yes" ; then - echo "CONFIG_TOOLS=y" >> $config_host_mak - fi -+if test "$pcap" = "yes" ; then -+ echo "CONFIG_PCAP=y" >> $config_host_mak -+ if test "$pcap_create" = "yes" ; then -+ echo "CONFIG_PCAP_CREATE=y" >> $config_host_mak -+ fi -+ if test "$bpf" = "yes" ; then -+ echo "CONFIG_BPF=y" >> $config_host_mak -+ fi -+fi - if test "$slirp" != "no"; then - echo "CONFIG_SLIRP=y" >> $config_host_mak - echo "CONFIG_SMBD_COMMAND=\"$smbd\"" >> $config_host_mak -@@ -6986,6 +7053,9 @@ fi - # if this macro is set. - if test "$have_fsxattr" = "yes" ; then - echo "HAVE_FSXATTR=y" >> $config_host_mak -+fi -+if test "$have_ifaddrs_h" = "yes" ; then -+ echo "HAVE_IFADDRS_H=y" >> $config_host_mak - fi - if test "$have_copy_file_range" = "yes" ; then - echo "HAVE_COPY_FILE_RANGE=y" >> $config_host_mak diff --git a/emulators/qemu42/files/patch-disas_libvixl_vixl_a64_disasm-a64.cc b/emulators/qemu42/files/patch-disas_libvixl_vixl_a64_disasm-a64.cc deleted file mode 100644 index 546595845c62..000000000000 --- a/emulators/qemu42/files/patch-disas_libvixl_vixl_a64_disasm-a64.cc +++ /dev/null @@ -1,11 +0,0 @@ ---- disas/libvixl/vixl/a64/disasm-a64.cc.orig 2019-04-23 18:14:45 UTC -+++ disas/libvixl/vixl/a64/disasm-a64.cc -@@ -2693,7 +2693,7 @@ void Disassembler::AppendPCRelativeOffsetToOutput(cons - if (offset < 0) { - abs_offset = -abs_offset; - } -- AppendToOutput("#%c0x%" PRIx64, sign, abs_offset); -+ AppendToOutput("#%c0x%" PRIx64, sign, offset < 0 ? -offset : offset); - } - - diff --git a/emulators/qemu42/files/patch-include_net_net.h b/emulators/qemu42/files/patch-include_net_net.h deleted file mode 100644 index 0fc50e52c6ce..000000000000 --- a/emulators/qemu42/files/patch-include_net_net.h +++ /dev/null @@ -1,13 +0,0 @@ ---- include/net/net.h.orig 2020-06-25 18:12:17 UTC -+++ include/net/net.h -@@ -208,8 +208,8 @@ void qmp_netdev_add(QDict *qdict, QObject **ret, Error - int net_hub_id_for_client(NetClientState *nc, int *id); - NetClientState *net_hub_port_find(int hub_id); - --#define DEFAULT_NETWORK_SCRIPT "/etc/qemu-ifup" --#define DEFAULT_NETWORK_DOWN_SCRIPT "/etc/qemu-ifdown" -+#define DEFAULT_NETWORK_SCRIPT PREFIX "/etc/qemu-ifup" -+#define DEFAULT_NETWORK_DOWN_SCRIPT PREFIX "/etc/qemu-ifdown" - #define DEFAULT_BRIDGE_HELPER CONFIG_QEMU_HELPERDIR "/qemu-bridge-helper" - #define DEFAULT_BRIDGE_INTERFACE "br0" - diff --git a/emulators/qemu42/files/patch-include_qemu_atomic.h b/emulators/qemu42/files/patch-include_qemu_atomic.h deleted file mode 100644 index 1885cef97c57..000000000000 --- a/emulators/qemu42/files/patch-include_qemu_atomic.h +++ /dev/null @@ -1,54 +0,0 @@ ---- include/qemu/atomic.h.orig 2020-06-25 18:12:17 UTC -+++ include/qemu/atomic.h -@@ -208,10 +208,12 @@ - /* Provide shorter names for GCC atomic builtins, return old value */ - #define atomic_fetch_inc(ptr) __atomic_fetch_add(ptr, 1, __ATOMIC_SEQ_CST) - #define atomic_fetch_dec(ptr) __atomic_fetch_sub(ptr, 1, __ATOMIC_SEQ_CST) -+#ifndef __cplusplus - #define atomic_fetch_add(ptr, n) __atomic_fetch_add(ptr, n, __ATOMIC_SEQ_CST) - #define atomic_fetch_sub(ptr, n) __atomic_fetch_sub(ptr, n, __ATOMIC_SEQ_CST) - #define atomic_fetch_and(ptr, n) __atomic_fetch_and(ptr, n, __ATOMIC_SEQ_CST) - #define atomic_fetch_or(ptr, n) __atomic_fetch_or(ptr, n, __ATOMIC_SEQ_CST) -+#endif - #define atomic_fetch_xor(ptr, n) __atomic_fetch_xor(ptr, n, __ATOMIC_SEQ_CST) - - #define atomic_inc_fetch(ptr) __atomic_add_fetch(ptr, 1, __ATOMIC_SEQ_CST) -@@ -225,10 +227,12 @@ - /* And even shorter names that return void. */ - #define atomic_inc(ptr) ((void) __atomic_fetch_add(ptr, 1, __ATOMIC_SEQ_CST)) - #define atomic_dec(ptr) ((void) __atomic_fetch_sub(ptr, 1, __ATOMIC_SEQ_CST)) -+#ifndef __cplusplus - #define atomic_add(ptr, n) ((void) __atomic_fetch_add(ptr, n, __ATOMIC_SEQ_CST)) - #define atomic_sub(ptr, n) ((void) __atomic_fetch_sub(ptr, n, __ATOMIC_SEQ_CST)) - #define atomic_and(ptr, n) ((void) __atomic_fetch_and(ptr, n, __ATOMIC_SEQ_CST)) - #define atomic_or(ptr, n) ((void) __atomic_fetch_or(ptr, n, __ATOMIC_SEQ_CST)) -+#endif - #define atomic_xor(ptr, n) ((void) __atomic_fetch_xor(ptr, n, __ATOMIC_SEQ_CST)) - - #else /* __ATOMIC_RELAXED */ -@@ -400,10 +404,12 @@ - - #define atomic_inc_fetch(ptr) __sync_add_and_fetch(ptr, 1) - #define atomic_dec_fetch(ptr) __sync_add_and_fetch(ptr, -1) -+#ifndef __cplusplus - #define atomic_add_fetch(ptr, n) __sync_add_and_fetch(ptr, n) - #define atomic_sub_fetch(ptr, n) __sync_sub_and_fetch(ptr, n) - #define atomic_and_fetch(ptr, n) __sync_and_and_fetch(ptr, n) - #define atomic_or_fetch(ptr, n) __sync_or_and_fetch(ptr, n) -+#endif - #define atomic_xor_fetch(ptr, n) __sync_xor_and_fetch(ptr, n) - - #define atomic_cmpxchg(ptr, old, new) __sync_val_compare_and_swap(ptr, old, new) -@@ -412,10 +418,12 @@ - /* And even shorter names that return void. */ - #define atomic_inc(ptr) ((void) __sync_fetch_and_add(ptr, 1)) - #define atomic_dec(ptr) ((void) __sync_fetch_and_add(ptr, -1)) -+#ifndef __cplusplus - #define atomic_add(ptr, n) ((void) __sync_fetch_and_add(ptr, n)) - #define atomic_sub(ptr, n) ((void) __sync_fetch_and_sub(ptr, n)) - #define atomic_and(ptr, n) ((void) __sync_fetch_and_and(ptr, n)) - #define atomic_or(ptr, n) ((void) __sync_fetch_and_or(ptr, n)) -+#endif - #define atomic_xor(ptr, n) ((void) __sync_fetch_and_xor(ptr, n)) - - #endif /* __ATOMIC_RELAXED */ diff --git a/emulators/qemu42/files/patch-net_tap-bsd.c b/emulators/qemu42/files/patch-net_tap-bsd.c deleted file mode 100644 index 6d94c1bde1ca..000000000000 --- a/emulators/qemu42/files/patch-net_tap-bsd.c +++ /dev/null @@ -1,10 +0,0 @@ ---- net/tap-bsd.c.orig 2019-04-23 18:14:46 UTC -+++ net/tap-bsd.c -@@ -31,6 +31,7 @@ - - #if defined(__NetBSD__) || defined(__FreeBSD__) - #include -+#include - #include - #include - #endif diff --git a/emulators/qemu42/files/patch-qemu-doc.texi b/emulators/qemu42/files/patch-qemu-doc.texi deleted file mode 100644 index 6a5f1f921c5a..000000000000 --- a/emulators/qemu42/files/patch-qemu-doc.texi +++ /dev/null @@ -1,21 +0,0 @@ ---- qemu-doc.texi.orig 2020-06-25 18:12:17 UTC -+++ qemu-doc.texi -@@ -205,7 +205,7 @@ VGA BIOS. - QEMU uses YM3812 emulation by Tatsuyuki Satoh. - - QEMU uses GUS emulation (GUSEMU32 @url{http://www.deinmeister.de/gusemu/}) --by Tibor "TS" Schütz. -+by Tibor "TS" Schuetz. - - Note that, by default, GUS shares IRQ(7) with parallel ports and so - QEMU must be told to not have parallel ports to have working GUS. -@@ -573,7 +573,8 @@ Send the escape character to the frontend - - @c man begin SEEALSO - The HTML documentation of QEMU for more precise information and Linux --user mode emulator invocation. -+user mode emulator invocation, as well as the FreeBSD host notes in -+@file{pkg-message} in the relevant qemu port directory. - @c man end - - @c man begin AUTHOR diff --git a/emulators/qemu42/files/pcap-patch-net_clients.h b/emulators/qemu42/files/pcap-patch-net_clients.h deleted file mode 100644 index 5b56f1b2f49a..000000000000 --- a/emulators/qemu42/files/pcap-patch-net_clients.h +++ /dev/null @@ -1,13 +0,0 @@ ---- 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 */ diff --git a/emulators/qemu42/files/pcap-patch-net_net.c b/emulators/qemu42/files/pcap-patch-net_net.c deleted file mode 100644 index 36a21bc0effe..000000000000 --- a/emulators/qemu42/files/pcap-patch-net_net.c +++ /dev/null @@ -1,251 +0,0 @@ ---- net/net.c.orig 2020-06-25 18:12:17 UTC -+++ net/net.c -@@ -55,6 +55,11 @@ - #include "net/filter.h" - #include "qapi/string-output-visitor.h" - -+#include -+#ifdef __FreeBSD__ -+#include -+#endif -+ - /* Net bridge is currently not supported for W32. */ - #if !defined(_WIN32) - # define CONFIG_NET_BRIDGE -@@ -935,7 +940,226 @@ static int net_init_nic(const Netdev *netdev, const ch - return idx; - } - -+#if defined(CONFIG_PCAP) -+#if defined(CONFIG_BPF) -+#define PCAP_DONT_INCLUDE_PCAP_BPF_H -+#include -+#endif -+#include - -+struct PCAPState { -+ NetClientState nc; -+ pcap_t *handle; -+ int max_eth_frame_size; -+}; -+ -+static ssize_t pcap_receive(NetClientState *nc, const uint8_t *buf, size_t size) -+{ -+ struct PCAPState *s = DO_UPCAST(struct PCAPState, nc, nc); -+ -+ return pcap_inject(s->handle, (u_char*)buf, size); -+} -+ -+static void pcap_callback(u_char *user, struct pcap_pkthdr *phdr, u_char *pdata -+ ) -+{ -+ NetClientState *nc = (NetClientState *)user; -+ -+ int len = phdr->len; -+#ifdef __FreeBSD__ -+ struct PCAPState *s = DO_UPCAST(struct PCAPState, nc, nc); -+ int max_eth_frame_size = s->max_eth_frame_size; -+ -+ if (len > max_eth_frame_size) { -+ fprintf(stderr, -+ "pcap_send: packet size > %d (%d), truncating\n", -+ max_eth_frame_size, len); -+ len = max_eth_frame_size; -+ } -+#endif -+ qemu_send_packet(nc, pdata, len); -+} -+ -+static void pcap_send(void *opaque) -+{ -+ struct PCAPState *s = (struct PCAPState *)opaque; -+ -+ for (;;) { -+ if (pcap_dispatch(s->handle, 0, (pcap_handler)&pcap_callback, (u_char *)&s->nc) >= 0) -+ break; -+ } -+} -+ -+static void pcap_cleanup(NetClientState *nc) -+{ -+ struct PCAPState *s = DO_UPCAST(struct PCAPState, nc, nc); -+ -+ qemu_purge_queued_packets(nc); -+ pcap_close(s->handle); -+} -+ -+static NetClientInfo net_pcap_info = { -+ .type = NET_CLIENT_DRIVER_PCAP, -+ .size = sizeof(struct PCAPState), -+ .receive = pcap_receive, -+// .receive_raw = pcap_receive_raw, -+// .receive_iov = pcap_receive_iov, -+// .poll = pcap_poll, -+ .cleanup = pcap_cleanup, -+}; -+/* -+ * ... -net pcap,ifname="..." -+ */ -+ -+int net_init_pcap(const Netdev *netdev, -+ const char *name, NetClientState *peer, Error **errp) -+{ -+ const NetdevPcapOptions *pcap_opts; -+ NetClientState *nc; *** 634 LINES SKIPPED ***