emulators/open-vm-tools: Update to 12.2.0

PR:		270077
Reported by:	John Wolfe <jwolfe@vmware.com>
Sponsored by:	Rubicon Communications, LLC ("Netgate")

11 files changed, 26 insertions, 103 deletions

diff --git a/emulators/open-vm-tools/Makefile b/emulators/open-vm-tools/Makefile
index ba7ece5f95e3..f01ce02cb828 100644
--- a/emulators/open-vm-tools/Makefile
+++ b/emulators/open-vm-tools/Makefile
@@ -1,7 +1,6 @@
 PORTNAME=	open-vm-tools
-PORTVERSION=	12.1.5
+PORTVERSION=	12.2.0
 DISTVERSIONPREFIX=	stable-
-PORTREVISION=	2
 PORTEPOCH=	2
 CATEGORIES=	emulators
 
diff --git a/emulators/open-vm-tools/distinfo b/emulators/open-vm-tools/distinfo
index 44488edc3085..c3412ed38de7 100644
--- a/emulators/open-vm-tools/distinfo
+++ b/emulators/open-vm-tools/distinfo
@@ -1,3 +1,3 @@
-TIMESTAMP = 1670847678
-SHA256 (vmware-open-vm-tools-stable-12.1.5_GH0.tar.gz) = 678d08b46fba15f2b4c39245b5bc4deec30284d6f13ee279c233bc3d3627ec8a
-SIZE (vmware-open-vm-tools-stable-12.1.5_GH0.tar.gz) = 2959869
+TIMESTAMP = 1678443295
+SHA256 (vmware-open-vm-tools-stable-12.2.0_GH0.tar.gz) = 5127dd8643e4c89a22a93728ea5420d236cd4083bc07d665f70fee08a581d635
+SIZE (vmware-open-vm-tools-stable-12.2.0_GH0.tar.gz) = 2975094
diff --git a/emulators/open-vm-tools/files/patch-lib_misc_util__misc.c b/emulators/open-vm-tools/files/patch-lib_misc_util__misc.c
deleted file mode 100644
index bffa9ea16acf..000000000000
--- a/emulators/open-vm-tools/files/patch-lib_misc_util__misc.c
+++ /dev/null
@@ -1,11 +0,0 @@
---- lib/misc/util_misc.c.orig	2020-10-16 23:15:58 UTC
-+++ lib/misc/util_misc.c
-@@ -304,7 +304,7 @@ Util_CanonicalPathsIdentical(const char *path1,  // IN
-    return (strcmp(path1, path2) == 0);
- #elif defined(_WIN32)
-    return (_stricmp(path1, path2) == 0);
--#elif defined(__APPLE__)
-+#elif defined(__APPLE__) || defined(__FreeBSD__)
-    return (strcasecmp(path1, path2) == 0);
- #else
-    NOT_IMPLEMENTED();
diff --git a/emulators/open-vm-tools/files/patch-lib_vmCheck_vmcheck.c b/emulators/open-vm-tools/files/patch-lib_vmCheck_vmcheck.c
deleted file mode 100644
index 1d9a52e7c78f..000000000000
--- a/emulators/open-vm-tools/files/patch-lib_vmCheck_vmcheck.c
+++ /dev/null
@@ -1,10 +0,0 @@
---- lib/vmCheck/vmcheck.c.orig	2020-10-16 23:15:58 UTC
-+++ lib/vmCheck/vmcheck.c
-@@ -144,6 +144,7 @@ VmCheckSafe(SafeCheckFn checkFn)
- #else
-    do {
-       int signals[] = {
-+         SIGBUS,
-          SIGILL,
-          SIGSEGV,
-       };
diff --git a/emulators/open-vm-tools/files/patch-modules_freebsd_vmblock_Makefile b/emulators/open-vm-tools/files/patch-modules_freebsd_vmblock_Makefile
deleted file mode 100644
index 55ea64323dd5..000000000000
--- a/emulators/open-vm-tools/files/patch-modules_freebsd_vmblock_Makefile
+++ /dev/null
@@ -1,11 +0,0 @@
---- modules/freebsd/vmblock/Makefile.orig	2020-10-16 23:15:58 UTC
-+++ modules/freebsd/vmblock/Makefile
-@@ -46,8 +46,6 @@ SRCS   := $(HEADERS) $(CSRCS)
- 
- KMOD    = vmblock
- PROG    = ../$(KMOD).ko
--NOMAN   = t
--NO_MAN  = t
- KLDMOD  = t
- 
- VMBLOCK := $(MAINSRCROOT)/modules/vmblock
diff --git a/emulators/open-vm-tools/files/patch-modules_freebsd_vmblock_subr.c b/emulators/open-vm-tools/files/patch-modules_freebsd_vmblock_subr.c
deleted file mode 100644
index c64602d1b9e5..000000000000
--- a/emulators/open-vm-tools/files/patch-modules_freebsd_vmblock_subr.c
+++ /dev/null
@@ -1,17 +0,0 @@
---- modules/freebsd/vmblock/subr.c.orig	2022-02-04 12:59:09 UTC
-+++ modules/freebsd/vmblock/subr.c
-@@ -392,7 +392,13 @@ VMBlockNodeGet(struct mount *mp,        // IN: VMBlock
-    }
- 
-    /* Before FreeBSD 7, insmntque was called by getnewvnode. */
--#if __FreeBSD_version >= 700055
-+#if __FreeBSD_version >= 1400051
-+   error = insmntque1(vp, mp);
-+   if (error != 0) {
-+      VMBlockInsMntQueDtr(vp, xp);
-+      return error;
-+   }
-+#else
-    error = insmntque1(vp, mp, VMBlockInsMntQueDtr, xp);
-    if (error != 0) {
-       return error;
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 76f88443fd98..40b8facd5869 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,25 +1,10 @@
---- modules/freebsd/vmblock/vfsops.c.orig	2022-11-29 21:17:22 UTC
+--- modules/freebsd/vmblock/vfsops.c.orig	2023-03-10 17:41:18 UTC
 +++ modules/freebsd/vmblock/vfsops.c
-@@ -171,14 +171,21 @@ 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
+@@ -173,7 +173,6 @@ VMBlockVFSMount(struct mount *mp)        // IN: mount(
+ #endif
     error = namei(ndp);
     if (error) {
 -      NDFREE(ndp, 0);
        uma_zfree(VMBlockPathnameZone, pathname);
        return error;
     }
-+#if __FreeBSD_version < 1400054
-    NDFREE(ndp, NDF_ONLY_PNBUF);
-+#else
-+   NDFREE_PNBUF(ndp);
-+#endif
- 
-    /*
-     * Check multi VMBlock mount to avoid `lock against myself' panic.
diff --git a/emulators/open-vm-tools/files/patch-modules_freebsd_vmmemctl_Makefile b/emulators/open-vm-tools/files/patch-modules_freebsd_vmmemctl_Makefile
deleted file mode 100644
index 632fff16326b..000000000000
--- a/emulators/open-vm-tools/files/patch-modules_freebsd_vmmemctl_Makefile
+++ /dev/null
@@ -1,11 +0,0 @@
---- modules/freebsd/vmmemctl/Makefile.orig	2020-10-16 23:15:58 UTC
-+++ modules/freebsd/vmmemctl/Makefile
-@@ -33,8 +33,6 @@ SRCS    += backdoorGcc32.c
- .endif
- KMOD	= vmmemctl
- PROG    = ../$(KMOD).ko
--NOMAN	= t
--NO_MAN  = t
- KLDMOD	= t
- 
- # Don't print a warning that the object dir wasn't specified
diff --git a/emulators/open-vm-tools/files/patch-modules_freebsd_vmmemctl_os.c b/emulators/open-vm-tools/files/patch-modules_freebsd_vmmemctl_os.c
index 2aee754762a6..0b6be303c9d6 100644
--- a/emulators/open-vm-tools/files/patch-modules_freebsd_vmmemctl_os.c
+++ b/emulators/open-vm-tools/files/patch-modules_freebsd_vmmemctl_os.c
@@ -1,20 +1,19 @@
---- modules/freebsd/vmmemctl/os.c.orig	2022-09-13 12:55:59 UTC
+--- modules/freebsd/vmmemctl/os.c.orig	2023-03-07 22:57:07 UTC
 +++ modules/freebsd/vmmemctl/os.c
-@@ -136,9 +136,11 @@ MALLOC_DEFINE(M_VMMEMCTL, BALLOON_NAME, "vmmemctl meta
- #endif
+@@ -103,7 +103,11 @@ MALLOC_DEFINE(M_VMMEMCTL, BALLOON_NAME, "vmmemctl meta
+ #define KVA_FREE(offset, size) kva_free(offset, size)
  
- #if __FreeBSD_version < 1000000
--   #define KMEM_FREE(offset, size) kmem_free(kernel_map, offset, size)
-+   #define KMEM_FREE(offset, size) kmem_free(kernel_map, (vm_offset_t)offset, size)
- #elif __FreeBSD_version < 1200083
--   #define KMEM_FREE(offset, size) kmem_free(kernel_arena, offset, size)
-+   #define KMEM_FREE(offset, size) kmem_free(kernel_arena, (vm_offset_t)offset, size)
-+#elif __FreeBSD_version < 1400070
+ #define KMEM_ALLOC(size) kmem_malloc(size, M_WAITOK | M_ZERO)
+-#define KMEM_FREE(offset, size) kmem_free(offset, size)
++#if __FreeBSD_version < 1400070
 +   #define KMEM_FREE(offset, size) kmem_free((vm_offset_t)offset, size)
- #else
-    #define KMEM_FREE(offset, size) kmem_free(offset, size)
- #endif
-@@ -442,7 +444,7 @@ os_pmap_free(os_pmap *p) // IN
++#else
++   #define KMEM_FREE(offset, size) kmem_free(offset, size)
++#endif
+ 
+ /*
+  * Globals
+@@ -404,7 +408,7 @@ os_pmap_free(os_pmap *p) // IN
  static void
  os_pmap_free(os_pmap *p) // IN
  {
diff --git a/emulators/open-vm-tools/files/patch-services_plugins_dndcp_dndcp.cpp b/emulators/open-vm-tools/files/patch-services_plugins_dndcp_dndcp.cpp
index cc0e68453b66..118c9b3a1b82 100644
--- a/emulators/open-vm-tools/files/patch-services_plugins_dndcp_dndcp.cpp
+++ b/emulators/open-vm-tools/files/patch-services_plugins_dndcp_dndcp.cpp
@@ -1,8 +1,8 @@
---- services/plugins/dndcp/dndcp.cpp.orig	2021-08-03 01:47:47 UTC
+--- services/plugins/dndcp/dndcp.cpp.orig	2023-03-07 22:57:07 UTC
 +++ services/plugins/dndcp/dndcp.cpp
-@@ -31,11 +31,9 @@
- 
- #define G_LOG_DOMAIN "dndcp"
+@@ -36,11 +36,9 @@
+  */
+ #include <glib.h>
  
 -extern "C" {
  #include "vmware/guestrpc/tclodefs.h"
diff --git a/emulators/open-vm-tools/files/patch-services_vmtoolsd_Makefile.am b/emulators/open-vm-tools/files/patch-services_vmtoolsd_Makefile.am
index a617eea05ad0..7ea9613f8517 100644
--- a/emulators/open-vm-tools/files/patch-services_vmtoolsd_Makefile.am
+++ b/emulators/open-vm-tools/files/patch-services_vmtoolsd_Makefile.am
@@ -1,6 +1,6 @@
---- services/vmtoolsd/Makefile.am.orig	2017-04-25 03:59:07 UTC
+--- services/vmtoolsd/Makefile.am.orig	2023-03-07 22:57:07 UTC
 +++ services/vmtoolsd/Makefile.am
-@@ -76,7 +76,7 @@ install-data-hook:
+@@ -79,7 +79,7 @@ install-exec-hook:
  	@INSTVMSG@ vmtoolsd $(srcdir)/l10n $(DESTDIR)$(datadir)
  
  install-exec-hook: