From nobody Sat Feb 05 20:39:45 2022 X-Original-To: dev-commits-ports-all@mlmmj.nyi.freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2610:1c1:1:606c::19:1]) by mlmmj.nyi.freebsd.org (Postfix) with ESMTP id 8DB3819A9F66; Sat, 5 Feb 2022 20:39:45 +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 4JrkmK3NmNz4c6Y; Sat, 5 Feb 2022 20:39:45 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1644093585; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=POisjPUBe9p7D7Bn30JJB4m39w+9ai3zkB3S1aAPIkw=; b=fxq2ejRtGmRX9kUA454HHxHNWH67TNlRtuxKYfEDBRrqbXN97mXRTjFl494ONNcndc9Mcp lGW41WGuUSS5k/5VhCRND4zcmZektW/b5f8MOypGhf11mx/nBd6+o+FAJzCg6hS+QwRAFj OuvJ2aU13pZwF2zEgllA/HeK1fusqoYb5oB2eaFcDSbLwwQ3yl6D5ysoHRJzvOlSwn+fmz ZhOJytGpYdlTmZmlHSoh6RjpY8Zlg/g8ZR7x1mkbbPtUFWr7FqwCPYhTm8uMqdLbsybV2z 5qn5Wgq0ggFyWCEzwXvRIiMX9B3LVR7l8DQ/MfgT7jN1KoI12vVbiBkp2TZ9Jg== 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 54BE725D0A; Sat, 5 Feb 2022 20:39:45 +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 215KdjbI074947; Sat, 5 Feb 2022 20:39:45 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.16.1/8.16.1/Submit) id 215KdjDR074946; Sat, 5 Feb 2022 20:39:45 GMT (envelope-from git) Date: Sat, 5 Feb 2022 20:39:45 GMT Message-Id: <202202052039.215KdjDR074946@gitrepo.freebsd.org> To: ports-committers@FreeBSD.org, dev-commits-ports-all@FreeBSD.org, dev-commits-ports-main@FreeBSD.org From: Guido Falsi Subject: git: 2db7c8763897 - main - emulators/virtualbox-ose-additions(-legacy): Fix build on recent head List-Id: Commit messages for all branches of the ports repository List-Archive: https://lists.freebsd.org/archives/dev-commits-ports-all List-Help: List-Post: List-Subscribe: List-Unsubscribe: Sender: owner-dev-commits-ports-all@freebsd.org X-BeenThere: dev-commits-ports-all@freebsd.org 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: 2db7c8763897e352fb8d74bfd60d9e32622ba82c Auto-Submitted: auto-generated ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1644093585; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=POisjPUBe9p7D7Bn30JJB4m39w+9ai3zkB3S1aAPIkw=; b=po/ondQvjgsjyncEYKkwwk5tc48fOifP3c/Gx/psHZD++2LCizb/n6Kwasx+SNhtlIIWv2 cJF1PS8QxC9zN39Stnj7jKTnCoMQhsgRgWy5W/BjvBApxq2NmCAXGgcpqSfo86Sjy4sy6n SxjZSKHgU8Pg/jLAMiowvH2RSJ1fZJ5CWt6ijzIFHg7hWgDeWTW6qcSuOKtOGf4hlqGDBS FwunbYL8P0CfQmVgUN4ovTKK0jnqIGhmJSNvKiwBkvKmsUZdFb3TCPofEDpIOh2qVi4STn Ix9QmcC4W1LYEyJt4HfvYWyQTKPfKgMm0FUPY0LKC9mdYxdQsOfiCxWdBM4eBw== ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1644093585; a=rsa-sha256; cv=none; b=d/no9/8/19KZkIG/bn7UvXjgxVjkPg4tfbZrjFsO4VpFzo9S2UhAwkYFdbrk2xeDoR0at1 xr4wcxQqxvM2oqWAzGr7UkEdCpX/TnX6M3WoThAF35NZM5P2Gjgz+jW/TWjj3Eeu+uS0sM Z0APVGQAkJ9F3NirTIDJXxRIQDyz/Cx2tkWjo7NGQqZgp9zu0wHi+3pDYblbVtlcw+WGlq 362mkV3Wym8albweozhFy6dyQBn5A55Ct+z5oPFtZSyXV2ga9jCdU/lxQ5Mc/0t90Sp1Te CNjNunCEKIqY7cAwUoJQL6rXez0BVA+oV/UF7LpGMJljX3YXvkSiFsodohhNog== ARC-Authentication-Results: i=1; mx1.freebsd.org; none X-ThisMailContainsUnwantedMimeParts: N The branch main has been updated by madpilot: URL: https://cgit.FreeBSD.org/ports/commit/?id=2db7c8763897e352fb8d74bfd60d9e32622ba82c commit 2db7c8763897e352fb8d74bfd60d9e32622ba82c Author: Guido Falsi AuthorDate: 2022-02-05 20:37:14 +0000 Commit: Guido Falsi CommitDate: 2022-02-05 20:37:14 +0000 emulators/virtualbox-ose-additions(-legacy): Fix build on recent head On recent head, after src commit 66c5fbca7719dc, the insmntque1(9) function arguments changed. Adapt virtualbox code, following what has been done in base with other filesystems migrating to insmntque(9). --- ...tch-src_VBox_Additions_freebsd_vboxvfs_vboxvfs__vnops.c | 14 +++++++++++--- ...tch-src_VBox_Additions_freebsd_vboxvfs_vboxvfs__vnops.c | 14 +++++++++++--- 2 files changed, 22 insertions(+), 6 deletions(-) diff --git a/emulators/virtualbox-ose-legacy/files/patch-src_VBox_Additions_freebsd_vboxvfs_vboxvfs__vnops.c b/emulators/virtualbox-ose-legacy/files/patch-src_VBox_Additions_freebsd_vboxvfs_vboxvfs__vnops.c index 068f98f21d1c..a191d66946cf 100644 --- a/emulators/virtualbox-ose-legacy/files/patch-src_VBox_Additions_freebsd_vboxvfs_vboxvfs__vnops.c +++ b/emulators/virtualbox-ose-legacy/files/patch-src_VBox_Additions_freebsd_vboxvfs_vboxvfs__vnops.c @@ -1,6 +1,6 @@ ---- src/VBox/Additions/freebsd/vboxvfs/vboxvfs_vnops.c.orig 2021-07-28 16:16:27 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 -@@ -14,228 +14,1354 @@ +@@ -14,228 +14,1362 @@ * VirtualBox OSE distribution. VirtualBox OSE is distributed in the * hope that it will be useful, but WITHOUT ANY WARRANTY of any kind. */ @@ -352,9 +352,17 @@ + if (vp->v_type != VFIFO) + VN_LOCK_ASHARE(vp); + ++#if __FreeBSD_version < 1400051 + error = insmntque1(vp, mp, vboxfs_insmntque_dtr, NULL); -+ if (error) ++#else ++ error = insmntque(vp, mp); ++#endif ++ if (error) { ++#if __FreeBSD_version >= 1400051 ++ vboxfs_insmntque_dtr(vp, NULL); ++#endif + vp = NULL; ++ } + +unlock: + VBOXFS_NODE_LOCK(node); 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 068f98f21d1c..a1a69874a29e 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,6 +1,6 @@ ---- src/VBox/Additions/freebsd/vboxvfs/vboxvfs_vnops.c.orig 2021-07-28 16:16:27 UTC +--- src/VBox/Additions/freebsd/vboxvfs/vboxvfs_vnops.c.orig 2022-01-13 18:49:34 UTC +++ src/VBox/Additions/freebsd/vboxvfs/vboxvfs_vnops.c -@@ -14,228 +14,1354 @@ +@@ -14,228 +14,1362 @@ * VirtualBox OSE distribution. VirtualBox OSE is distributed in the * hope that it will be useful, but WITHOUT ANY WARRANTY of any kind. */ @@ -352,9 +352,17 @@ + if (vp->v_type != VFIFO) + VN_LOCK_ASHARE(vp); + ++#if __FreeBSD_version < 1400051 + error = insmntque1(vp, mp, vboxfs_insmntque_dtr, NULL); -+ if (error) ++#else ++ error = insmntque(vp, mp); ++#endif ++ if (error) { ++#if __FreeBSD_version >= 1400051 ++ vboxfs_insmntque_dtr(vp, NULL); ++#endif + vp = NULL; ++ } + +unlock: + VBOXFS_NODE_LOCK(node);