Skip site navigation (1)Skip section navigation (2)
Date:      Wed, 30 Jun 2021 12:49:38 GMT
From:      Guido Falsi <madpilot@FreeBSD.org>
To:        ports-committers@FreeBSD.org, dev-commits-ports-all@FreeBSD.org, dev-commits-ports-branches@FreeBSD.org
Subject:   git: 65b0517571c5 - 2021Q2 - emulators/virtualbox-ose-legacy: Fix additions build on recent HEAD
Message-ID:  <202106301249.15UCnc8X012437@gitrepo.freebsd.org>

next in thread | raw e-mail | index | archive | help
The branch 2021Q2 has been updated by madpilot:

URL: https://cgit.FreeBSD.org/ports/commit/?id=65b0517571c5ed63a287b6e722708f7f13bf66f0

commit 65b0517571c5ed63a287b6e722708f7f13bf66f0
Author:     Guido Falsi <madpilot@FreeBSD.org>
AuthorDate: 2021-06-30 12:43:28 +0000
Commit:     Guido Falsi <madpilot@FreeBSD.org>
CommitDate: 2021-06-30 12:48:48 +0000

    emulators/virtualbox-ose-legacy: Fix additions build on recent HEAD
    
    Apply same fix used for the main port in commit ef04eff33cf626:
    
    Src HEAD commit 6d3e78ad6c11 vfs_quotactl function signature, adapt
    virtualbox code to be able to compile there too.
    
    Reported by:    koobs, dim
    MFH:            2021Q2
    
    (cherry picked from commit 4792c8e65e73101fef10ed9bb2edb4b4335e6960)
---
 .../patch-src_VBox_Additions_freebsd_vboxvfs_vboxvfs__vfsops.c    | 8 ++++++--
 1 file changed, 6 insertions(+), 2 deletions(-)

diff --git a/emulators/virtualbox-ose-legacy/files/patch-src_VBox_Additions_freebsd_vboxvfs_vboxvfs__vfsops.c b/emulators/virtualbox-ose-legacy/files/patch-src_VBox_Additions_freebsd_vboxvfs_vboxvfs__vfsops.c
index 128085de6cb9..9f56989aa920 100644
--- a/emulators/virtualbox-ose-legacy/files/patch-src_VBox_Additions_freebsd_vboxvfs_vboxvfs__vfsops.c
+++ b/emulators/virtualbox-ose-legacy/files/patch-src_VBox_Additions_freebsd_vboxvfs_vboxvfs__vfsops.c
@@ -9,7 +9,7 @@
  /*
   * Copyright (C) 2008-2017 Oracle Corporation
   *
-@@ -14,245 +9,478 @@
+@@ -14,245 +9,482 @@
   * VirtualBox OSE distribution. VirtualBox OSE is distributed in the
   * hope that it will be useful, but WITHOUT ANY WARRANTY of any kind.
   */
@@ -539,7 +539,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);



Want to link to this message? Use this URL: <https://mail-archive.FreeBSD.org/cgi/mid.cgi?202106301249.15UCnc8X012437>