svn commit: r544828 - branches/2020Q3/emulators/virtualbox-ose/files

[Jung-uk Kim]

Author: jkim
Date: Thu Aug 13 18:22:22 2020
New Revision: 544828
URL: https://svnweb.freebsd.org/changeset/ports/544828

Log:
  MFH:	r544827
  
  Fix building emulators/virtualbox-ose-additions on head after vaccess(9) KPI
  change.
  
  Approved by:	ports-secteam (blanket, build fix)

Modified:
  branches/2020Q3/emulators/virtualbox-ose/files/patch-src_VBox_Additions_freebsd_vboxvfs_vboxvfs__vnops.c
Directory Properties:
  branches/2020Q3/   (props changed)

Modified: branches/2020Q3/emulators/virtualbox-ose/files/patch-src_VBox_Additions_freebsd_vboxvfs_vboxvfs__vnops.c
==============================================================================
--- branches/2020Q3/emulators/virtualbox-ose/files/patch-src_VBox_Additions_freebsd_vboxvfs_vboxvfs__vnops.c	Thu Aug 13 18:18:34 2020	(r544827)
+++ branches/2020Q3/emulators/virtualbox-ose/files/patch-src_VBox_Additions_freebsd_vboxvfs_vboxvfs__vnops.c	Thu Aug 13 18:22:22 2020	(r544828)
@@ -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)