diff --git a/emulators/qemu-devel/Makefile b/emulators/qemu-devel/Makefile index cb2f82b278e5..591ee7a43382 100644 --- a/emulators/qemu-devel/Makefile +++ b/emulators/qemu-devel/Makefile @@ -1,175 +1,175 @@ PORTNAME= qemu -DISTVERSION= 10.1.20251231 +DISTVERSION= 10.1.20260130 CATEGORIES= emulators PKGNAMESUFFIX= -devel DIST_SUBDIR= qemu/${PORTVERSION} MAINTAINER= bofh@FreeBSD.org COMMENT= QEMU CPU Emulator - development version WWW= https://www.qemu.org/ LICENSE= GPLv2 ONLY_FOR_ARCHS= amd64 powerpc powerpc64 powerpc64 powerpc64le BUILD_DEPENDS= sphinx-build:textproc/py-sphinx \ ${PYTHON_PKGNAMEPREFIX}sphinx_rtd_theme>0:textproc/py-sphinx_rtd_theme@${PY_FLAVOR} \ bash:shells/bash LIB_DEPENDS= libepoxy.so:graphics/libepoxy \ libinotify.so:devel/libinotify \ liblzo2.so:archivers/lzo2 \ libzstd.so:archivers/zstd \ libslirp.so:net/libslirp USES= bison compiler:c11 cpe gmake gnome iconv:wchar_t localbase:ldflags \ ninja:build perl5 pkgconfig python:build shebangfix tar:xz xorg USE_GITLAB= yes GL_ACCOUNT= qemu-project -GL_TAGNAME= 667e1fff878326c35c7f5146072e60a63a9a41c8 +GL_TAGNAME= d9ca273f8f31acb22d3f5aca5f063b94fb962e19 GL_TUPLE= qemu-project:keycodemapdb:f5772a62ec52591ff6870b7e8ef32482371f22c6:keycodemapdb/subprojects/keycodemapdb \ qemu-project:dtc:b6910bec11614980a21e46fbccc35934b671bd81:dtc/subprojects/dtc \ qemu-project:libvfio-user:0b28d205572c80b568a1003db2c8f37ca333e4d7:libvfio/subprojects/libvfio-user \ - qemu-project:meson:4a9075b863c7a5002e51a129a4efa7281aafa0b2:meson/meson \ + qemu-project:meson:152bd992e52b45ccee53046d8a83d9482aca3e48:meson/meson \ qemu-project:berkeley-softfloat-3:b64af41c3276f97f0e181920400ee056b9c88037:berkeleysoftfloat3/subprojects/berkeley-softfloat-3 \ qemu-project:berkeley-testfloat-3:e7af9751d9f9fd3b47911f51a5cfd08af256a9ab:berkeleytestfloat3/subprojects/berkeley-testfloat-3 USE_GNOME= cairo glib20 USE_PERL5= build USE_XORG= pixman SHEBANG_FILES= scripts/xml-preprocess.py HAS_CONFIGURE= yes CONFIGURE_ARGS= --localstatedir=/var --mandir=share/man --extra-ldflags=-L\"/usr/lib\" \ --extra-ldflags=-L\"${LOCALBASE}/lib\" --enable-debug \ --prefix=${PREFIX} --cc=${CC} --enable-netmap --disable-kvm \ --disable-linux-user --disable-linux-aio --disable-xen \ --enable-debug-info --python=${PYTHON_CMD} --disable-guest-agent \ --extra-cflags=-I${WRKSRC}\ -I${LOCALBASE}/include\ -DPREFIX=\\\"\"${PREFIX}\\\"\" CFLAGS:= ${CFLAGS:C/-fno-tree-vrp//} WITHOUT_CPU_CFLAGS=yes #to avoid problems with register allocation BINARY_ALIAS= python3=${PYTHON_VERSION} PORTDOCS= .buildinfo _static/* about/* dbus-dbusindex.html devel/* \ docs genindex.html glossary.html index.html interop/* \ objects.inv qapi-qga-index.html qapi-qmp-index.html \ qapi-qsd-index.html search.html searchindex.js specs/* system/* \ tools/* user/* OPTIONS_DEFINE= SAMBA X11 GTK3 OPENGL GNUTLS SASL JPEG PNG CURL VDE \ CDROM_DMA USBREDIR X86_TARGETS STATIC_LINK DOCS CAPSTONE OPTIONS_DEFAULT=X11 GTK3 OPENGL GNUTLS SASL JPEG PNG CDROM_DMA CURL NCURSES_DEFAULT VDE \ CAPSTONE OPTIONS_SINGLE= NCURSES OPTIONS_SINGLE_NCURSES= NCURSES_DEFAULT NCURSES_BASE NCURSES_PORT OPTIONS_SUB= yes CAPSTONE_DESC= Disassembly framework support CDROM_DMA_DESC= IDE CDROM DMA GNUTLS_DESC= gnutls dependency (vnc encryption) JPEG_DESC= jpeg dependency (vnc lossy compression) NCURSES_BASE_DESC= Depend on ncurses in base NCURSES_DEFAULT_DESC= Depend on ncurses (ports if installed, otherwise base) NCURSES_PORT_DESC= Depend on devel/ncurses in ports 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 CAPSTONE_LIB_DEPENDS= libcapstone.so:devel/capstone CAPSTONE_CONFIGURE_ON= --enable-capstone --extra-cflags=-I${LOCALBASE}/include/capstone CAPSTONE_CONFIGURE_OFF= --disable-capstone CURL_LIB_DEPENDS= libcurl.so:ftp/curl CURL_CONFIGURE_OFF= --disable-curl DOCS_USES= makeinfo DOCS_CONFIGURE_ENABLE= docs GNUTLS_LIB_DEPENDS= libgnutls.so:security/gnutls GNUTLS_CONFIGURE_OFF= --disable-gnutls GTK3_LIB_DEPENDS= libxkbcommon.so:x11/libxkbcommon GTK3_USES= gettext gl GTK3_USE= GNOME=gdkpixbuf,vte3 XORG=x11,xext GTK3_CONFIGURE_OFF= --disable-gtk --disable-vte JPEG_USES= jpeg JPEG_CONFIGURE_OFF= --disable-vnc-jpeg NCURSES_BASE_USES= ncurses:base NCURSES_DEFAULT_USES= ncurses NCURSES_PORT_USES= ncurses:port OPENGL_USES= gl OPENGL_USE= GL=gbm OPENGL_CONFIGURE_OFF= --disable-opengl PNG_LIB_DEPENDS= libpng16.so:graphics/png PNG_CONFIGURE_OFF= --disable-vnc-png SAMBA_USES= samba:run # smbd SAMBA_CONFIGURE_ON= --smbd=${LOCALBASE}/sbin/smbd SASL_CONFIGURE_OFF= --disable-vnc-sasl STATIC_LINK_PREVENTS= GTK3 X11 STATIC_LINK_PREVENTS_MSG= X11 ui cannot be built static STATIC_LINK_CONFIGURE_ON= --static USBREDIR_BUILD_DEPENDS= usbredir>=0.6:net/usbredir USBREDIR_RUN_DEPENDS= usbredir>=0.6:net/usbredir USBREDIR_CONFIGURE_OFF= --disable-usb-redir VDE_CONFIGURE_OFF= --disable-vde X11_USES= sdl X11_USE= SDL=sdl2 XORG=x11,xext GNOME=gdkpixbuf X11_CONFIGURE_ENABLE= sdl .include .if !defined(STRIP) || ${STRIP} == "" CONFIGURE_ARGS+=--disable-strip .endif .if ${ARCH} == "amd64" MAKE_ARGS+= ARCH=x86_64 .endif .if ${ARCH} == "powerpc" CFLAGS+= -D_CALL_SYSV MAKE_ARGS+= ARCH=ppc USE_GCC= yes .endif .if ${ARCH:Mpowerpc64*} CONFIGURE_ARGS+= --disable-bsd-user MAKE_ARGS+= ARCH=ppc64 PLIST_SUB+= BSDUSER="@comment " .else PLIST_SUB+= BSDUSER="" .endif PLIST_SUB+= LINUXBOOT_DMA="" post-extract: ${CP} ${WRKSRC}/subprojects/packagefiles/berkeley-softfloat-3/* \ ${WRKSRC}/subprojects/berkeley-softfloat-3/ ${CP} ${WRKSRC}/subprojects/packagefiles/berkeley-testfloat-3/* \ ${WRKSRC}/subprojects/berkeley-testfloat-3/ post-patch-CDROM_DMA-off: @${REINPLACE_CMD} -e '/USE_DMA_CDROM/d' ${WRKSRC}/include/hw/ide/internal.h do-build: # Don't build with -j, because the development branch of QEMU regresses from time to time cd ${WRKSRC} && ${SETENVI} ${WRK_ENV} ${GMAKE} do-install: cd ${WRKSRC} && ${SETENVI} ${WRK_ENV} DESTDIR=${STAGEDIR} ${GMAKE} install .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 do-test: cd ${WRKSRC} && ${SETENVI} ${WRK_ENV} ${GMAKE} test .include diff --git a/emulators/qemu-devel/distinfo b/emulators/qemu-devel/distinfo index fead2291eb7e..cb586efd999c 100644 --- a/emulators/qemu-devel/distinfo +++ b/emulators/qemu-devel/distinfo @@ -1,15 +1,15 @@ -TIMESTAMP = 1775905237 -SHA256 (qemu/10.1.20251231/qemu-project-qemu-667e1fff878326c35c7f5146072e60a63a9a41c8_GL0.tar.gz) = 7f55dc31dbccf12bddc5e18c8b06bab4cd877c54621c933eb514fe699b122143 -SIZE (qemu/10.1.20251231/qemu-project-qemu-667e1fff878326c35c7f5146072e60a63a9a41c8_GL0.tar.gz) = 42004392 -SHA256 (qemu/10.1.20251231/qemu-project-keycodemapdb-f5772a62ec52591ff6870b7e8ef32482371f22c6_GL0.tar.gz) = d014b53382dbb17b8196ad12f50de7f20d0ef1b9f7d54b0be51a6cbb14209195 -SIZE (qemu/10.1.20251231/qemu-project-keycodemapdb-f5772a62ec52591ff6870b7e8ef32482371f22c6_GL0.tar.gz) = 29580 -SHA256 (qemu/10.1.20251231/qemu-project-dtc-b6910bec11614980a21e46fbccc35934b671bd81_GL0.tar.gz) = e115f987eec23a1ba25150a46ced1675de3716072d3b4905afb3a9cda0f007c7 -SIZE (qemu/10.1.20251231/qemu-project-dtc-b6910bec11614980a21e46fbccc35934b671bd81_GL0.tar.gz) = 205556 -SHA256 (qemu/10.1.20251231/qemu-project-libvfio-user-0b28d205572c80b568a1003db2c8f37ca333e4d7_GL0.tar.gz) = d2f60cd4f86f345aab1332953eb736cce3518159e6e99bcc2d10467c06f717fe -SIZE (qemu/10.1.20251231/qemu-project-libvfio-user-0b28d205572c80b568a1003db2c8f37ca333e4d7_GL0.tar.gz) = 189943 -SHA256 (qemu/10.1.20251231/qemu-project-meson-4a9075b863c7a5002e51a129a4efa7281aafa0b2_GL0.tar.gz) = 3e17684ded5a3432752944d165c496c23599d5f08363e041b69e41e23039fb62 -SIZE (qemu/10.1.20251231/qemu-project-meson-4a9075b863c7a5002e51a129a4efa7281aafa0b2_GL0.tar.gz) = 4979003 -SHA256 (qemu/10.1.20251231/qemu-project-berkeley-softfloat-3-b64af41c3276f97f0e181920400ee056b9c88037_GL0.tar.gz) = faae889814ea6a292f7ca03d9b36e6c7e95bab2a64777804883cc822b8d48757 -SIZE (qemu/10.1.20251231/qemu-project-berkeley-softfloat-3-b64af41c3276f97f0e181920400ee056b9c88037_GL0.tar.gz) = 148741 -SHA256 (qemu/10.1.20251231/qemu-project-berkeley-testfloat-3-e7af9751d9f9fd3b47911f51a5cfd08af256a9ab_GL0.tar.gz) = e7a09d51dc7e96cb8422c919c85fc3833d4f788567638c9162ef5cd7db59b1df -SIZE (qemu/10.1.20251231/qemu-project-berkeley-testfloat-3-e7af9751d9f9fd3b47911f51a5cfd08af256a9ab_GL0.tar.gz) = 139308 +TIMESTAMP = 1775938133 +SHA256 (qemu/10.1.20260130/qemu-project-qemu-d9ca273f8f31acb22d3f5aca5f063b94fb962e19_GL0.tar.gz) = 366b949ca020055f56234e267807315054d0db541837a2c4d1353313f078f90c +SIZE (qemu/10.1.20260130/qemu-project-qemu-d9ca273f8f31acb22d3f5aca5f063b94fb962e19_GL0.tar.gz) = 42025758 +SHA256 (qemu/10.1.20260130/qemu-project-keycodemapdb-f5772a62ec52591ff6870b7e8ef32482371f22c6_GL0.tar.gz) = d014b53382dbb17b8196ad12f50de7f20d0ef1b9f7d54b0be51a6cbb14209195 +SIZE (qemu/10.1.20260130/qemu-project-keycodemapdb-f5772a62ec52591ff6870b7e8ef32482371f22c6_GL0.tar.gz) = 29580 +SHA256 (qemu/10.1.20260130/qemu-project-dtc-b6910bec11614980a21e46fbccc35934b671bd81_GL0.tar.gz) = e115f987eec23a1ba25150a46ced1675de3716072d3b4905afb3a9cda0f007c7 +SIZE (qemu/10.1.20260130/qemu-project-dtc-b6910bec11614980a21e46fbccc35934b671bd81_GL0.tar.gz) = 205556 +SHA256 (qemu/10.1.20260130/qemu-project-libvfio-user-0b28d205572c80b568a1003db2c8f37ca333e4d7_GL0.tar.gz) = d2f60cd4f86f345aab1332953eb736cce3518159e6e99bcc2d10467c06f717fe +SIZE (qemu/10.1.20260130/qemu-project-libvfio-user-0b28d205572c80b568a1003db2c8f37ca333e4d7_GL0.tar.gz) = 189943 +SHA256 (qemu/10.1.20260130/qemu-project-meson-152bd992e52b45ccee53046d8a83d9482aca3e48_GL0.tar.gz) = f36fa3e6f5ab5a02aa3681e0febe408ada3b73d097ca807a03af133b31f45cfc +SIZE (qemu/10.1.20260130/qemu-project-meson-152bd992e52b45ccee53046d8a83d9482aca3e48_GL0.tar.gz) = 4989035 +SHA256 (qemu/10.1.20260130/qemu-project-berkeley-softfloat-3-b64af41c3276f97f0e181920400ee056b9c88037_GL0.tar.gz) = faae889814ea6a292f7ca03d9b36e6c7e95bab2a64777804883cc822b8d48757 +SIZE (qemu/10.1.20260130/qemu-project-berkeley-softfloat-3-b64af41c3276f97f0e181920400ee056b9c88037_GL0.tar.gz) = 148741 +SHA256 (qemu/10.1.20260130/qemu-project-berkeley-testfloat-3-e7af9751d9f9fd3b47911f51a5cfd08af256a9ab_GL0.tar.gz) = e7a09d51dc7e96cb8422c919c85fc3833d4f788567638c9162ef5cd7db59b1df +SIZE (qemu/10.1.20260130/qemu-project-berkeley-testfloat-3-e7af9751d9f9fd3b47911f51a5cfd08af256a9ab_GL0.tar.gz) = 139308 diff --git a/emulators/qemu-devel/files/patch-tests_functional_qemu__test_____init____.py b/emulators/qemu-devel/files/patch-tests_functional_qemu__test_____init____.py index ece7c08f4235..b0ae7f818267 100644 --- a/emulators/qemu-devel/files/patch-tests_functional_qemu__test_____init____.py +++ b/emulators/qemu-devel/files/patch-tests_functional_qemu__test_____init____.py @@ -1,11 +1,11 @@ ---- tests/functional/qemu_test/__init__.py.orig 2025-11-25 22:22:39 UTC +--- tests/functional/qemu_test/__init__.py.orig 2026-01-30 13:52:59 UTC +++ tests/functional/qemu_test/__init__.py @@ -16,7 +16,7 @@ from .decorators import skipIfMissingCommands, skipIfN from .decorators import skipIfMissingCommands, skipIfNotMachine, \ skipFlakyTest, skipUntrustedTest, skipBigDataTest, skipSlowTest, \ - skipIfMissingImports, skipIfOperatingSystem, skipLockedMemoryTest, \ -- skipIfMissingEnv -+ skipIfMissingEnv, skipIfInsideFreeBSDJail + skipIfMissingImports, skipIfOperatingSystem, skipUnlessOperatingSystem, \ +- skipLockedMemoryTest, skipIfMissingEnv ++ skipLockedMemoryTest, skipIfMissingEnv, skipIfInsideFreeBSDJail from .archive import archive_extract from .uncompress import uncompress from .gdb import GDB diff --git a/emulators/qemu-devel/files/patch-tests_functional_qemu__test_decorators.py b/emulators/qemu-devel/files/patch-tests_functional_qemu__test_decorators.py index d5901a0da1a2..1b84801ea2ca 100644 --- a/emulators/qemu-devel/files/patch-tests_functional_qemu__test_decorators.py +++ b/emulators/qemu-devel/files/patch-tests_functional_qemu__test_decorators.py @@ -1,35 +1,35 @@ ---- tests/functional/qemu_test/decorators.py.orig 2025-11-25 22:22:39 UTC +--- tests/functional/qemu_test/decorators.py.orig 2026-01-30 13:52:59 UTC +++ tests/functional/qemu_test/decorators.py @@ -6,6 +6,7 @@ import resource import os import platform import resource +import subprocess from unittest import skipIf, skipUnless from .cmd import which -@@ -165,3 +166,24 @@ def skipLockedMemoryTest(locked_memory): +@@ -177,3 +178,24 @@ def skipLockedMemoryTest(locked_memory): ulimit_memory == resource.RLIM_INFINITY or ulimit_memory >= locked_memory * 1024, f'Test required {locked_memory} kB of available locked memory', ) + +def skipIfInsideFreeBSDJail(): + ''' + Decorator to skip execution in a FreeBSD jail + + @skipIfInsideFreeBSDJail() + ''' + jailed = False + try: + result = subprocess.run( + ['sysctl', '-n', 'security.jail.jailed'], + capture_output=True, + text=True, + check=True + ) + jailed = result.stdout.strip() == '1' + except Exception: + pass + + return skipIf(platform.system() == 'FreeBSD' and jailed, + 'running inside the FreeBSD jail') diff --git a/emulators/qemu-devel/files/patch-tests_functional_x86__64_test__memlock.py b/emulators/qemu-devel/files/patch-tests_functional_x86__64_test__memlock.py index 135f238fa18c..13640cc7cd3f 100644 --- a/emulators/qemu-devel/files/patch-tests_functional_x86__64_test__memlock.py +++ b/emulators/qemu-devel/files/patch-tests_functional_x86__64_test__memlock.py @@ -1,18 +1,19 @@ ---- tests/functional/x86_64/test_memlock.py.orig 2025-11-25 22:22:39 UTC +--- tests/functional/x86_64/test_memlock.py.orig 2026-01-30 13:52:59 UTC +++ tests/functional/x86_64/test_memlock.py -@@ -14,13 +14,14 @@ from qemu_test import QemuSystemTest +@@ -14,7 +14,7 @@ from qemu_test import QemuSystemTest from typing import Dict from qemu_test import QemuSystemTest --from qemu_test import skipLockedMemoryTest -+from qemu_test import skipLockedMemoryTest, skipIfInsideFreeBSDJail +-from qemu_test import skipLockedMemoryTest, skipUnlessOperatingSystem ++from qemu_test import skipLockedMemoryTest, skipUnlessOperatingSystem, skipIfInsideFreeBSDJail STATUS_VALUE_PATTERN = re.compile(r'^(\w+):\s+(\d+) kB', re.MULTILINE) +@@ -22,6 +22,7 @@ STATUS_VALUE_PATTERN = re.compile(r'^(\w+):\s+(\d+) kB - + @skipUnlessOperatingSystem('Linux') @skipLockedMemoryTest(2_097_152) # 2GB +@skipIfInsideFreeBSDJail() class MemlockTest(QemuSystemTest): """ Runs a guest with memlock options.