emulators/open-vm-tools: Fix build after 1400043

NDINIT() last parameter was removed after this osversion Sponsored by: Rubicon Communications, LLC ("Netgate")
freebsd · Nov 30, 2021 · ecfed7e · ecfed7e
1 parent 19b8979
commit ecfed7e
Show file tree

Hide file tree

Showing 2 changed files with 15 additions and 2 deletions.
diff --git a/emulators/open-vm-tools/Makefile b/emulators/open-vm-tools/Makefile
@@ -2,6 +2,7 @@
 
 PORTNAME=	open-vm-tools
 PORTVERSION=	11.3.5
+PORTREVISION=	1
 DISTVERSIONPREFIX=	stable-
 PORTEPOCH=	2
 CATEGORIES=	emulators

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
@@ -1,4 +1,4 @@
---- modules/freebsd/vmblock/vfsops.c.orig	2018-03-30 18:44:35 UTC
+--- modules/freebsd/vmblock/vfsops.c.orig	2021-09-24 04:19:18 UTC
 +++ modules/freebsd/vmblock/vfsops.c
 @@ -124,6 +124,11 @@ VMBlockVFSMount(struct mount *mp,        // IN: mount(
     char *pathname;
@@ -12,7 +12,19 @@
     VMBLOCKDEBUG("VMBlockVFSMount(mp = %p)\n", (void *)mp);
 
     /*
-@@ -276,6 +281,11 @@ VMBlockVFSUnmount(struct mount *mp,    // IN: filesyst
+@@ -171,7 +176,11 @@ VMBlockVFSMount(struct mount *mp,        // IN: mount(
+     * Find lower node and lock if not already locked.
+     */
+
++#if __FreeBSD_version >= 1400043
++   NDINIT(ndp, LOOKUP, FOLLOW|LOCKLEAF, UIO_SYSSPACE, target);
++#else
+    NDINIT(ndp, LOOKUP, FOLLOW|LOCKLEAF, UIO_SYSSPACE, target, compat_td);
++#endif
+    error = namei(ndp);
+    if (error) {
+       NDFREE(ndp, 0);
+@@ -276,6 +285,11 @@ VMBlockVFSUnmount(struct mount *mp,    // IN: filesyst
     void *mntdata;
     int error;
     int flags = 0, removed = 0;