From owner-dev-commits-ports-all@freebsd.org Fri Jun 4 07:35:17 2021
Return-Path: <owner-dev-commits-ports-all@freebsd.org>
Delivered-To: dev-commits-ports-all@mailman.nyi.freebsd.org
Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2610:1c1:1:606c::19:1])
by mailman.nyi.freebsd.org (Postfix) with ESMTP id 69725649799;
Fri, 4 Jun 2021 07:35:17 +0000 (UTC) (envelope-from git@FreeBSD.org)
Received: from mxrelay.nyi.freebsd.org (mxrelay.nyi.freebsd.org
[IPv6:2610:1c1:1:606c::19:3])
(using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits)
key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256
client-signature RSA-PSS (4096 bits) client-digest SHA256)
(Client CN "mxrelay.nyi.freebsd.org", Issuer "R3" (verified OK))
by mx1.freebsd.org (Postfix) with ESMTPS id 4FxF0j29HCz4VHB;
Fri, 4 Jun 2021 07:35:17 +0000 (UTC) (envelope-from git@FreeBSD.org)
Received: from gitrepo.freebsd.org (gitrepo.freebsd.org
[IPv6:2610:1c1:1:6068::e6a:5])
(using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits)
key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256)
(Client did not present a certificate)
by mxrelay.nyi.freebsd.org (Postfix) with ESMTPS id 32B6C18ED4;
Fri, 4 Jun 2021 07:35:17 +0000 (UTC) (envelope-from git@FreeBSD.org)
Received: from gitrepo.freebsd.org ([127.0.1.44])
by gitrepo.freebsd.org (8.16.1/8.16.1) with ESMTP id 1547ZHqk066449;
Fri, 4 Jun 2021 07:35:17 GMT (envelope-from git@gitrepo.freebsd.org)
Received: (from git@localhost)
by gitrepo.freebsd.org (8.16.1/8.16.1/Submit) id 1547ZHWC066448;
Fri, 4 Jun 2021 07:35:17 GMT (envelope-from git)
Date: Fri, 4 Jun 2021 07:35:17 GMT
Message-Id: <202106040735.1547ZHWC066448@gitrepo.freebsd.org>
To: ports-committers@FreeBSD.org, dev-commits-ports-all@FreeBSD.org,
dev-commits-ports-main@FreeBSD.org
From: Guido Falsi <madpilot@FreeBSD.org>
Subject: git: ef04eff33cf6 - main - emulators/virtualbox-ose: Fix additions
build on recent HEAD
MIME-Version: 1.0
Content-Type: text/plain; charset=utf-8
Content-Transfer-Encoding: 8bit
X-Git-Committer: madpilot
X-Git-Repository: ports
X-Git-Refname: refs/heads/main
X-Git-Reftype: branch
X-Git-Commit: ef04eff33cf6262e79da1d092d69951ae26f915a
Auto-Submitted: auto-generated
X-BeenThere: dev-commits-ports-all@freebsd.org
X-Mailman-Version: 2.1.34
Precedence: list
List-Id: Commit messages for all branches of the ports repository
<dev-commits-ports-all.freebsd.org>
List-Unsubscribe: <https://lists.freebsd.org/mailman/options/dev-commits-ports-all>,
<mailto:dev-commits-ports-all-request@freebsd.org?subject=unsubscribe>
List-Archive: <http://lists.freebsd.org/pipermail/dev-commits-ports-all/>
List-Post: <mailto:dev-commits-ports-all@freebsd.org>
List-Help: <mailto:dev-commits-ports-all-request@freebsd.org?subject=help>
List-Subscribe: <https://lists.freebsd.org/mailman/listinfo/dev-commits-ports-all>,
<mailto:dev-commits-ports-all-request@freebsd.org?subject=subscribe>
X-List-Received-Date: Fri, 04 Jun 2021 07:35:17 -0000
The branch main has been updated by madpilot:
URL: https://cgit.FreeBSD.org/ports/commit/?id=ef04eff33cf6262e79da1d092d69951ae26f915a
commit ef04eff33cf6262e79da1d092d69951ae26f915a
Author: Guido Falsi <madpilot@FreeBSD.org>
AuthorDate: 2021-06-04 07:31:59 +0000
Commit: Guido Falsi <madpilot@FreeBSD.org>
CommitDate: 2021-06-04 07:34:21 +0000
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
---
.../patch-src_VBox_Additions_freebsd_vboxvfs_vboxvfs__vfsops.c | 10 +++++++---
1 file 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);