diff options
Diffstat (limited to 'emulators/open-vm-tools')
13 files changed, 113 insertions, 14 deletions
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..acda99766f9f --- /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.sample + 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..a5a9f3428e99 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.sample %%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 |