aboutsummaryrefslogtreecommitdiff
path: root/emulators
diff options
context:
space:
mode:
authorGuido Falsi <madpilot@FreeBSD.org>2021-06-04 07:31:59 +0000
committerGuido Falsi <madpilot@FreeBSD.org>2021-06-04 07:34:21 +0000
commitef04eff33cf6262e79da1d092d69951ae26f915a (patch)
tree20e2fd72dcff4ee73044790bd122b0a6e2811de1 /emulators
parent662fb5c9e3a1a9bb12e402b0e8f8f17ba12d08cd (diff)
downloadports-ef04eff33cf6262e79da1d092d69951ae26f915a.tar.gz
ports-ef04eff33cf6262e79da1d092d69951ae26f915a.zip
emulators/virtualbox-ose: Fix additions build on recent HEAD
Src HEAD commit 6d3e78ad6c11 vfs_quotactl function signature, adapt virtualbox code to be able to compile there too. MFH: 2021Q2
Diffstat (limited to 'emulators')
-rw-r--r--emulators/virtualbox-ose/files/patch-src_VBox_Additions_freebsd_vboxvfs_vboxvfs__vfsops.c10
1 files changed, 7 insertions, 3 deletions
diff --git a/emulators/virtualbox-ose/files/patch-src_VBox_Additions_freebsd_vboxvfs_vboxvfs__vfsops.c b/emulators/virtualbox-ose/files/patch-src_VBox_Additions_freebsd_vboxvfs_vboxvfs__vfsops.c
index f496e3367647..c37baa13efc4 100644
--- a/emulators/virtualbox-ose/files/patch-src_VBox_Additions_freebsd_vboxvfs_vboxvfs__vfsops.c
+++ b/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-04-20 04:24:19 UTC
+--- src/VBox/Additions/freebsd/vboxvfs/vboxvfs_vfsops.c.orig 2021-04-28 16:24:46 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,474 @@
+@@ -14,245 +9,478 @@
* VirtualBox OSE distribution. VirtualBox OSE is distributed in the
* hope that it will be useful, but WITHOUT ANY WARRANTY of any kind.
*/
@@ -535,7 +535,11 @@
+ * Do operation associated with quotas, not supported
+ */
+static int
-+vboxfs_quotactl(struct mount *mp, int cmd, uid_t uid, void *arg)
++vboxfs_quotactl(struct mount *mp, int cmd, uid_t uid, void *arg
++#if __FreeBSD_version >= 1400018
++ , bool *mp_busy
++#endif
++ )
{
- int rc;
+ return (EOPNOTSUPP);