git: abd2d04998b2 - main - emulators/open-vm-*: Update to 13.0.5 + fixes
- Go to: [ bottom of page ] [ top of archives ] [ this month ]
Date: Mon, 06 Oct 2025 20:59:01 UTC
The branch main has been updated by garga:
URL: https://cgit.FreeBSD.org/ports/commit/?id=abd2d04998b2fd543a964b89486a009806900d1e
commit abd2d04998b2fd543a964b89486a009806900d1e
Author: Takefu <takefu@airport.fm>
AuthorDate: 2025-10-06 20:53:24 +0000
Commit: Renato Botelho <garga@FreeBSD.org>
CommitDate: 2025-10-06 20:58:39 +0000
emulators/open-vm-*: Update to 13.0.5 + fixes
- Update to 13.0.5 [1]
- Fix build on CURRENT after retirement of NULLVP, VREF and VCALL macros
- Move configuration files from /etc to $PREFIX/etc [2]
PR: 287729 [1], 289927, 269008 [2]
Sponsored by: Rubicon Communications, LLC ("Netgate")
---
emulators/open-vm-kmod/Makefile | 6 ++--
emulators/open-vm-kmod/distinfo | 6 ++--
emulators/open-vm-kmod/files/patch-vmblock_subr.c | 29 +++++++++++++++
.../open-vm-kmod/files/patch-vmblock_vfsops.c | 11 +++++-
emulators/open-vm-kmod/files/patch-vmblock_vnops.c | 41 ++++++++++++++++++++++
emulators/open-vm-kmod/files/patch-vmmemctl_os.c | 8 ++---
emulators/open-vm-tools/Makefile | 14 ++++++--
emulators/open-vm-tools/distinfo | 6 ++--
emulators/open-vm-tools/files/patch-Makefile.am | 11 ++++++
.../files/patch-lib_guestApp_guestApp.c | 2 +-
.../open-vm-tools/files/patch-lib_misc_codeset.c | 11 ++++++
emulators/open-vm-tools/files/patch-pam_generic | 4 +--
.../files/patch-scripts_common_vm-support | 11 ++++++
...atch-services_plugins_componentMgr_svtminion.sh | 11 ++++++
.../files/patch-services_vmtoolsd_Makefile.am | 6 ++--
.../files/patch-vgauth_common_prefs.h | 20 +++++++++++
.../files/patch-vgauth_service_Makefile.am | 17 +++++++++
.../files/patch-vmware-user-suid-wrapper_wrapper.h | 11 ++++++
emulators/open-vm-tools/pkg-plist | 3 +-
19 files changed, 202 insertions(+), 26 deletions(-)
diff --git a/emulators/open-vm-kmod/Makefile b/emulators/open-vm-kmod/Makefile
index a7c726caf9fe..2fc821071214 100644
--- a/emulators/open-vm-kmod/Makefile
+++ b/emulators/open-vm-kmod/Makefile
@@ -1,5 +1,5 @@
PORTNAME= open-vm-kmod
-PORTVERSION= 12.5.2
+PORTVERSION= 13.0.5
DISTVERSIONPREFIX= stable-
PORTEPOCH= 2
CATEGORIES= emulators
@@ -10,8 +10,8 @@ WWW= https://github.com/vmware/open-vm-tools
LICENSE= BSD2CLAUSE GPLv2
LICENSE_COMB= multi
-LICENSE_FILE_GPLv2= ${WRKSRC}/vmmemctl/COPYING
LICENSE_FILE_BSD2CLAUSE= ${WRKSRC}/vmblock/COPYING
+LICENSE_FILE_GPLv2= ${WRKSRC}/vmmemctl/COPYING
ONLY_FOR_ARCHS= aarch64 amd64 i386
@@ -21,8 +21,8 @@ USE_GITHUB= yes
GH_ACCOUNT= vmware
GH_PROJECT= open-vm-tools
-WRKSRC_SUBDIR= open-vm-tools/modules/freebsd/
MAKE_ARGS= OVT_SOURCE_DIR=${WRKSRC:H:H:H}
+WRKSRC_SUBDIR= open-vm-tools/modules/freebsd/
PLIST_FILES= ${KMODDIR}/vmblock.ko \
${KMODDIR}/vmmemctl.ko
diff --git a/emulators/open-vm-kmod/distinfo b/emulators/open-vm-kmod/distinfo
index 884191452e52..b05fe8f3acc7 100644
--- a/emulators/open-vm-kmod/distinfo
+++ b/emulators/open-vm-kmod/distinfo
@@ -1,3 +1,3 @@
-TIMESTAMP = 1750427304
-SHA256 (vmware-open-vm-tools-stable-12.5.2_GH0.tar.gz) = 9fa2ebda1aaf53c163a978832775d845378d9ce59032c07b1c63b84ba091610f
-SIZE (vmware-open-vm-tools-stable-12.5.2_GH0.tar.gz) = 3004283
+TIMESTAMP = 1759280952
+SHA256 (vmware-open-vm-tools-stable-13.0.5_GH0.tar.gz) = 9d4aa767c2b2acec2d56bb50546ef1bb59283e608444d50ef55c97afcd445457
+SIZE (vmware-open-vm-tools-stable-13.0.5_GH0.tar.gz) = 2990133
diff --git a/emulators/open-vm-kmod/files/patch-vmblock_subr.c b/emulators/open-vm-kmod/files/patch-vmblock_subr.c
new file mode 100644
index 000000000000..256772117d77
--- /dev/null
+++ b/emulators/open-vm-kmod/files/patch-vmblock_subr.c
@@ -0,0 +1,29 @@
+--- vmblock/subr.c.orig 2025-10-01 18:42:23 UTC
++++ vmblock/subr.c
+@@ -208,7 +208,7 @@ VMBlockHashGet(struct mount *mp, // IN: vmblock
+ }
+ }
+ mtx_unlock(&hashMutex);
+- return NULLVP;
++ return NULL;
+ }
+
+
+@@ -254,7 +254,7 @@ VMBlockHashInsert(struct mount *mp, // IN:
+ }
+ LIST_INSERT_HEAD(hd, xp, hashEntry);
+ mtx_unlock(&hashMutex);
+- return NULLVP;
++ return NULL;
+ }
+
+
+@@ -465,7 +465,7 @@ VMBlockCheckVp(vp, fil, lno)
+ panic("VMBlockCheckVp");
+ };
+ #endif
+- if (a->lowerVnode == NULLVP) {
++ if (a->lowerVnode == NULL) {
+ /* Should never happen */
+ int i; u_long *p;
+ printf("vp = %p, ZERO ptr\n", (void *)vp);
diff --git a/emulators/open-vm-kmod/files/patch-vmblock_vfsops.c b/emulators/open-vm-kmod/files/patch-vmblock_vfsops.c
index 97840675e338..11207b5cb0e2 100644
--- a/emulators/open-vm-kmod/files/patch-vmblock_vfsops.c
+++ b/emulators/open-vm-kmod/files/patch-vmblock_vfsops.c
@@ -1,4 +1,4 @@
---- vmblock/vfsops.c.orig 2024-10-10 15:05:07 UTC
+--- vmblock/vfsops.c.orig 2025-10-01 18:44:42 UTC
+++ vmblock/vfsops.c
@@ -173,7 +173,6 @@ VMBlockVFSMount(struct mount *mp) // IN: mount(
#endif
@@ -8,3 +8,12 @@
uma_zfree(VMBlockPathnameZone, pathname);
return error;
}
+@@ -354,7 +353,7 @@ VMBlockVFSRoot(struct mount *mp, // IN: vmblock
+ * Return locked reference to root.
+ */
+ vp = MNTTOVMBLOCKMNT(mp)->rootVnode;
+- VREF(vp);
++ vref(vp);
+ compat_vn_lock(vp, flags | LK_RETRY, compat_td);
+ *vpp = vp;
+ return 0;
diff --git a/emulators/open-vm-kmod/files/patch-vmblock_vnops.c b/emulators/open-vm-kmod/files/patch-vmblock_vnops.c
new file mode 100644
index 000000000000..64ebd25e1ce0
--- /dev/null
+++ b/emulators/open-vm-kmod/files/patch-vmblock_vnops.c
@@ -0,0 +1,41 @@
+--- vmblock/vnops.c.orig 2025-10-01 18:40:23 UTC
++++ vmblock/vnops.c
+@@ -479,9 +479,9 @@ struct vop_generic_args {
+ * Check for and don't map any that aren't. (We must always map first
+ * vp or vclean fails.)
+ */
+- if (i && (*this_vp_p == NULLVP ||
++ if (i && (*this_vp_p == NULL ||
+ (*this_vp_p)->v_op != &VMBlockVnodeOps)) {
+- old_vps[i] = NULLVP;
++ old_vps[i] = NULL;
+ } else {
+ old_vps[i] = *this_vp_p;
+ *(vps_p[i]) = VMBVPTOLOWERVP(*this_vp_p);
+@@ -491,7 +491,7 @@ struct vop_generic_args {
+ * future.)
+ */
+ if (reles & VDESC_VP0_WILLRELE) {
+- VREF(*this_vp_p);
++ vref(*this_vp_p);
+ }
+ }
+ }
+@@ -501,7 +501,7 @@ struct vop_generic_args {
+ * structure.
+ */
+ if (vps_p[0] && *vps_p[0]) {
+- error = VCALL(ap);
++ error = ap->a_desc->vdesc_call(ap);
+ } else {
+ printf("VMBlockVopBypass: no map for %s\n", descp->vdesc_name);
+ error = EINVAL;
+@@ -681,7 +681,7 @@ struct vop_lookup_args {
+ */
+ if (ldvp == lvp) {
+ *ap->a_vpp = dvp;
+- VREF(dvp);
++ vref(dvp);
+ vrele(lvp);
+ } else {
+ error = VMBlockNodeGet(dvp->v_mount, lvp, &vp, pathname);
diff --git a/emulators/open-vm-kmod/files/patch-vmmemctl_os.c b/emulators/open-vm-kmod/files/patch-vmmemctl_os.c
index d083ec453d4f..899fd4d90a50 100644
--- a/emulators/open-vm-kmod/files/patch-vmmemctl_os.c
+++ b/emulators/open-vm-kmod/files/patch-vmmemctl_os.c
@@ -1,14 +1,12 @@
---- vmmemctl/os.c.orig 2025-05-15 19:16:07 UTC
+--- vmmemctl/os.c.orig 2025-09-30 06:45:41 UTC
+++ vmmemctl/os.c
@@ -91,8 +91,13 @@ MALLOC_DEFINE(M_VMMEMCTL, BALLOON_NAME, "vmmemctl meta
/*
* FreeBSD specific MACROS
*/
--#define VM_PAGE_LOCK(page) vm_page_lock(page);
--#define VM_PAGE_UNLOCK(page) vm_page_unlock(page)
+#if __FreeBSD_version < 1500046
-+#define VM_PAGE_LOCK(page) vm_page_tryxbusy(page);
-+#define VM_PAGE_UNLOCK(page) vm_page_xunbusy(page)
+ #define VM_PAGE_LOCK(page) vm_page_lock(page);
+ #define VM_PAGE_UNLOCK(page) vm_page_unlock(page)
+#else
+#define VM_PAGE_LOCK(page) vm_page_tryxbusy(page);
+#define VM_PAGE_UNLOCK(page) vm_page_xunbusy(page)
diff --git a/emulators/open-vm-tools/Makefile b/emulators/open-vm-tools/Makefile
index 845b3ee995b3..0170a949bc17 100644
--- a/emulators/open-vm-tools/Makefile
+++ b/emulators/open-vm-tools/Makefile
@@ -1,5 +1,5 @@
PORTNAME= open-vm-tools
-PORTVERSION= 12.5.2
+PORTVERSION= 13.0.5
DISTVERSIONPREFIX= stable-
PORTEPOCH= 2
CATEGORIES= emulators
@@ -72,8 +72,16 @@ X11_USE= GNOME=gdkpixbuf,gdkpixbuf2xlib,gtk30,gtkmm30 \
X11_CONFIGURE_WITH= gtk3 gtkmm3 x
post-patch:
- @${REINPLACE_CMD} -e "s@%%PREFIX%%@${PREFIX}@"\
- ${WRKSRC}/lib/guestApp/guestApp.c
+ @${REINPLACE_CMD} -e "s@%%PREFIX%%@${PREFIX}@" \
+ ${WRKSRC}/Makefile.am \
+ ${WRKSRC}/lib/guestApp/guestApp.c \
+ ${WRKSRC}/lib/misc/codeset.c \
+ ${WRKSRC}/scripts/common/vm-support \
+ ${WRKSRC}/services/plugins/componentMgr/svtminion.sh \
+ ${WRKSRC}/services/vmtoolsd/Makefile.am \
+ ${WRKSRC}/vgauth/common/prefs.h \
+ ${WRKSRC}/vgauth/service/Makefile.am \
+ ${WRKSRC}/vmware-user-suid-wrapper/wrapper.h
post-install:
${MKDIR} ${STAGEDIR}${PREFIX}/lib/vmware-tools/modules/drivers
diff --git a/emulators/open-vm-tools/distinfo b/emulators/open-vm-tools/distinfo
index 38b3f66a1081..fdf03439d71a 100644
--- a/emulators/open-vm-tools/distinfo
+++ b/emulators/open-vm-tools/distinfo
@@ -1,3 +1,3 @@
-TIMESTAMP = 1750427284
-SHA256 (vmware-open-vm-tools-stable-12.5.2_GH0.tar.gz) = 9fa2ebda1aaf53c163a978832775d845378d9ce59032c07b1c63b84ba091610f
-SIZE (vmware-open-vm-tools-stable-12.5.2_GH0.tar.gz) = 3004283
+TIMESTAMP = 1759281082
+SHA256 (vmware-open-vm-tools-stable-13.0.5_GH0.tar.gz) = 9d4aa767c2b2acec2d56bb50546ef1bb59283e608444d50ef55c97afcd445457
+SIZE (vmware-open-vm-tools-stable-13.0.5_GH0.tar.gz) = 2990133
diff --git a/emulators/open-vm-tools/files/patch-Makefile.am b/emulators/open-vm-tools/files/patch-Makefile.am
new file mode 100644
index 000000000000..7bee47e68728
--- /dev/null
+++ b/emulators/open-vm-tools/files/patch-Makefile.am
@@ -0,0 +1,11 @@
+--- Makefile.am.orig 2025-06-19 04:05:18 UTC
++++ Makefile.am
+@@ -77,6 +77,6 @@ endif
+
+
+ install-data-local:
+- $(INSTALL) -d $(DESTDIR)/etc/vmware-tools/
+- $(INSTALL) -m 644 $(srcdir)/tools.conf $(DESTDIR)/etc/vmware-tools/tools.conf.example
++ $(INSTALL) -d $(DESTDIR)%%PREFIX%%/etc/vmware-tools/
++ $(INSTALL) -m 644 $(srcdir)/tools.conf $(DESTDIR)%%PREFIX%%/etc/vmware-tools/tools.conf.example
+
diff --git a/emulators/open-vm-tools/files/patch-lib_guestApp_guestApp.c b/emulators/open-vm-tools/files/patch-lib_guestApp_guestApp.c
index 8dded6d07581..48c614b1ee30 100644
--- a/emulators/open-vm-tools/files/patch-lib_guestApp_guestApp.c
+++ b/emulators/open-vm-tools/files/patch-lib_guestApp_guestApp.c
@@ -1,4 +1,4 @@
---- lib/guestApp/guestApp.c.orig 2024-10-10 15:05:07 UTC
+--- lib/guestApp/guestApp.c.orig 2025-06-19 04:05:18 UTC
+++ lib/guestApp/guestApp.c
@@ -65,7 +65,7 @@
#elif defined __APPLE__
diff --git a/emulators/open-vm-tools/files/patch-lib_misc_codeset.c b/emulators/open-vm-tools/files/patch-lib_misc_codeset.c
new file mode 100644
index 000000000000..2a3354fef566
--- /dev/null
+++ b/emulators/open-vm-tools/files/patch-lib_misc_codeset.c
@@ -0,0 +1,11 @@
+--- lib/misc/codeset.c.orig 2025-06-19 04:05:18 UTC
++++ lib/misc/codeset.c
+@@ -100,7 +100,7 @@
+ # define POSIX_ICU_DIR DEFAULT_LIBDIRECTORY
+ #elif !defined _WIN32
+ # if defined(VMX86_TOOLS)
+-# define POSIX_ICU_DIR "/etc/vmware-tools"
++# define POSIX_ICU_DIR "%%PREFIX%%/etc/vmware-tools"
+ # else
+ # define POSIX_ICU_DIR "/etc/vmware"
+ # endif
diff --git a/emulators/open-vm-tools/files/patch-pam_generic b/emulators/open-vm-tools/files/patch-pam_generic
index 1954cc6cf818..bdafd4d15d59 100644
--- a/emulators/open-vm-tools/files/patch-pam_generic
+++ b/emulators/open-vm-tools/files/patch-pam_generic
@@ -1,8 +1,8 @@
---- pam/generic.orig 2020-10-16 23:15:58 UTC
+--- pam/generic.orig 2025-06-19 04:05:18 UTC
+++ pam/generic
@@ -1,9 +1,5 @@
# This is a generic pam config file for open-vm-tools
- # See https://kb.vmware.com/s/article/78251 for advice to use
+ # See https://knowledge.broadcom.com/external/article?legacyId=78251 for advice to use
# common authentication mechanisms.
-auth required pam_shells.so
-auth sufficient pam_unix.so shadow
diff --git a/emulators/open-vm-tools/files/patch-scripts_common_vm-support b/emulators/open-vm-tools/files/patch-scripts_common_vm-support
new file mode 100644
index 000000000000..9b8d1d2f5ac6
--- /dev/null
+++ b/emulators/open-vm-tools/files/patch-scripts_common_vm-support
@@ -0,0 +1,11 @@
+--- scripts/common/vm-support.orig 2025-06-19 04:05:18 UTC
++++ scripts/common/vm-support
+@@ -397,7 +397,7 @@ banner "Collecting support information..."
+ # Common stuff that we gather for all OSes.
+ runcmd "/tmp/vm-support-version.txt" echo vm-support version: $VER
+
+-addfiles /etc/vmware-tools
++addfiles %%PREFIX%%/etc/vmware-tools
+ addfiles /var/log/boot*
+ addfiles /var/log/secure*
+ addfiles /var/log/messages*
diff --git a/emulators/open-vm-tools/files/patch-services_plugins_componentMgr_svtminion.sh b/emulators/open-vm-tools/files/patch-services_plugins_componentMgr_svtminion.sh
new file mode 100644
index 000000000000..e78069d0d1c9
--- /dev/null
+++ b/emulators/open-vm-tools/files/patch-services_plugins_componentMgr_svtminion.sh
@@ -0,0 +1,11 @@
+--- services/plugins/componentMgr/svtminion.sh.orig 2025-06-19 04:05:18 UTC
++++ services/plugins/componentMgr/svtminion.sh
+@@ -120,7 +120,7 @@ list_of_onedir_locations_check[0]="${onedir_pre_3006_l
+ list_of_onedir_locations_check[1]="${onedir_post_3005_location}"
+
+ ## VMware file and directory locations
+-readonly vmtools_base_dir_etc="/etc/vmware-tools"
++readonly vmtools_base_dir_etc="%%PREFIX%%/etc/vmware-tools"
+ readonly vmtools_conf_file="tools.conf"
+ readonly vmtools_salt_minion_section_name="salt_minion"
+
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 3678de640c63..6d41f66c3e5c 100644
--- a/emulators/open-vm-tools/files/patch-services_vmtoolsd_Makefile.am
+++ b/emulators/open-vm-tools/files/patch-services_vmtoolsd_Makefile.am
@@ -1,11 +1,11 @@
---- services/vmtoolsd/Makefile.am.orig 2024-10-10 15:05:07 UTC
+--- services/vmtoolsd/Makefile.am.orig 2025-06-19 04:05:18 UTC
+++ services/vmtoolsd/Makefile.am
-@@ -81,7 +81,7 @@ install-exec-hook:
+@@ -81,7 +81,7 @@ install-data-hook:
@INSTVMSG@ vmtoolsd $(srcdir)/l10n $(DESTDIR)$(datadir)
install-exec-hook:
- $(INSTALL) -d $(DESTDIR)/etc/vmware-tools
-+# $(INSTALL) -d $(DESTDIR)/etc/vmware-tools
++ $(INSTALL) -d $(DESTDIR)%%PREFIX%%/etc/vmware-tools
$(INSTALL) -d $(DESTDIR)/$(PAM_PREFIX)/pam.d/
$(INSTALL) $(top_srcdir)/pam/generic $(DESTDIR)/$(PAM_PREFIX)/pam.d/vmtoolsd
diff --git a/emulators/open-vm-tools/files/patch-vgauth_common_prefs.h b/emulators/open-vm-tools/files/patch-vgauth_common_prefs.h
new file mode 100644
index 000000000000..31b2394e6d34
--- /dev/null
+++ b/emulators/open-vm-tools/files/patch-vgauth_common_prefs.h
@@ -0,0 +1,20 @@
+--- vgauth/common/prefs.h.orig 2025-06-19 04:05:18 UTC
++++ vgauth/common/prefs.h
+@@ -65,7 +65,7 @@ void Pref_LogAllEntries(const PrefHandle ph);
+ // fallback value if registry isn't set
+ #define VGAUTH_PREF_CONFIG_FILENAME "c:\\Program Files\\VMware\\VMware Tools\\vgauth.conf"
+ #else
+-#define VGAUTH_PREF_CONFIG_FILENAME "/etc/vmware-tools/vgauth.conf"
++#define VGAUTH_PREF_CONFIG_FILENAME "%%PREFIX%%/etc/vmware-tools/vgauth.conf"
+ // XXX temp til installer tweaks its location
+ #define VGAUTH_PREF_CONFIG_FILENAME_OLD "/etc/vmware/vgauth.conf"
+ #endif
+@@ -102,7 +102,7 @@ ticketTTL=3600
+ auditSuccessEvents=true
+
+ [localization]
+-msgCatalog = /etc/vmware-tools/vgauth/messages
++msgCatalog = %%PREFIX%%/etc/vmware-tools/vgauth/messages
+ # EOF
+ @endverbatim
+ * See http://developer.gnome.org/glib/2.28/glib-Key-value-file-parser.html#glib-Key-value-file-parser.description
diff --git a/emulators/open-vm-tools/files/patch-vgauth_service_Makefile.am b/emulators/open-vm-tools/files/patch-vgauth_service_Makefile.am
new file mode 100644
index 000000000000..e71997971912
--- /dev/null
+++ b/emulators/open-vm-tools/files/patch-vgauth_service_Makefile.am
@@ -0,0 +1,17 @@
+--- vgauth/service/Makefile.am.orig 2025-06-19 04:05:18 UTC
++++ vgauth/service/Makefile.am
+@@ -45,7 +45,7 @@ VGAuthService_SOURCES += ../common/VGAuthUtil.c
+ VGAuthService_SOURCES += ../common/vmxlog.c
+ VGAuthService_SOURCES += ../common/vmxrpc.c
+
+-VGAuthServicedir = /etc/vmware-tools/vgauth/schemas
++VGAuthServicedir = %%PREFIX%%/etc/vmware-tools/vgauth/schemas
+ VGAuthService_SCRIPTS =
+ VGAuthService_SCRIPTS += ../serviceImpl/schemas/datatypes.dtd
+ VGAuthService_SCRIPTS += ../serviceImpl/schemas/saml-schema-assertion-2.0.xsd
+@@ -93,4 +93,4 @@ VGAuthMsgDir = $(datadir)/open-vm-tools
+ install-data-hook:
+ @INSTVMSG@ VGAuthService $(srcdir)/l10n $(DESTDIR)$(datadir)
+ cat vgauth.conf | sed -e"s!@@VGAUTHSCHEMADIR@@!$(VGAuthServicedir)!" \
+- | sed -e"s!@@VGAUTHMSGDIR@@!$(VGAuthMsgDir)!" > $(DESTDIR)/etc/vmware-tools/vgauth.conf
++ | sed -e"s!@@VGAUTHMSGDIR@@!$(VGAuthMsgDir)!" > $(DESTDIR)%%PREFIX%%/etc/vmware-tools/vgauth.conf
diff --git a/emulators/open-vm-tools/files/patch-vmware-user-suid-wrapper_wrapper.h b/emulators/open-vm-tools/files/patch-vmware-user-suid-wrapper_wrapper.h
new file mode 100644
index 000000000000..568a224f1b07
--- /dev/null
+++ b/emulators/open-vm-tools/files/patch-vmware-user-suid-wrapper_wrapper.h
@@ -0,0 +1,11 @@
+--- vmware-user-suid-wrapper/wrapper.h.orig 2025-06-19 04:05:18 UTC
++++ vmware-user-suid-wrapper/wrapper.h
+@@ -43,7 +43,7 @@
+ * in the latter.
+ */
+ #ifdef USES_LOCATIONS_DB
+-# define LOCATIONS_PATH "/etc/vmware-tools/locations"
++# define LOCATIONS_PATH "%%PREFIX%%/etc/vmware-tools/locations"
+
+ /*
+ * Locations DB query selector. Values in this enum are used as array
diff --git a/emulators/open-vm-tools/pkg-plist b/emulators/open-vm-tools/pkg-plist
index 92ebcad1749b..d8cd7adcfaee 100644
--- a/emulators/open-vm-tools/pkg-plist
+++ b/emulators/open-vm-tools/pkg-plist
@@ -1,4 +1,3 @@
-/etc/vmware-tools/tools.conf.example
bin/vm-support
%%FUSE%%bin/vmhgfs-fuse
bin/vmtoolsd
@@ -12,6 +11,7 @@ bin/vmware-toolbox-cmd
%%FUSE%%bin/vmware-vmblock-fuse
bin/vmware-xferlogs
etc/pam.d/vmtoolsd
+@sample etc/vmware-tools/tools.conf.example
%%X11%%etc/xdg/autostart/vmware-user.desktop
%%DEPLOYPKG%%include/libDeployPkg/deployPkgFormat.h
%%DEPLOYPKG%%include/libDeployPkg/deploypkg.h
@@ -85,5 +85,4 @@ share/vmware-tools/suspend-vm-default
@dir lib/vmware-tools/modules/input
@dir %%DATADIR%%/scripts/vmware
@dir %%DATADIR%%/tests
-@dir /etc/vmware-tools
@preunexec %%PREFIX%%/bin/vmware-rpctool 'tools.set.version 0' 2>/dev/null || /usr/bin/true