diff --git a/emulators/open-vm-tools/Makefile b/emulators/open-vm-tools/Makefile index 5e36bfa86c0a..202faed130a9 100644 --- a/emulators/open-vm-tools/Makefile +++ b/emulators/open-vm-tools/Makefile @@ -1,94 +1,94 @@ PORTNAME= open-vm-tools -PORTVERSION= 12.4.5 +PORTVERSION= 12.5.0 DISTVERSIONPREFIX= stable- PORTEPOCH= 2 CATEGORIES= emulators MAINTAINER= garga@FreeBSD.org COMMENT= Open VMware tools for FreeBSD VMware guests ${${FLAVOR}_COMMENT} WWW= https://github.com/vmware/open-vm-tools LICENSE= LGPL21 LICENSE_FILE= ${WRKSRC}/COPYING ONLY_FOR_ARCHS= aarch64 amd64 i386 LIB_DEPENDS= libdnet.so:net/libdnet FLAVORS= default nox11 default_CONFLICTS_INSTALL= open-vm-tools-nox11 nox11_PKGNAMESUFFIX= -nox11 nox11_CONFLICTS_INSTALL= open-vm-tools nox11_COMMENT= (without X11) USES= autoreconf gettext-runtime gnome kmod libtool localbase \ pathfix pkgconfig USE_GITHUB= yes GH_ACCOUNT= vmware USE_GNOME= glib20 USE_LDCONFIG= yes USE_RC_SUBR= vmware-guestd vmware-kmod GNU_CONFIGURE= yes CONFIGURE_ARGS+=--disable-vgauth \ --enable-containerinfo=no \ --sysconfdir=${PREFIX}/etc \ --without-icu CONFIGURE_ENV+= SYSDIR=${SRC_BASE}/sys INSTALL_TARGET= install-strip CPPFLAGS+= -Wno-deprecated-declarations SSP_UNSAFE= kernel module does not support ssp WRKSRC_SUBDIR= open-vm-tools PORTDOCS= * OPTIONS_DEFINE= DOCS DEPLOYPKG FUSE LIBNOTIFY OPENSSL X11 OPTIONS_DEFAULT=DOCS FUSE LIBNOTIFY OPENSSL X11 .if ${FLAVOR:U} == nox11 OPTIONS_EXCLUDE:= LIBNOTIFY X11 .endif OPTIONS_SUB= DEPLOYPKG_DESC= DeployPkg plugin LIBNOTIFY_DESC= Desktop notification support DEPLOYPKG_LIB_DEPENDS= libmspack.so:archivers/libmspack DEPLOYPKG_CONFIGURE_ENABLE= deploypkg DOCS_BUILD_DEPENDS= doxygen:devel/doxygen DOCS_CONFIGURE_ENABLE= docs FUSE_USES= fuse LIBNOTIFY_LIB_DEPENDS= libnotify.so:devel/libnotify OPENSSL_CONFIGURE_WITH= ssl X11_LIB_DEPENDS= libfontconfig.so:x11-fonts/fontconfig \ libfreetype.so:print/freetype2 \ libharfbuzz.so:print/harfbuzz X11_USES= desktop-file-utils xorg X11_USE= GNOME=gdkpixbuf2,gdkpixbuf2xlib,gtk30,gtkmm30 \ XORG=ice,sm,x11,xext,xi,xinerama,xorgproto,xrandr,xrender,xtst X11_CONFIGURE_WITH= gtk3 gtkmm3 x post-patch: @${REINPLACE_CMD} -e "s@%%PREFIX%%@${PREFIX}@"\ ${WRKSRC}/lib/guestApp/guestApp.c post-build: cd ${WRKSRC}/modules && ${SETENV} ${MAKE_ENV} ${MAKE} ${MAKE_ARGS} post-install: ${MKDIR} ${STAGEDIR}${PREFIX}/lib/vmware-tools/modules/drivers ${MKDIR} ${STAGEDIR}${PREFIX}/lib/vmware-tools/modules/input ${INSTALL_DATA} ${WRKSRC}/modules/freebsd/vmblock.ko \ ${STAGEDIR}${PREFIX}/lib/vmware-tools/modules/drivers/vmblock.ko ${INSTALL_DATA} ${WRKSRC}/modules/freebsd/vmmemctl.ko \ ${STAGEDIR}${PREFIX}/lib/vmware-tools/modules/drivers/vmmemctl.ko ${MKDIR} ${STAGEDIR}${DATADIR} ${INSTALL_DATA} ${WRKSRC}/tools.conf \ ${STAGEDIR}${DATADIR}/tools.conf.sample ${MKDIR} ${STAGEDIR}${PREFIX}/share/open-vm-tools/scripts/vmware/ ${MKDIR} ${STAGEDIR}${PREFIX}/share/open-vm-tools/tests/ .include diff --git a/emulators/open-vm-tools/distinfo b/emulators/open-vm-tools/distinfo index ec6737991729..6c88a1a8f846 100644 --- a/emulators/open-vm-tools/distinfo +++ b/emulators/open-vm-tools/distinfo @@ -1,3 +1,3 @@ -TIMESTAMP = 1728389715 -SHA256 (vmware-open-vm-tools-stable-12.4.5_GH0.tar.gz) = 1e36b41ddb7a2672158842297a08115ff8369bb8f6b80c9df144a22cb5f28550 -SIZE (vmware-open-vm-tools-stable-12.4.5_GH0.tar.gz) = 2992872 +TIMESTAMP = 1730460386 +SHA256 (vmware-open-vm-tools-stable-12.5.0_GH0.tar.gz) = a52182c7e6b5df41bb317625e9d8592ecdb9db814d1c2c9b7cdb91a77f8c0640 +SIZE (vmware-open-vm-tools-stable-12.5.0_GH0.tar.gz) = 3001944 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 99e8c5c09ba3..8dded6d07581 100644 --- a/emulators/open-vm-tools/files/patch-lib_guestApp_guestApp.c +++ b/emulators/open-vm-tools/files/patch-lib_guestApp_guestApp.c @@ -1,11 +1,11 @@ ---- lib/guestApp/guestApp.c.orig 2018-07-13 18:54:23 UTC +--- lib/guestApp/guestApp.c.orig 2024-10-10 15:05:07 UTC +++ lib/guestApp/guestApp.c -@@ -63,7 +63,7 @@ +@@ -65,7 +65,7 @@ #elif defined __APPLE__ # define GUESTAPP_TOOLS_INSTALL_PATH "/Library/Application Support/VMware Tools" #else -# define GUESTAPP_TOOLS_INSTALL_PATH "/etc/vmware-tools" +# define GUESTAPP_TOOLS_INSTALL_PATH "%%PREFIX%%/share/vmware-tools" #endif #if defined _WIN32 diff --git a/emulators/open-vm-tools/files/patch-lib_procMgr_procMgrPosix.c b/emulators/open-vm-tools/files/patch-lib_procMgr_procMgrPosix.c index a4088489e16a..01ebbce2842a 100644 --- a/emulators/open-vm-tools/files/patch-lib_procMgr_procMgrPosix.c +++ b/emulators/open-vm-tools/files/patch-lib_procMgr_procMgrPosix.c @@ -1,11 +1,11 @@ ---- lib/procMgr/procMgrPosix.c.orig 2023-07-18 17:10:48 UTC +--- lib/procMgr/procMgrPosix.c.orig 2024-10-10 15:05:07 UTC +++ lib/procMgr/procMgrPosix.c -@@ -58,6 +58,8 @@ +@@ -59,6 +59,8 @@ #include #include #include +#include +#include #endif #if defined(__APPLE__) #include diff --git a/emulators/open-vm-tools/files/patch-services_plugins_dndcp_stringxx_string.hh b/emulators/open-vm-tools/files/patch-services_plugins_dndcp_stringxx_string.hh new file mode 100644 index 000000000000..093f63ca86be --- /dev/null +++ b/emulators/open-vm-tools/files/patch-services_plugins_dndcp_stringxx_string.hh @@ -0,0 +1,11 @@ +--- services/plugins/dndcp/stringxx/string.hh.orig 2024-11-05 17:51:28 UTC ++++ services/plugins/dndcp/stringxx/string.hh +@@ -87,7 +87,7 @@ typedef std::string utf8string; + * to replace the std::string in our codebase. + */ + typedef std::string utf8string; +-typedef std::basic_string utf16string; ++typedef std::u16string utf16string; + + class VMSTRING_EXPORT string + { 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 7ea9613f8517..3678de640c63 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 2023-03-07 22:57:07 UTC +--- services/vmtoolsd/Makefile.am.orig 2024-10-10 15:05:07 UTC +++ services/vmtoolsd/Makefile.am -@@ -79,7 +79,7 @@ install-exec-hook: +@@ -81,7 +81,7 @@ install-exec-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)/$(PAM_PREFIX)/pam.d/ $(INSTALL) $(top_srcdir)/pam/generic $(DESTDIR)/$(PAM_PREFIX)/pam.d/vmtoolsd