pkgsrc-Changes archive

[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index][Old Index]

CVS commit: pkgsrc/sysutils/xentools418



Module Name:    pkgsrc
Committed By:   bouyer
Date:           Tue Nov 21 11:37:03 UTC 2023

Added Files:
        pkgsrc/sysutils/xentools418: DESCR MESSAGE MESSAGE.NetBSD Makefile
            PLIST buildlink3.mk distinfo version.mk
        pkgsrc/sysutils/xentools418/files: xen-watchdog.sh xencommons.sh
            xendomains.sh
        pkgsrc/sysutils/xentools418/patches:
            patch-.._seabios-rel-1.16.2_src_string.c patch-Config.mk
            patch-configure patch-docs_man_xl.1.pod.in
            patch-docs_man_xl.cfg.5.pod.in patch-docs_man_xlcpupool.cfg.5.pod
            patch-docs_misc_block-scripts.txt patch-docs_misc_vtd.txt
            patch-tools_Makefile patch-tools_Rules.mk patch-tools_configure
            patch-tools_console_daemon_utils.c patch-tools_examples_Makefile
            patch-tools_firmware_Makefile
            patch-tools_firmware_etherboot_Makefile
            patch-tools_hotplug_NetBSD_Makefile
            patch-tools_hotplug_NetBSD_block
            patch-tools_hotplug_common_Makefile
            patch-tools_include_xen-sys_NetBSD_evtchn.h
            patch-tools_include_xen-sys_NetBSD_privcmd.h
            patch-tools_libxl_libxl_dom.c patch-tools_libxl_libxl_event.c
            patch-tools_libxl_libxl_internal.h patch-tools_ocaml_common.make
            patch-tools_ocaml_xenstored_Makefile
            patch-tools_ocaml_xenstored_utils.ml patch-tools_pygrub_Makefile
            patch-tools_python_Makefile
            patch-tools_qemu-xen-traditional_Makefile
            patch-tools_qemu-xen-traditional_block-raw-posix.c
            patch-tools_qemu-xen-traditional_configure
            patch-tools_qemu-xen-traditional_hw_e1000.c
            patch-tools_qemu-xen-traditional_hw_ide.c
            patch-tools_qemu-xen-traditional_hw_pass-through.c
            patch-tools_qemu-xen-traditional_hw_pt-graphics.c
            patch-tools_qemu-xen-traditional_hw_pt-msi.c
            patch-tools_qemu-xen-traditional_hw_pt-msi.h
            patch-tools_qemu-xen-traditional_i386-dm_hookstarget.mak
            patch-tools_qemu-xen-traditional_net.c
            patch-tools_qemu-xen-traditional_xen-hooks.mak
            patch-tools_qemu-xen_audio_audio.c
            patch-tools_qemu-xen_bios_optionrom_Makefile
            patch-tools_qemu-xen_net_tap-bsd.c patch-tools_qemu-xen_net_tap.c
            patch-tools_xenpaging_xenpaging.c patch-tools_xl_Makefile
            patch-xen_Makefile patch-xen_include_Makefile

Log Message:
Add xentools418 version 20231116
Unlike previous Xen packages, the xentools418 and xenkernel418 will point
to a specific commit of the stable branch (instead of release tags),
the package version being the date of the commit. Hopefully this will make
tracking security fixes easier.

>From DESCR:
The Xen virtual machine monitor allows running several virtual machines
on a single physical machine.  The xentools418 package contains the
tools to create, destroy and control the virtual machines.

This package contains the tools for Xen 4.18.x


To generate a diff of this commit:
cvs rdiff -u -r0 -r1.1 pkgsrc/sysutils/xentools418/DESCR \
    pkgsrc/sysutils/xentools418/MESSAGE \
    pkgsrc/sysutils/xentools418/MESSAGE.NetBSD \
    pkgsrc/sysutils/xentools418/Makefile pkgsrc/sysutils/xentools418/PLIST \
    pkgsrc/sysutils/xentools418/buildlink3.mk \
    pkgsrc/sysutils/xentools418/distinfo \
    pkgsrc/sysutils/xentools418/version.mk
cvs rdiff -u -r0 -r1.1 pkgsrc/sysutils/xentools418/files/xen-watchdog.sh \
    pkgsrc/sysutils/xentools418/files/xencommons.sh \
    pkgsrc/sysutils/xentools418/files/xendomains.sh
cvs rdiff -u -r0 -r1.1 \
    pkgsrc/sysutils/xentools418/patches/patch-.._seabios-rel-1.16.2_src_string.c \
    pkgsrc/sysutils/xentools418/patches/patch-Config.mk \
    pkgsrc/sysutils/xentools418/patches/patch-configure \
    pkgsrc/sysutils/xentools418/patches/patch-docs_man_xl.1.pod.in \
    pkgsrc/sysutils/xentools418/patches/patch-docs_man_xl.cfg.5.pod.in \
    pkgsrc/sysutils/xentools418/patches/patch-docs_man_xlcpupool.cfg.5.pod \
    pkgsrc/sysutils/xentools418/patches/patch-docs_misc_block-scripts.txt \
    pkgsrc/sysutils/xentools418/patches/patch-docs_misc_vtd.txt \
    pkgsrc/sysutils/xentools418/patches/patch-tools_Makefile \
    pkgsrc/sysutils/xentools418/patches/patch-tools_Rules.mk \
    pkgsrc/sysutils/xentools418/patches/patch-tools_configure \
    pkgsrc/sysutils/xentools418/patches/patch-tools_console_daemon_utils.c \
    pkgsrc/sysutils/xentools418/patches/patch-tools_examples_Makefile \
    pkgsrc/sysutils/xentools418/patches/patch-tools_firmware_Makefile \
    pkgsrc/sysutils/xentools418/patches/patch-tools_firmware_etherboot_Makefile \
    pkgsrc/sysutils/xentools418/patches/patch-tools_hotplug_NetBSD_Makefile \
    pkgsrc/sysutils/xentools418/patches/patch-tools_hotplug_NetBSD_block \
    pkgsrc/sysutils/xentools418/patches/patch-tools_hotplug_common_Makefile \
    pkgsrc/sysutils/xentools418/patches/patch-tools_include_xen-sys_NetBSD_evtchn.h \
    pkgsrc/sysutils/xentools418/patches/patch-tools_include_xen-sys_NetBSD_privcmd.h \
    pkgsrc/sysutils/xentools418/patches/patch-tools_libxl_libxl_dom.c \
    pkgsrc/sysutils/xentools418/patches/patch-tools_libxl_libxl_event.c \
    pkgsrc/sysutils/xentools418/patches/patch-tools_libxl_libxl_internal.h \
    pkgsrc/sysutils/xentools418/patches/patch-tools_ocaml_common.make \
    pkgsrc/sysutils/xentools418/patches/patch-tools_ocaml_xenstored_Makefile \
    pkgsrc/sysutils/xentools418/patches/patch-tools_ocaml_xenstored_utils.ml \
    pkgsrc/sysutils/xentools418/patches/patch-tools_pygrub_Makefile \
    pkgsrc/sysutils/xentools418/patches/patch-tools_python_Makefile \
    pkgsrc/sysutils/xentools418/patches/patch-tools_qemu-xen-traditional_Makefile \
    pkgsrc/sysutils/xentools418/patches/patch-tools_qemu-xen-traditional_block-raw-posix.c \
    pkgsrc/sysutils/xentools418/patches/patch-tools_qemu-xen-traditional_configure \
    pkgsrc/sysutils/xentools418/patches/patch-tools_qemu-xen-traditional_hw_e1000.c \
    pkgsrc/sysutils/xentools418/patches/patch-tools_qemu-xen-traditional_hw_ide.c \
    pkgsrc/sysutils/xentools418/patches/patch-tools_qemu-xen-traditional_hw_pass-through.c \
    pkgsrc/sysutils/xentools418/patches/patch-tools_qemu-xen-traditional_hw_pt-graphics.c \
    pkgsrc/sysutils/xentools418/patches/patch-tools_qemu-xen-traditional_hw_pt-msi.c \
    pkgsrc/sysutils/xentools418/patches/patch-tools_qemu-xen-traditional_hw_pt-msi.h \
    pkgsrc/sysutils/xentools418/patches/patch-tools_qemu-xen-traditional_i386-dm_hookstarget.mak \
    pkgsrc/sysutils/xentools418/patches/patch-tools_qemu-xen-traditional_net.c \
    pkgsrc/sysutils/xentools418/patches/patch-tools_qemu-xen-traditional_xen-hooks.mak \
    pkgsrc/sysutils/xentools418/patches/patch-tools_qemu-xen_audio_audio.c \
    pkgsrc/sysutils/xentools418/patches/patch-tools_qemu-xen_bios_optionrom_Makefile \
    pkgsrc/sysutils/xentools418/patches/patch-tools_qemu-xen_net_tap-bsd.c \
    pkgsrc/sysutils/xentools418/patches/patch-tools_qemu-xen_net_tap.c \
    pkgsrc/sysutils/xentools418/patches/patch-tools_xenpaging_xenpaging.c \
    pkgsrc/sysutils/xentools418/patches/patch-tools_xl_Makefile \
    pkgsrc/sysutils/xentools418/patches/patch-xen_Makefile \
    pkgsrc/sysutils/xentools418/patches/patch-xen_include_Makefile

Please note that diffs are not public domain; they are subject to the
copyright notices on the relevant files.

Added files:

