Index: emulators/virtualbox-ose-additions/Makefile =================================================================== --- emulators/virtualbox-ose-additions/Makefile +++ emulators/virtualbox-ose-additions/Makefile @@ -1,8 +1,7 @@ # Created by: Bernhard Froehlich PORTNAME= virtualbox-ose -PORTVERSION= 6.1.18 -PORTREVISION= 1 +PORTVERSION= 6.1.20 CATEGORIES= emulators MASTER_SITES= https://download.virtualbox.org/virtualbox/${PORTVERSION}/ PKGNAMESUFFIX?= -additions Index: emulators/virtualbox-ose-additions/distinfo =================================================================== --- emulators/virtualbox-ose-additions/distinfo +++ emulators/virtualbox-ose-additions/distinfo @@ -1,3 +1,3 @@ -TIMESTAMP = 1613903085 -SHA256 (VirtualBox-6.1.18.tar.bz2) = 108d42b9b391b7a332a33df1662cf7b0e9d9a80f3079d16288d8b9487f427d40 -SIZE (VirtualBox-6.1.18.tar.bz2) = 165507486 +TIMESTAMP = 1619010563 +SHA256 (VirtualBox-6.1.20.tar.bz2) = e690c91974a2e7a5aca2c0939ad514382f9a2136797a5e0b96aab778e42bc8a7 +SIZE (VirtualBox-6.1.20.tar.bz2) = 165569564 Index: emulators/virtualbox-ose-kmod/Makefile =================================================================== --- emulators/virtualbox-ose-kmod/Makefile +++ emulators/virtualbox-ose-kmod/Makefile @@ -1,8 +1,7 @@ # Created by: Bernhard Froehlich PORTNAME= virtualbox-ose -PORTVERSION= 6.1.18 -PORTREVISION= 1 +PORTVERSION= 6.1.20 CATEGORIES= emulators MASTER_SITES= https://download.virtualbox.org/virtualbox/${PORTVERSION}/ PKGNAMESUFFIX= -kmod Index: emulators/virtualbox-ose-kmod/distinfo =================================================================== --- emulators/virtualbox-ose-kmod/distinfo +++ emulators/virtualbox-ose-kmod/distinfo @@ -1,3 +1,3 @@ -TIMESTAMP = 1613865409 -SHA256 (VirtualBox-6.1.18.tar.bz2) = 108d42b9b391b7a332a33df1662cf7b0e9d9a80f3079d16288d8b9487f427d40 -SIZE (VirtualBox-6.1.18.tar.bz2) = 165507486 +TIMESTAMP = 1619010563 +SHA256 (VirtualBox-6.1.20.tar.bz2) = e690c91974a2e7a5aca2c0939ad514382f9a2136797a5e0b96aab778e42bc8a7 +SIZE (VirtualBox-6.1.20.tar.bz2) = 165569564 Index: emulators/virtualbox-ose/Makefile =================================================================== --- emulators/virtualbox-ose/Makefile +++ emulators/virtualbox-ose/Makefile @@ -1,7 +1,7 @@ # Created by: Bernhard Froehlich PORTNAME= virtualbox-ose -PORTVERSION= 6.1.18 +PORTVERSION= 6.1.20 CATEGORIES= emulators MASTER_SITES= https://download.virtualbox.org/virtualbox/${PORTVERSION}/ DISTFILES= VirtualBox-${PORTVERSION}${EXTRACT_SUFX} ${GUESTADDITIONS} Index: emulators/virtualbox-ose/distinfo =================================================================== --- emulators/virtualbox-ose/distinfo +++ emulators/virtualbox-ose/distinfo @@ -1,5 +1,5 @@ -TIMESTAMP = 1613863264 -SHA256 (VirtualBox-6.1.18.tar.bz2) = 108d42b9b391b7a332a33df1662cf7b0e9d9a80f3079d16288d8b9487f427d40 -SIZE (VirtualBox-6.1.18.tar.bz2) = 165507486 -SHA256 (VBoxGuestAdditions_6.1.18.iso) = 904432eb331d7ae517afaa4e4304e6492b7947b46ecb8267de7ef792c4921b4c -SIZE (VBoxGuestAdditions_6.1.18.iso) = 61157376 +TIMESTAMP = 1619010563 +SHA256 (VirtualBox-6.1.20.tar.bz2) = e690c91974a2e7a5aca2c0939ad514382f9a2136797a5e0b96aab778e42bc8a7 +SIZE (VirtualBox-6.1.20.tar.bz2) = 165569564 +SHA256 (VBoxGuestAdditions_6.1.20.iso) = 65d22a9f1fcf690d77be99d549149ec9129e2a728ddd9202df436ed9593ba520 +SIZE (VBoxGuestAdditions_6.1.20.iso) = 61018112 Index: emulators/virtualbox-ose/files/patch-include-iprt-x86.h =================================================================== --- emulators/virtualbox-ose/files/patch-include-iprt-x86.h +++ emulators/virtualbox-ose/files/patch-include-iprt-x86.h @@ -1,4 +1,4 @@ ---- include/iprt/x86.h.orig 2021-01-07 15:31:34 UTC +--- include/iprt/x86.h.orig 2021-04-20 04:22:23 UTC +++ include/iprt/x86.h @@ -38,6 +38,16 @@ # pragma D depends_on library vbox-types.d @@ -14,6 +14,6 @@ +# undef MSR_IA32_FEATURE_CONTROL +#endif + - /* Workaround for Solaris sys/regset.h defining CS, DS */ + /** Workaround for Solaris sys/regset.h defining CS, DS and sys/controlregs.h + * defining MSR_IA32_FLUSH_CMD */ #ifdef RT_OS_SOLARIS - # undef CS Index: emulators/virtualbox-ose/files/patch-src_VBox_Additions_freebsd_vboxvfs_vboxvfs__vfsops.c =================================================================== --- emulators/virtualbox-ose/files/patch-src_VBox_Additions_freebsd_vboxvfs_vboxvfs__vfsops.c +++ emulators/virtualbox-ose/files/patch-src_VBox_Additions_freebsd_vboxvfs_vboxvfs__vfsops.c @@ -1,4 +1,4 @@ ---- src/VBox/Additions/freebsd/vboxvfs/vboxvfs_vfsops.c.orig 2021-01-07 15:34:22 UTC +--- src/VBox/Additions/freebsd/vboxvfs/vboxvfs_vfsops.c.orig 2021-04-20 04:24:19 UTC +++ src/VBox/Additions/freebsd/vboxvfs/vboxvfs_vfsops.c @@ -1,8 +1,3 @@ -/* $Id: vboxvfs_vfsops.c $ */ @@ -9,7 +9,7 @@ /* * Copyright (C) 2008-2020 Oracle Corporation * -@@ -14,245 +9,478 @@ +@@ -14,245 +9,474 @@ * VirtualBox OSE distribution. VirtualBox OSE is distributed in the * hope that it will be useful, but WITHOUT ANY WARRANTY of any kind. */ @@ -456,12 +456,8 @@ + mp->mnt_flag |= MNT_LOCAL; + if (readonly != 0) + mp->mnt_flag |= MNT_RDONLY; -+#if __FreeBSD_version >= 1000021 ++ + mp->mnt_kern_flag |= MNTK_LOOKUP_SHARED | MNTK_EXTENDED_SHARED; -+#else -+ mp->mnt_kern_flag |= MNTK_MPSAFE | MNTK_LOOKUP_SHARED | -+ MNTK_EXTENDED_SHARED; -+#endif + MNT_IUNLOCK(mp); + vfs_mountedfrom(mp, share_name); + Index: emulators/virtualbox-ose/files/patch-src_VBox_Devices_Audio_DrvHostAudioAlsa.cpp =================================================================== --- emulators/virtualbox-ose/files/patch-src_VBox_Devices_Audio_DrvHostAudioAlsa.cpp +++ emulators/virtualbox-ose/files/patch-src_VBox_Devices_Audio_DrvHostAudioAlsa.cpp @@ -1,6 +1,6 @@ ---- src/VBox/Devices/Audio/DrvHostALSAAudio.cpp.orig 2021-01-07 15:37:12 UTC -+++ src/VBox/Devices/Audio/DrvHostALSAAudio.cpp -@@ -820,6 +820,7 @@ static DECLCALLBACK(int) drvHostAlsaAudioHA_StreamPlay +--- src/VBox/Devices/Audio/DrvHostAudioAlsa.cpp.orig 2021-04-20 04:27:52 UTC ++++ src/VBox/Devices/Audio/DrvHostAudioAlsa.cpp +@@ -833,6 +833,7 @@ static DECLCALLBACK(int) drvHostAlsaAudioHA_StreamPlay continue; } @@ -8,7 +8,7 @@ case -ESTRPIPE: { /* Stream was suspended and waiting for a recovery. */ -@@ -833,6 +834,7 @@ static DECLCALLBACK(int) drvHostAlsaAudioHA_StreamPlay +@@ -846,6 +847,7 @@ static DECLCALLBACK(int) drvHostAlsaAudioHA_StreamPlay LogFlowFunc(("Resumed suspended output stream\n")); continue; } Index: emulators/virtualbox-ose/files/patch-src_VBox_Devices_Audio_DrvHostAudioOss.cpp =================================================================== --- emulators/virtualbox-ose/files/patch-src_VBox_Devices_Audio_DrvHostAudioOss.cpp +++ emulators/virtualbox-ose/files/patch-src_VBox_Devices_Audio_DrvHostAudioOss.cpp @@ -1,5 +1,5 @@ ---- src/VBox/Devices/Audio/DrvHostOSSAudio.cpp.orig 2021-01-07 15:37:12 UTC -+++ src/VBox/Devices/Audio/DrvHostOSSAudio.cpp +--- src/VBox/Devices/Audio/DrvHostAudioOss.cpp.orig 2021-04-20 04:27:52 UTC ++++ src/VBox/Devices/Audio/DrvHostAudioOss.cpp @@ -253,10 +253,11 @@ static int ossStreamOpen(const char *pszDev, int fOpen default: @@ -17,7 +17,7 @@ pCfgAcq->Backend.cFramesPeriod = PDMAUDIOSTREAMCFG_B2F(pCfgAcq, ossAcq.cbFragmentSize); pCfgAcq->Backend.cFramesBufferSize = pCfgAcq->Backend.cFramesPeriod * 2; /* Use "double buffering". */ -+ pCfgAcq->Backend.cFramesPreBuffering = pCfgAcq->Backend.cFramesBufferSize; ++ pCfgAcq->Backend.cFramesPreBuffering = pCfgAcq->Backend.cFramesBufferSize; /** @todo Pre-buffering required? */ } } @@ -25,7 +25,7 @@ #endif pCfgAcq->Backend.cFramesPeriod = PDMAUDIOSTREAMCFG_B2F(pCfgAcq, obtStream.cbFragmentSize); pCfgAcq->Backend.cFramesBufferSize = pCfgAcq->Backend.cFramesPeriod * 2; /* Use "double buffering" */ -+ pCfgAcq->Backend.cFramesPreBuffering = pCfgAcq->Backend.cFramesBufferSize; ++ pCfgAcq->Backend.cFramesPreBuffering = pCfgAcq->Backend.cFramesBufferSize; } } while (0); Index: emulators/virtualbox-ose/files/patch-src_VBox_Runtime_r0drv_freebsd_thread-r0drv-freebsd.c =================================================================== --- emulators/virtualbox-ose/files/patch-src_VBox_Runtime_r0drv_freebsd_thread-r0drv-freebsd.c +++ emulators/virtualbox-ose/files/patch-src_VBox_Runtime_r0drv_freebsd_thread-r0drv-freebsd.c @@ -1,4 +1,4 @@ ---- src/VBox/Runtime/r0drv/freebsd/thread-r0drv-freebsd.c.orig 2018-10-15 14:31:31 UTC +--- src/VBox/Runtime/r0drv/freebsd/thread-r0drv-freebsd.c.orig 2021-04-20 04:32:44 UTC +++ src/VBox/Runtime/r0drv/freebsd/thread-r0drv-freebsd.c @@ -49,7 +49,6 @@ RTDECL(RTNATIVETHREAD) RTThreadNativeSelf(void) static int rtR0ThreadFbsdSleepCommon(RTMSINTERVAL cMillies) @@ -8,7 +8,7 @@ /* * 0 ms sleep -> yield. -@@ -60,11 +59,28 @@ static int rtR0ThreadFbsdSleepCommon(RTMSINTERVAL cMil +@@ -60,30 +59,34 @@ static int rtR0ThreadFbsdSleepCommon(RTMSINTERVAL cMil return VINF_SUCCESS; } @@ -19,7 +19,17 @@ */ if (cMillies != RT_INDEFINITE_WAIT) { -+#if __FreeBSD_version >= 1000029 +- if (hz == 1000) +- cTicks = cMillies; +- else if (hz == 100) +- cTicks = cMillies / 10; +- else +- { +- int64_t cTicks64 = ((uint64_t)cMillies * hz) / 1000; +- cTicks = (int)cTicks64; +- if (cTicks != cTicks64) +- cTicks = INT_MAX; +- } + struct timeval tv; + + tv.tv_sec = cMillies / 1000; @@ -31,24 +41,6 @@ + tvtosbt(tv), + 0, + C_ABSOLUTE); -+#else -+ int cTicks; -+ - if (hz == 1000) - cTicks = cMillies; - else if (hz == 100) -@@ -76,14 +92,24 @@ static int rtR0ThreadFbsdSleepCommon(RTMSINTERVAL cMil - if (cTicks != cTicks64) - cTicks = INT_MAX; - } -+ if (!cTicks) -+ cTicks = 1; -+ -+ rc = tsleep((void *)RTThreadSleep, -+ PZERO | PCATCH, -+ "iprtsl", /* max 6 chars */ -+ cTicks); -+#endif } else - cTicks = 0; /* requires giant lock! */ @@ -68,7 +60,7 @@ switch (rc) { case 0: -@@ -114,11 +140,13 @@ RTDECL(int) RTThreadSleepNoLog(RTMSINTERVAL cMillies) +@@ -114,11 +117,13 @@ RTDECL(int) RTThreadSleepNoLog(RTMSINTERVAL cMillies) RTDECL(bool) RTThreadYield(void) { @@ -82,7 +74,7 @@ return false; /** @todo figure this one ... */ } -@@ -167,12 +195,14 @@ RTDECL(void) RTThreadPreemptDisable(PRTTHREADPREEMPTST +@@ -167,12 +172,14 @@ RTDECL(void) RTThreadPreemptDisable(PRTTHREADPREEMPTST RTDECL(void) RTThreadPreemptRestore(PRTTHREADPREEMPTSTATE pState) {