diff --git a/emulators/open-vm-tools/Makefile b/emulators/open-vm-tools/Makefile index d90505341720..436a464e4965 100644 --- a/emulators/open-vm-tools/Makefile +++ b/emulators/open-vm-tools/Makefile @@ -1,92 +1,96 @@ PORTNAME= open-vm-tools PORTVERSION= 12.2.5 DISTVERSIONPREFIX= stable- +PORTREVISION= 1 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 \ - libmspack.so:archivers/libmspack +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 \ + --enable-deploypkg \ --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 FUSE LIBNOTIFY OPENSSL X11 +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/files/patch-libDeployPkg_processPosix.c b/emulators/open-vm-tools/files/patch-libDeployPkg_processPosix.c new file mode 100644 index 000000000000..966cfa5827fe --- /dev/null +++ b/emulators/open-vm-tools/files/patch-libDeployPkg_processPosix.c @@ -0,0 +1,11 @@ +--- libDeployPkg/processPosix.c.orig 2023-07-18 17:10:48 UTC ++++ libDeployPkg/processPosix.c +@@ -28,6 +28,8 @@ + #include + #include + #include ++#include ++#include + #include + + #include "util.h" diff --git a/emulators/open-vm-tools/files/patch-lib_panic_panic.c b/emulators/open-vm-tools/files/patch-lib_panic_panic.c new file mode 100644 index 000000000000..555962fa2039 --- /dev/null +++ b/emulators/open-vm-tools/files/patch-lib_panic_panic.c @@ -0,0 +1,11 @@ +--- lib/panic/panic.c.orig 2023-06-12 23:13:35 UTC ++++ lib/panic/panic.c +@@ -34,6 +34,8 @@ + # include + # ifdef __APPLE__ + # include ++# endif ++# if defined (__APPLE__) || defined (__FreeBSD__) + # include + # include + # endif diff --git a/emulators/open-vm-tools/files/patch-lib_procMgr_procMgrPosix.c b/emulators/open-vm-tools/files/patch-lib_procMgr_procMgrPosix.c new file mode 100644 index 000000000000..a4088489e16a --- /dev/null +++ b/emulators/open-vm-tools/files/patch-lib_procMgr_procMgrPosix.c @@ -0,0 +1,11 @@ +--- lib/procMgr/procMgrPosix.c.orig 2023-07-18 17:10:48 UTC ++++ lib/procMgr/procMgrPosix.c +@@ -58,6 +58,8 @@ + #include + #include + #include ++#include ++#include + #endif + #if defined(__APPLE__) + #include diff --git a/emulators/open-vm-tools/pkg-plist b/emulators/open-vm-tools/pkg-plist index ae96eabc1925..7ae249592b27 100644 --- a/emulators/open-vm-tools/pkg-plist +++ b/emulators/open-vm-tools/pkg-plist @@ -1,74 +1,90 @@ /etc/vmware-tools/tools.conf.example bin/vm-support %%FUSE%%bin/vmhgfs-fuse bin/vmtoolsd bin/vmware-checkvm bin/vmware-hgfsclient bin/vmware-namespace-cmd bin/vmware-rpctool bin/vmware-toolbox-cmd %%X11%%bin/vmware-user %%X11%%bin/vmware-user-suid-wrapper %%FUSE%%bin/vmware-vmblock-fuse bin/vmware-xferlogs etc/pam.d/vmtoolsd %%X11%%etc/xdg/autostart/vmware-user.desktop +%%DEPLOYPKG%%include/libDeployPkg/deployPkgFormat.h +%%DEPLOYPKG%%include/libDeployPkg/deploypkg.h +%%DEPLOYPKG%%include/libDeployPkg/guestcust-events.h +%%DEPLOYPKG%%include/libDeployPkg/guestrpc.h +%%DEPLOYPKG%%include/libDeployPkg/imgcust-api.h +%%DEPLOYPKG%%include/libDeployPkg/includeCheck.h +%%DEPLOYPKG%%include/libDeployPkg/linuxDeployment.h +%%DEPLOYPKG%%include/libDeployPkg/log.h +%%DEPLOYPKG%%include/libDeployPkg/process.h +%%DEPLOYPKG%%include/libDeployPkg/vm_basic_types.h include/vmGuestLib/includeCheck.h include/vmGuestLib/vmGuestLib.h include/vmGuestLib/vmSessionId.h include/vmGuestLib/vm_basic_types.h +%%DEPLOYPKG%%lib/libDeployPkg.a +%%DEPLOYPKG%%lib/libDeployPkg.so +%%DEPLOYPKG%%lib/libDeployPkg.so.0 +%%DEPLOYPKG%%lib/libDeployPkg.so.0.0.0 lib/libguestlib.a lib/libguestlib.so lib/libguestlib.so.0 lib/libguestlib.so.0.0.0 lib/libhgfs.a lib/libhgfs.so lib/libhgfs.so.0 lib/libhgfs.so.0.0.0 lib/libvmtools.a lib/libvmtools.so lib/libvmtools.so.0 lib/libvmtools.so.0.0.0 lib/open-vm-tools/plugins/common/libhgfsServer.so lib/open-vm-tools/plugins/common/libvix.so +%%DEPLOYPKG%%lib/open-vm-tools/plugins/vmsvc/libdeployPkgPlugin.so lib/open-vm-tools/plugins/vmsvc/libguestInfo.so lib/open-vm-tools/plugins/vmsvc/libpowerOps.so lib/open-vm-tools/plugins/vmsvc/libtimeSync.so lib/open-vm-tools/plugins/vmsvc/libvmbackup.so %%X11%%lib/open-vm-tools/plugins/vmusr/libdesktopEvents.so %%X11%%lib/open-vm-tools/plugins/vmusr/libdndcp.so %%X11%%lib/open-vm-tools/plugins/vmusr/libresolutionSet.so lib/vmware-tools/modules/drivers/vmblock.ko lib/vmware-tools/modules/drivers/vmmemctl.ko +%%DEPLOYPKG%%libdata/pkgconfig/libDeployPkg.pc libdata/pkgconfig/vmguestlib.pc sbin/mount_vmblock %%DATADIR%%/messages/de/toolboxcmd.vmsg %%DATADIR%%/messages/de/vmtoolsd.vmsg %%DATADIR%%/messages/en/toolboxcmd.vmsg %%DATADIR%%/messages/en/vmtoolsd.vmsg %%DATADIR%%/messages/es/toolboxcmd.vmsg %%DATADIR%%/messages/es/vmtoolsd.vmsg %%DATADIR%%/messages/fr/toolboxcmd.vmsg %%DATADIR%%/messages/fr/vmtoolsd.vmsg %%DATADIR%%/messages/it/toolboxcmd.vmsg %%DATADIR%%/messages/it/vmtoolsd.vmsg %%DATADIR%%/messages/ja/toolboxcmd.vmsg %%DATADIR%%/messages/ja/vmtoolsd.vmsg %%DATADIR%%/messages/ko/toolboxcmd.vmsg %%DATADIR%%/messages/ko/vmtoolsd.vmsg %%DATADIR%%/messages/zh_CN/toolboxcmd.vmsg %%DATADIR%%/messages/zh_CN/vmtoolsd.vmsg %%DATADIR%%/messages/zh_TW/toolboxcmd.vmsg %%DATADIR%%/messages/zh_TW/vmtoolsd.vmsg @sample %%DATADIR%%/tools.conf.sample share/vmware-tools/poweroff-vm-default share/vmware-tools/poweron-vm-default share/vmware-tools/resume-vm-default share/vmware-tools/scripts/vmware/network share/vmware-tools/statechange.subr 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