diff options
| author | Jung-uk Kim <jkim@FreeBSD.org> | 2020-08-13 18:22:22 +0000 |
|---|---|---|
| committer | Jung-uk Kim <jkim@FreeBSD.org> | 2020-08-13 18:22:22 +0000 |
| commit | fad47638831ac9db4be8bf24786044dd082962c3 (patch) | |
| tree | ac12820c39e5e99bc39b1c749a66ecec1eb89baf /emulators | |
| parent | 2afc11fe92dc827cce96b5afc43265521a70b971 (diff) | |
| download | ports-fad47638831ac9db4be8bf24786044dd082962c3.tar.gz ports-fad47638831ac9db4be8bf24786044dd082962c3.zip | |
MFH: r544827
Fix building emulators/virtualbox-ose-additions on head after vaccess(9) KPI
change.
Approved by: ports-secteam (blanket, build fix)
Notes
Notes:
svn path=/branches/2020Q3/; revision=544828
Diffstat (limited to 'emulators')
| -rw-r--r-- | emulators/virtualbox-ose/files/patch-src_VBox_Additions_freebsd_vboxvfs_vboxvfs__vnops.c | 9 |
1 files changed, 7 insertions, 2 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 efbe32c442a2..7cefdb5ac531 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,4 +1,4 @@ ---- src/VBox/Additions/freebsd/vboxvfs/vboxvfs_vnops.c.orig 2019-10-10 18:06:51 UTC +--- src/VBox/Additions/freebsd/vboxvfs/vboxvfs_vnops.c.orig 2020-07-09 16:50:11 UTC +++ src/VBox/Additions/freebsd/vboxvfs/vboxvfs_vnops.c @@ -1,10 +1,6 @@ -/* $Id: vboxvfs_vnops.c $ */ @@ -12,7 +12,7 @@ * * This file is part of VirtualBox Open Source Edition (OSE), as * available from http://www.virtualbox.org. This file is free software; -@@ -14,228 +10,1338 @@ +@@ -14,228 +10,1343 @@ * VirtualBox OSE distribution. VirtualBox OSE is distributed in the * hope that it will be useful, but WITHOUT ANY WARRANTY of any kind. */ @@ -502,8 +502,13 @@ + error = vsfnode_update_stat_cache(node); + m = (error == 0) ? node->sf_stat.sf_mode : 0; + ++#if __FreeBSD_version < 1300105 + return (vaccess(vp->v_type, m, node->vboxfsmp->sf_uid, + node->vboxfsmp->sf_gid, accmode, ap->a_cred, NULL)); ++#else ++ return (vaccess(vp->v_type, m, node->vboxfsmp->sf_uid, ++ node->vboxfsmp->sf_gid, accmode, ap->a_cred)); ++#endif } -static int vboxvfs_link(struct vop_link_args *ap) |