From owner-dev-commits-ports-all@freebsd.org Wed Jun 30 12:49:38 2021 Return-Path: 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 8ABB7664555; Wed, 30 Jun 2021 12:49:38 +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 4GFLlQ30Pzz3pJf; Wed, 30 Jun 2021 12:49:38 +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 4A8574EBA; Wed, 30 Jun 2021 12:49:38 +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 15UCncYa012438; Wed, 30 Jun 2021 12:49:38 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.16.1/8.16.1/Submit) id 15UCnc8X012437; Wed, 30 Jun 2021 12:49:38 GMT (envelope-from git) Date: Wed, 30 Jun 2021 12:49:38 GMT Message-Id: <202106301249.15UCnc8X012437@gitrepo.freebsd.org> To: ports-committers@FreeBSD.org, dev-commits-ports-all@FreeBSD.org, dev-commits-ports-branches@FreeBSD.org From: Guido Falsi Subject: git: 65b0517571c5 - 2021Q2 - emulators/virtualbox-ose-legacy: 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/2021Q2 X-Git-Reftype: branch X-Git-Commit: 65b0517571c5ed63a287b6e722708f7f13bf66f0 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 List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Wed, 30 Jun 2021 12:49:38 -0000 The branch 2021Q2 has been updated by madpilot: URL: https://cgit.FreeBSD.org/ports/commit/?id=65b0517571c5ed63a287b6e722708f7f13bf66f0 commit 65b0517571c5ed63a287b6e722708f7f13bf66f0 Author: Guido Falsi AuthorDate: 2021-06-30 12:43:28 +0000 Commit: Guido Falsi 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);