aboutsummaryrefslogtreecommitdiff
path: root/emulators
diff options
context:
space:
mode:
authorGuido Falsi <madpilot@FreeBSD.org>2021-10-17 09:28:09 +0000
committerGuido Falsi <madpilot@FreeBSD.org>2021-10-17 09:33:24 +0000
commit2040f3e693391aa917798ec90cd244eda81185e1 (patch)
treed048509dc2d6b4da36da3e59819f1955e8dc7021 /emulators
parent93dea9a1ea1e315edeabb7d3782b4a521bb3b4e1 (diff)
downloadports-2040f3e693391aa917798ec90cd244eda81185e1.tar.gz
ports-2040f3e693391aa917798ec90cd244eda81185e1.zip
emulators/virtualbox-ose-additons: Fix build on recent head
Fix build after head commit b4a58fbf640409a1 (vfs: remove cn_thread) MFH: 2021Q4 (cherry picked from commit 21d79d6e16aab2e3aa337901b0f6519c942c55ee)
Diffstat (limited to 'emulators')
-rw-r--r--emulators/virtualbox-ose/files/patch-src_VBox_Additions_freebsd_vboxvfs_vboxvfs__vnops.c6
1 files changed, 5 insertions, 1 deletions
diff --git a/emulators/virtualbox-ose/files/patch-src_VBox_Additions_freebsd_vboxvfs_vboxvfs__vnops.c b/emulators/virtualbox-ose/files/patch-src_VBox_Additions_freebsd_vboxvfs_vboxvfs__vnops.c
index 904c251395dd..068f98f21d1c 100644
--- a/emulators/virtualbox-ose/files/patch-src_VBox_Additions_freebsd_vboxvfs_vboxvfs__vnops.c
+++ b/emulators/virtualbox-ose/files/patch-src_VBox_Additions_freebsd_vboxvfs_vboxvfs__vnops.c
@@ -1,6 +1,6 @@
--- src/VBox/Additions/freebsd/vboxvfs/vboxvfs_vnops.c.orig 2021-07-28 16:16:27 UTC
+++ src/VBox/Additions/freebsd/vboxvfs/vboxvfs_vnops.c
-@@ -14,228 +14,1350 @@
+@@ -14,228 +14,1354 @@
* VirtualBox OSE distribution. VirtualBox OSE is distributed in the
* hope that it will be useful, but WITHOUT ANY WARRANTY of any kind.
*/
@@ -1397,7 +1397,11 @@
+ cnp->cn_flags & DOWHITEOUT &&
+ cnp->cn_flags & ISWHITEOUT))) {
+ error = VOP_ACCESS(dvp, VWRITE, cnp->cn_cred,
++#if __FreeBSD_version < 1400037
+ cnp->cn_thread);
++#else
++ curthread);
++#endif
+ if (error != 0)
+ goto out;
+