Index: pkgsrc/sysutils/xentools418/DESCR
diff -u /dev/null pkgsrc/sysutils/xentools418/DESCR:1.1
--- /dev/null   Tue Nov 21 11:37:03 2023
+++ pkgsrc/sysutils/xentools418/DESCR   Tue Nov 21 11:37:03 2023
@@ -0,0 +1,5 @@
+The Xen virtual machine monitor allows running several virtual machines
+on a single physical machine.  The xentools418 package contains the
+tools to create, destroy and control the virtual machines.
+
+This package contains the tools for Xen 4.18.x
Index: pkgsrc/sysutils/xentools418/MESSAGE
diff -u /dev/null pkgsrc/sysutils/xentools418/MESSAGE:1.1
--- /dev/null   Tue Nov 21 11:37:03 2023
+++ pkgsrc/sysutils/xentools418/MESSAGE Tue Nov 21 11:37:03 2023
@@ -0,0 +1,12 @@
+===========================================================================
+$NetBSD: MESSAGE,v 1.1 2023/11/21 11:37:03 bouyer Exp $
+
+Note that the rc.d scripts have been updated in this version.
+If you don't use PKG_RCD_SCRIPTS=YES then it is very important for
+you to copy the new rc.d scripts to /etc/rc.d.
+
+To create HVM guest with UEFI firmware, install sysutils/ovmf and set
+bios='ovmf'
+in your domU config
+
+===========================================================================
Index: pkgsrc/sysutils/xentools418/MESSAGE.NetBSD
diff -u /dev/null pkgsrc/sysutils/xentools418/MESSAGE.NetBSD:1.1
--- /dev/null   Tue Nov 21 11:37:03 2023
+++ pkgsrc/sysutils/xentools418/MESSAGE.NetBSD  Tue Nov 21 11:37:03 2023
@@ -0,0 +1,17 @@
+===========================================================================
+$NetBSD: MESSAGE.NetBSD,v 1.1 2023/11/21 11:37:03 bouyer Exp $
+
+Please ensure that the Xen-specific devices needed by xend(8) exist:
+
+       cd /dev && sh MAKEDEV xen
+
+There are example configuration files for setting up a guest domain in:
+
+       ${EGDIR}/
+
+Please also refer to the the "NetBSD/xen How-To" for more information on
+creating a Xen setup:
+
+       http://www.NetBSD.org/ports/xen/howto.html
+
+===========================================================================
Index: pkgsrc/sysutils/xentools418/Makefile
diff -u /dev/null pkgsrc/sysutils/xentools418/Makefile:1.1
--- /dev/null   Tue Nov 21 11:37:03 2023
+++ pkgsrc/sysutils/xentools418/Makefile        Tue Nov 21 11:37:03 2023
@@ -0,0 +1,257 @@
+# $NetBSD: Makefile,v 1.1 2023/11/21 11:37:03 bouyer Exp $
+#
+# VERSION is set in version.mk as it is shared with other packages
+#PKGREVISION=        1
+.include        "version.mk"
+PKGNAME=               xentools418-${VERSION:S/-//g}
+
+CATEGORIES=            sysutils
+
+MAINTAINER=            bouyer%NetBSD.org@localhost
+HOMEPAGE=              https://xenproject.org/
+COMMENT=               Userland Tools for Xen 4.18.x
+LICENSE=               gnu-gpl-v2
+
+# XXX add version check: Xen requires dev86 >= 0.16.14
+TOOL_DEPENDS+= dev86-[0-9]*:../../devel/dev86 # needed to build firmware
+.if !exists(/usr/bin/iasl)
+TOOL_DEPENDS+= acpica-utils-[0-9]*:../../sysutils/acpica-utils
+.endif
+
+TOOL_DEPENDS+=  ninja-build-[0-9]*:../../devel/ninja-build
+TOOL_DEPENDS+=  ${PYPKGPREFIX}-setuptools-[0-9]*:../../devel/py-setuptools
+PYTHON_VERSIONS_INCOMPATIBLE=  27
+
+PKG_SYSCONFSUBDIR=     xen
+
+ONLY_FOR_PLATFORM+=    NetBSD-1[0-9]*-x86_64
+ONLY_FOR_PLATFORM+=    NetBSD-9.99.*-x86_64
+ONLY_FOR_PLATFORM+=    NetBSD-9.[1-9]-x86_64
+ONLY_FOR_PLATFORM+=    NetBSD-9.[1-9]_*-x86_64
+ONLY_FOR_PLATFORM+=    NetBSD-9.0_STABLE-x86_64
+
+SSP_SUPPORTED=         no
+MKPIE_SUPPORTED=       no
+
+CONFLICTS+=            libxen-[0-9]*
+CONFLICTS+=            xenstoretools-[0-9]*
+
+CHECK_PORTABILITY_SKIP=        tools/examples/* \
+                       tools/qemu-xen/scripts/qemu-binfmt-conf.sh
+CHECK_RELRO_SKIP=      libexec/xen/boot/hvmloader
+CHECK_RELRO_SKIP+=     libexec/xen/boot/xen-shim
+CHECK_RELRO_SKIP+=     lib/debug/usr/pkg/libexec/xen/boot/xen-shim-syms
+
+EGDIR=                 ${PREFIX}/share/examples/xen
+MESSAGE_SUBST+=                EGDIR=${EGDIR}
+
+USE_TOOLS+=            pod2man gmake pkg-config makeinfo perl bash cmake gsed bison
+USE_LANGUAGES=         c c++
+
+GNU_CONFIGURE=         YES
+CONFIGURE_ARGS+=       --enable-rpath --disable-golang
+CONFIGURE_ARGS+=       --sysconfdir=${PKG_SYSCONFBASE}
+CONFIGURE_ARGS+=       --enable-ipxe
+CONFIGURE_ARGS+=       --with-system-ovmf=${PREFIX}/share/ovmf/OVMFX64.fd
+
+MAKE_ENV+=             PREFIX=${prefix:Q} WRKSRC=${WRKSRC}
+MAKE_ENV+=             APPEND_LIB=${LDFLAGS:Q}
+MAKE_ENV+=             XEN_EXAMPLES_DIR=${EGDIR}
+MAKE_ENV+=             MV=${MV:Q} CP=${CP:Q}
+MAKE_ENV+=             PYTHON=${PYTHONBIN:Q} PYTHON_COMMAND=${PYTHONBIN:Q}
+MAKE_ENV+=             SED=${SED:Q}
+MAKE_ENV+=             V=YES
+MAKE_ENV+=             BARE_CPP="gcc -E"
+#MAKE_ENV+=            NO_WERROR=1
+
+#BUILDLINK_TRANSFORM+= rm:-Werror
+
+PY_PATCHPLIST=         yes
+REPLACE_PYTHON+=       tools/misc/xencons
+REPLACE_PYTHON+=       tools/misc/xenpvnetboot tools/misc/xensymoops
+REPLACE_PYTHON+=       tools/python/scripts/convert-legacy-stream
+REPLACE_PYTHON+=       tools/python/scripts/verify-stream-v2
+REPLACE_PYTHON+=       tools/xenmon/xenmon.py tools/misc/xencov_split
+
+REPLACE_PERL+=         tools/firmware/rombios/makesym.perl
+REPLACE_PERL+=         tools/qemu-xen-traditional/texi2pod.pl
+REPLACE_PERL+=         tools/examples/xeninfo.pl
+REPLACE_PERL+=         tools/include/xen-external/bsd-sys-queue-h-seddery
+REPLACE_PERL+=         tools/qemu-xen/scripts/texi2pod.pl
+REPLACE_PERL+=         tools/qemu-xen/scripts/get_maintainer.pl
+REPLACE_PERL+=         tools/qemu-xen/scripts/checkpatch.pl
+
+SUBST_CLASSES+=                conf
+SUBST_STAGE.conf=      pre-configure
+SUBST_FILES.conf=      docs/misc/block-scripts.txt
+SUBST_FILES.conf+=     docs/misc/vtd.txt
+SUBST_SED.conf=                -e "s,@XENDCONFDIR@,${PKG_SYSCONFDIR},g"
+
+XEND_SCRIPTS=          block vif-bridge vif-ip qemu-ifup hotplugpath.sh locking.sh
+
+SUBST_CLASSES+=                getopt
+SUBST_STAGE.getopt=    pre-configure
+SUBST_MESSAGE.getopt=  Fixing getopt_long_only
+SUBST_FILES.getopt+=   tools/fuzz/x86_instruction_emulator/afl-harness.c
+SUBST_SED.getopt+=     -e 's,getopt_long_only,getopt_long,'
+
+SUBST_CLASSES+=                        rpath-link
+SUBST_STAGE.rpath-link=                pre-configure
+SUBST_MESSAGE.rpath-link=      Fixing rpath-link syntax
+SUBST_FILES.rpath-link+=       tools/Rules.mk
+SUBST_SED.rpath-link+=         -e 's/-rpath-link=/-rpath-link,/g'
+
+OPSYSVARS+=            PROCPATH
+PROCPATH.NetBSD=       /kern
+PROCPATH.*=            /proc
+
+.include "../../mk/bsd.prefs.mk"
+
+.if ${OPSYS} == "NetBSD"
+MESSAGE_SRC=           ${.CURDIR}/MESSAGE ${.CURDIR}/MESSAGE.NetBSD
+.endif
+
+RCD_SCRIPTS=           xen-watchdog xencommons xendomains
+FILES_SUBST+=          RCD_INTERPRETER=${PYTHONBIN:Q}
+FILES_SUBST+=          PROCPATH=${PROCPATH:Q}
+FILES_SUBST+=          PKG_SYSCONFDIR=${PKG_SYSCONFDIR}
+FILES_SUBST+=          PREFIX=${PREFIX}
+
+CONF_FILES+=           ${EGDIR}/xl.conf ${PKG_SYSCONFDIR}/xl.conf
+CONF_FILES+=           ${EGDIR}/oxenstored.conf ${PKG_SYSCONFDIR}/oxenstored.conf
+
+OWN_DIRS=              ${PKG_SYSCONFDIR}/scripts ${VARBASE}/log/xen
+
+.for s in ${XEND_SCRIPTS}
+CONF_FILES_PERMS+=     ${EGDIR}/scripts/${s} ${PKG_SYSCONFDIR}/scripts/${s} \
+                       ${REAL_ROOT_USER} ${REAL_ROOT_GROUP} 0755
+.endfor
+
+post-extract:
+       ${MV} ${WRKDIR}/${QEMU_DIST} ${WRKSRC}/tools/qemu-xen
+       ${MV} ${WRKDIR}/${QEMUTRAD_DIST} ${WRKSRC}/tools/qemu-xen-traditional
+
+pre-build:
+       rm -f ${WRKSRC}/check/check_x11_devel
+       ${SED} -e "s,@XENDCONFDIR@,${PKG_SYSCONFDIR},g" \
+               ${WRKSRC}/docs/man/xenstore-chmod.1.pod |\
+           pod2man -n xenstore-chmod >${WRKDIR}/xenstore-chmod.1
+       ${SED} -e "s,@XENDCONFDIR@,${PKG_SYSCONFDIR},g" \
+               ${WRKSRC}/docs/man/xenstore-ls.1.pod |\
+           pod2man -n xenstore-ls >${WRKDIR}/xenstore-ls.1
+       ${SED} -e "s,@XENDCONFDIR@,${PKG_SYSCONFDIR},g" \
+               ${WRKSRC}/docs/man/xenstore.1.pod |\
+           pod2man -n xenstore >${WRKDIR}/xenstore.1
+       ${SED} -e "s,@XENDCONFDIR@,${PKG_SYSCONFDIR},g" \
+               ${WRKSRC}/docs/man/xentop.1.pod |\
+           pod2man -n xentop >${WRKDIR}/xentop.1
+       ${SED} -e "s,@XENDCONFDIR@,${PKG_SYSCONFDIR},g" \
+               ${WRKSRC}/docs/man/xentrace.8.pod |\
+           pod2man -n xentrace >${WRKDIR}/xentrace.8
+       ${SED} -e "s,@XENDCONFDIR@,${PKG_SYSCONFDIR},g" \
+               ${WRKSRC}/docs/man/xentrace_format.1.pod |\
+           pod2man -n xenstore_format >${WRKDIR}/xentrace_format.1
+       ${SED} -e "s,@XENDCONFDIR@,${PKG_SYSCONFDIR},g" \
+               ${WRKSRC}/docs/man/xl.cfg.5.pod.in |\
+           pod2man -n xl.cfg >${WRKDIR}/xl.cfg.5
+       ${SED} -e "s,@XENDCONFDIR@,${PKG_SYSCONFDIR},g" \
+               ${WRKSRC}/docs/man/xl.conf.5.pod |\
+           pod2man -n xl.conf >${WRKDIR}/xl.conf.5
+       ${SED} -e "s,@XENDCONFDIR@,${PKG_SYSCONFDIR},g" \
+               ${WRKSRC}/docs/man/xl.1.pod.in |\
+           pod2man -n xl >${WRKDIR}/xl.1
+       ${SED} -e "s,@XENDCONFDIR@,${PKG_SYSCONFDIR},g" \
+               ${WRKSRC}/docs/man/xlcpupool.cfg.5.pod |\
+           pod2man -n xlcpupool.cfg >${WRKDIR}/xlcpupool.cfg.5
+       ${SED} -e "s,@XENDCONFDIR@,${PKG_SYSCONFDIR},g" \
+               ${WRKSRC}/docs/man/xl-disk-configuration.5.pod |\
+           pod2man -n xl-disk-configuration >${WRKDIR}/xl-disk-configuration.5
+
+INSTALLATION_DIRS=     ${EGDIR} ${PKGMANDIR}/man1 ${PKGMANDIR}/man5
+INSTALLATION_DIRS+=    ${PKGMANDIR}/man8 share/doc/xen
+INSTALLATION_DIRS+=    ${PYSITELIB}
+
+BUILD_DEFS+=           VARBASE
+
+do-build:
+       cd ${WRKSRC} && ${BUILD_MAKE_CMD} V=1 build-tools
+       cd ${WRKSRC} && ${BUILD_MAKE_CMD} build-docs
+
+do-install:
+       cd ${WRKSRC} && ${BUILD_MAKE_CMD} DESTDIR=${DESTDIR} install-tools
+       cd ${WRKSRC} && ${BUILD_MAKE_CMD} DESTDIR=${DESTDIR} install-docs
+
+post-install:
+       ${INSTALL_MAN} ${WRKDIR}/xenstore-chmod.1 ${DESTDIR}${PREFIX}/${PKGMANDIR}/man1
+       ${INSTALL_MAN} ${WRKDIR}/xenstore-ls.1 ${DESTDIR}${PREFIX}/${PKGMANDIR}/man1
+       ${INSTALL_MAN} ${WRKDIR}/xenstore.1 ${DESTDIR}${PREFIX}/${PKGMANDIR}/man1
+       ${INSTALL_MAN} ${WRKDIR}/xentop.1 ${DESTDIR}${PREFIX}/${PKGMANDIR}/man1
+       ${INSTALL_MAN} ${WRKDIR}/xentrace.8 ${DESTDIR}${PREFIX}/${PKGMANDIR}/man8
+       ${INSTALL_MAN} ${WRKDIR}/xentrace_format.1 ${DESTDIR}${PREFIX}/${PKGMANDIR}/man1
+       ${INSTALL_MAN} ${WRKDIR}/xl.cfg.5 ${DESTDIR}${PREFIX}/${PKGMANDIR}/man5
+       ${INSTALL_MAN} ${WRKDIR}/xl.conf.5 ${DESTDIR}${PREFIX}/${PKGMANDIR}/man5
+       ${INSTALL_MAN} ${WRKDIR}/xl.1 ${DESTDIR}${PREFIX}/${PKGMANDIR}/man1
+       ${INSTALL_MAN} ${WRKDIR}/xlcpupool.cfg.5 ${DESTDIR}${PREFIX}/${PKGMANDIR}/man5
+.for f in \
+    gamd-ucode-container.txt       gqemu-backends.txt \
+    gblock-scripts.txt             gqemu-deprivilege.txt \
+    gconsole.txt                   gstubdom.txt \
+    gcrashdb.txt                   gvtd-pi.txt \
+    gdistro_mapping.txt            gvtd.txt \
+    gdump-core-format.txt          gvtpm-platforms.txt \
+    ggrant-tables.txt              gxen-error-handling.txt \
+    gkconfig-language.txt          gxenmon.txt \
+    gkconfig.txt                   gxenpaging.txt \
+    gkexec_and_kdump.txt           gxenstore-ring.txt \
+    glibxl_memory.txt              gxenstore.txt \
+    gprintk-formats.txt            gxsm-flask.txt \
+       ${INSTALL_DATA} ${WRKSRC}/docs/misc/$f ${DESTDIR}${PREFIX}/share/doc/xen
+.endfor
+
+.if ${OPSYS} == "NetBSD" && ${OPSYS_VERSION} < 069900
+CPPFLAGS+=     -Dshm_open=open -Dshm_unlink=unlink
+.endif
+
+.include "../../mk/compiler.mk"
+EXTRA_CFLAGS+= -Wno-error=char-subscripts \
+       -Wno-error=declaration-after-statement \
+       -Wno-error=maybe-uninitialized \
+       -Wno-error=unused-value
+EXTRA_HOSTCFLAGS+=     -Wno-error=char-subscripts \
+       -Wno-error=declaration-after-statement \
+       -Wno-error=unused-value
+.if !empty(PKGSRC_COMPILER:Mclang)
+EXTRA_HOSTCFLAGS+=     -Wno-error=ignored-attributes
+EXTRA_CFLAGS+= -Wno-error=ignored-attributes -no-integrated-as \
+               -Wno-error=tautological-compare -Wno-error=null-dereference \
+               -Wno-error=empty-body -Wno-error=self-assign \
+               -Wno-error=sometimes-uninitialized \
+               -Wno-error=unused-function -Wno-error=format \
+               -Wno-error=unused-const-variable \
+               -Wno-error=gnu-designator -Wno-error=uninitialized \
+               -Wno-error=parentheses-equality \
+               -Wno-error=enum-conversion \
+               -Wno-error=address-of-packed-member
+BUILDLINK_TRANSFORM+=  rm:-falign-jumps=1 rm:-falign-loops=1 \
+                       rm:-mpreferred-stack-boundary=2
+.endif
+
+MAKE_ENV+=     EXTRA_HOSTCFLAGS=${EXTRA_HOSTCFLAGS:Q} EXTRA_CFLAGS=${EXTRA_CFLAGS:M*:Q} TARGET_CC=${TARGET_CC}
+
+.include "../../lang/python/batteries-included.mk"
+.include "../../lang/python/application.mk"
+.include "../../lang/python/extension.mk"
+#.include "../../devel/SDL/buildlink3.mk"
+.include "../../lang/ocaml/buildlink3.mk"
+.include "../../devel/ocaml-findlib/buildlink3.mk"
+BUILDLINK_API_DEPENDS.pciutils+=       pciutils>=3.8
+.include "../../sysutils/pciutils/buildlink3.mk"
+.include "../../archivers/zstd/buildlink3.mk"
+.include "../../devel/glib2/buildlink3.mk"
+.include "../../devel/yajl/buildlink3.mk"
+.include "../../devel/argp/buildlink3.mk"
+.include "../../security/libgcrypt/buildlink3.mk"
+.include "../../x11/pixman/buildlink3.mk"
+
+.include "../../mk/curses.buildlink3.mk"
+.include "../../mk/bsd.pkg.mk"
Index: pkgsrc/sysutils/xentools418/PLIST
diff -u /dev/null pkgsrc/sysutils/xentools418/PLIST:1.1
--- /dev/null   Tue Nov 21 11:37:03 2023
+++ pkgsrc/sysutils/xentools418/PLIST   Tue Nov 21 11:37:03 2023
@@ -0,0 +1,773 @@
+@comment $NetBSD: PLIST,v 1.1 2023/11/21 11:37:03 bouyer Exp $
+${PYSITELIB}/grub/ExtLinuxConf.py
+${PYSITELIB}/grub/ExtLinuxConf.pyc
+${PYSITELIB}/grub/GrubConf.py
+${PYSITELIB}/grub/GrubConf.pyc
+${PYSITELIB}/grub/LiloConf.py
+${PYSITELIB}/grub/LiloConf.pyc
+${PYSITELIB}/grub/__init__.py
+${PYSITELIB}/grub/__init__.pyc
+${PYSITELIB}/pygrub-0.7-py${PYVERSSUFFIX}.egg-info/PKG-INFO
+${PYSITELIB}/pygrub-0.7-py${PYVERSSUFFIX}.egg-info/SOURCES.txt
+${PYSITELIB}/pygrub-0.7-py${PYVERSSUFFIX}.egg-info/dependency_links.txt
+${PYSITELIB}/pygrub-0.7-py${PYVERSSUFFIX}.egg-info/top_level.txt
+${PYSITELIB}/xen-3.0-py${PYVERSSUFFIX}.egg-info/PKG-INFO
+${PYSITELIB}/xen-3.0-py${PYVERSSUFFIX}.egg-info/SOURCES.txt
+${PYSITELIB}/xen-3.0-py${PYVERSSUFFIX}.egg-info/dependency_links.txt
+${PYSITELIB}/xen-3.0-py${PYVERSSUFFIX}.egg-info/top_level.txt
+${PYSITELIB}/xen/__init__.py
+${PYSITELIB}/xen/__init__.pyc
+${PYSITELIB}/xen/lowlevel/__init__.py
+${PYSITELIB}/xen/lowlevel/__init__.pyc
+${PYSITELIB}/xen/lowlevel/xc.so
+${PYSITELIB}/xen/lowlevel/xs.so
+${PYSITELIB}/xen/migration/__init__.py
+${PYSITELIB}/xen/migration/__init__.pyc
+${PYSITELIB}/xen/migration/legacy.py
+${PYSITELIB}/xen/migration/legacy.pyc
+${PYSITELIB}/xen/migration/libxc.py
+${PYSITELIB}/xen/migration/libxc.pyc
+${PYSITELIB}/xen/migration/libxl.py
+${PYSITELIB}/xen/migration/libxl.pyc
+${PYSITELIB}/xen/migration/public.py
+${PYSITELIB}/xen/migration/public.pyc
+${PYSITELIB}/xen/migration/tests.py
+${PYSITELIB}/xen/migration/tests.pyc
+${PYSITELIB}/xen/migration/verify.py
+${PYSITELIB}/xen/migration/verify.pyc
+${PYSITELIB}/xen/migration/xl.py
+${PYSITELIB}/xen/migration/xl.pyc
+${PYSITELIB}/xen/util.py
+${PYSITELIB}/xen/util.pyc
+${PYSITELIB}/xenfsimage.so
+bin/pygrub
+bin/xen-cpuid
+bin/xen-detect
+bin/xenalyze
+bin/xencov_split
+bin/xenstore
+bin/xenstore-chmod
+bin/xenstore-control
+bin/xenstore-exists
+bin/xenstore-list
+bin/xenstore-ls
+bin/xenstore-read
+bin/xenstore-rm
+bin/xenstore-watch
+bin/xenstore-write
+bin/xentrace_format
+include/_libxl_types.h
+include/_libxl_types_json.h
+include/libxl.h
+include/libxl_event.h
+include/libxl_json.h
+include/libxl_utils.h
+include/libxl_uuid.h
+include/libxlutil.h
+include/xen/COPYING
+include/xen/arch-arm.h
+include/xen/arch-arm/hvm/save.h
+include/xen/arch-arm/smccc.h
+include/xen/arch-ppc.h
+include/xen/arch-x86/cpufeatureset.h
+include/xen/arch-x86/cpuid.h
+include/xen/arch-x86/guest-acpi.h
+include/xen/arch-x86/hvm/save.h
+include/xen/arch-x86/hvm/start_info.h
+include/xen/arch-x86/pmu.h
+include/xen/arch-x86/xen-mca.h
+include/xen/arch-x86/xen-x86_32.h
+include/xen/arch-x86/xen-x86_64.h
+include/xen/arch-x86/xen.h
+include/xen/arch-x86_32.h
+include/xen/arch-x86_64.h
+include/xen/argo.h
+include/xen/callback.h
+include/xen/device_tree_defs.h
+include/xen/dom0_ops.h
+include/xen/domctl.h
+include/xen/elfnote.h
+include/xen/errno.h
+include/xen/event_channel.h
+include/xen/features.h
+include/xen/foreign/arm32.h
+include/xen/foreign/arm64.h
+include/xen/foreign/x86_32.h
+include/xen/foreign/x86_64.h
+include/xen/grant_table.h
+include/xen/hvm/dm_op.h
+include/xen/hvm/e820.h
+include/xen/hvm/hvm_info_table.h
+include/xen/hvm/hvm_op.h
+include/xen/hvm/hvm_vcpu.h
+include/xen/hvm/hvm_xs_strings.h
+include/xen/hvm/ioreq.h
+include/xen/hvm/params.h
+include/xen/hvm/pvdrivers.h
+include/xen/hvm/save.h
+include/xen/hypfs.h
+include/xen/io/9pfs.h
+include/xen/io/blkif.h
+include/xen/io/cameraif.h
+include/xen/io/console.h
+include/xen/io/displif.h
+include/xen/io/fbif.h
+include/xen/io/fsif.h
+include/xen/io/kbdif.h
+include/xen/io/libxenvchan.h
+include/xen/io/netif.h
+include/xen/io/pciif.h
+include/xen/io/protocols.h
+include/xen/io/pvcalls.h
+include/xen/io/ring.h
+include/xen/io/sndif.h
+include/xen/io/tpmif.h
+include/xen/io/usbif.h
+include/xen/io/vscsiif.h
+include/xen/io/xenbus.h
+include/xen/io/xs_wire.h
+include/xen/kexec.h
+include/xen/memory.h
+include/xen/nmi.h
+include/xen/physdev.h
+include/xen/platform.h
+include/xen/pmu.h
+include/xen/sched.h
+include/xen/sys/evtchn.h
+include/xen/sys/privcmd.h
+include/xen/sysctl.h
+include/xen/tmem.h
+include/xen/trace.h
+include/xen/vcpu.h
+include/xen/version.h
+include/xen/vm_event.h
+include/xen/xen-compat.h
+include/xen/xen.h
+include/xen/xencomm.h
+include/xen/xenoprof.h
+include/xen/xsm/flask_op.h
+include/xen_list.h
+include/xencall.h
+include/xenctrl.h
+include/xenctrl_compat.h
+include/xendevicemodel.h
+include/xenevtchn.h
+include/xenforeignmemory.h
+include/xenfsimage.h
+include/xenfsimage_grub.h
+include/xenfsimage_plugin.h
+include/xengnttab.h
+include/xenguest.h
+include/xenhypfs.h
+include/xenstat.h
+include/xenstore-compat/xs.h
+include/xenstore-compat/xs_lib.h
+include/xenstore.h
+include/xenstore_lib.h
+include/xentoolcore.h
+include/xentoollog.h
+include/xs.h
+include/xs_lib.h
+lib/debug${LOCALBASE}/libexec/xen/boot/xen-shim-syms
+lib/libxencall.a
+lib/libxencall.so
+lib/libxencall.so.1
+lib/libxencall.so.1.3
+lib/libxenctrl.a
+lib/libxenctrl.so
+lib/libxenctrl.so.4.18
+lib/libxenctrl.so.4.18.0
+lib/libxendevicemodel.a
+lib/libxendevicemodel.so
+lib/libxendevicemodel.so.1
+lib/libxendevicemodel.so.1.4
+lib/libxenevtchn.a
+lib/libxenevtchn.so
+lib/libxenevtchn.so.1
+lib/libxenevtchn.so.1.2
+lib/libxenforeignmemory.a
+lib/libxenforeignmemory.so
+lib/libxenforeignmemory.so.1
+lib/libxenforeignmemory.so.1.4
+lib/libxenfsimage.so
+lib/libxenfsimage.so.4.18
+lib/libxenfsimage.so.4.18.0
+lib/libxengnttab.a
+lib/libxengnttab.so
+lib/libxengnttab.so.1
+lib/libxengnttab.so.1.2
+lib/libxenguest.a
+lib/libxenguest.so
+lib/libxenguest.so.4.18
+lib/libxenguest.so.4.18.0
+lib/libxenhypfs.a
+lib/libxenhypfs.so
+lib/libxenhypfs.so.1
+lib/libxenhypfs.so.1.0
+lib/libxenlight.a
+lib/libxenlight.so
+lib/libxenlight.so.4.18
+lib/libxenlight.so.4.18.0
+lib/libxenstat.a
+lib/libxenstat.so
+lib/libxenstat.so.4.18
+lib/libxenstat.so.4.18.0
+lib/libxenstore.a
+lib/libxenstore.so
+lib/libxenstore.so.4
+lib/libxenstore.so.4.0
+lib/libxentoolcore.a
+lib/libxentoolcore.so
+lib/libxentoolcore.so.1
+lib/libxentoolcore.so.1.0
+lib/libxentoollog.a
+lib/libxentoollog.so
+lib/libxentoollog.so.1
+lib/libxentoollog.so.1.0
+lib/libxlutil.a
+lib/libxlutil.so
+lib/libxlutil.so.4.18
+lib/libxlutil.so.4.18.0
+lib/ocaml/site-lib/xenbus/META
+lib/ocaml/site-lib/xenbus/dllxenbus_stubs.so
+lib/ocaml/site-lib/xenbus/libxenbus_stubs.a
+lib/ocaml/site-lib/xenbus/xenbus.a
+lib/ocaml/site-lib/xenbus/xenbus.cma
+lib/ocaml/site-lib/xenbus/xenbus.cmi
+lib/ocaml/site-lib/xenbus/xenbus.cmo
+lib/ocaml/site-lib/xenbus/xenbus.cmx
+lib/ocaml/site-lib/xenbus/xenbus.cmxa
+lib/ocaml/site-lib/xenctrl/META
+lib/ocaml/site-lib/xenctrl/dllxenctrl_stubs.so
+lib/ocaml/site-lib/xenctrl/libxenctrl_stubs.a
+lib/ocaml/site-lib/xenctrl/xenctrl.a
+lib/ocaml/site-lib/xenctrl/xenctrl.cma
+lib/ocaml/site-lib/xenctrl/xenctrl.cmi
+lib/ocaml/site-lib/xenctrl/xenctrl.cmx
+lib/ocaml/site-lib/xenctrl/xenctrl.cmxa
+lib/ocaml/site-lib/xeneventchn/META
+lib/ocaml/site-lib/xeneventchn/dllxeneventchn_stubs.so
+lib/ocaml/site-lib/xeneventchn/libxeneventchn_stubs.a
+lib/ocaml/site-lib/xeneventchn/xeneventchn.a
+lib/ocaml/site-lib/xeneventchn/xeneventchn.cma
+lib/ocaml/site-lib/xeneventchn/xeneventchn.cmi
+lib/ocaml/site-lib/xeneventchn/xeneventchn.cmx
+lib/ocaml/site-lib/xeneventchn/xeneventchn.cmxa
+lib/ocaml/site-lib/xenmmap/META
+lib/ocaml/site-lib/xenmmap/dllxenmmap_stubs.so
+lib/ocaml/site-lib/xenmmap/libxenmmap_stubs.a
+lib/ocaml/site-lib/xenmmap/xenmmap.a
+lib/ocaml/site-lib/xenmmap/xenmmap.cma
+lib/ocaml/site-lib/xenmmap/xenmmap.cmi
+lib/ocaml/site-lib/xenmmap/xenmmap.cmx
+lib/ocaml/site-lib/xenmmap/xenmmap.cmxa
+lib/ocaml/site-lib/xenstore/META
+lib/ocaml/site-lib/xenstore/xenstore.a
+lib/ocaml/site-lib/xenstore/xenstore.cma
+lib/ocaml/site-lib/xenstore/xenstore.cmi
+lib/ocaml/site-lib/xenstore/xenstore.cmo
+lib/ocaml/site-lib/xenstore/xenstore.cmx
+lib/ocaml/site-lib/xenstore/xenstore.cmxa
+lib/pkgconfig/xencall.pc
+lib/pkgconfig/xencontrol.pc
+lib/pkgconfig/xendevicemodel.pc
+lib/pkgconfig/xenevtchn.pc
+lib/pkgconfig/xenforeignmemory.pc
+lib/pkgconfig/xengnttab.pc
+lib/pkgconfig/xenguest.pc
+lib/pkgconfig/xenhypfs.pc
+lib/pkgconfig/xenlight.pc
+lib/pkgconfig/xenstat.pc
+lib/pkgconfig/xenstore.pc
+lib/pkgconfig/xentoolcore.pc
+lib/pkgconfig/xentoollog.pc
+lib/pkgconfig/xlutil.pc
+lib/xenfsimage/ext2fs/fsimage.so
+lib/xenfsimage/fat/fsimage.so
+lib/xenfsimage/iso9660/fsimage.so
+lib/xenfsimage/reiserfs/fsimage.so
+lib/xenfsimage/ufs/fsimage.so
+lib/xenfsimage/xfs/fsimage.so
+lib/xenfsimage/zfs/fsimage.so
+libexec/xen/bin/convert-legacy-stream
+libexec/xen/bin/libxl-save-helper
+libexec/xen/bin/lsevtchn
+libexec/xen/bin/pygrub
+libexec/xen/bin/qemu-edid
+libexec/xen/bin/qemu-img
+libexec/xen/bin/qemu-io
+libexec/xen/bin/qemu-nbd
+libexec/xen/bin/qemu-storage-daemon
+libexec/xen/bin/qemu-system-i386
+libexec/xen/bin/readnotes
+libexec/xen/bin/verify-stream-v2
+libexec/xen/bin/xen-init-dom0
+libexec/xen/bin/xenconsole
+libexec/xen/bin/xenctx
+libexec/xen/bin/xenpaging
+libexec/xen/boot/hvmloader
+libexec/xen/boot/ipxe.bin
+libexec/xen/boot/seabios.bin
+libexec/xen/boot/xen-shim
+libexec/xen/include/qemu-plugin.h
+man/man1/xenhypfs.1
+man/man1/xenstore-chmod.1
+man/man1/xenstore-ls.1
+man/man1/xenstore-read.1
+man/man1/xenstore-write.1
+man/man1/xenstore.1
+man/man1/xentop.1
+man/man1/xentrace_format.1
+man/man1/xl.1
+man/man5/xl-disk-configuration.5
+man/man5/xl-network-configuration.5
+man/man5/xl-pci-configuration.5
+man/man5/xl.cfg.5
+man/man5/xl.conf.5
+man/man5/xlcpupool.cfg.5
+man/man7/xen-pci-device-reservations.7
+man/man7/xen-pv-channel.7
+man/man7/xen-tscmode.7
+man/man7/xen-vtpm.7
+man/man7/xen-vtpmmgr.7
+man/man7/xl-numa-placement.7
+man/man8/xentrace.8
+sbin/flask-get-bool
+sbin/flask-getenforce
+sbin/flask-label-pci
+sbin/flask-loadpolicy
+sbin/flask-set-bool
+sbin/flask-setenforce
+sbin/gdbsx
+sbin/oxenstored
+sbin/xen-access
+sbin/xen-diag
+sbin/xen-hptool
+sbin/xen-hvmcrash
+sbin/xen-hvmctx
+sbin/xen-kdd
+sbin/xen-livepatch
+sbin/xen-lowmemd
+sbin/xen-mceinj
+sbin/xen-memshare
+sbin/xen-mfndump
+sbin/xen-ucode
+sbin/xen-vmtrace
+sbin/xenbaked
+sbin/xenconsoled
+sbin/xencov
+sbin/xenhypfs
+sbin/xenlockprof
+sbin/xenmon
+sbin/xenperf
+sbin/xenpm
+sbin/xenpmd
+sbin/xenstored
+sbin/xentop
+sbin/xentrace
+sbin/xentrace_setmask
+sbin/xentrace_setsize
+sbin/xenwatchdogd
+sbin/xl
+share/doc/xen/html/hypercall/arm/include,public,arch-arm,hvm,save.h.html
+share/doc/xen/html/hypercall/arm/include,public,arch-arm,smccc.h.html
+share/doc/xen/html/hypercall/arm/include,public,arch-arm.h.html
+share/doc/xen/html/hypercall/arm/include,public,arch-ppc.h.html
+share/doc/xen/html/hypercall/arm/include,public,argo.h.html
+share/doc/xen/html/hypercall/arm/include,public,callback.h.html
+share/doc/xen/html/hypercall/arm/include,public,device_tree_defs.h.html
+share/doc/xen/html/hypercall/arm/include,public,dom0_ops.h.html
+share/doc/xen/html/hypercall/arm/include,public,domctl.h.html
+share/doc/xen/html/hypercall/arm/include,public,elfnote.h.html
+share/doc/xen/html/hypercall/arm/include,public,errno.h.html
+share/doc/xen/html/hypercall/arm/include,public,event_channel.h.html
+share/doc/xen/html/hypercall/arm/include,public,features.h.html
+share/doc/xen/html/hypercall/arm/include,public,grant_table.h.html
+share/doc/xen/html/hypercall/arm/include,public,hvm,dm_op.h.html
+share/doc/xen/html/hypercall/arm/include,public,hvm,e820.h.html
+share/doc/xen/html/hypercall/arm/include,public,hvm,hvm_info_table.h.html
+share/doc/xen/html/hypercall/arm/include,public,hvm,hvm_op.h.html
+share/doc/xen/html/hypercall/arm/include,public,hvm,hvm_vcpu.h.html
+share/doc/xen/html/hypercall/arm/include,public,hvm,hvm_xs_strings.h.html
+share/doc/xen/html/hypercall/arm/include,public,hvm,ioreq.h.html
+share/doc/xen/html/hypercall/arm/include,public,hvm,params.h.html
+share/doc/xen/html/hypercall/arm/include,public,hvm,pvdrivers.h.html
+share/doc/xen/html/hypercall/arm/include,public,hvm,save.h.html
+share/doc/xen/html/hypercall/arm/include,public,hypfs.h.html
+share/doc/xen/html/hypercall/arm/include,public,io,9pfs.h.html
+share/doc/xen/html/hypercall/arm/include,public,io,blkif.h.html
+share/doc/xen/html/hypercall/arm/include,public,io,cameraif.h.html
+share/doc/xen/html/hypercall/arm/include,public,io,console.h.html
+share/doc/xen/html/hypercall/arm/include,public,io,displif.h.html
+share/doc/xen/html/hypercall/arm/include,public,io,fbif.h.html
+share/doc/xen/html/hypercall/arm/include,public,io,fsif.h.html
+share/doc/xen/html/hypercall/arm/include,public,io,kbdif.h.html
+share/doc/xen/html/hypercall/arm/include,public,io,libxenvchan.h.html
+share/doc/xen/html/hypercall/arm/include,public,io,netif.h.html
+share/doc/xen/html/hypercall/arm/include,public,io,pciif.h.html
+share/doc/xen/html/hypercall/arm/include,public,io,protocols.h.html
+share/doc/xen/html/hypercall/arm/include,public,io,pvcalls.h.html
+share/doc/xen/html/hypercall/arm/include,public,io,ring.h.html
+share/doc/xen/html/hypercall/arm/include,public,io,sndif.h.html
+share/doc/xen/html/hypercall/arm/include,public,io,tpmif.h.html
+share/doc/xen/html/hypercall/arm/include,public,io,usbif.h.html
+share/doc/xen/html/hypercall/arm/include,public,io,vscsiif.h.html
+share/doc/xen/html/hypercall/arm/include,public,io,xenbus.h.html
+share/doc/xen/html/hypercall/arm/include,public,io,xs_wire.h.html
+share/doc/xen/html/hypercall/arm/include,public,kexec.h.html
+share/doc/xen/html/hypercall/arm/include,public,memory.h.html
+share/doc/xen/html/hypercall/arm/include,public,nmi.h.html
+share/doc/xen/html/hypercall/arm/include,public,physdev.h.html
+share/doc/xen/html/hypercall/arm/include,public,platform.h.html
+share/doc/xen/html/hypercall/arm/include,public,pmu.h.html
+share/doc/xen/html/hypercall/arm/include,public,sched.h.html
+share/doc/xen/html/hypercall/arm/include,public,sysctl.h.html
+share/doc/xen/html/hypercall/arm/include,public,tmem.h.html
+share/doc/xen/html/hypercall/arm/include,public,trace.h.html
+share/doc/xen/html/hypercall/arm/include,public,vcpu.h.html
+share/doc/xen/html/hypercall/arm/include,public,version.h.html
+share/doc/xen/html/hypercall/arm/include,public,vm_event.h.html
+share/doc/xen/html/hypercall/arm/include,public,xen-compat.h.html
+share/doc/xen/html/hypercall/arm/include,public,xen.h.html
+share/doc/xen/html/hypercall/arm/include,public,xencomm.h.html
+share/doc/xen/html/hypercall/arm/include,public,xenoprof.h.html
+share/doc/xen/html/hypercall/arm/include,public,xsm,flask_op.h.html
+share/doc/xen/html/hypercall/arm/include,xen,errno.h.html
+share/doc/xen/html/hypercall/arm/index.html
+share/doc/xen/html/hypercall/index.html
+share/doc/xen/html/hypercall/x86_32/include,public,arch-ppc.h.html
+share/doc/xen/html/hypercall/x86_32/include,public,arch-x86,cpufeatureset.h.html
+share/doc/xen/html/hypercall/x86_32/include,public,arch-x86,cpuid.h.html
+share/doc/xen/html/hypercall/x86_32/include,public,arch-x86,guest-acpi.h.html
+share/doc/xen/html/hypercall/x86_32/include,public,arch-x86,hvm,save.h.html
+share/doc/xen/html/hypercall/x86_32/include,public,arch-x86,hvm,start_info.h.html
+share/doc/xen/html/hypercall/x86_32/include,public,arch-x86,pmu.h.html
+share/doc/xen/html/hypercall/x86_32/include,public,arch-x86,xen-mca.h.html
+share/doc/xen/html/hypercall/x86_32/include,public,arch-x86,xen-x86_32.h.html
+share/doc/xen/html/hypercall/x86_32/include,public,arch-x86,xen.h.html
+share/doc/xen/html/hypercall/x86_32/include,public,arch-x86_32.h.html
+share/doc/xen/html/hypercall/x86_32/include,public,argo.h.html
+share/doc/xen/html/hypercall/x86_32/include,public,callback.h.html
+share/doc/xen/html/hypercall/x86_32/include,public,device_tree_defs.h.html
+share/doc/xen/html/hypercall/x86_32/include,public,dom0_ops.h.html
+share/doc/xen/html/hypercall/x86_32/include,public,domctl.h.html
+share/doc/xen/html/hypercall/x86_32/include,public,elfnote.h.html
+share/doc/xen/html/hypercall/x86_32/include,public,errno.h.html
+share/doc/xen/html/hypercall/x86_32/include,public,event_channel.h.html
+share/doc/xen/html/hypercall/x86_32/include,public,features.h.html
+share/doc/xen/html/hypercall/x86_32/include,public,grant_table.h.html
+share/doc/xen/html/hypercall/x86_32/include,public,hvm,dm_op.h.html
+share/doc/xen/html/hypercall/x86_32/include,public,hvm,e820.h.html
+share/doc/xen/html/hypercall/x86_32/include,public,hvm,hvm_info_table.h.html
+share/doc/xen/html/hypercall/x86_32/include,public,hvm,hvm_op.h.html
+share/doc/xen/html/hypercall/x86_32/include,public,hvm,hvm_vcpu.h.html
+share/doc/xen/html/hypercall/x86_32/include,public,hvm,hvm_xs_strings.h.html
+share/doc/xen/html/hypercall/x86_32/include,public,hvm,ioreq.h.html
+share/doc/xen/html/hypercall/x86_32/include,public,hvm,params.h.html
+share/doc/xen/html/hypercall/x86_32/include,public,hvm,pvdrivers.h.html
+share/doc/xen/html/hypercall/x86_32/include,public,hvm,save.h.html
+share/doc/xen/html/hypercall/x86_32/include,public,hypfs.h.html
+share/doc/xen/html/hypercall/x86_32/include,public,io,9pfs.h.html
+share/doc/xen/html/hypercall/x86_32/include,public,io,blkif.h.html
+share/doc/xen/html/hypercall/x86_32/include,public,io,cameraif.h.html
+share/doc/xen/html/hypercall/x86_32/include,public,io,console.h.html
+share/doc/xen/html/hypercall/x86_32/include,public,io,displif.h.html
+share/doc/xen/html/hypercall/x86_32/include,public,io,fbif.h.html
+share/doc/xen/html/hypercall/x86_32/include,public,io,fsif.h.html
+share/doc/xen/html/hypercall/x86_32/include,public,io,kbdif.h.html
+share/doc/xen/html/hypercall/x86_32/include,public,io,libxenvchan.h.html
+share/doc/xen/html/hypercall/x86_32/include,public,io,netif.h.html
+share/doc/xen/html/hypercall/x86_32/include,public,io,pciif.h.html
+share/doc/xen/html/hypercall/x86_32/include,public,io,protocols.h.html
+share/doc/xen/html/hypercall/x86_32/include,public,io,pvcalls.h.html
+share/doc/xen/html/hypercall/x86_32/include,public,io,ring.h.html
+share/doc/xen/html/hypercall/x86_32/include,public,io,sndif.h.html
+share/doc/xen/html/hypercall/x86_32/include,public,io,tpmif.h.html
+share/doc/xen/html/hypercall/x86_32/include,public,io,usbif.h.html
+share/doc/xen/html/hypercall/x86_32/include,public,io,vscsiif.h.html
+share/doc/xen/html/hypercall/x86_32/include,public,io,xenbus.h.html
+share/doc/xen/html/hypercall/x86_32/include,public,io,xs_wire.h.html
+share/doc/xen/html/hypercall/x86_32/include,public,kexec.h.html
+share/doc/xen/html/hypercall/x86_32/include,public,memory.h.html
+share/doc/xen/html/hypercall/x86_32/include,public,nmi.h.html
+share/doc/xen/html/hypercall/x86_32/include,public,physdev.h.html
+share/doc/xen/html/hypercall/x86_32/include,public,platform.h.html
+share/doc/xen/html/hypercall/x86_32/include,public,pmu.h.html
+share/doc/xen/html/hypercall/x86_32/include,public,sched.h.html
+share/doc/xen/html/hypercall/x86_32/include,public,sysctl.h.html
+share/doc/xen/html/hypercall/x86_32/include,public,tmem.h.html
+share/doc/xen/html/hypercall/x86_32/include,public,trace.h.html
+share/doc/xen/html/hypercall/x86_32/include,public,vcpu.h.html
+share/doc/xen/html/hypercall/x86_32/include,public,version.h.html
+share/doc/xen/html/hypercall/x86_32/include,public,vm_event.h.html
+share/doc/xen/html/hypercall/x86_32/include,public,xen-compat.h.html
+share/doc/xen/html/hypercall/x86_32/include,public,xen.h.html
+share/doc/xen/html/hypercall/x86_32/include,public,xencomm.h.html
+share/doc/xen/html/hypercall/x86_32/include,public,xenoprof.h.html
+share/doc/xen/html/hypercall/x86_32/include,public,xsm,flask_op.h.html
+share/doc/xen/html/hypercall/x86_32/include,xen,errno.h.html
+share/doc/xen/html/hypercall/x86_32/index.html
+share/doc/xen/html/hypercall/x86_64/include,public,arch-ppc.h.html
+share/doc/xen/html/hypercall/x86_64/include,public,arch-x86,cpufeatureset.h.html
+share/doc/xen/html/hypercall/x86_64/include,public,arch-x86,cpuid.h.html
+share/doc/xen/html/hypercall/x86_64/include,public,arch-x86,guest-acpi.h.html
+share/doc/xen/html/hypercall/x86_64/include,public,arch-x86,hvm,save.h.html
+share/doc/xen/html/hypercall/x86_64/include,public,arch-x86,hvm,start_info.h.html
+share/doc/xen/html/hypercall/x86_64/include,public,arch-x86,pmu.h.html
+share/doc/xen/html/hypercall/x86_64/include,public,arch-x86,xen-mca.h.html
+share/doc/xen/html/hypercall/x86_64/include,public,arch-x86,xen-x86_64.h.html
+share/doc/xen/html/hypercall/x86_64/include,public,arch-x86,xen.h.html
+share/doc/xen/html/hypercall/x86_64/include,public,arch-x86_64.h.html
+share/doc/xen/html/hypercall/x86_64/include,public,argo.h.html
+share/doc/xen/html/hypercall/x86_64/include,public,callback.h.html
+share/doc/xen/html/hypercall/x86_64/include,public,device_tree_defs.h.html
+share/doc/xen/html/hypercall/x86_64/include,public,dom0_ops.h.html
+share/doc/xen/html/hypercall/x86_64/include,public,domctl.h.html
+share/doc/xen/html/hypercall/x86_64/include,public,elfnote.h.html
+share/doc/xen/html/hypercall/x86_64/include,public,errno.h.html
+share/doc/xen/html/hypercall/x86_64/include,public,event_channel.h.html
+share/doc/xen/html/hypercall/x86_64/include,public,features.h.html
+share/doc/xen/html/hypercall/x86_64/include,public,grant_table.h.html
+share/doc/xen/html/hypercall/x86_64/include,public,hvm,dm_op.h.html
+share/doc/xen/html/hypercall/x86_64/include,public,hvm,e820.h.html
+share/doc/xen/html/hypercall/x86_64/include,public,hvm,hvm_info_table.h.html
+share/doc/xen/html/hypercall/x86_64/include,public,hvm,hvm_op.h.html
+share/doc/xen/html/hypercall/x86_64/include,public,hvm,hvm_vcpu.h.html
+share/doc/xen/html/hypercall/x86_64/include,public,hvm,hvm_xs_strings.h.html
+share/doc/xen/html/hypercall/x86_64/include,public,hvm,ioreq.h.html
+share/doc/xen/html/hypercall/x86_64/include,public,hvm,params.h.html
+share/doc/xen/html/hypercall/x86_64/include,public,hvm,pvdrivers.h.html
+share/doc/xen/html/hypercall/x86_64/include,public,hvm,save.h.html
+share/doc/xen/html/hypercall/x86_64/include,public,hypfs.h.html
+share/doc/xen/html/hypercall/x86_64/include,public,io,9pfs.h.html
+share/doc/xen/html/hypercall/x86_64/include,public,io,blkif.h.html
+share/doc/xen/html/hypercall/x86_64/include,public,io,cameraif.h.html
+share/doc/xen/html/hypercall/x86_64/include,public,io,console.h.html
+share/doc/xen/html/hypercall/x86_64/include,public,io,displif.h.html
+share/doc/xen/html/hypercall/x86_64/include,public,io,fbif.h.html
+share/doc/xen/html/hypercall/x86_64/include,public,io,fsif.h.html
+share/doc/xen/html/hypercall/x86_64/include,public,io,kbdif.h.html
+share/doc/xen/html/hypercall/x86_64/include,public,io,libxenvchan.h.html
+share/doc/xen/html/hypercall/x86_64/include,public,io,netif.h.html
+share/doc/xen/html/hypercall/x86_64/include,public,io,pciif.h.html
+share/doc/xen/html/hypercall/x86_64/include,public,io,protocols.h.html
+share/doc/xen/html/hypercall/x86_64/include,public,io,pvcalls.h.html
+share/doc/xen/html/hypercall/x86_64/include,public,io,ring.h.html
+share/doc/xen/html/hypercall/x86_64/include,public,io,sndif.h.html
+share/doc/xen/html/hypercall/x86_64/include,public,io,tpmif.h.html
+share/doc/xen/html/hypercall/x86_64/include,public,io,usbif.h.html
+share/doc/xen/html/hypercall/x86_64/include,public,io,vscsiif.h.html
+share/doc/xen/html/hypercall/x86_64/include,public,io,xenbus.h.html
+share/doc/xen/html/hypercall/x86_64/include,public,io,xs_wire.h.html
+share/doc/xen/html/hypercall/x86_64/include,public,kexec.h.html
+share/doc/xen/html/hypercall/x86_64/include,public,memory.h.html
+share/doc/xen/html/hypercall/x86_64/include,public,nmi.h.html
+share/doc/xen/html/hypercall/x86_64/include,public,physdev.h.html
+share/doc/xen/html/hypercall/x86_64/include,public,platform.h.html
+share/doc/xen/html/hypercall/x86_64/include,public,pmu.h.html
+share/doc/xen/html/hypercall/x86_64/include,public,sched.h.html
+share/doc/xen/html/hypercall/x86_64/include,public,sysctl.h.html
+share/doc/xen/html/hypercall/x86_64/include,public,tmem.h.html
+share/doc/xen/html/hypercall/x86_64/include,public,trace.h.html
+share/doc/xen/html/hypercall/x86_64/include,public,vcpu.h.html
+share/doc/xen/html/hypercall/x86_64/include,public,version.h.html
+share/doc/xen/html/hypercall/x86_64/include,public,vm_event.h.html
+share/doc/xen/html/hypercall/x86_64/include,public,xen-compat.h.html
+share/doc/xen/html/hypercall/x86_64/include,public,xen.h.html
+share/doc/xen/html/hypercall/x86_64/include,public,xencomm.h.html
+share/doc/xen/html/hypercall/x86_64/include,public,xenoprof.h.html
+share/doc/xen/html/hypercall/x86_64/include,public,xsm,flask_op.h.html
+share/doc/xen/html/hypercall/x86_64/include,xen,errno.h.html
+share/doc/xen/html/hypercall/x86_64/index.html
+share/doc/xen/html/index.html
+share/doc/xen/html/man/index.html
+share/doc/xen/html/man/xen-pci-device-reservations.7.html
+share/doc/xen/html/man/xen-pv-channel.7.html
+share/doc/xen/html/man/xen-tscmode.7.html
+share/doc/xen/html/man/xen-vtpm.7.html
+share/doc/xen/html/man/xen-vtpmmgr.7.html
+share/doc/xen/html/man/xenhypfs.1.html
+share/doc/xen/html/man/xenstore-chmod.1.html
+share/doc/xen/html/man/xenstore-ls.1.html
+share/doc/xen/html/man/xenstore-read.1.html
+share/doc/xen/html/man/xenstore-write.1.html
+share/doc/xen/html/man/xenstore.1.html
+share/doc/xen/html/man/xentop.1.html
+share/doc/xen/html/man/xentrace.8.html
+share/doc/xen/html/man/xentrace_format.1.html
+share/doc/xen/html/man/xl-disk-configuration.5.html
+share/doc/xen/html/man/xl-network-configuration.5.html
+share/doc/xen/html/man/xl-numa-placement.7.html
+share/doc/xen/html/man/xl-pci-configuration.5.html
+share/doc/xen/html/man/xl.1.html
+share/doc/xen/html/man/xl.cfg.5.html
+share/doc/xen/html/man/xl.conf.5.html
+share/doc/xen/html/man/xlcpupool.cfg.5.html
+share/doc/xen/html/misc/amd-ucode-container.txt
+share/doc/xen/html/misc/arm/big.LITTLE.txt
+share/doc/xen/html/misc/arm/booting.txt
+share/doc/xen/html/misc/arm/device-tree/acpi.txt
+share/doc/xen/html/misc/arm/device-tree/booting.txt
+share/doc/xen/html/misc/arm/device-tree/cpupools.txt
+share/doc/xen/html/misc/arm/device-tree/guest.txt
+share/doc/xen/html/misc/arm/device-tree/index.html
+share/doc/xen/html/misc/arm/device-tree/passthrough.txt
+share/doc/xen/html/misc/arm/early-printk.txt
+share/doc/xen/html/misc/arm/index.html
+share/doc/xen/html/misc/arm/passthrough-noiommu.txt
+share/doc/xen/html/misc/arm/passthrough.txt
+share/doc/xen/html/misc/arm/silicon-errata.txt
+share/doc/xen/html/misc/block-scripts.txt
+share/doc/xen/html/misc/console.txt
+share/doc/xen/html/misc/crashdb.txt
+share/doc/xen/html/misc/distro_mapping.txt
+share/doc/xen/html/misc/dump-core-format.txt
+share/doc/xen/html/misc/grant-tables.txt
+share/doc/xen/html/misc/index.html
+share/doc/xen/html/misc/kexec_and_kdump.txt
+share/doc/xen/html/misc/libxl_memory.txt
+share/doc/xen/html/misc/printk-formats.txt
+share/doc/xen/html/misc/qemu-backends.txt
+share/doc/xen/html/misc/stubdom.txt
+share/doc/xen/html/misc/vtd-pi.txt
+share/doc/xen/html/misc/vtd.txt
+share/doc/xen/html/misc/vtpm-platforms.txt
+share/doc/xen/html/misc/xen-error-handling.txt
+share/doc/xen/html/misc/xenmon.txt
+share/doc/xen/html/misc/xenpaging.txt
+share/doc/xen/html/misc/xenstore-ring.txt
+share/doc/xen/html/misc/xenstore.txt
+share/doc/xen/html/misc/xsm-flask.txt
+share/examples/xen/README
+share/examples/xen/cpupool
+share/examples/xen/oxenstored.conf
+share/examples/xen/scripts/block
+share/examples/xen/scripts/hotplugpath.sh
+share/examples/xen/scripts/locking.sh
+share/examples/xen/scripts/qemu-ifup
+share/examples/xen/scripts/vif-bridge
+share/examples/xen/scripts/vif-ip
+share/examples/xen/xl.bash
+share/examples/xen/xl.conf
+share/examples/xen/xlexample.hvm
+share/examples/xen/xlexample.pvhlinux
+share/examples/xen/xlexample.pvlinux
+share/qemu-xen/applications/qemu.desktop
+share/qemu-xen/icons/hicolor/128x128/apps/qemu.png
+share/qemu-xen/icons/hicolor/16x16/apps/qemu.png
+share/qemu-xen/icons/hicolor/24x24/apps/qemu.png
+share/qemu-xen/icons/hicolor/256x256/apps/qemu.png
+share/qemu-xen/icons/hicolor/32x32/apps/qemu.bmp
+share/qemu-xen/icons/hicolor/32x32/apps/qemu.png
+share/qemu-xen/icons/hicolor/48x48/apps/qemu.png
+share/qemu-xen/icons/hicolor/512x512/apps/qemu.png
+share/qemu-xen/icons/hicolor/64x64/apps/qemu.png
+share/qemu-xen/icons/hicolor/scalable/apps/qemu.svg
+share/qemu-xen/qemu/QEMU,cgthree.bin
+share/qemu-xen/qemu/QEMU,tcx.bin
+share/qemu-xen/qemu/bamboo.dtb
+share/qemu-xen/qemu/bios-256k.bin
+share/qemu-xen/qemu/bios-microvm.bin
+share/qemu-xen/qemu/bios.bin
+share/qemu-xen/qemu/canyonlands.dtb
+share/qemu-xen/qemu/edk2-aarch64-code.fd
+share/qemu-xen/qemu/edk2-arm-code.fd
+share/qemu-xen/qemu/edk2-arm-vars.fd
+share/qemu-xen/qemu/edk2-i386-code.fd
+share/qemu-xen/qemu/edk2-i386-secure-code.fd
+share/qemu-xen/qemu/edk2-i386-vars.fd
+share/qemu-xen/qemu/edk2-licenses.txt
+share/qemu-xen/qemu/edk2-x86_64-code.fd
+share/qemu-xen/qemu/edk2-x86_64-secure-code.fd
+share/qemu-xen/qemu/efi-e1000.rom
+share/qemu-xen/qemu/efi-e1000e.rom
+share/qemu-xen/qemu/efi-eepro100.rom
+share/qemu-xen/qemu/efi-ne2k_pci.rom
+share/qemu-xen/qemu/efi-pcnet.rom
+share/qemu-xen/qemu/efi-rtl8139.rom
+share/qemu-xen/qemu/efi-virtio.rom
+share/qemu-xen/qemu/efi-vmxnet3.rom
+share/qemu-xen/qemu/firmware/50-edk2-i386-secure.json
+share/qemu-xen/qemu/firmware/50-edk2-x86_64-secure.json
+share/qemu-xen/qemu/firmware/60-edk2-aarch64.json
+share/qemu-xen/qemu/firmware/60-edk2-arm.json
+share/qemu-xen/qemu/firmware/60-edk2-i386.json
+share/qemu-xen/qemu/firmware/60-edk2-x86_64.json
+share/qemu-xen/qemu/hppa-firmware.img
+share/qemu-xen/qemu/keymaps/ar
+share/qemu-xen/qemu/keymaps/bepo
+share/qemu-xen/qemu/keymaps/cz
+share/qemu-xen/qemu/keymaps/da
+share/qemu-xen/qemu/keymaps/de
+share/qemu-xen/qemu/keymaps/de-ch
+share/qemu-xen/qemu/keymaps/en-gb
+share/qemu-xen/qemu/keymaps/en-us
+share/qemu-xen/qemu/keymaps/es
+share/qemu-xen/qemu/keymaps/et
+share/qemu-xen/qemu/keymaps/fi
+share/qemu-xen/qemu/keymaps/fo
+share/qemu-xen/qemu/keymaps/fr
+share/qemu-xen/qemu/keymaps/fr-be
+share/qemu-xen/qemu/keymaps/fr-ca
+share/qemu-xen/qemu/keymaps/fr-ch
+share/qemu-xen/qemu/keymaps/hr
+share/qemu-xen/qemu/keymaps/hu
+share/qemu-xen/qemu/keymaps/is
+share/qemu-xen/qemu/keymaps/it
+share/qemu-xen/qemu/keymaps/ja
+share/qemu-xen/qemu/keymaps/lt
+share/qemu-xen/qemu/keymaps/lv
+share/qemu-xen/qemu/keymaps/mk
+share/qemu-xen/qemu/keymaps/nl
+share/qemu-xen/qemu/keymaps/no
+share/qemu-xen/qemu/keymaps/pl
+share/qemu-xen/qemu/keymaps/pt
+share/qemu-xen/qemu/keymaps/pt-br
+share/qemu-xen/qemu/keymaps/ru
+share/qemu-xen/qemu/keymaps/sl
+share/qemu-xen/qemu/keymaps/sv
+share/qemu-xen/qemu/keymaps/th
+share/qemu-xen/qemu/keymaps/tr
+share/qemu-xen/qemu/kvmvapic.bin
+share/qemu-xen/qemu/linuxboot.bin
+share/qemu-xen/qemu/linuxboot_dma.bin
+share/qemu-xen/qemu/multiboot.bin
+share/qemu-xen/qemu/multiboot_dma.bin
+share/qemu-xen/qemu/npcm7xx_bootrom.bin
+share/qemu-xen/qemu/openbios-ppc
+share/qemu-xen/qemu/openbios-sparc32
+share/qemu-xen/qemu/openbios-sparc64
+share/qemu-xen/qemu/opensbi-riscv32-generic-fw_dynamic.bin
+share/qemu-xen/qemu/opensbi-riscv64-generic-fw_dynamic.bin
+share/qemu-xen/qemu/palcode-clipper
+share/qemu-xen/qemu/petalogix-ml605.dtb
+share/qemu-xen/qemu/petalogix-s3adsp1800.dtb
+share/qemu-xen/qemu/pvh.bin
+share/qemu-xen/qemu/pxe-e1000.rom
+share/qemu-xen/qemu/pxe-eepro100.rom
+share/qemu-xen/qemu/pxe-ne2k_pci.rom
+share/qemu-xen/qemu/pxe-pcnet.rom
+share/qemu-xen/qemu/pxe-rtl8139.rom
+share/qemu-xen/qemu/pxe-virtio.rom
+share/qemu-xen/qemu/qboot.rom
+share/qemu-xen/qemu/qemu-nsis.bmp
+share/qemu-xen/qemu/qemu_vga.ndrv
+share/qemu-xen/qemu/s390-ccw.img
+share/qemu-xen/qemu/s390-netboot.img
+share/qemu-xen/qemu/skiboot.lid
+share/qemu-xen/qemu/slof.bin
+share/qemu-xen/qemu/trace-events-all
+share/qemu-xen/qemu/u-boot-sam460-20100605.bin
+share/qemu-xen/qemu/u-boot.e500
+share/qemu-xen/qemu/vgabios-ati.bin
+share/qemu-xen/qemu/vgabios-bochs-display.bin
+share/qemu-xen/qemu/vgabios-cirrus.bin
+share/qemu-xen/qemu/vgabios-qxl.bin
+share/qemu-xen/qemu/vgabios-ramfb.bin
+share/qemu-xen/qemu/vgabios-stdvga.bin
+share/qemu-xen/qemu/vgabios-virtio.bin
+share/qemu-xen/qemu/vgabios-vmware.bin
+share/qemu-xen/qemu/vgabios.bin
+share/qemu-xen/qemu/vof-nvram.bin
+share/qemu-xen/qemu/vof.bin
+@pkgdir share/examples/xen/auto
Index: pkgsrc/sysutils/xentools418/buildlink3.mk
diff -u /dev/null pkgsrc/sysutils/xentools418/buildlink3.mk:1.1
--- /dev/null   Tue Nov 21 11:37:03 2023
+++ pkgsrc/sysutils/xentools418/buildlink3.mk   Tue Nov 21 11:37:03 2023
@@ -0,0 +1,14 @@
+# $NetBSD: buildlink3.mk,v 1.1 2023/11/21 11:37:03 bouyer Exp $
+
+BUILDLINK_TREE+=       xentools415
+
+.if !defined(XENTOOLS415_BUILDLINK3_MK)
+XENTOOLS415_BUILDLINK3_MK:=
+
+BUILDLINK_API_DEPENDS.xentools415+=    xentools415>=4.15.2nb3
+BUILDLINK_ABI_DEPENDS.xentools415?=    xentools415>=4.15.4nb1
+BUILDLINK_PKGSRCDIR.xentools415?=      ../../sysutils/xentools415
+
+.endif # XENTOOLS415_BUILDLINK3_MK
+
+BUILDLINK_TREE+=       -xentools415
Index: pkgsrc/sysutils/xentools418/distinfo
diff -u /dev/null pkgsrc/sysutils/xentools418/distinfo:1.1
--- /dev/null   Tue Nov 21 11:37:03 2023
+++ pkgsrc/sysutils/xentools418/distinfo        Tue Nov 21 11:37:03 2023
@@ -0,0 +1,65 @@
+$NetBSD: distinfo,v 1.1 2023/11/21 11:37:03 bouyer Exp $
+
+BLAKE2s (xen418/ipxe-1d1cf74a5e58811822bee4b3da3cff7282fcdfca.tar.gz) = 82256e7e5d45980590a6493e17a4e133ff63fa28f00aff1963db96371e702448
+SHA512 (xen418/ipxe-1d1cf74a5e58811822bee4b3da3cff7282fcdfca.tar.gz) = e1c11e37f53aab0cc6a3ceaace0b8417f07009b1f20ff8572320895fef24f1a796ade041094a024eb24c988b9bed404c556a1fdde809bba89fb49f0e0ff45a57
+Size (xen418/ipxe-1d1cf74a5e58811822bee4b3da3cff7282fcdfca.tar.gz) = 4079541 bytes
+BLAKE2s (xen418/qemu-xen-20231116.tar.gz) = eee3ef6342ba518e00724a81b5ab1c20f05147c72a4dd2d99de4656e8ee91024
+SHA512 (xen418/qemu-xen-20231116.tar.gz) = a7bc24adc0bb70a0b518cd0e85766bcf15ad740986e097818cf0e4894e0ae85dfe02467dd8f505cbf6ad6ed02bc302258cc21a9dc765b4f7330e6505a50aa2f8
+Size (xen418/qemu-xen-20231116.tar.gz) = 40718645 bytes
+BLAKE2s (xen418/qemu-xen-traditional-3d273dd.tar.gz) = 451316ac6d33cd349aa4eb06e56b5c05685b533867b9729a2749e18d7049060d
+SHA512 (xen418/qemu-xen-traditional-3d273dd.tar.gz) = 46a3d7054f8ccd211a9c984385bf33ed763247b94626eb09f962086307dbc7e2d058942c16622e09ae782a7e7ea357524b29ea410ac53a70b9fa26b60e8a37ef
+Size (xen418/qemu-xen-traditional-3d273dd.tar.gz) = 3733225 bytes
+BLAKE2s (xen418/seabios-1.16.2.tar.gz) = 5c61373b373fe039436fb73e6459ce48c1b18a11cd48df157ebffa3e91001cef
+SHA512 (xen418/seabios-1.16.2.tar.gz) = 4e6ede3cc614617e57f1a288e105e09d84aeaa47e53b03a20ba75124a4fac18f68ba0665c5661f7bfb75b57623866e2d0faf6da8270890b4da2cf7e0e8d1f534
+Size (xen418/seabios-1.16.2.tar.gz) = 635922 bytes
+BLAKE2s (xen418/xen-d75f1e9.tar.gz) = 378782f6af3fb609a0fce4c7e76a3fc22d3ad691b89aa2d328be3310431dfbcf
+SHA512 (xen418/xen-d75f1e9.tar.gz) = e928b980f6bff13b9754f705d6b01ed0d4c4083187d74105dc4fad5af5c6bae0dd97b36ebc21482750ddbc038538e38a1296d4a3cf782fdcd2dc2b8b97d6dbd5
+Size (xen418/xen-d75f1e9.tar.gz) = 6820424 bytes
+SHA1 (patch-.._seabios-rel-1.16.2_src_string.c) = a8861860e63fb38dee3ebca1fce7f470ec7ff000
+SHA1 (patch-Config.mk) = d108a1743b5b5313d3ea957b02a005b49f5b3bf6
+SHA1 (patch-configure) = d52bd51ae234ffd0796b0d3c2453e5e5931c9b63
+SHA1 (patch-docs_man_xl.1.pod.in) = 280a3717b9f15578d90f85392249ef97844b6765
+SHA1 (patch-docs_man_xl.cfg.5.pod.in) = 5970961552f29c4536a884161a208a27a20dccf4
+SHA1 (patch-docs_man_xlcpupool.cfg.5.pod) = ab3a2529cd10458948557fd7ab032e80df8b1d81
+SHA1 (patch-docs_misc_block-scripts.txt) = 29a49edc4d15c4c8db822fd1d6356d07aeb27b86
+SHA1 (patch-docs_misc_vtd.txt) = 26c12a3023315f35a6f59b6715b811c989c67680
+SHA1 (patch-tools_Makefile) = 19849d9a531f9cf9c428a95871db602b4113795d
+SHA1 (patch-tools_Rules.mk) = da67aed4c817b9bfe7771bd0790aaaeefde9d839
+SHA1 (patch-tools_configure) = ba5ce2bdd4bdbb1cb94ffa4937721821a75e2c07
+SHA1 (patch-tools_console_daemon_utils.c) = ea0f66a3edbf6cb643580d0fae190064c0cbf0e0
+SHA1 (patch-tools_examples_Makefile) = 55839120606cd4c029cf5a816db4a284c249188e
+SHA1 (patch-tools_firmware_Makefile) = 9a50b5b9ce9988d76a62773bf3e9b3681acf5412
+SHA1 (patch-tools_firmware_etherboot_Makefile) = 61741d59c72430d53682ea83deed91ee4ff3d220
+SHA1 (patch-tools_hotplug_NetBSD_Makefile) = 61798426eb3bd3e7eca1f52fe19ee258db951a01
+SHA1 (patch-tools_hotplug_NetBSD_block) = 23a18f1ebfa3bc4a689707fd5c8afa07fa232bee
+SHA1 (patch-tools_hotplug_common_Makefile) = 8d2a57ba929e9b57b87869d08731c6b5bb13ba87
+SHA1 (patch-tools_include_xen-sys_NetBSD_evtchn.h) = cac834bdddfab8bb76be3b4766f084f6fc2a7bc2
+SHA1 (patch-tools_include_xen-sys_NetBSD_privcmd.h) = b47ef90b0e823b270c491b9206ae10b9f230971d
+SHA1 (patch-tools_libxl_libxl_dom.c) = 4aa62de9adbc1eb659ba22d03e3fed42619e5a21
+SHA1 (patch-tools_libxl_libxl_event.c) = 9446c88d01b419cc7531b6f6d959816410e74024
+SHA1 (patch-tools_libxl_libxl_internal.h) = abcfaec70521b3ada6b4eae743119c24f141ea8f
+SHA1 (patch-tools_ocaml_common.make) = 305994b93fe29fb42e4aa57e19a039abef4e76fe
+SHA1 (patch-tools_ocaml_xenstored_Makefile) = b267702cf4090c7b45bba530e60327fced24e3e5
+SHA1 (patch-tools_ocaml_xenstored_utils.ml) = 4933684e759609e728c1764ca14766128b2a7730
+SHA1 (patch-tools_pygrub_Makefile) = ed9e471c70047bb1b8bfe0265b8cfecbc293937b
+SHA1 (patch-tools_python_Makefile) = 92706e044b1933d6699aab5e4fa89e53b83f23dd
+SHA1 (patch-tools_qemu-xen-traditional_Makefile) = 5fbb55bf84f9856043be301d5d06530190fe9a60
+SHA1 (patch-tools_qemu-xen-traditional_block-raw-posix.c) = eb3efea4b0c7fd744f627f1926fca737ba826b99
+SHA1 (patch-tools_qemu-xen-traditional_configure) = 6a42dcac010f90439a347c0f6e886b07185cb19a
+SHA1 (patch-tools_qemu-xen-traditional_hw_e1000.c) = ec86584529cc743ea27768ad1fab523ee9fb6bea
+SHA1 (patch-tools_qemu-xen-traditional_hw_ide.c) = b541546390c6d142bc6079dbd51cfd65b5223e9e
+SHA1 (patch-tools_qemu-xen-traditional_hw_pass-through.c) = 45848fb5038bdd6def218b35dd0a6496a14102f1
+SHA1 (patch-tools_qemu-xen-traditional_hw_pt-graphics.c) = b9c18042f40ccacb3f24ab0f1e3c6e1a5bf5521a
+SHA1 (patch-tools_qemu-xen-traditional_hw_pt-msi.c) = a953380dbc3e64528c39e26d2c45c0cbd3e4d738
+SHA1 (patch-tools_qemu-xen-traditional_hw_pt-msi.h) = 787447cc24518fe5ae16942d72d3038db612419d
+SHA1 (patch-tools_qemu-xen-traditional_i386-dm_hookstarget.mak) = 3fdfbb7c9c2243a4cf5dabc5a6dd13c12f9d5850
+SHA1 (patch-tools_qemu-xen-traditional_net.c) = 17ca8b0ba8fca5eee277fc97373287aaf25b5dae
+SHA1 (patch-tools_qemu-xen-traditional_xen-hooks.mak) = bc59cb87742036dfa75869572b21b58dd5a2c5ee
+SHA1 (patch-tools_qemu-xen_audio_audio.c) = d6a857ae398cb218d8ae4219f6b905bd8d7c0b0b
+SHA1 (patch-tools_qemu-xen_bios_optionrom_Makefile) = b05db9e1fddbd8e02f8882c2a8d89889f4289b74
+SHA1 (patch-tools_qemu-xen_net_tap-bsd.c) = 1d143fcc75ba21c78d7b44a191fd265c76a235e6
+SHA1 (patch-tools_qemu-xen_net_tap.c) = 8fdcbefcd38c15ddd65f6df62e0e410e325bae4e
+SHA1 (patch-tools_xenpaging_xenpaging.c) = 3ade1afeb17210632ca350cdbb649f30d4697493
+SHA1 (patch-tools_xl_Makefile) = 76f401d3f3dddb4fd48cf386494583db658e56b0
+SHA1 (patch-xen_Makefile) = bba02be1c25c1a1cef44754602e073afc5de85eb
+SHA1 (patch-xen_include_Makefile) = 5bdd9f7e3eda76285fff1f8aa9c32d2fa9e4a837
Index: pkgsrc/sysutils/xentools418/version.mk
diff -u /dev/null pkgsrc/sysutils/xentools418/version.mk:1.1
--- /dev/null   Tue Nov 21 11:37:03 2023
+++ pkgsrc/sysutils/xentools418/version.mk      Tue Nov 21 11:37:03 2023
@@ -0,0 +1,36 @@
+# $NetBSD: version.mk,v 1.1 2023/11/21 11:37:03 bouyer Exp $
+#
+# Version number is used by xenkernel418, xentools418 and xenstoretools
+
+VERSION=               20231116
+XEN_COMMIT=            d75f1e9b74314cea91ce435730d4e3539ecca77d
+XEN_SHORTCOMMIT=       d75f1e9
+
+DIST_SUBDIR=           xen418
+DISTNAME=              xen-${XEN_SHORTCOMMIT}
+MASTER_SITES=          -https://xenbits.xen.org/gitweb/?p=xen.git;a=snapshot;h=${XEN_COMMIT};sf=tgz
+DISTFILES=             ${DISTNAME}.tar.gz
+
+.if !defined(XENKERNEL)
+IPXE_VERSION=          1d1cf74a5e58811822bee4b3da3cff7282fcdfca
+IPXE_DIST=             ipxe-${IPXE_VERSION}.tar.gz
+DISTFILES+=            ${IPXE_DIST}
+SITES.${IPXE_DIST}=    -https://github.com/ipxe/ipxe/archive/${IPXE_VERSION}.tar.gz
+
+QEMU_VERSION=          ${VERSION}
+QEMU_DIST=             qemu-xen-${QEMU_VERSION}
+QEMU_DISTFILE=         ${QEMU_DIST}.tar.gz
+DISTFILES+=            ${QEMU_DISTFILE}
+SITES.${QEMU_DISTFILE}=         ${MASTER_SITE_LOCAL}
+
+QEMUTRAD_VERSION=      3d273dd05e51e5a1ffba3d98c7437ee84e8f8764
+QEMUTRAD_DIST=         qemu-xen-traditional-3d273dd
+QEMUTRAD_DISTFILE=     ${QEMUTRAD_DIST}.tar.gz
+DISTFILES+=            ${QEMUTRAD_DISTFILE}
+SITES.${QEMUTRAD_DISTFILE}=    -https://xenbits.xen.org/gitweb/?p=qemu-xen-traditional.git;a=snapshot;h=${QEMUTRAD_VERSION};sf=tgz
+
+SEABIOS_VERSION=       1.16.2
+SEABIOS_DIST=          seabios-${SEABIOS_VERSION}.tar.gz
+DISTFILES+=            ${SEABIOS_DIST}
+SITES.${SEABIOS_DIST}= -http://xenbits.xen.org/gitweb/?p=seabios.git;a=snapshot;h=refs/tags/rel-${SEABIOS_VERSION};sf=tgz
+.endif # !XENKERNEL

Index: pkgsrc/sysutils/xentools418/files/xen-watchdog.sh
diff -u /dev/null pkgsrc/sysutils/xentools418/files/xen-watchdog.sh:1.1
--- /dev/null   Tue Nov 21 11:37:03 2023
+++ pkgsrc/sysutils/xentools418/files/xen-watchdog.sh   Tue Nov 21 11:37:03 2023
@@ -0,0 +1,17 @@
+#!@RCD_SCRIPTS_SHELL@
+#
+# PROVIDE: xen-watchdog
+# REQUIRE: DAEMON
+#
+# description: Run domain watchdog daemon
+#
+
+. /etc/rc.subr
+
+name="xenwatchdog"
+rcvar=$name
+command="@PREFIX@/sbin/xenwatchdogd"
+start_cmd="echo Starting ${name}. && PATH=${PATH}:@PREFIX@/sbin ${command} 30 15"
+
+load_rc_config $name
+run_rc_command "$1"
Index: pkgsrc/sysutils/xentools418/files/xencommons.sh
diff -u /dev/null pkgsrc/sysutils/xentools418/files/xencommons.sh:1.1
--- /dev/null   Tue Nov 21 11:37:03 2023
+++ pkgsrc/sysutils/xentools418/files/xencommons.sh     Tue Nov 21 11:37:03 2023
@@ -0,0 +1,107 @@
+#!@RCD_SCRIPTS_SHELL@
+#
+# PROVIDE: xencommons
+# REQUIRE: DAEMON
+
+. /etc/rc.subr
+
+name="xencommons"
+rcvar=$name
+start_precmd="xen_precmd"
+start_cmd="xen_startcmd"
+stop_cmd="xen_stop"
+status_cmd="xen_status"
+extra_commands="status"
+required_files="/kern/xen/privcmd"
+
+XENSTORED_PIDFILE="/var/run/xenstored.pid"
+XENCONSOLED_PIDFILE="/var/run/xenconsoled.pid"
+
+BINDIR=@PREFIX@/bin
+SBINDIR=@PREFIX@/sbin
+LIBEXEC_BIN=@PREFIX@/libexec/xen/bin
+
+xen_precmd()
+{
+       mkdir -p /var/run/xen || exit 1
+       mkdir -p /var/run/xenstored || exit 1
+}
+
+xen_startcmd()
+{
+       printf "Starting xenservices: xenstored, xenconsoled.\n"
+       if test ! -r ${required_files}; then
+               warn "${required_files} is not readable."
+       fi
+       XENSTORED_ARGS=" --pid-file ${XENSTORED_PIDFILE}"
+       if [ -n "${XENSTORED_TRACE}" ]; then
+               XENSTORED_ARGS="${XENSTORED_ARGS} -T /var/log/xen/xenstored-trace.log"
+       fi
+
+       ${SBINDIR}/xenstored ${XENSTORED_ARGS}
+       sleep 5
+
+        printf "Setting domain 0 name, domid and JSON config...\n"
+        ${LIBEXEC_BIN}/xen-init-dom0
+
+       XENCONSOLED_ARGS=""
+       if [ -n "${XENCONSOLED_TRACE}" ]; then
+               XENCONSOLED_ARGS="${XENCONSOLED_ARGS} --log=${XENCONSOLED_TRACE}"
+       fi
+
+       ${SBINDIR}/xenconsoled ${XENCONSOLED_ARGS}
+}
+
+xen_stop()
+{
+       pids=""
+       printf "Stopping xencommons"
+
+       rc_pid=$(check_pidfile ${XENCONSOLED_PIDFILE} ${SBINDIR}/xenconsoled)
+       pids="$pids $rc_pid"
+       rc_pid=$(check_pidfile ${XENSTORED_PIDFILE} ${SBINDIR}/xenstored)
+       pids="$pids $rc_pid"
+
+       kill -${sig_stop:-TERM} $pids
+       wait_for_pids $pids
+
+       printf ".\n"
+}
+
+xen_status()
+{
+       xenstored_pid=$(check_pidfile ${XENSTORED_PIDFILE} ${SBINDIR}/xenstored)
+       if test -n ${xenstored_pid}; then
+               pids="$pids $xenstored_pid"
+       fi
+
+       xenconsoled_pid=$(check_pidfile ${XENCONSOLED_PIDFILE} ${SBINDIR}/xenconsoled)
+       if test -n ${xenconsoled_pid}; then
+               pids="$pids $xenconsoled_pid"
+       fi
+
+       if test -n "$xenconsoled_pid" -a -n "$xenstored_pid";
+       then
+               echo "xencommons are running as pids $pids."
+               return 0
+       fi
+       if test -a -z "$xenconsoled_pid" -a -z "$xenstored_pid";
+       then
+               echo "xencommons are not running."
+               return 0
+       fi
+
+       if test -n "$xenstored_pid"; then
+               echo "xenstored is running as pid $xenstored_pid."
+       else
+               echo "xenstored is not running."
+       fi
+       if test -n "$xenconsoled_pid"; then
+               echo "xenconsoled is running as pid $xenconsoled_pid."
+       else
+               echo "xenconsoled is not running."
+       fi
+}
+
+load_rc_config $name
+run_rc_command "$1"
Index: pkgsrc/sysutils/xentools418/files/xendomains.sh
diff -u /dev/null pkgsrc/sysutils/xentools418/files/xendomains.sh:1.1
--- /dev/null   Tue Nov 21 11:37:03 2023
+++ pkgsrc/sysutils/xentools418/files/xendomains.sh     Tue Nov 21 11:37:03 2023
@@ -0,0 +1,129 @@
+#!@RCD_SCRIPTS_SHELL@
+#
+# PROVIDE: xendomains
+# REQUIRE: xencommons
+# KEYWORD: shutdown
+#
+# xendomains           This required variable is a whitespace-separated
+#                      list of domains, e.g., xendomains="dom1 dom2 dom3".
+#
+# xendomains_config    This optional variable is a format string that
+#                      represents the path to the configuration file for
+#                      each domain.  "%s" is substituted with the name of
+#                      the domain.  The default is "@PKG_SYSCONFDIR@/%s".
+#
+# xendomains_prehook   This optional variable is a format string that
+#                      represents the command to run, if it exists, before
+#                      starting each domain.  "%s" is substituted with the
+#                      name of the domain.  The default is
+#                      "@PKG_SYSCONFDIR@/%s-pre".
+#
+# xendomains_posthook  This optional variable is a format string that
+#                      represents the command to run, if it exists, after
+#                      stopping each domain.  "%s" is substituted with the
+#                      name of the domain.  The default is
+#                      "@PKG_SYSCONFDIR@/%s-post".
+#
+
+. /etc/rc.subr
+
+name="xendomains"
+ctl_command="@PREFIX@/sbin/xl"
+start_cmd="xendomains_start"
+stop_cmd="xendomains_stop"
+list_cmd="xendomains_list"
+extra_commands="list"
+required_files="/kern/xen/privcmd"
+
+xendomains_start()
+{
+       [ -n "$xendomains" ] || return
+
+       echo "Starting xen domains."
+       for domain in $xendomains; do
+               case "$domain" in
+               "")     continue ;;
+               esac
+
+               # Start off by running the pre-hook script if it's present.
+               if [ -n "${xendomains_prehook}" ]; then
+                       cmdline=`printf "${xendomains_prehook}" $domain`
+                       cmd="${cmdline%% *}"
+                       if [ -x "$cmd" ]; then
+                               if ! $cmdline; then
+                                       echo "Pre-hook \`\`$cmdline'' failed... skipping $domain."
+                                       continue
+                               fi
+                       fi
+               fi
+
+               # Ask xend to create the domain.
+               if [ -n "${xendomains_config}" ]; then
+                       file=`printf "${xendomains_config}" $domain`
+                       if [ -f "$file" ]; then
+                               ${ctl_command} create "$file"
+                       fi
+               fi
+       done
+}
+
+xendomains_list() {
+       # Output a whitespace-separated list of live guest domains.
+       ${ctl_command} list | awk '
+               (FNR <= 2) { next }
+               ($5 !~ /s/) { s = s " " $1 }
+               END { sub(" *", "", s); print s }'
+}
+
+xendomains_stop()
+{
+       # Determine an appropriate timeout waiting for all domains to
+       # stop -- always wait at least 60s, and add 5s per active domain.
+       #
+       numdomains=$(xendomains_list | awk '{ print NF }')
+       [ $numdomains -gt 0 ] || return
+       timeout=$((60 + numdomains * 5))
+
+       # Ask xend to stop every domain, and poll xend every 10s up to the
+       # timeout period to check if all the domains are stopped.  We
+       # consider a domain in the "s" (shutdown) state to be stopped.
+       #
+       echo "Stopping xen domains."
+       for domain in $(xendomains_list); do
+               ${ctl_command} shutdown -F $domain
+       done
+       while [ $timeout -gt 0 ]; do
+               livedomains=$(xendomains_list)
+               [ -n "$livedomains" ] || break
+               timeout=$((timeout - 10))
+               sleep 10
+       done
+       livedomains=$(xendomains_list)
+       if [ -n "$livedomains" ]; then
+               echo "Failed to stop: $livedomains"
+       else
+               echo "All domains stopped."
+       fi
+
+       # Finish off by running the post-hook script if it's present.
+       for domain in $xendomains; do
+               case "$domain" in
+               "")     continue ;;
+               esac
+               if [ -n "${xendomains_posthook}" ]; then
+                       cmdline=`printf "${xendomains_posthook}" $domain`
+                       cmd="${cmdline%% *}"
+                       if [ -x "$cmd" ]; then
+                               $cmdline || echo "Post-hook \`\`$cmdline'' failed."
+                       fi
+               fi
+       done
+}
+
+load_rc_config $name
+
+: ${xendomains_config="@PKG_SYSCONFDIR@/%s"}
+: ${xendomains_prehook="@PKG_SYSCONFDIR@/%s-pre"}
+: ${xendomains_posthook="@PKG_SYSCONFDIR@/%s-post"}
+
+run_rc_command "$1"

Index: pkgsrc/sysutils/xentools418/patches/patch-.._seabios-rel-1.16.2_src_string.c
diff -u /dev/null pkgsrc/sysutils/xentools418/patches/patch-.._seabios-rel-1.16.2_src_string.c:1.1
--- /dev/null   Tue Nov 21 11:37:03 2023
+++ pkgsrc/sysutils/xentools418/patches/patch-.._seabios-rel-1.16.2_src_string.c        Tue Nov 21 11:37:03 2023
@@ -0,0 +1,18 @@
+$NetBSD: patch-.._seabios-rel-1.16.2_src_string.c,v 1.1 2023/11/21 11:37:03 bouyer Exp $
+
+when the code is compiled -fwhole-program, memcpy() will be ommitted by gcc
+because nothing in the file references it. Later the link fails with
+undefined references to memcpy().
+Force the inclusion with (externally_visible) attribute
+
+--- ../seabios-rel-1.16.2/src/string.c.orig    2021-04-17 22:32:25.409876075 +0200
++++ ../seabios-rel-1.16.2/src/string.c 2021-04-17 22:32:39.873615679 +0200
+@@ -149,7 +149,7 @@
+         memcpy(d_fl, s_fl, len);
+ }
+ 
+-void *
++__attribute__((externally_visible)) void *
+ #undef memcpy
+ memcpy(void *d1, const void *s1, size_t len)
+ #if MODESEGMENT == 0
Index: pkgsrc/sysutils/xentools418/patches/patch-Config.mk
diff -u /dev/null pkgsrc/sysutils/xentools418/patches/patch-Config.mk:1.1
--- /dev/null   Tue Nov 21 11:37:03 2023
+++ pkgsrc/sysutils/xentools418/patches/patch-Config.mk Tue Nov 21 11:37:03 2023
@@ -0,0 +1,34 @@
+$NetBSD: patch-Config.mk,v 1.1 2023/11/21 11:37:03 bouyer Exp $
+
+Make sure to pass pkgsrc CFLAGS.
+Use -R instead if -rpath, to appease our linker (--enable-rpath bug ?)
+
+--- Config.mk.orig     2020-12-08 15:28:31.000000000 +0100
++++ Config.mk  2020-12-14 11:48:10.669586105 +0100
+@@ -33,7 +33,7 @@
+ 
+ # Tools to run on system hosting the build
+ HOSTCFLAGS  = -Wall -Werror -Wstrict-prototypes -O2 -fomit-frame-pointer
+-HOSTCFLAGS += -fno-strict-aliasing
++HOSTCFLAGS += -fno-strict-aliasing ${EXTRA_HOSTCFLAGS}
+ 
+ DISTDIR     ?= $(XEN_ROOT)/dist
+ DESTDIR     ?= /
+@@ -188,6 +188,8 @@
+ 
+ CFLAGS += -Wall -Wstrict-prototypes
+ 
++CFLAGS += ${EXTRA_CFLAGS}
++
+ $(call cc-option-add,HOSTCFLAGS,HOSTCC,-Wdeclaration-after-statement)
+ $(call cc-option-add,CFLAGS,CC,-Wdeclaration-after-statement)
+ $(call cc-option-add,CFLAGS,CC,-Wno-unused-but-set-variable)
+@@ -198,7 +200,7 @@
+ LDFLAGS += $(foreach i, $(PREPEND_LIB), -L$(i))
+ CFLAGS += $(foreach i, $(PREPEND_INCLUDES), -I$(i))
+ ifeq ($(XEN_TOOLS_RPATH),y)
+-LDFLAGS += -Wl,-rpath,$(libdir)
++LDFLAGS += -Wl,-R$(libdir)
+ endif
+ APPEND_LDFLAGS += $(foreach i, $(APPEND_LIB), -L$(i))
+ APPEND_CFLAGS += $(foreach i, $(APPEND_INCLUDES), -I$(i))
Index: pkgsrc/sysutils/xentools418/patches/patch-configure
diff -u /dev/null pkgsrc/sysutils/xentools418/patches/patch-configure:1.1
--- /dev/null   Tue Nov 21 11:37:03 2023
+++ pkgsrc/sysutils/xentools418/patches/patch-configure Tue Nov 21 11:37:03 2023
@@ -0,0 +1,15 @@
+$NetBSD: patch-configure,v 1.1 2023/11/21 11:37:03 bouyer Exp $
+
+Don't try to build stubdom
+
+--- configure.orig     2023-10-11 16:40:52.386364019 +0200
++++ configure  2023-10-11 16:41:06.088121617 +0200
+@@ -2127,7 +2127,7 @@
+ 
+ case "$host_cpu" in
+     i[3456]86|x86_64)
+-        arch_enable_stubdom=y
++        arch_enable_stubdom=n
+         ;;
+     *)
+         arch_enable_stubdom=n
Index: pkgsrc/sysutils/xentools418/patches/patch-docs_man_xl.1.pod.in
diff -u /dev/null pkgsrc/sysutils/xentools418/patches/patch-docs_man_xl.1.pod.in:1.1
--- /dev/null   Tue Nov 21 11:37:03 2023
+++ pkgsrc/sysutils/xentools418/patches/patch-docs_man_xl.1.pod.in      Tue Nov 21 11:37:03 2023
@@ -0,0 +1,17 @@
+$NetBSD: patch-docs_man_xl.1.pod.in,v 1.1 2023/11/21 11:37:03 bouyer Exp $
+
+--- docs/man/xl.1.pod.in.orig  2021-04-06 19:14:18.000000000 +0200
++++ docs/man/xl.1.pod.in       2021-04-17 13:34:37.085288645 +0200
+@@ -33,10 +33,10 @@
+ 
+ =over 4
+ 
+-=item start the script B</etc/init.d/xencommons> at boot time
++=item start the script B</etc/rc.d/xencommons> at boot time
+ 
+ Most B<xl> operations rely upon B<xenstored> and B<xenconsoled>: make
+-sure you start the script B</etc/init.d/xencommons> at boot time to
++sure you start the script B</etc/rc.d/xencommons> at boot time to
+ initialize all the daemons needed by B<xl>.
+ 
+ =item setup a B<xenbr0> bridge in dom0
Index: pkgsrc/sysutils/xentools418/patches/patch-docs_man_xl.cfg.5.pod.in
diff -u /dev/null pkgsrc/sysutils/xentools418/patches/patch-docs_man_xl.cfg.5.pod.in:1.1
--- /dev/null   Tue Nov 21 11:37:03 2023
+++ pkgsrc/sysutils/xentools418/patches/patch-docs_man_xl.cfg.5.pod.in  Tue Nov 21 11:37:03 2023
@@ -0,0 +1,29 @@
+$NetBSD: patch-docs_man_xl.cfg.5.pod.in,v 1.1 2023/11/21 11:37:03 bouyer Exp $
+
+--- docs/man/xl.cfg.5.pod.in.orig      2018-04-17 19:21:31.000000000 +0200
++++ docs/man/xl.cfg.5.pod.in   2018-04-23 16:14:18.000000000 +0200
+@@ -4,13 +4,13 @@
+ 
+ =head1 SYNOPSIS
+ 
+- /etc/xen/xldomain
++ @XENDCONFDIR@/xldomain
+ 
+ =head1 DESCRIPTION
+ 
+ Creating a VM (a domain in Xen terminology, sometimes called a guest)
+ with xl requires the provision of a domain configuration file.  Typically,
+-these live in F</etc/xen/DOMAIN.cfg>, where DOMAIN is the name of the
++these live in F<@XENDCONFDIR@/DOMAIN.cfg>, where DOMAIN is the name of the
+ domain.
+ 
+ =head1 SYNTAX
+@@ -2623,7 +2623,7 @@
+ 
+ =head1 FILES
+ 
+-F</etc/xen/NAME.cfg>
++F<@XENDCONFDIR@/NAME.cfg>
+ F<@XEN_DUMP_DIR@/NAME>
+ 
+ =head1 BUGS
Index: pkgsrc/sysutils/xentools418/patches/patch-docs_man_xlcpupool.cfg.5.pod
diff -u /dev/null pkgsrc/sysutils/xentools418/patches/patch-docs_man_xlcpupool.cfg.5.pod:1.1
--- /dev/null   Tue Nov 21 11:37:03 2023
+++ pkgsrc/sysutils/xentools418/patches/patch-docs_man_xlcpupool.cfg.5.pod      Tue Nov 21 11:37:03 2023
@@ -0,0 +1,28 @@
+$NetBSD: patch-docs_man_xlcpupool.cfg.5.pod,v 1.1 2023/11/21 11:37:03 bouyer Exp $
+
+--- docs/man/xlcpupool.cfg.5.pod.orig  2017-03-24 17:41:23.000000000 +0100
++++ docs/man/xlcpupool.cfg.5.pod       2017-03-24 17:41:50.000000000 +0100
+@@ -4,12 +4,12 @@
+ 
+ =head1 SYNOPSIS
+ 
+- /etc/xen/xlcpupool
++ @XENDCONFDIR@/xlcpupool
+ 
+ =head1 DESCRIPTION
+ 
+ To create a Cpupool with xl requires the provision of a cpupool config
+-file.  Typically these live in `/etc/xen/CPUPOOL.cfg` where CPUPOOL is
++file.  Typically these live in `@XENDCONFDIR@/CPUPOOL.cfg` where CPUPOOL is
+ the name of the cpupool.
+ 
+ =head1 SYNTAX
+@@ -117,7 +117,7 @@
+ 
+ =head1 FILES
+ 
+-F</etc/xen/CPUPOOL.cfg>
++F<@XENDCONFDIR@/CPUPOOL.cfg>
+ 
+ =head1 BUGS
+ 
Index: pkgsrc/sysutils/xentools418/patches/patch-docs_misc_block-scripts.txt
diff -u /dev/null pkgsrc/sysutils/xentools418/patches/patch-docs_misc_block-scripts.txt:1.1
--- /dev/null   Tue Nov 21 11:37:03 2023
+++ pkgsrc/sysutils/xentools418/patches/patch-docs_misc_block-scripts.txt       Tue Nov 21 11:37:03 2023
@@ -0,0 +1,13 @@
+$NetBSD: patch-docs_misc_block-scripts.txt,v 1.1 2023/11/21 11:37:03 bouyer Exp $
+
+--- ./docs/misc/block-scripts.txt.orig 2018-04-23 16:23:34.000000000 +0200
++++ ./docs/misc/block-scripts.txt      2018-04-23 16:23:39.000000000 +0200
+@@ -18,7 +18,7 @@
+ 
+ It is highly recommended that custom hotplug scripts as much as
+ possible include and use the common Xen functionality.  If the script
+-is run from the normal block script location (/etc/xen/scripts by
++is run from the normal block script location (@XENDCONFDIR@/scripts by
+ default), then this can be done by adding the following to the top of
+ the script:
+ 
Index: pkgsrc/sysutils/xentools418/patches/patch-docs_misc_vtd.txt
diff -u /dev/null pkgsrc/sysutils/xentools418/patches/patch-docs_misc_vtd.txt:1.1
--- /dev/null   Tue Nov 21 11:37:03 2023
+++ pkgsrc/sysutils/xentools418/patches/patch-docs_misc_vtd.txt Tue Nov 21 11:37:03 2023
@@ -0,0 +1,22 @@
+$NetBSD: patch-docs_misc_vtd.txt,v 1.1 2023/11/21 11:37:03 bouyer Exp $
+
+--- docs/misc/vtd.txt.orig     2020-05-08 16:46:26.400241453 +0200
++++ docs/misc/vtd.txt  2020-05-08 16:46:50.253734556 +0200
+@@ -39,7 +39,7 @@
+             echo -n 0000:01:00.0 >/sys/bus/pci/drivers/pciback/bind
+ 
+ 12) reboot system (not requires if you use the dynamic hiding method)
+-13) add "pci" line in /etc/xen/hvm.conf for to assigned devices
++13) add "pci" line in @XENDCONFDIR@/hvm.conf for to assigned devices
+         pci = [ '01:00.0', '03:00.0' ]
+ 15) start hvm guest and use "lspci" to see the passthru device and
+     "ifconfig" to see if IP address has been assigned to NIC devices.
+@@ -77,7 +77,7 @@
+         echo "0000:01:00.0" > /sys/bus/pci/devices/0000:01:00.0/driver/unbind
+         echo "0000:01:00.0" > /sys/bus/pci/drivers/pci-stub/bind
+ 
+-12) add "pci" line in /etc/xen/hvm.conf for to assigned devices
++12) add "pci" line in @XENDCONFDIR@/hvm.conf for to assigned devices
+         pci = [ '01:00.0' ]
+ 13) start hvm guest and use "lspci" to see the passthru device and
+     "ifconfig" to see if IP address has been assigned to NIC devices.
Index: pkgsrc/sysutils/xentools418/patches/patch-tools_Makefile
diff -u /dev/null pkgsrc/sysutils/xentools418/patches/patch-tools_Makefile:1.1
--- /dev/null   Tue Nov 21 11:37:03 2023
+++ pkgsrc/sysutils/xentools418/patches/patch-tools_Makefile    Tue Nov 21 11:37:03 2023
@@ -0,0 +1,38 @@
+$NetBSD: patch-tools_Makefile,v 1.1 2023/11/21 11:37:03 bouyer Exp $
+
+--- tools/Makefile.orig        2023-10-06 19:17:42.000000000 +0200
++++ tools/Makefile     2023-10-12 13:25:11.719288881 +0200
+@@ -34,7 +34,6 @@
+ SUBDIRS-y += helpers
+ SUBDIRS-$(CONFIG_X86) += xenpaging
+ SUBDIRS-$(CONFIG_X86) += debugger
+-SUBDIRS-$(CONFIG_TESTS) += tests
+ 
+ SUBDIRS-y += python
+ SUBDIRS-$(CONFIG_PYGRUB) += pygrub
+@@ -230,7 +229,7 @@
+       else \
+               virtfs='' ; \
+       fi ; \
+-      PKG_CONFIG_PATH=$(XEN_ROOT)/tools/pkg-config$${PKG_CONFIG_PATH:+:$${PKG_CONFIG_PATH}} \
++      PKG_CONFIG_PATH=$(XEN_ROOT)/tools/pkg-config$${PKG_CONFIG_PATH:+:$${PKG_CONFIG_PATH}} CFLAGS= \
+       $$source/configure --enable-xen --target-list=i386-softmmu \
+               $(QEMU_XEN_ENABLE_DEBUG) \
+               $$enable_trace_backend \
+@@ -246,6 +245,7 @@
+               --bindir=$(LIBEXEC_BIN) \
+               --datadir=$(SHAREDIR)/qemu-xen \
+               --localstatedir=$(localstatedir) \
++              --disable-opengl \
+               --docdir=$(LIBEXEC)/share/doc \
+               --mandir=$(LIBEXEC)/share/man \
+               --libexecdir=$(LIBEXEC)/libexec \
+@@ -258,7 +258,7 @@
+               --cpu=$(IOEMU_CPU_ARCH) \
+               $(IOEMU_CONFIGURE_CROSS) \
+               $$virtfs; \
+-      $(MAKE) all
++      CFLAGS= $(MAKE) all
+ 
+ subdir-install-qemu-xen-dir: subdir-all-qemu-xen-dir
+       cd qemu-xen-build; \
Index: pkgsrc/sysutils/xentools418/patches/patch-tools_Rules.mk
diff -u /dev/null pkgsrc/sysutils/xentools418/patches/patch-tools_Rules.mk:1.1
--- /dev/null   Tue Nov 21 11:37:03 2023
+++ pkgsrc/sysutils/xentools418/patches/patch-tools_Rules.mk    Tue Nov 21 11:37:03 2023
@@ -0,0 +1,13 @@
+$NetBSD: patch-tools_Rules.mk,v 1.1 2023/11/21 11:37:03 bouyer Exp $
+
+--- tools/Rules.mk.orig        2023-10-11 16:46:01.471180800 +0200
++++ tools/Rules.mk     2023-10-11 16:48:25.511566058 +0200
+@@ -90,7 +90,7 @@
+ 
+ # Flags for linking recursive dependencies of Xen libraries in $(1)
+ define xenlibs-rpath
+-    $(addprefix -Wl$(comma)-rpath-link=$(XEN_ROOT)/tools/libs/,$(call xenlibs-dependencies,$(1)))
++    $(addprefix -Wl$(comma)-rpath-link$(comma)$(XEN_ROOT)/tools/libs/,$(call xenlibs-dependencies,$(1)))
+ endef
+ 
+ # Provide a path for each library in $(1)
Index: pkgsrc/sysutils/xentools418/patches/patch-tools_configure
diff -u /dev/null pkgsrc/sysutils/xentools418/patches/patch-tools_configure:1.1
--- /dev/null   Tue Nov 21 11:37:03 2023
+++ pkgsrc/sysutils/xentools418/patches/patch-tools_configure   Tue Nov 21 11:37:03 2023
@@ -0,0 +1,30 @@
+$NetBSD: patch-tools_configure,v 1.1 2023/11/21 11:37:03 bouyer Exp $
+
+--- tools/configure.orig       2023-10-06 19:17:42.000000000 +0200
++++ tools/configure    2023-10-11 16:06:37.459963548 +0200
+@@ -2457,7 +2457,7 @@
+ 
+ 
+ 
+-ac_config_files="$ac_config_files ../config/Tools.mk hotplug/common/hotplugpath.sh hotplug/FreeBSD/rc.d/xencommons hotplug/FreeBSD/rc.d/xendriverdomain hotplug/Linux/init.d/sysconfig.xencommons 
hotplug/Linux/init.d/sysconfig.xendomains hotplug/Linux/init.d/xen-watchdog hotplug/Linux/init.d/xencommons hotplug/Linux/init.d/xendomains hotplug/Linux/init.d/xendriverdomain 
hotplug/Linux/launch-xenstore hotplug/Linux/vif-setup hotplug/Linux/xen-hotplug-common.sh hotplug/Linux/xendomains hotplug/NetBSD/rc.d/xencommons hotplug/NetBSD/rc.d/xendriverdomain 
ocaml/libs/xs/paths.ml ocaml/xenstored/paths.ml ocaml/xenstored/oxenstored.conf"
++ac_config_files="$ac_config_files ../config/Tools.mk ../config/Paths.mk hotplug/common/hotplugpath.sh hotplug/FreeBSD/rc.d/xencommons hotplug/FreeBSD/rc.d/xendriverdomain 
hotplug/Linux/init.d/sysconfig.xencommons hotplug/Linux/init.d/sysconfig.xendomains hotplug/Linux/init.d/xen-watchdog hotplug/Linux/init.d/xencommons hotplug/Linux/init.d/xendomains 
hotplug/Linux/init.d/xendriverdomain hotplug/Linux/launch-xenstore hotplug/Linux/vif-setup hotplug/Linux/xen-hotplug-common.sh hotplug/Linux/xendomains hotplug/NetBSD/rc.d/xencommons 
hotplug/NetBSD/rc.d/xendriverdomain ocaml/libs/xs/paths.ml ocaml/xenstored/paths.ml ocaml/xenstored/oxenstored.conf"
+ 
+ ac_config_headers="$ac_config_headers config.h"
+ 
+@@ -3907,7 +3907,7 @@
+ 
+ if test "x$sysconfdir" = 'x${prefix}/etc' ; then
+     case "$host_os" in
+-         *freebsd*)
++         *freebsd*|*netbsd*)
+          sysconfdir=$prefix/etc
+          ;;
+          *solaris*)
+@@ -10927,6 +10927,7 @@
+ do
+   case $ac_config_target in
+     "../config/Tools.mk") CONFIG_FILES="$CONFIG_FILES ../config/Tools.mk" ;;
++    "../config/Paths.mk") CONFIG_FILES="$CONFIG_FILES ../config/Paths.mk" ;;
+     "hotplug/common/hotplugpath.sh") CONFIG_FILES="$CONFIG_FILES hotplug/common/hotplugpath.sh" ;;
+     "hotplug/FreeBSD/rc.d/xencommons") CONFIG_FILES="$CONFIG_FILES hotplug/FreeBSD/rc.d/xencommons" ;;
+     "hotplug/FreeBSD/rc.d/xendriverdomain") CONFIG_FILES="$CONFIG_FILES hotplug/FreeBSD/rc.d/xendriverdomain" ;;
Index: pkgsrc/sysutils/xentools418/patches/patch-tools_console_daemon_utils.c
diff -u /dev/null pkgsrc/sysutils/xentools418/patches/patch-tools_console_daemon_utils.c:1.1
--- /dev/null   Tue Nov 21 11:37:03 2023
+++ pkgsrc/sysutils/xentools418/patches/patch-tools_console_daemon_utils.c      Tue Nov 21 11:37:03 2023
@@ -0,0 +1,22 @@
+$NetBSD: patch-tools_console_daemon_utils.c,v 1.1 2023/11/21 11:37:03 bouyer Exp $
+
+--- tools/console/daemon/utils.c.orig  2020-12-08 15:28:31.000000000 +0100
++++ tools/console/daemon/utils.c       2020-12-09 16:22:49.947276738 +0100
+@@ -107,13 +107,15 @@
+       xs = xs_open(0);
+       if (xs == NULL) {
+               dolog(LOG_ERR,
+-                    "Failed to contact xenstore (%m).  Is it running?");
++                    "Failed to contact xenstore (%s).  Is it running?",
++                        strerror(errno));
+               goto out;
+       }
+ 
+       xc = xc_interface_open(0,0,0);
+       if (!xc) {
+-              dolog(LOG_ERR, "Failed to contact hypervisor (%m)");
++              dolog(LOG_ERR, "Failed to contact hypervisor (%s)",
++                  strerror(errno));
+               goto out;
+       }
+ 
Index: pkgsrc/sysutils/xentools418/patches/patch-tools_examples_Makefile
diff -u /dev/null pkgsrc/sysutils/xentools418/patches/patch-tools_examples_Makefile:1.1
--- /dev/null   Tue Nov 21 11:37:03 2023
+++ pkgsrc/sysutils/xentools418/patches/patch-tools_examples_Makefile   Tue Nov 21 11:37:03 2023
@@ -0,0 +1,12 @@
+$NetBSD: patch-tools_examples_Makefile,v 1.1 2023/11/21 11:37:03 bouyer Exp $
+
+--- tools/examples/Makefile.orig       2023-10-06 19:17:42.000000000 +0200
++++ tools/examples/Makefile    2023-10-11 16:08:29.065203062 +0200
+@@ -1,6 +1,7 @@
+ XEN_ROOT = $(CURDIR)/../..
+ include $(XEN_ROOT)/tools/Rules.mk
+ 
++XEN_CONFIG_DIR=${XEN_EXAMPLES_DIR}
+ # Xen configuration dir and configs to go there.
+ 
+ XEN_READMES = README
Index: pkgsrc/sysutils/xentools418/patches/patch-tools_firmware_Makefile
diff -u /dev/null pkgsrc/sysutils/xentools418/patches/patch-tools_firmware_Makefile:1.1
--- /dev/null   Tue Nov 21 11:37:03 2023
+++ pkgsrc/sysutils/xentools418/patches/patch-tools_firmware_Makefile   Tue Nov 21 11:37:03 2023
@@ -0,0 +1,13 @@
+$NetBSD: patch-tools_firmware_Makefile,v 1.1 2023/11/21 11:37:03 bouyer Exp $
+
+--- tools/firmware/Makefile.orig       2020-05-14 14:19:32.000000000 +0200
++++ tools/firmware/Makefile    2020-08-26 19:39:04.950176746 +0200
+@@ -24,7 +24,7 @@
+       cp ovmf-makefile ovmf-dir/Makefile;
+ 
+ seabios-dir:
+-      GIT=$(GIT) $(XEN_ROOT)/scripts/git-checkout.sh $(SEABIOS_UPSTREAM_URL) $(SEABIOS_UPSTREAM_REVISION) seabios-dir
++      ln -sf ../../../seabios-rel-1.16.2 ${WRKSRC}/tools/firmware/seabios-dir
+       cp seabios-config seabios-dir/.config;
+       $(MAKE) -C seabios-dir olddefconfig CC=$(SEABIOSCC) LD=$(SEABIOSLD)
+       rm -f seabios-dir/.version
Index: pkgsrc/sysutils/xentools418/patches/patch-tools_firmware_etherboot_Makefile
diff -u /dev/null pkgsrc/sysutils/xentools418/patches/patch-tools_firmware_etherboot_Makefile:1.1
--- /dev/null   Tue Nov 21 11:37:03 2023
+++ pkgsrc/sysutils/xentools418/patches/patch-tools_firmware_etherboot_Makefile Tue Nov 21 11:37:03 2023
@@ -0,0 +1,26 @@
+$NetBSD: patch-tools_firmware_etherboot_Makefile,v 1.1 2023/11/21 11:37:03 bouyer Exp $
+
+--- tools/firmware/etherboot/Makefile.orig     2019-12-17 15:23:09.000000000 +0100
++++ tools/firmware/etherboot/Makefile  2020-05-08 16:59:46.337172477 +0200
+@@ -32,18 +32,10 @@
+ %.rom: $D/src/arch/i386/Makefile
+       $(MAKE) -C $D/src bin/$(*F).rom
+ 
+-$T:
+-      set -e; if ! $(FETCHER) _$T $(IPXE_TARBALL_URL); then \
+-              $(GIT) clone $(IPXE_GIT_URL) $D.git; \
+-              (cd $D.git && $(GIT) archive --format=tar --prefix=$D/ \
+-              $(IPXE_GIT_TAG) | gzip -n >../_$T); \
+-              rm -rf $D.git; \
+-      fi
+-      mv _$T $T
++$D:
++      ln -sf $(WRKSRC)/../ipxe-${IPXE_GIT_TAG} $D
+ 
+-$D/src/arch/i386/Makefile: $T Config
+-      rm -rf $D
+-      gzip -dc $T | tar xf -
++$D/src/arch/i386/Makefile: $D Config
+       for i in $$(cat patches/series) ; do                 \
+           patch -d $D -p1 --quiet <patches/$$i || exit 1 ; \
+       done
Index: pkgsrc/sysutils/xentools418/patches/patch-tools_hotplug_NetBSD_Makefile
diff -u /dev/null pkgsrc/sysutils/xentools418/patches/patch-tools_hotplug_NetBSD_Makefile:1.1
--- /dev/null   Tue Nov 21 11:37:03 2023
+++ pkgsrc/sysutils/xentools418/patches/patch-tools_hotplug_NetBSD_Makefile     Tue Nov 21 11:37:03 2023
@@ -0,0 +1,46 @@
+$NetBSD: patch-tools_hotplug_NetBSD_Makefile,v 1.1 2023/11/21 11:37:03 bouyer Exp $
+
+--- tools/hotplug/NetBSD/Makefile.orig 2023-10-06 19:17:42.000000000 +0200
++++ tools/hotplug/NetBSD/Makefile      2023-10-11 16:10:06.619544743 +0200
+@@ -10,7 +10,7 @@
+ XEN_SCRIPTS += qemu-ifup
+ 
+ XEN_SCRIPT_DATA :=
+-XEN_RCD_PROG := rc.d/xencommons rc.d/xendomains rc.d/xen-watchdog rc.d/xendriverdomain
++#XEN_RCD_PROG := rc.d/xencommons rc.d/xendomains rc.d/xen-watchdog rc.d/xendriverdomain
+ 
+ .PHONY: all
+ all:
+@@ -23,10 +23,11 @@
+ 
+ .PHONY: install-scripts
+ install-scripts:
+-      $(INSTALL_DIR) $(DESTDIR)$(XEN_SCRIPT_DIR)
++      $(INSTALL_DIR) $(DESTDIR)$(XEN_EXAMPLES_DIR)
++      $(INSTALL_DIR) $(DESTDIR)$(XEN_EXAMPLES_DIR)/scripts
+       set -e; for i in $(XEN_SCRIPTS); \
+          do \
+-         $(INSTALL_PROG) $$i $(DESTDIR)$(XEN_SCRIPT_DIR); \
++         $(INSTALL_PROG) $$i $(DESTDIR)$(XEN_EXAMPLES_DIR)/scripts; \
+       done
+       set -e; for i in $(XEN_SCRIPT_DATA); \
+          do \
+@@ -40,12 +41,12 @@
+ 
+ .PHONY: install-rcd
+ install-rcd:
+-      $(INSTALL_DIR) $(DESTDIR)$(INITD_DIR)
+-      set -e; for i in $(XEN_RCD_PROG); \
+-         do \
+-         $(INSTALL_PROG) $$i $(DESTDIR)$(INITD_DIR); \
+-      done
+-      $(INSTALL_DATA) ../common/hotplugpath.sh $(DESTDIR)$(INITD_DIR)/xen-hotplugpath.sh
++#     $(INSTALL_DIR) $(DESTDIR)$(INITD_DIR)
++#     set -e; for i in $(XEN_RCD_PROG); \
++#        do \
++#        $(INSTALL_PROG) $$i $(DESTDIR)$(INITD_DIR); \
++#     done
++#     $(INSTALL_DATA) ../common/hotplugpath.sh $(DESTDIR)$(INITD_DIR)/xen-hotplugpath.sh
+ 
+ .PHONY: uninstall-rcd
+ uninstall-rcd:
Index: pkgsrc/sysutils/xentools418/patches/patch-tools_hotplug_NetBSD_block
diff -u /dev/null pkgsrc/sysutils/xentools418/patches/patch-tools_hotplug_NetBSD_block:1.1
--- /dev/null   Tue Nov 21 11:37:03 2023
+++ pkgsrc/sysutils/xentools418/patches/patch-tools_hotplug_NetBSD_block        Tue Nov 21 11:37:03 2023
@@ -0,0 +1,27 @@
+$NetBSD: patch-tools_hotplug_NetBSD_block,v 1.1 2023/11/21 11:37:03 bouyer Exp $
+
+work around an issue in NetBSD 9.99.x kernel: pass the vnd name to vnconfig,
+not the path to the block device.
+
+--- tools/hotplug/NetBSD/block.orig    2022-01-31 10:42:09.000000000 +0100
++++ tools/hotplug/NetBSD/block 2022-05-30 10:50:42.821527086 +0200
+@@ -64,8 +64,9 @@
+               for disk in $available_disks; do
+                       eval status=\$$disk
+                       if [ "$status" = "free" ] && \
+-                          vnconfig /dev/${disk}d $xparams >/dev/null; then
++                          vnconfig ${disk} $xparams >/dev/null; then
+                               device=/dev/${disk}d
++                              vnd_device=$disk
+                               break   
+                       fi
+               done
+@@ -73,7 +74,7 @@
+               if [ x$device = x ] ; then
+                       error "no available vnd device"
+               fi
+-              xenstore-write $xpath/vnd $device
++              xenstore-write $xpath/vnd $vnd_device
+               ;;
+       phy)
+               device=$xparams
Index: pkgsrc/sysutils/xentools418/patches/patch-tools_hotplug_common_Makefile
diff -u /dev/null pkgsrc/sysutils/xentools418/patches/patch-tools_hotplug_common_Makefile:1.1
--- /dev/null   Tue Nov 21 11:37:03 2023
+++ pkgsrc/sysutils/xentools418/patches/patch-tools_hotplug_common_Makefile     Tue Nov 21 11:37:03 2023
@@ -0,0 +1,22 @@
+$NetBSD: patch-tools_hotplug_common_Makefile,v 1.1 2023/11/21 11:37:03 bouyer Exp $
+
+--- tools/hotplug/common/Makefile.orig 2023-10-06 19:17:42.000000000 +0200
++++ tools/hotplug/common/Makefile      2023-10-11 16:12:44.756127842 +0200
+@@ -18,14 +18,14 @@
+ 
+ .PHONY: install-scripts
+ install-scripts: all
+-      $(INSTALL_DIR) $(DESTDIR)$(XEN_SCRIPT_DIR)
++      $(INSTALL_DIR) $(DESTDIR)$(XEN_EXAMPLES_DIR)/scripts
+       set -e; for i in $(XEN_SCRIPTS); \
+          do \
+-         $(INSTALL_PROG) $$i $(DESTDIR)$(XEN_SCRIPT_DIR); \
++         $(INSTALL_PROG) $$i $(DESTDIR)$(XEN_EXAMPLES_DIR)/scripts; \
+       done
+       set -e; for i in $(XEN_SCRIPT_DATA); \
+          do \
+-         $(INSTALL_DATA) $$i $(DESTDIR)$(XEN_SCRIPT_DIR); \
++         $(INSTALL_DATA) $$i $(DESTDIR)$(XEN_EXAMPLES_DIR)/scripts; \
+       done
+ 
+ .PHONY: uninstall-scripts
Index: pkgsrc/sysutils/xentools418/patches/patch-tools_include_xen-sys_NetBSD_evtchn.h
diff -u /dev/null pkgsrc/sysutils/xentools418/patches/patch-tools_include_xen-sys_NetBSD_evtchn.h:1.1
--- /dev/null   Tue Nov 21 11:37:03 2023
+++ pkgsrc/sysutils/xentools418/patches/patch-tools_include_xen-sys_NetBSD_evtchn.h     Tue Nov 21 11:37:03 2023
@@ -0,0 +1,95 @@
+$NetBSD: patch-tools_include_xen-sys_NetBSD_evtchn.h,v 1.1 2023/11/21 11:37:03 bouyer Exp $
+
+Use system-provided headers instead of local, outdated definitions
+
+--- tools/include/xen-sys/NetBSD/evtchn.h.orig 2021-04-17 13:48:20.754547947 +0200
++++ tools/include/xen-sys/NetBSD/evtchn.h      2021-04-17 13:51:39.136816295 +0200
+@@ -2,85 +2,3 @@
+-/******************************************************************************
+- * evtchn.h
+- * 
+- * Interface to /dev/xen/evtchn.
+- * 
+- * Copyright (c) 2003-2005, K A Fraser
+- * 
+- * This file may be distributed separately from the Linux kernel, or
+- * incorporated into other software packages, subject to the following license:
+- * 
+- * Permission is hereby granted, free of charge, to any person obtaining a copy
+- * of this source file (the "Software"), to deal in the Software without
+- * restriction, including without limitation the rights to use, copy, modify,
+- * merge, publish, distribute, sublicense, and/or sell copies of the Software,
+- * and to permit persons to whom the Software is furnished to do so, subject to
+- * the following conditions:
+- * 
+- * The above copyright notice and this permission notice shall be included in
+- * all copies or substantial portions of the Software.
+- * 
+- * THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
+- * IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
+- * FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE
+- * AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER
+- * LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING
+- * FROM, OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS
+- * IN THE SOFTWARE.
+- */
+-
+-#ifndef __NetBSD_EVTCHN_H__
+-#define __NetBSD_EVTCHN_H__
+-
+-/*
+- * Bind a fresh port to VIRQ @virq.
+- */
+-#define IOCTL_EVTCHN_BIND_VIRQ                                \
+-      _IOWR('E', 4, struct ioctl_evtchn_bind_virq)
+-struct ioctl_evtchn_bind_virq {
+-      unsigned int virq;
+-      unsigned int port;
+-};
+-
+-/*
+- * Bind a fresh port to remote <@remote_domain, @remote_port>.
+- */
+-#define IOCTL_EVTCHN_BIND_INTERDOMAIN                 \
+-      _IOWR('E', 5, struct ioctl_evtchn_bind_interdomain)
+-struct ioctl_evtchn_bind_interdomain {
+-      unsigned int remote_domain, remote_port;
+-      unsigned int port;
+-};
+-
+-/*
+- * Allocate a fresh port for binding to @remote_domain.
+- */
+-#define IOCTL_EVTCHN_BIND_UNBOUND_PORT                        \
+-      _IOWR('E', 6, struct ioctl_evtchn_bind_unbound_port)
+-struct ioctl_evtchn_bind_unbound_port {
+-      unsigned int remote_domain;
+-      unsigned int port;
+-};
+-
+-/*
+- * Unbind previously allocated @port.
+- */
+-#define IOCTL_EVTCHN_UNBIND                           \
+-      _IOW('E', 7, struct ioctl_evtchn_unbind)
+-struct ioctl_evtchn_unbind {
+-      unsigned int port;
+-};
+-
+-/*
+- * Send event to previously allocated @port.
+- */
+-#define IOCTL_EVTCHN_NOTIFY                           \
+-      _IOW('E', 8, struct ioctl_evtchn_notify)
+-struct ioctl_evtchn_notify {
+-      unsigned int port;
+-};
+-
+-/* Clear and reinitialise the event buffer. Clear error condition. */
+-#define IOCTL_EVTCHN_RESET                            \
+-      _IO('E', 9)
+-
+-#endif /* __NetBSD_EVTCHN_H__ */
++/* use the system-provided headers */
++#include <xen/xenio.h>
++#include <xen/xenio3.h>
Index: pkgsrc/sysutils/xentools418/patches/patch-tools_include_xen-sys_NetBSD_privcmd.h
diff -u /dev/null pkgsrc/sysutils/xentools418/patches/patch-tools_include_xen-sys_NetBSD_privcmd.h:1.1
--- /dev/null   Tue Nov 21 11:37:03 2023
+++ pkgsrc/sysutils/xentools418/patches/patch-tools_include_xen-sys_NetBSD_privcmd.h    Tue Nov 21 11:37:03 2023
@@ -0,0 +1,116 @@
+$NetBSD: patch-tools_include_xen-sys_NetBSD_privcmd.h,v 1.1 2023/11/21 11:37:03 bouyer Exp $
+
+Use system-provided headers instead of local, outdated definitions
+
+--- tools/include/xen-sys/NetBSD/privcmd.h.orig        2021-04-17 13:48:20.759557127 +0200
++++ tools/include/xen-sys/NetBSD/privcmd.h     2021-04-17 13:53:28.776879861 +0200
+@@ -1,106 +1,3 @@
+-/*    NetBSD: xenio.h,v 1.3 2005/05/24 12:07:12 yamt Exp $    */
+-
+-/******************************************************************************
+- * privcmd.h
+- * 
+- * Copyright (c) 2003-2004, K A Fraser
+- * 
+- * This file may be distributed separately from the Linux kernel, or
+- * incorporated into other software packages, subject to the following license:
+- * 
+- * Permission is hereby granted, free of charge, to any person obtaining a copy
+- * of this source file (the "Software"), to deal in the Software without
+- * restriction, including without limitation the rights to use, copy, modify,
+- * merge, publish, distribute, sublicense, and/or sell copies of the Software,
+- * and to permit persons to whom the Software is furnished to do so, subject to
+- * the following conditions:
+- * 
+- * The above copyright notice and this permission notice shall be included in
+- * all copies or substantial portions of the Software.
+- * 
+- * THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
+- * IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
+- * FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE
+- * AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER
+- * LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING
+- * FROM, OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS
+- * IN THE SOFTWARE.
+- */
+-
+-#ifndef __NetBSD_PRIVCMD_H__
+-#define __NetBSD_PRIVCMD_H__
+-
+-/* Interface to /dev/xen/privcmd */
+-
+-typedef struct privcmd_hypercall
+-{
+-    unsigned long op;
+-    unsigned long arg[5];
+-    long retval;
+-} privcmd_hypercall_t;
+-
+-typedef struct privcmd_mmap_entry {
+-    unsigned long va;
+-    unsigned long mfn;
+-    unsigned long npages;
+-} privcmd_mmap_entry_t; 
+-
+-typedef struct privcmd_mmap {
+-    int num;
+-    domid_t dom; /* target domain */
+-    privcmd_mmap_entry_t *entry;
+-} privcmd_mmap_t; 
+-
+-typedef struct privcmd_mmapbatch {
+-    int num;     /* number of pages to populate */
+-    domid_t dom; /* target domain */
+-    unsigned long addr;  /* virtual address */
+-    unsigned long *arr; /* array of mfns - top nibble set on err */
+-} privcmd_mmapbatch_t; 
+-
+-typedef struct privcmd_blkmsg
+-{
+-    unsigned long op;
+-    void         *buf;
+-    int           buf_size;
+-} privcmd_blkmsg_t;
+-
+-/*
+- * @cmd: IOCTL_PRIVCMD_HYPERCALL
+- * @arg: &privcmd_hypercall_t
+- * Return: Value returned from execution of the specified hypercall.
+- */
+-#define IOCTL_PRIVCMD_HYPERCALL         \
+-    _IOWR('P', 0, privcmd_hypercall_t)
+-
+-#if defined(_KERNEL)
+-/* compat */
+-#define IOCTL_PRIVCMD_INITDOMAIN_EVTCHN_OLD \
+-    _IO('P', 1)
+-#endif /* defined(_KERNEL) */
+-    
+-#define IOCTL_PRIVCMD_MMAP             \
+-    _IOW('P', 2, privcmd_mmap_t)
+-#define IOCTL_PRIVCMD_MMAPBATCH        \
+-    _IOW('P', 3, privcmd_mmapbatch_t)
+-#define IOCTL_PRIVCMD_GET_MACH2PHYS_START_MFN \
+-    _IOR('P', 4, unsigned long)
+-
+-/*
+- * @cmd: IOCTL_PRIVCMD_INITDOMAIN_EVTCHN
+- * @arg: n/a
+- * Return: Port associated with domain-controller end of control event channel
+- *         for the initial domain.
+- */
+-#define IOCTL_PRIVCMD_INITDOMAIN_EVTCHN \
+-    _IOR('P', 5, int)
+-
+-/* Interface to /dev/xenevt */
+-/* EVTCHN_RESET: Clear and reinit the event buffer. Clear error condition. */
+-#define EVTCHN_RESET  _IO('E', 1)
+-/* EVTCHN_BIND: Bind to the specified event-channel port. */
+-#define EVTCHN_BIND   _IOW('E', 2, unsigned long)
+-/* EVTCHN_UNBIND: Unbind from the specified event-channel port. */
+-#define EVTCHN_UNBIND _IOW('E', 3, unsigned long)
+-
+-#endif /* __NetBSD_PRIVCMD_H__ */
++/* use the system-provided headers */
++#include <xen/xenio.h>
++#include <xen/xenio3.h>
Index: pkgsrc/sysutils/xentools418/patches/patch-tools_libxl_libxl_dom.c
diff -u /dev/null pkgsrc/sysutils/xentools418/patches/patch-tools_libxl_libxl_dom.c:1.1
--- /dev/null   Tue Nov 21 11:37:03 2023
+++ pkgsrc/sysutils/xentools418/patches/patch-tools_libxl_libxl_dom.c   Tue Nov 21 11:37:03 2023
@@ -0,0 +1,13 @@
+$NetBSD: patch-tools_libxl_libxl_dom.c,v 1.1 2023/11/21 11:37:03 bouyer Exp $
+
+--- tools/libs/light/libxl_dom.c.orig  2020-12-08 15:28:31.000000000 +0100
++++ tools/libs/light/libxl_dom.c       2020-12-09 15:59:56.104509990 +0100
+@@ -1228,7 +1228,7 @@
+         goto out;
+     }
+     uuid_string = GCSPRINTF(LIBXL_UUID_FMT, LIBXL_UUID_BYTES(info.uuid));
+-    path = GCSPRINTF(XEN_LIB_DIR "/userdata-%s.%u.%s.%s",
++    path = GCSPRINTF(XEN_RUN_DIR "/userdata-%s.%u.%s.%s",
+                      wh, domid, uuid_string, userdata_userid);
+ 
+  out:
Index: pkgsrc/sysutils/xentools418/patches/patch-tools_libxl_libxl_event.c
diff -u /dev/null pkgsrc/sysutils/xentools418/patches/patch-tools_libxl_libxl_event.c:1.1
--- /dev/null   Tue Nov 21 11:37:03 2023
+++ pkgsrc/sysutils/xentools418/patches/patch-tools_libxl_libxl_event.c Tue Nov 21 11:37:03 2023
@@ -0,0 +1,24 @@
+$NetBSD: patch-tools_libxl_libxl_event.c,v 1.1 2023/11/21 11:37:03 bouyer Exp $
+
+The SIGCHLD handler just writes to a pipe where the reader is the
+same process. The idea is that this will cause poll(2) in the main
+thread to exit with the reaper pipe readable, and do child cleanup here.
+
+Unfortunably, is the child also has a write pipe back to the
+parent (as e.g. with pygrub), the loop in afterpoll_internal() may see the
+POLLHUP event on this pipe before the POLLIN even on the reaper pipe, and
+this will be considered as an error (from e.g. pygrub).
+
+work around by filtering POLLHUP events here
+
+--- tools/libs/light/libxl_event.c.orig        2020-12-08 15:28:31.000000000 +0100
++++ tools/libs/light/libxl_event.c     2020-12-09 16:00:48.840221028 +0100
+@@ -1443,7 +1443,7 @@
+ 
+             revents = afterpoll_check_fd(poller,fds,nfds,
+                                          efd->fd,efd->events);
+-            if (revents)
++            if (revents & ~POLLHUP)
+                 goto found_fd_event;
+         }
+         /* no ordinary fd events, then */
Index: pkgsrc/sysutils/xentools418/patches/patch-tools_libxl_libxl_internal.h
diff -u /dev/null pkgsrc/sysutils/xentools418/patches/patch-tools_libxl_libxl_internal.h:1.1
--- /dev/null   Tue Nov 21 11:37:03 2023
+++ pkgsrc/sysutils/xentools418/patches/patch-tools_libxl_libxl_internal.h      Tue Nov 21 11:37:03 2023
@@ -0,0 +1,23 @@
+$NetBSD: patch-tools_libxl_libxl_internal.h,v 1.1 2023/11/21 11:37:03 bouyer Exp $
+
+bump some timeouts to more reasonable values. 40s is not enough
+if there is lots of them (e.g lots of network interfaces) and they
+need to be serialized.
+
+--- tools/libs/light/libxl_internal.h.orig     2020-12-08 15:28:31.000000000 +0100
++++ tools/libs/light/libxl_internal.h  2020-12-09 16:01:49.819103324 +0100
+@@ -93,11 +93,11 @@
+ #include "_libxl_types_internal_json.h"
+ 
+ #define LIBXL_INIT_TIMEOUT 10
+-#define LIBXL_DESTROY_TIMEOUT 10
+-#define LIBXL_HOTPLUG_TIMEOUT 40
++#define LIBXL_DESTROY_TIMEOUT 180
++#define LIBXL_HOTPLUG_TIMEOUT 180
+ /* QEMU may be slow to load and start due to a bug in Linux where the I/O
+  * subsystem sometime produce high latency under load. */
+-#define LIBXL_DEVICE_MODEL_START_TIMEOUT 60
++#define LIBXL_DEVICE_MODEL_START_TIMEOUT 180
+ #define LIBXL_DEVICE_MODEL_SAVE_FILE XEN_LIB_DIR "/qemu-save" /* .$domid */
+ #define LIBXL_DEVICE_MODEL_RESTORE_FILE XEN_LIB_DIR "/qemu-resume" /* .$domid */
+ #define LIBXL_QMP_CMD_TIMEOUT 10
Index: pkgsrc/sysutils/xentools418/patches/patch-tools_ocaml_common.make
diff -u /dev/null pkgsrc/sysutils/xentools418/patches/patch-tools_ocaml_common.make:1.1
--- /dev/null   Tue Nov 21 11:37:03 2023
+++ pkgsrc/sysutils/xentools418/patches/patch-tools_ocaml_common.make   Tue Nov 21 11:37:03 2023
@@ -0,0 +1,23 @@
+$NetBSD: patch-tools_ocaml_common.make,v 1.1 2023/11/21 11:37:03 bouyer Exp $
+
+Handle ocaml-findlib 1.7.3 already appending destdir
+
+--- tools/ocaml/common.make.orig       2020-12-08 15:28:31.000000000 +0100
++++ tools/ocaml/common.make    2021-01-09 19:27:02.447285099 +0100
+@@ -3,7 +3,7 @@
+ CC ?= gcc
+ OCAMLOPT ?= ocamlopt
+ OCAMLC ?= ocamlc
+-OCAMLMKLIB ?= ocamlmklib
++OCAMLMKLIB ?= ocamlmklib -elfmode
+ OCAMLDEP ?= ocamldep
+ OCAMLLEX ?= ocamllex
+ OCAMLYACC ?= ocamlyacc
+@@ -17,6 +17,6 @@
+ 
+ VERSION := 4.1
+ 
+-OCAMLDESTDIR ?= $(DESTDIR)$(shell $(OCAMLFIND) printconf destdir)
++OCAMLDESTDIR ?= $(shell $(OCAMLFIND) printconf destdir)
+ 
+ o= >$@.new && mv -f $@.new $@
Index: pkgsrc/sysutils/xentools418/patches/patch-tools_ocaml_xenstored_Makefile
diff -u /dev/null pkgsrc/sysutils/xentools418/patches/patch-tools_ocaml_xenstored_Makefile:1.1
--- /dev/null   Tue Nov 21 11:37:03 2023
+++ pkgsrc/sysutils/xentools418/patches/patch-tools_ocaml_xenstored_Makefile    Tue Nov 21 11:37:03 2023
@@ -0,0 +1,12 @@
+$NetBSD: patch-tools_ocaml_xenstored_Makefile,v 1.1 2023/11/21 11:37:03 bouyer Exp $
+
+--- tools/ocaml/xenstored/Makefile.orig        2016-02-09 14:44:19.000000000 +0000
++++ tools/ocaml/xenstored/Makefile
+@@ -1,6 +1,7 @@
+ XEN_ROOT = $(CURDIR)/../../..
+ OCAML_TOPLEVEL = $(CURDIR)/..
+ include $(OCAML_TOPLEVEL)/common.make
++XEN_CONFIG_DIR=${XEN_EXAMPLES_DIR}
+ 
+ # Include configure output (config.h)
+ CFLAGS += -include $(XEN_ROOT)/tools/config.h
Index: pkgsrc/sysutils/xentools418/patches/patch-tools_ocaml_xenstored_utils.ml
diff -u /dev/null pkgsrc/sysutils/xentools418/patches/patch-tools_ocaml_xenstored_utils.ml:1.1
--- /dev/null   Tue Nov 21 11:37:03 2023
+++ pkgsrc/sysutils/xentools418/patches/patch-tools_ocaml_xenstored_utils.ml    Tue Nov 21 11:37:03 2023
@@ -0,0 +1,13 @@
+$NetBSD: patch-tools_ocaml_xenstored_utils.ml,v 1.1 2023/11/21 11:37:03 bouyer Exp $
+
+--- tools/ocaml/xenstored/utils.ml.orig        2023-10-06 19:17:42.000000000 +0200
++++ tools/ocaml/xenstored/utils.ml     2023-10-11 16:21:27.581933766 +0200
+@@ -86,7 +86,7 @@
+   let buf = Bytes.make 20 '\000' in
+   let sz = Unix.read fd buf 0 20 in
+   Unix.close fd;
+-  int_of_string (Bytes.sub_string buf 0 sz)
++  int_of_string (String.trim (Bytes.sub_string buf 0 sz))
+ 
+ (* @path may be guest data and needs its length validating.  @connection_path
+  * is generated locally in xenstored and always of the form "/local/domain/$N/" *)
Index: pkgsrc/sysutils/xentools418/patches/patch-tools_pygrub_Makefile
diff -u /dev/null pkgsrc/sysutils/xentools418/patches/patch-tools_pygrub_Makefile:1.1
--- /dev/null   Tue Nov 21 11:37:03 2023
+++ pkgsrc/sysutils/xentools418/patches/patch-tools_pygrub_Makefile     Tue Nov 21 11:37:03 2023
@@ -0,0 +1,13 @@
+$NetBSD: patch-tools_pygrub_Makefile,v 1.1 2023/11/21 11:37:03 bouyer Exp $
+
+--- tools/pygrub/Makefile.orig 2023-10-06 19:17:42.000000000 +0200
++++ tools/pygrub/Makefile      2023-10-11 16:22:36.161106315 +0200
+@@ -3,7 +3,7 @@
+ include $(XEN_ROOT)/tools/Rules.mk
+ 
+ PY_CFLAGS = $(CFLAGS) $(PY_NOOPT_CFLAGS)
+-PY_LDFLAGS = $(SHLIB_LDFLAGS) $(APPEND_LDFLAGS)
++PY_LDFLAGS = $(SHLIB_LDFLAGS) $(LDFLAGS) $(APPEND_LDFLAGS)
+ INSTALL_LOG = build/installed_files.txt
+ 
+ setup.py = CC="$(CC)" CFLAGS="$(PY_CFLAGS)" LDSHARED="$(CC)" LDFLAGS="$(PY_LDFLAGS)" \
Index: pkgsrc/sysutils/xentools418/patches/patch-tools_python_Makefile
diff -u /dev/null pkgsrc/sysutils/xentools418/patches/patch-tools_python_Makefile:1.1
--- /dev/null   Tue Nov 21 11:37:03 2023
+++ pkgsrc/sysutils/xentools418/patches/patch-tools_python_Makefile     Tue Nov 21 11:37:03 2023
@@ -0,0 +1,13 @@
+$NetBSD: patch-tools_python_Makefile,v 1.1 2023/11/21 11:37:03 bouyer Exp $
+
+--- tools/python/Makefile.orig 2020-12-14 15:32:06.314547060 +0100
++++ tools/python/Makefile      2020-12-14 15:33:29.005101260 +0100
+@@ -5,7 +5,7 @@
+ all: build
+ 
+ PY_CFLAGS = $(CFLAGS) $(PY_NOOPT_CFLAGS)
+-PY_LDFLAGS = $(SHLIB_LDFLAGS) $(APPEND_LDFLAGS)
++PY_LDFLAGS = $(SHLIB_LDFLAGS) $(LDFLAGS) $(APPEND_LDFLAGS)
+ INSTALL_LOG = build/installed_files.txt
+ 
+ setup.py = CC="$(CC)" CFLAGS="$(PY_CFLAGS)" LDSHARED="$(CC)" LDFLAGS="$(PY_LDFLAGS)" \
Index: pkgsrc/sysutils/xentools418/patches/patch-tools_qemu-xen-traditional_Makefile
diff -u /dev/null pkgsrc/sysutils/xentools418/patches/patch-tools_qemu-xen-traditional_Makefile:1.1
--- /dev/null   Tue Nov 21 11:37:03 2023
+++ pkgsrc/sysutils/xentools418/patches/patch-tools_qemu-xen-traditional_Makefile       Tue Nov 21 11:37:03 2023
@@ -0,0 +1,84 @@
+$NetBSD: patch-tools_qemu-xen-traditional_Makefile,v 1.1 2023/11/21 11:37:03 bouyer Exp $
+
+--- tools/qemu-xen-traditional/Makefile.orig   2014-10-06 17:50:24.000000000 +0200
++++ tools/qemu-xen-traditional/Makefile        2015-01-19 14:16:12.000000000 +0100
+@@ -1,7 +1,7 @@
+ # Makefile for QEMU.
+ 
+-include config-host.mak
+-include $(SRC_PATH)/rules.mak
++-include config-host.mak
++-include $(SRC_PATH)/rules.mak
+ 
+ .PHONY: all clean cscope distclean dvi html info install install-doc \
+       recurse-all speed tar tarbin test
+@@ -231,30 +231,30 @@
+ endif
+ 
+ install-doc: $(DOCS)
+-      mkdir -p "$(DESTDIR)$(docdir)"
+-      $(INSTALL) -m 644 qemu-doc.html  qemu-tech.html "$(DESTDIR)$(docdir)"
++      $(INSTALL_DIR) "$(DESTDIR)$(docdir)"
++      $(INSTALL_DATA) qemu-doc.html  qemu-tech.html "$(DESTDIR)$(docdir)"
+ ifndef CONFIG_WIN32
+-      mkdir -p "$(DESTDIR)$(mandir)/man1"
+-      $(INSTALL) -m 644 qemu.1 qemu-img.1 "$(DESTDIR)$(mandir)/man1"
+-      mkdir -p "$(DESTDIR)$(mandir)/man8"
+-      $(INSTALL) -m 644 qemu-nbd.8 "$(DESTDIR)$(mandir)/man8"
++      $(INSTALL_DIR) "$(DESTDIR)$(mandir)/man1"
++      $(INSTALL_DATA) qemu.1 qemu-img.1 "$(DESTDIR)$(mandir)/man1"
++      $(INSTALL_DIR) "$(DESTDIR)$(mandir)/man8"
++      $(INSTALL_DATA) qemu-nbd.8 "$(DESTDIR)$(mandir)/man8"
+ endif
+ 
+ install: all $(if $(BUILD_DOCS),install-doc)
+-      mkdir -p "$(DESTDIR)$(bindir)"
++      $(INSTALL_DIR) "$(DESTDIR)$(bindir)"
+ ifneq ($(TOOLS),)
+       $(INSTALL_PROG) $(STRIP_OPT) $(TOOLS) "$(DESTDIR)$(bindir)"
+ endif
+ ifneq ($(BLOBS),)
+-      mkdir -p "$(DESTDIR)$(datadir)"
++      $(INSTALL_DIR) "$(DESTDIR)$(datadir)"
+       set -e; for x in $(BLOBS); do \
+-              $(INSTALL) -m 644 $(SRC_PATH)/pc-bios/$$x "$(DESTDIR)$(datadir)"; \
++              $(INSTALL_DATA) $(SRC_PATH)/pc-bios/$$x "$(DESTDIR)$(datadir)"; \
+       done
+ endif
+ ifndef CONFIG_WIN32
+-      mkdir -p "$(DESTDIR)$(datadir)/keymaps"
++      $(INSTALL_DIR) "$(DESTDIR)$(datadir)/keymaps"
+       set -e; for x in $(KEYMAPS); do \
+-              $(INSTALL) -m 644 $(SRC_PATH)/keymaps/$$x "$(DESTDIR)$(datadir)/keymaps"; \
++              $(INSTALL_DATA) $(SRC_PATH)/keymaps/$$x "$(DESTDIR)$(datadir)/keymaps"; \
+       done
+ endif
+       for d in $(TARGET_DIRS); do \
+@@ -275,7 +275,7 @@
+ 
+ # documentation
+ %.html: %.texi
+-      texi2html -monolithic -number $<
++      texi2html -monolithic -number-sections $<
+ 
+ %.info: %.texi
+       makeinfo $< -o $@
+@@ -284,15 +284,15 @@
+       texi2dvi $<
+ 
+ qemu.1: qemu-doc.texi
+-      $(SRC_PATH)/texi2pod.pl $< qemu.pod
++      perl $(SRC_PATH)/texi2pod.pl $< qemu.pod
+       pod2man --section=1 --center=" " --release=" " qemu.pod > $@
+ 
+ qemu-img.1: qemu-img.texi
+-      $(SRC_PATH)/texi2pod.pl $< qemu-img.pod
++      perl $(SRC_PATH)/texi2pod.pl $< qemu-img.pod
+       pod2man --section=1 --center=" " --release=" " qemu-img.pod > $@
+ 
+ qemu-nbd.8: qemu-nbd.texi
+-      $(SRC_PATH)/texi2pod.pl $< qemu-nbd.pod
++      perl $(SRC_PATH)/texi2pod.pl $< qemu-nbd.pod
+       pod2man --section=8 --center=" " --release=" " qemu-nbd.pod > $@
+ 
+ info: qemu-doc.info qemu-tech.info
Index: pkgsrc/sysutils/xentools418/patches/patch-tools_qemu-xen-traditional_block-raw-posix.c
diff -u /dev/null pkgsrc/sysutils/xentools418/patches/patch-tools_qemu-xen-traditional_block-raw-posix.c:1.1
--- /dev/null   Tue Nov 21 11:37:03 2023
+++ pkgsrc/sysutils/xentools418/patches/patch-tools_qemu-xen-traditional_block-raw-posix.c      Tue Nov 21 11:37:03 2023
@@ -0,0 +1,62 @@
+$NetBSD: patch-tools_qemu-xen-traditional_block-raw-posix.c,v 1.1 2023/11/21 11:37:03 bouyer Exp $
+
+- if given a block device, use the character device instead.
+
+--- tools/qemu-xen-traditional/block-raw-posix.c.orig  2014-10-06 17:50:24.000000000 +0200
++++ tools/qemu-xen-traditional/block-raw-posix.c       2015-01-19 13:16:38.000000000 +0100
+@@ -65,6 +65,7 @@
+ #include <sys/disklabel.h>
+ #include <sys/dkio.h>
+ #include <sys/disk.h>
++#include <sys/param.h>
+ #endif
+ 
+ #ifdef __OpenBSD__
+@@ -72,6 +73,13 @@
+ #include <sys/disklabel.h>
+ #include <sys/dkio.h>
+ #endif
++#if defined(__NetBSD__)
++#include <sys/ioctl.h>
++#include <sys/disklabel.h>
++#include <sys/dkio.h>
++#define SLIST_ENTRY(x) int /*XXXX !*/
++#include <sys/disk.h>
++#endif
+ 
+ //#define DEBUG_FLOPPY
+ 
+@@ -1008,6 +1016,33 @@
+ {
+     BDRVRawState *s = bs->opaque;
+     int fd, open_flags, ret;
++#ifdef __NetBSD__
++    struct stat sb;
++    static char namebuf[MAXPATHLEN];
++    const char *dp;
++
++    if (lstat(filename, &sb) < 0) {
++      fprintf(stderr, "%s: stat failed: %s\n", filename, strerror(errno));
++      return -errno;
++    }
++    if (S_ISLNK(sb.st_mode)) {
++      fprintf(stderr, "%s: symolink links not supported by qemu-dm\n",
++          filename);
++      return -EINVAL;
++    }
++    if (S_ISBLK(sb.st_mode)) {
++      dp = strrchr(filename, '/');
++      if (dp == NULL) {
++              snprintf(namebuf, MAXPATHLEN, "r%s", filename);
++      } else {
++              snprintf(namebuf, MAXPATHLEN, "%.*s/r%s",
++                  (int)(dp - filename), filename, dp + 1);
++      }
++      fprintf(stderr, "%s is a block device", filename);
++      filename = namebuf;
++      fprintf(stderr, ", using %s\n", filename);
++    }
++#endif
+ 
+     posix_aio_init();
+ 
Index: pkgsrc/sysutils/xentools418/patches/patch-tools_qemu-xen-traditional_configure
diff -u /dev/null pkgsrc/sysutils/xentools418/patches/patch-tools_qemu-xen-traditional_configure:1.1
--- /dev/null   Tue Nov 21 11:37:03 2023
+++ pkgsrc/sysutils/xentools418/patches/patch-tools_qemu-xen-traditional_configure      Tue Nov 21 11:37:03 2023
@@ -0,0 +1,41 @@
+$NetBSD: patch-tools_qemu-xen-traditional_configure,v 1.1 2023/11/21 11:37:03 bouyer Exp $
+
+--- tools/qemu-xen-traditional/configure.orig  2014-10-06 17:50:24.000000000 +0200
++++ tools/qemu-xen-traditional/configure       2015-01-20 22:58:07.000000000 +0100
+@@ -1089,7 +1089,7 @@
+ # Check if tools are available to build documentation.
+ if [ -x "`which texi2html 2>/dev/null`" ] && \
+    [ -x "`which pod2man 2>/dev/null`" ]; then
+-  build_docs="yes"
++#  build_docs="yes"
+ fi
+ 
+ ##########################################
+@@ -1124,7 +1124,7 @@
+   if test -z "$prefix" ; then
+       prefix="/usr/local"
+   fi
+-  mansuffix="/share/man"
++  mansuffix="/man"
+   datasuffix="/share/qemu"
+   docsuffix="/share/doc/qemu"
+   binsuffix="/bin"
+@@ -1216,6 +1216,8 @@
+ echo "MAKE=$make" >> $config_mak
+ echo "INSTALL=$install" >> $config_mak
+ echo "INSTALL_PROG=$install -m 0755" >> $config_mak
++echo "INSTALL_DATA=$install -m0644" >> $config_mak
++echo "INSTALL_DIR=$install -d -m0755 -p" >> $config_mak
+ echo "CC=$cc" >> $config_mak
+ echo "HOST_CC=$host_cc" >> $config_mak
+ echo "AR=$ar" >> $config_mak
+@@ -1493,7 +1495,9 @@
+ # XXX: suppress that
+ if [ "$bsd" = "yes" ] ; then
+   echo "#define O_LARGEFILE 0" >> $config_h
++  echo "#ifndef MAP_ANONYMOUS" >> $config_h
+   echo "#define MAP_ANONYMOUS MAP_ANON" >> $config_h
++  echo "#endif" >> $config_h
+   echo "#define _BSD 1" >> $config_h
+ fi
+ 
Index: pkgsrc/sysutils/xentools418/patches/patch-tools_qemu-xen-traditional_hw_e1000.c
diff -u /dev/null pkgsrc/sysutils/xentools418/patches/patch-tools_qemu-xen-traditional_hw_e1000.c:1.1
--- /dev/null   Tue Nov 21 11:37:03 2023
+++ pkgsrc/sysutils/xentools418/patches/patch-tools_qemu-xen-traditional_hw_e1000.c     Tue Nov 21 11:37:03 2023
@@ -0,0 +1,34 @@
+$NetBSD: patch-tools_qemu-xen-traditional_hw_e1000.c,v 1.1 2023/11/21 11:37:03 bouyer Exp $
+
+From sysutils/xentools33/patches/patch-ak.
+
+qemu-0.13.x will include this fix:
+http://git.qemu.org/qemu.git/commit/?id=9651ac55e5de0e1534d898316cc851af6ffc4334
+
+--- tools/qemu-xen-traditional/hw/e1000.c.orig 2014-10-06 17:50:24.000000000 +0200
++++ tools/qemu-xen-traditional/hw/e1000.c      2015-01-19 13:16:38.000000000 +0100
+@@ -265,16 +265,20 @@
+ 
+     s->eecd_state.old_eecd = val & (E1000_EECD_SK | E1000_EECD_CS |
+             E1000_EECD_DI|E1000_EECD_FWE_MASK|E1000_EECD_REQ);
++    if (!(E1000_EECD_CS & val))                        // CS inactive; nothing to do
++       return;
++    if (E1000_EECD_CS & (val ^ oldval)) {      // CS rise edge; reset state
++       s->eecd_state.val_in = 0;
++       s->eecd_state.bitnum_in = 0;
++       s->eecd_state.bitnum_out = 0;
++       s->eecd_state.reading = 0;
++    }
+     if (!(E1000_EECD_SK & (val ^ oldval)))    // no clock edge
+         return;
+     if (!(E1000_EECD_SK & val)) {             // falling edge
+         s->eecd_state.bitnum_out++;
+         return;
+     }
+-    if (!(val & E1000_EECD_CS)) {             // rising, no CS (EEPROM reset)
+-        memset(&s->eecd_state, 0, sizeof s->eecd_state);
+-        return;
+-    }
+     s->eecd_state.val_in <<= 1;
+     if (val & E1000_EECD_DI)
+         s->eecd_state.val_in |= 1;
Index: pkgsrc/sysutils/xentools418/patches/patch-tools_qemu-xen-traditional_hw_ide.c
diff -u /dev/null pkgsrc/sysutils/xentools418/patches/patch-tools_qemu-xen-traditional_hw_ide.c:1.1
--- /dev/null   Tue Nov 21 11:37:03 2023
+++ pkgsrc/sysutils/xentools418/patches/patch-tools_qemu-xen-traditional_hw_ide.c       Tue Nov 21 11:37:03 2023
@@ -0,0 +1,37 @@
+$NetBSD: patch-tools_qemu-xen-traditional_hw_ide.c,v 1.1 2023/11/21 11:37:03 bouyer Exp $
+
+--- tools/qemu-xen-traditional/hw/ide.c.orig   2014-01-09 13:44:42.000000000 +0100
++++ tools/qemu-xen-traditional/hw/ide.c        2015-06-11 16:15:49.000000000 +0200
+@@ -757,10 +757,15 @@
+     put_le16(p + 58, oldsize >> 16);
+     if (s->mult_sectors)
+         put_le16(p + 59, 0x100 | s->mult_sectors);
+-    put_le16(p + 60, s->nb_sectors);
+-    put_le16(p + 61, s->nb_sectors >> 16);
++    if (s->nb_sectors > 0x10000000)
++      oldsize = 0x10000000; /* report only 128GB */
++    else
++      oldsize =  s->nb_sectors;
++    put_le16(p + 60, oldsize);
++    put_le16(p + 61, oldsize >> 16);
+     put_le16(p + 62, 0x07); /* single word dma0-2 supported */
+     put_le16(p + 63, 0x07); /* mdma0-2 supported */
++    put_le16(p + 64, 0x03); /* pio3-4 supported */
+     put_le16(p + 65, 120);
+     put_le16(p + 66, 120);
+     put_le16(p + 67, 120);
+@@ -812,13 +817,12 @@
+     put_le16(p + 53, 7); /* words 64-70, 54-58, 88 valid */
+     put_le16(p + 62, 7);  /* single word dma0-2 supported */
+     put_le16(p + 63, 7);  /* mdma0-2 supported */
+-    put_le16(p + 64, 0x3f); /* PIO modes supported */
+ #else
+     put_le16(p + 49, 1 << 9); /* LBA supported, no DMA */
+     put_le16(p + 53, 3); /* words 64-70, 54-58 valid */
+     put_le16(p + 63, 0x103); /* DMA modes XXX: may be incorrect */
+-    put_le16(p + 64, 1); /* PIO modes */
+ #endif
++    put_le16(p + 64, 3); /* pio3-4 supported */
+     put_le16(p + 65, 0xb4); /* minimum DMA multiword tx cycle time */
+     put_le16(p + 66, 0xb4); /* recommended DMA multiword tx cycle time */
+     put_le16(p + 67, 0x12c); /* minimum PIO cycle time without flow control */
Index: pkgsrc/sysutils/xentools418/patches/patch-tools_qemu-xen-traditional_hw_pass-through.c
diff -u /dev/null pkgsrc/sysutils/xentools418/patches/patch-tools_qemu-xen-traditional_hw_pass-through.c:1.1
--- /dev/null   Tue Nov 21 11:37:03 2023
+++ pkgsrc/sysutils/xentools418/patches/patch-tools_qemu-xen-traditional_hw_pass-through.c      Tue Nov 21 11:37:03 2023
@@ -0,0 +1,13 @@
+$NetBSD: patch-tools_qemu-xen-traditional_hw_pass-through.c,v 1.1 2023/11/21 11:37:03 bouyer Exp $
+
+--- tools/qemu-xen-traditional/hw/pass-through.c.orig  2014-10-06 17:50:24.000000000 +0200
++++ tools/qemu-xen-traditional/hw/pass-through.c       2015-01-19 13:16:38.000000000 +0100
+@@ -84,8 +84,6 @@
+  */
+ 
+ #include "pass-through.h"
+-#include "pci/header.h"
+-#include "pci/pci.h"
+ #include "pt-msi.h"
+ #include "qemu-xen.h"
+ #include "iomulti.h"
Index: pkgsrc/sysutils/xentools418/patches/patch-tools_qemu-xen-traditional_hw_pt-graphics.c
diff -u /dev/null pkgsrc/sysutils/xentools418/patches/patch-tools_qemu-xen-traditional_hw_pt-graphics.c:1.1
--- /dev/null   Tue Nov 21 11:37:03 2023
+++ pkgsrc/sysutils/xentools418/patches/patch-tools_qemu-xen-traditional_hw_pt-graphics.c       Tue Nov 21 11:37:03 2023
@@ -0,0 +1,13 @@
+$NetBSD: patch-tools_qemu-xen-traditional_hw_pt-graphics.c,v 1.1 2023/11/21 11:37:03 bouyer Exp $
+
+--- tools/qemu-xen-traditional/hw/pt-graphics.c.orig   2015-01-19 16:14:46.000000000 +0100
++++ tools/qemu-xen-traditional/hw/pt-graphics.c        2015-01-19 16:14:51.000000000 +0100
+@@ -4,8 +4,6 @@
+ 
+ #include "pass-through.h"
+ #include "pci.h"
+-#include "pci/header.h"
+-#include "pci/pci.h"
+ 
+ #include <unistd.h>
+ #include <sys/ioctl.h>
Index: pkgsrc/sysutils/xentools418/patches/patch-tools_qemu-xen-traditional_hw_pt-msi.c
diff -u /dev/null pkgsrc/sysutils/xentools418/patches/patch-tools_qemu-xen-traditional_hw_pt-msi.c:1.1
--- /dev/null   Tue Nov 21 11:37:03 2023
+++ pkgsrc/sysutils/xentools418/patches/patch-tools_qemu-xen-traditional_hw_pt-msi.c    Tue Nov 21 11:37:03 2023
@@ -0,0 +1,15 @@
+$NetBSD: patch-tools_qemu-xen-traditional_hw_pt-msi.c,v 1.1 2023/11/21 11:37:03 bouyer Exp $
+
+--- tools/qemu-xen-traditional/hw/pt-msi.c.orig        2014-10-06 17:50:24.000000000 +0200
++++ tools/qemu-xen-traditional/hw/pt-msi.c     2015-01-19 13:16:38.000000000 +0100
+@@ -22,6 +22,10 @@
+ #include "pt-msi.h"
+ #include <sys/mman.h>
+ 
++#ifdef __NetBSD__
++#define MAP_LOCKED MAP_WIRED
++#endif
++
+ void msi_set_enable(struct pt_dev *dev, int en)
+ {
+     uint16_t val = 0;
Index: pkgsrc/sysutils/xentools418/patches/patch-tools_qemu-xen-traditional_hw_pt-msi.h
diff -u /dev/null pkgsrc/sysutils/xentools418/patches/patch-tools_qemu-xen-traditional_hw_pt-msi.h:1.1
--- /dev/null   Tue Nov 21 11:37:03 2023
+++ pkgsrc/sysutils/xentools418/patches/patch-tools_qemu-xen-traditional_hw_pt-msi.h    Tue Nov 21 11:37:03 2023
@@ -0,0 +1,12 @@
+$NetBSD: patch-tools_qemu-xen-traditional_hw_pt-msi.h,v 1.1 2023/11/21 11:37:03 bouyer Exp $
+
+--- tools/qemu-xen-traditional/hw/pt-msi.h.orig        2014-10-06 17:50:24.000000000 +0200
++++ tools/qemu-xen-traditional/hw/pt-msi.h     2015-01-19 13:16:38.000000000 +0100
+@@ -1,7 +1,6 @@
+ #ifndef _PT_MSI_H
+ #define _PT_MSI_H
+ 
+-#include "pci/pci.h"
+ #include "pass-through.h"
+ 
+ #define  PCI_CAP_ID_MSI     0x05    /* Message Signalled Interrupts */
Index: pkgsrc/sysutils/xentools418/patches/patch-tools_qemu-xen-traditional_i386-dm_hookstarget.mak
diff -u /dev/null pkgsrc/sysutils/xentools418/patches/patch-tools_qemu-xen-traditional_i386-dm_hookstarget.mak:1.1
--- /dev/null   Tue Nov 21 11:37:03 2023
+++ pkgsrc/sysutils/xentools418/patches/patch-tools_qemu-xen-traditional_i386-dm_hookstarget.mak        Tue Nov 21 11:37:03 2023
@@ -0,0 +1,12 @@
+$NetBSD: patch-tools_qemu-xen-traditional_i386-dm_hookstarget.mak,v 1.1 2023/11/21 11:37:03 bouyer Exp $
+
+--- tools/qemu-xen-traditional/i386-dm/hookstarget.mak.orig    2014-10-06 17:50:24.000000000 +0200
++++ tools/qemu-xen-traditional/i386-dm/hookstarget.mak 2015-01-19 13:16:38.000000000 +0100
+@@ -2,5 +2,5 @@
+ 
+ install-hook:
+       $(INSTALL_DIR) "$(DESTDIR)/$(bindir)"
+-      $(INSTALL_DIR) "$(DESTDIR)/$(configdir)"
+-      $(INSTALL_PROG) $(QEMU_ROOT)/i386-dm/qemu-ifup-$(IOEMU_OS) "$(DESTDIR)/$(configdir)/qemu-ifup"
++      $(INSTALL_DIR) "$(DESTDIR)/$(XEN_EXAMPLES_DIR)/scripts"
++      $(INSTALL_PROG) $(QEMU_ROOT)/i386-dm/qemu-ifup-$(IOEMU_OS) "$(DESTDIR)/$(XEN_EXAMPLES_DIR)/scripts/qemu-ifup"
Index: pkgsrc/sysutils/xentools418/patches/patch-tools_qemu-xen-traditional_net.c
diff -u /dev/null pkgsrc/sysutils/xentools418/patches/patch-tools_qemu-xen-traditional_net.c:1.1
--- /dev/null   Tue Nov 21 11:37:03 2023
+++ pkgsrc/sysutils/xentools418/patches/patch-tools_qemu-xen-traditional_net.c  Tue Nov 21 11:37:03 2023
@@ -0,0 +1,48 @@
+$NetBSD: patch-tools_qemu-xen-traditional_net.c,v 1.1 2023/11/21 11:37:03 bouyer Exp $
+
+
+--- tools/qemu-xen-traditional/net.c.orig      2016-11-29 17:36:38.000000000 +0100
++++ tools/qemu-xen-traditional/net.c   2017-03-29 18:16:54.000000000 +0200
+@@ -990,6 +990,7 @@
+ #define DEFAULT_NETWORK_DOWN_SCRIPT ""
+ #endif
+ 
++#if !defined(CONFIG_STUBDOM)
+ static int launch_script(const char *setup_script, const char *ifname,
+                          const char *script_arg, int fd)
+ {
+@@ -1028,6 +1029,7 @@
+         }
+     return 0;
+ }
++#endif
+ 
+ static int net_tap_init(VLANState *vlan, const char *model,
+                         const char *name, const char *ifname1,
+@@ -1048,12 +1050,14 @@
+ 
+     if (!setup_script || !strcmp(setup_script, "no"))
+         setup_script = "";
++#if !defined(CONFIG_STUBDOM)
+     if (setup_script[0] != '\0') {
+       if (launch_script(setup_script, ifname, script_arg, fd)) {
+           close(fd);
+           return -1;
+       }
+     }
++#endif
+     s = net_tap_fd_init(vlan, model, name, fd);
+     if (!s)
+         return -1;
+@@ -1965,9 +1969,11 @@
+             if (vc->fd_read == tap_receive) {
+                 TAPState *s = vc->opaque;
+ 
++#ifndef CONFIG_STUBDOM
+                 if (s->down_script[0])
+                     launch_script(s->down_script, s->down_script_arg,
+                                 s->script_arg, s->fd);
++#endif
+             }
+ #if defined(CONFIG_VDE)
+             if (vc->fd_read == vde_from_qemu) {
Index: pkgsrc/sysutils/xentools418/patches/patch-tools_qemu-xen-traditional_xen-hooks.mak
diff -u /dev/null pkgsrc/sysutils/xentools418/patches/patch-tools_qemu-xen-traditional_xen-hooks.mak:1.1
--- /dev/null   Tue Nov 21 11:37:03 2023
+++ pkgsrc/sysutils/xentools418/patches/patch-tools_qemu-xen-traditional_xen-hooks.mak  Tue Nov 21 11:37:03 2023
@@ -0,0 +1,34 @@
+$NetBSD: patch-tools_qemu-xen-traditional_xen-hooks.mak,v 1.1 2023/11/21 11:37:03 bouyer Exp $
+
+enable PCI passthrough when pciutils is present
+
+--- tools/qemu-xen-traditional/xen-hooks.mak.orig      2020-12-08 16:54:20.000000000 +0100
++++ tools/qemu-xen-traditional/xen-hooks.mak   2020-12-09 16:07:04.817171636 +0100
+@@ -61,17 +61,25 @@
+ ifdef CONFIG_STUBDOM
+ CONFIG_PASSTHROUGH=1
+ else
+-  ifeq (,$(wildcard /usr/include/pci))
++  ifeq ($(CONFIG_NetBSD), y)
++CONFIG_PASSTHROUGH=1
++  else
++    ifeq (,$(wildcard /usr/include/pci))
+ $(warning === pciutils-dev package not found - missing /usr/include/pci)
+ $(warning === PCI passthrough capability has been disabled)
+-  else
++    else
+ CONFIG_PASSTHROUGH=1
++    endif
+   endif
+ endif
+ 
+ ifdef CONFIG_PASSTHROUGH
+ OBJS+= pass-through.o pt-msi.o pt-graphics.o
++ifeq ($(CONFIG_NetBSD), y)
++LIBS += -Wl,-R${PREFIX}/lib -L${PREFIX}/lib -lpciutils -lpci
++else
+ LIBS += -lpci
++endif
+ CFLAGS += -DCONFIG_PASSTHROUGH 
+ $(info === PCI passthrough capability has been enabled ===)
+ endif
Index: pkgsrc/sysutils/xentools418/patches/patch-tools_qemu-xen_audio_audio.c
diff -u /dev/null pkgsrc/sysutils/xentools418/patches/patch-tools_qemu-xen_audio_audio.c:1.1
--- /dev/null   Tue Nov 21 11:37:03 2023
+++ pkgsrc/sysutils/xentools418/patches/patch-tools_qemu-xen_audio_audio.c      Tue Nov 21 11:37:03 2023
@@ -0,0 +1,27 @@
+$NetBSD: patch-tools_qemu-xen_audio_audio.c,v 1.1 2023/11/21 11:37:03 bouyer Exp $
+
+--- tools/qemu-xen/audio/audio.c.orig  2023-08-16 11:43:53.000000000 +0200
++++ tools/qemu-xen/audio/audio.c       2023-10-12 12:59:41.625600778 +0200
+@@ -895,6 +895,7 @@
+     if (audio_get_pdo_in(hw->s->dev)->mixing_engine) {
+         return audio_pcm_sw_read(sw, buf, size);
+     } else {
++#undef read
+         return hw->pcm_ops->read(hw, buf, size);
+     }
+ }
+@@ -2158,12 +2159,13 @@
+ void audio_parse_option(const char *opt)
+ {
+     Audiodev *dev = NULL;
++    Visitor *v;
+ 
+     if (is_help_option(opt)) {
+         audio_help();
+         exit(EXIT_SUCCESS);
+     }
+-    Visitor *v = qobject_input_visitor_new_str(opt, "driver", &error_fatal);
++    v = qobject_input_visitor_new_str(opt, "driver", &error_fatal);
+     visit_type_Audiodev(v, NULL, &dev, &error_fatal);
+     visit_free(v);
+ 
Index: pkgsrc/sysutils/xentools418/patches/patch-tools_qemu-xen_bios_optionrom_Makefile
diff -u /dev/null pkgsrc/sysutils/xentools418/patches/patch-tools_qemu-xen_bios_optionrom_Makefile:1.1
--- /dev/null   Tue Nov 21 11:37:03 2023
+++ pkgsrc/sysutils/xentools418/patches/patch-tools_qemu-xen_bios_optionrom_Makefile    Tue Nov 21 11:37:03 2023
@@ -0,0 +1,15 @@
+$NetBSD: patch-tools_qemu-xen_bios_optionrom_Makefile,v 1.1 2023/11/21 11:37:03 bouyer Exp $
+
+force ld in 32bit mode
+
+--- tools/qemu-xen/pc-bios/optionrom/Makefile.orig     2023-10-12 12:31:23.365032012 +0200
++++ tools/qemu-xen/pc-bios/optionrom/Makefile  2023-10-12 12:32:10.391775796 +0200
+@@ -36,7 +36,7 @@
+           $(call cc-option,-Wno-array-bounds)) 3> config-cc.mak
+ -include config-cc.mak
+ 
+-override LDFLAGS = -nostdlib -Wl,-T,$(SRC_DIR)/flat.lds
++override LDFLAGS = -nostdlib -Wl,-melf_i386 -Wl,-T,$(SRC_DIR)/flat.lds
+ 
+ pvh.img: pvh.o pvh_main.o
+ 
Index: pkgsrc/sysutils/xentools418/patches/patch-tools_qemu-xen_net_tap-bsd.c
diff -u /dev/null pkgsrc/sysutils/xentools418/patches/patch-tools_qemu-xen_net_tap-bsd.c:1.1
--- /dev/null   Tue Nov 21 11:37:03 2023
+++ pkgsrc/sysutils/xentools418/patches/patch-tools_qemu-xen_net_tap-bsd.c      Tue Nov 21 11:37:03 2023
@@ -0,0 +1,44 @@
+$NetBSD: patch-tools_qemu-xen_net_tap-bsd.c,v 1.1 2023/11/21 11:37:03 bouyer Exp $
+
+--- tools/qemu-xen/net/tap-bsd.c.orig  2023-08-16 11:43:53.000000000 +0200
++++ tools/qemu-xen/net/tap-bsd.c       2023-11-14 17:27:20.501570015 +0100
+@@ -34,7 +34,7 @@
+ #include <net/if_tap.h>
+ #endif
+ 
+-#ifndef __FreeBSD__
++#if !defined(__FreeBSD__) && !defined(__NetBSD__)
+ int tap_open(char *ifname, int ifname_size, int *vnet_hdr,
+              int vnet_hdr_required, int mq_required, Error **errp)
+ {
+@@ -102,7 +102,7 @@
+     return fd;
+ }
+ 
+-#else /* __FreeBSD__ */
++#else /* !__FreeBSD__ && !__NetBSD__ */
+ 
+ #define PATH_NET_TAP "/dev/tap"
+ 
+@@ -127,6 +127,7 @@
+     }
+ 
+     if (ifname[0] != '\0') {
++#ifdef SIOCSIFNAME
+         /* User requested the interface to have a specific name */
+         s = socket(AF_LOCAL, SOCK_DGRAM, 0);
+         if (s < 0) {
+@@ -143,10 +144,12 @@
+             close(fd);
+             return -1;
+         }
++#else
++        pstrcpy(ifname, ifname_size, ifr.ifr_name);
++#endif
+     } else {
+         pstrcpy(ifname, ifname_size, ifr.ifr_name);
+     }
+-
+     return fd;
+ }
+ 
Index: pkgsrc/sysutils/xentools418/patches/patch-tools_qemu-xen_net_tap.c
diff -u /dev/null pkgsrc/sysutils/xentools418/patches/patch-tools_qemu-xen_net_tap.c:1.1
--- /dev/null   Tue Nov 21 11:37:03 2023
+++ pkgsrc/sysutils/xentools418/patches/patch-tools_qemu-xen_net_tap.c  Tue Nov 21 11:37:03 2023
@@ -0,0 +1,70 @@
+$NetBSD: patch-tools_qemu-xen_net_tap.c,v 1.1 2023/11/21 11:37:03 bouyer Exp $
+
+From Roman Shaposhnik via xen-devel: pass bridge name to ifup script
+
+--- tools/qemu-xen/net/tap.c.orig
++++ tools/qemu-xen/net/tap.c
+@@ -62,7 +62,7 @@
+     Notifier exit;
+ } TAPState;
+ 
+-static void launch_script(const char *setup_script, const char *ifname,
++static void launch_script(const char *setup_script, const char *ifname, const char *bridge,
+                           int fd, Error **errp);
+ 
+ static void tap_send(void *opaque);
+@@ -300,7 +300,7 @@
+     Error *err = NULL;
+ 
+     if (s->down_script[0]) {
+-        launch_script(s->down_script, s->down_script_arg, s->fd, &err);
++        launch_script(s->down_script, s->down_script_arg, "bn1", s->fd, &err);
+         if (err) {
+             error_report_err(err);
+         }
+@@ -397,7 +397,7 @@
+     return s;
+ }
+ 
+-static void launch_script(const char *setup_script, const char *ifname,
++static void launch_script(const char *setup_script, const char *ifname, const char *bridge,
+                           int fd, Error **errp)
+ {
+     int pid, status;
+@@ -422,6 +422,7 @@
+         parg = args;
+         *parg++ = (char *)setup_script;
+         *parg++ = (char *)ifname;
++      *parg++ = (char *)bridge;
+         *parg = NULL;
+         execv(setup_script, args);
+         _exit(1);
+@@ -607,7 +608,7 @@
+ 
+ static int net_tap_init(const NetdevTapOptions *tap, int *vnet_hdr,
+                         const char *setup_script, char *ifname,
+-                        size_t ifname_sz, int mq_required, Error **errp)
++                        size_t ifname_sz, const char *bridge, int mq_required, Error **errp)
+ {
+     Error *err = NULL;
+     int fd, vnet_hdr_required;
+@@ -629,7 +630,7 @@
+     if (setup_script &&
+         setup_script[0] != '\0' &&
+         strcmp(setup_script, "no") != 0) {
+-        launch_script(setup_script, ifname, fd, &err);
++        launch_script(setup_script, ifname, bridge, fd, &err);
+         if (err) {
+             error_propagate(errp, err);
+             close(fd);
+@@ -918,7 +919,9 @@
+ 
+         for (i = 0; i < queues; i++) {
+             fd = net_tap_init(tap, &vnet_hdr, i >= 1 ? "no" : script,
+-                              ifname, sizeof ifname, queues > 1, errp);
++                              ifname, sizeof ifname, 
++                            tap->br != NULL ? tap->br : "bn1",
++                            queues > 1, errp);
+             if (fd == -1) {
+                 return -1;
+             }
Index: pkgsrc/sysutils/xentools418/patches/patch-tools_xenpaging_xenpaging.c
diff -u /dev/null pkgsrc/sysutils/xentools418/patches/patch-tools_xenpaging_xenpaging.c:1.1
--- /dev/null   Tue Nov 21 11:37:03 2023
+++ pkgsrc/sysutils/xentools418/patches/patch-tools_xenpaging_xenpaging.c       Tue Nov 21 11:37:03 2023
@@ -0,0 +1,15 @@
+$NetBSD: patch-tools_xenpaging_xenpaging.c,v 1.1 2023/11/21 11:37:03 bouyer Exp $
+
+Fix "error: 'buffer' may be used uninitialized"
+
+--- tools/xenpaging/xenpaging.c.orig   2021-04-17 14:43:41.053494277 +0200
++++ tools/xenpaging/xenpaging.c        2021-04-17 14:44:17.167271008 +0200
+@@ -180,7 +180,7 @@
+ 
+ static void *init_page(void)
+ {
+-    void *buffer;
++    void *buffer = NULL; /* XXX gcc */
+ 
+     /* Allocated page memory */
+     errno = posix_memalign(&buffer, XC_PAGE_SIZE, XC_PAGE_SIZE);
Index: pkgsrc/sysutils/xentools418/patches/patch-tools_xl_Makefile
diff -u /dev/null pkgsrc/sysutils/xentools418/patches/patch-tools_xl_Makefile:1.1
--- /dev/null   Tue Nov 21 11:37:03 2023
+++ pkgsrc/sysutils/xentools418/patches/patch-tools_xl_Makefile Tue Nov 21 11:37:03 2023
@@ -0,0 +1,16 @@
+$NetBSD: patch-tools_xl_Makefile,v 1.1 2023/11/21 11:37:03 bouyer Exp $
+
+--- tools/xl/Makefile.orig     2021-01-26 12:35:19.000000000 +0100
++++ tools/xl/Makefile  2021-01-26 19:21:03.038848363 +0100
+@@ -43,9 +43,9 @@
+ .PHONY: install
+ install: all
+       $(INSTALL_DIR) $(DESTDIR)$(sbindir)
+-      $(INSTALL_DIR) $(DESTDIR)$(BASH_COMPLETION_DIR)
++      $(INSTALL_DIR) $(DESTDIR)$(XEN_EXAMPLES_DIR)
+       $(INSTALL_PROG) xl $(DESTDIR)$(sbindir)
+-      $(INSTALL_DATA) bash-completion $(DESTDIR)$(BASH_COMPLETION_DIR)/xl
++      $(INSTALL_DATA) bash-completion $(DESTDIR)$(XEN_EXAMPLES_DIR)/xl.bash
+ 
+ .PHONY: uninstall
+ uninstall:
Index: pkgsrc/sysutils/xentools418/patches/patch-xen_Makefile
diff -u /dev/null pkgsrc/sysutils/xentools418/patches/patch-xen_Makefile:1.1
--- /dev/null   Tue Nov 21 11:37:03 2023
+++ pkgsrc/sysutils/xentools418/patches/patch-xen_Makefile      Tue Nov 21 11:37:03 2023
@@ -0,0 +1,12 @@
+$NetBSD: patch-xen_Makefile,v 1.1 2023/11/21 11:37:03 bouyer Exp $
+
+--- xen/Makefile.orig  2023-10-12 11:25:40.066708313 +0200
++++ xen/Makefile       2023-10-12 11:25:43.774709255 +0200
+@@ -1,3 +1,7 @@
++# reset CFLAGS, it accumulates settings from upper level (maybe because it's
++# in $ENV in pkgsrc
++CFLAGS=
++
+ # $(lastword,) for GNU Make older than 3.81
+ lastword = $(word $(words $(1)),$(1))
+ this-makefile := $(call lastword,$(MAKEFILE_LIST))
Index: pkgsrc/sysutils/xentools418/patches/patch-xen_include_Makefile
diff -u /dev/null pkgsrc/sysutils/xentools418/patches/patch-xen_include_Makefile:1.1
--- /dev/null   Tue Nov 21 11:37:03 2023
+++ pkgsrc/sysutils/xentools418/patches/patch-xen_include_Makefile      Tue Nov 21 11:37:03 2023
@@ -0,0 +1,15 @@
+$NetBSD: patch-xen_include_Makefile,v 1.1 2023/11/21 11:37:03 bouyer Exp $
+
+also filter out flags added by pkgsrc
+
+--- xen/include/Makefile.orig  2023-10-06 19:17:42.000000000 +0200
++++ xen/include/Makefile       2023-10-11 16:33:13.599360669 +0200
+@@ -56,7 +56,7 @@
+ cmd_stub_h = echo '/* empty */' >$@
+ 
+ quiet_cmd_compat_i = CPP     $@
+-cmd_compat_i = $(CPP) $(filter-out -Wa$(comma)% -include %/include/xen/config.h,$(XEN_CFLAGS)) $(cppflags-y) -o $@ $<
++cmd_compat_i = $(CPP) $(filter-out -Wa$(comma)% -g3 -include %/include/xen/config.h,$(XEN_CFLAGS)) $(cppflags-y) -o $@ $<
+ 
+ quiet_cmd_compat_c = GEN     $@
+ cmd_compat_c = \



Home | Main Index | Thread Index | Old Index