From nobody Thu Dec 22 16:31:20 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 4NdG61124sz1G8XY;
Thu, 22 Dec 2022 16:31:21 +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 4NdG610Ztdz3qHf;
Thu, 22 Dec 2022 16:31:21 +0000 (UTC)
(envelope-from git@FreeBSD.org)
DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim;
t=1671726681;
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=hF+RbiGqu2UCre/1RF0++DllpeGQavMP896hTegppE0=;
b=VKOp5jTMy36zbFds8Wlg2UJd6fAoggr08qoYPu/tuze/5co7dUHEO4aS+qUdXg0TT78HO1
2NHJ8G3wBR9aoFmYWiEpYSZSq2IDzyTaIvA5R04Fr9GTPVaJRW4TwqPyunzkgDj20TY3xn
+44EL6HYzWhI7/M8svxpZfq48VLNEH+aoS/TPUxOmb+K8GM69aUc3X5JjxNJFX3SHXYSTO
sXCMQAebhxyvC+ZGTPT7Z+5TkYJvXj9wWW15oDQL6g89RHT5BVXldmgHRPTzStO4jOxRNT
xmDSEoWXw6MK/vyVKD9K2PryyNUwSLD8ajL48I5Ll637Dei3BfAGdlvv/wRvuQ==
ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org;
s=dkim; t=1671726681;
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=hF+RbiGqu2UCre/1RF0++DllpeGQavMP896hTegppE0=;
b=hTv8QE0YBLMArW9PYe/HzasCWCh8Wl95GMsnUCdBAWZTB9oGNPc8CbiHdudKDSe2EuFwtv
8gNXAUkTw7hMkc6aO83YWfPmfPf3DQeULIZsWhidQGOqt3Ent4EKwRO0wMIklBsMNxVAOq
XzsZ4eIuV94MgZ+TPWDJrOkZkM+gHCnSYfLGImRUTLIPlrhHWTVaTmeNfhuQ0IWsK5ijmh
TNFvYQL1BWozH//5j6iYLZ/m7OFhYSrpg+0ua/XydiCYhY7bEZHcS8eU/L4oBN4RLd7wel
1ipfqN7uYQIRw7IpuuEWFSgob+qMBj/r29qsm4lVFAnLt9syBCmTvtTvwyvznQ==
ARC-Authentication-Results: i=1;
mx1.freebsd.org;
none
ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1671726681; a=rsa-sha256; cv=none;
b=mGn3yK+5pDj9/2dKT4UMUclWehh+vCMyTG4fiXRQgawKSkU2j4YVtZTn4/ZEy9kBiAl4F1
zTH0/2HRMU/K4Ru4qldm//Qi4eHGqWya2qrQcLqWVX8WVpocfj3+OCPfOy08Fq23AM8VkP
JQ5Mkjm77Wzo9i/Zb0vuDaX2o6XQXYWeUEUrkjZoQjlTUJb2OW5ct0hHgo5s88GWMVrYmu
RHRdO7iFsdQRWR35sklxXRz7oG8tOpmbXGIkddikTRwtEsNkDvX3s0yNox+HYuFIMXsWMj
XUX7HtQrjkQJs10+0Nu2I/3Qvn9mU/GcoLxMsmzpu5jqZLyoerrLodgAAO5XVw==
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 4NdG606lHFz11kl;
Thu, 22 Dec 2022 16:31:20 +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 2BMGVKxK050639;
Thu, 22 Dec 2022 16:31:20 GMT
(envelope-from git@gitrepo.freebsd.org)
Received: (from git@localhost)
by gitrepo.freebsd.org (8.16.1/8.16.1/Submit) id 2BMGVKHu050638;
Thu, 22 Dec 2022 16:31:20 GMT
(envelope-from git)
Date: Thu, 22 Dec 2022 16:31:20 GMT
Message-Id: <202212221631.2BMGVKHu050638@gitrepo.freebsd.org>
To: ports-committers@FreeBSD.org, dev-commits-ports-all@FreeBSD.org,
dev-commits-ports-main@FreeBSD.org
From: Renato Botelho <garga@FreeBSD.org>
Subject: git: 4126c3ae4f6c - main - emulators/open-vm-tools: Unbreak build on CURRENT
List-Id: Commit messages for all branches of the ports repository <dev-commits-ports-all.freebsd.org>
List-Archive: https://lists.freebsd.org/archives/dev-commits-ports-all
List-Help: <mailto:dev-commits-ports-all+help@freebsd.org>
List-Post: <mailto:dev-commits-ports-all@freebsd.org>
List-Subscribe: <mailto:dev-commits-ports-all+subscribe@freebsd.org>
List-Unsubscribe: <mailto:dev-commits-ports-all+unsubscribe@freebsd.org>
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: garga
X-Git-Repository: ports
X-Git-Refname: refs/heads/main
X-Git-Reftype: branch
X-Git-Commit: 4126c3ae4f6c876a2fdc4fd359c633cfe9e342c2
Auto-Submitted: auto-generated
X-ThisMailContainsUnwantedMimeParts: N
The branch main has been updated by garga:
URL: https://cgit.FreeBSD.org/ports/commit/?id=4126c3ae4f6c876a2fdc4fd359c633cfe9e342c2
commit 4126c3ae4f6c876a2fdc4fd359c633cfe9e342c2
Author: Renato Botelho <garga@FreeBSD.org>
AuthorDate: 2022-12-22 16:29:28 +0000
Commit: Renato Botelho <garga@FreeBSD.org>
CommitDate: 2022-12-22 16:29:28 +0000
emulators/open-vm-tools: Unbreak build on CURRENT
Fix build on CURRENT after NDFREE retirement
Sponsored by: Rubicon Communications, LLC ("Netgate")
---
.../open-vm-tools/files/patch-modules_freebsd_vmblock_vfsops.c | 8 ++++----
1 file changed, 4 insertions(+), 4 deletions(-)
diff --git a/emulators/open-vm-tools/files/patch-modules_freebsd_vmblock_vfsops.c b/emulators/open-vm-tools/files/patch-modules_freebsd_vmblock_vfsops.c
index ba54239caecd..76f88443fd98 100644
--- a/emulators/open-vm-tools/files/patch-modules_freebsd_vmblock_vfsops.c
+++ b/emulators/open-vm-tools/files/patch-modules_freebsd_vmblock_vfsops.c
@@ -1,6 +1,6 @@
---- modules/freebsd/vmblock/vfsops.c.orig 2022-03-04 21:01:24 UTC
+--- modules/freebsd/vmblock/vfsops.c.orig 2022-11-29 21:17:22 UTC
+++ modules/freebsd/vmblock/vfsops.c
-@@ -171,14 +171,22 @@ VMBlockVFSMount(struct mount *mp, // IN: mount(
+@@ -171,14 +171,21 @@ VMBlockVFSMount(struct mount *mp, // IN: mount(
* Find lower node and lock if not already locked.
*/
@@ -11,11 +11,11 @@
+#endif
error = namei(ndp);
if (error) {
- NDFREE(ndp, 0);
+- NDFREE(ndp, 0);
uma_zfree(VMBlockPathnameZone, pathname);
return error;
}
-+#ifdef NDF_ONLY_PNBUF
++#if __FreeBSD_version < 1400054
NDFREE(ndp, NDF_ONLY_PNBUF);
+#else
+ NDFREE_PNBUF(ndp);