Index: head/emulators/open-vm-tools/Makefile =================================================================== --- head/emulators/open-vm-tools/Makefile (revision 457022) +++ head/emulators/open-vm-tools/Makefile (revision 457023) @@ -1,96 +1,95 @@ # Created by: mbr@FreeBSD.org # $FreeBSD$ PORTNAME= open-vm-tools PORTVERSION= ${RELEASE_VER} DISTVERSIONPREFIX= stable- -PORTREVISION= 5 PORTEPOCH= 2 CATEGORIES= emulators MAINTAINER= jpaetzel@FreeBSD.org COMMENT?= Open VMware tools for FreeBSD VMware guests LICENSE= LGPL21 LICENSE_FILE= ${WRKSRC}/COPYING ONLY_FOR_ARCHS= amd64 i386 LIB_DEPENDS= libmspack.so:archivers/libmspack -RELEASE_VER= 10.1.10 -BUILD_VER= 6082533 +RELEASE_VER= 10.2.0 +BUILD_VER= 7253323 OPTIONS_DEFINE= DNET LIBNOTIFY OPENSSL X11 OPTIONS_DEFAULT= DNET LIBNOTIFY OPENSSL X11 OPTIONS_SUB= DNET_DESC= libdnet support LIBNOTIFY_DESC= Desktop notification support X11_CONFIGURE_WITH= x gtk2 gtkmm X11_USE= xorg=ice,sm,x11,xext,xi,xinerama,xineramaproto,xrandr,xrender,xtst \ gnome=gdkpixbuf2,gtk20,gtkmm24 X11_LIB_DEPENDS= libfontconfig.so:x11-fonts/fontconfig \ libfreetype.so:print/freetype2 LIBNOTIFY_LIB_DEPENDS= libnotify.so:devel/libnotify DNET_CONFIGURE_WITH= dnet DNET_LIB_DEPENDS= libdnet.so:net/libdnet OPENSSL_CONFIGURE_WITH= ssl WRKSRC_SUBDIR= open-vm-tools GNU_CONFIGURE= yes USES= autoreconf:-iv fuse gettext-runtime kmod libtool localbase pathfix pkgconfig USE_GNOME= glib20 USE_GITHUB= yes GH_ACCOUNT= vmware USE_LDCONFIG= yes CPPFLAGS+= -Wno-deprecated-declarations SSP_UNSAFE= kernel module does not support ssp CONFIGURE_ARGS+= --without-icu \ --disable-vgauth \ --sysconfdir=${PREFIX}/etc CONFLICTS+= vmware-guestd[0-9]* vmware-tools[0-9]* USE_RC_SUBR= vmware-guestd vmware-kmod INSTALL_TARGET= install-strip .include .if ${PORT_OPTIONS:MX11} CONFLICTS= open-vm-tools-nox11-[0-9]* .else CONFLICTS= open-vm-tools-[0-9]* .endif CONFIGURE_ENV+= SYSDIR=${SRC_BASE}/sys .include 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 ${INSTALL_DATA} ${WRKSRC}/modules/freebsd/vmxnet.ko ${STAGEDIR}${PREFIX}/lib/vmware-tools/modules/drivers/vmxnet.ko ${MKDIR} ${STAGEDIR}${PREFIX}/share/open-vm-tools/scripts/vmware/ ${MKDIR} ${STAGEDIR}${PREFIX}/share/open-vm-tools/scripts/ ${MKDIR} ${STAGEDIR}${PREFIX}/share/open-vm-tools/tests/ ${MKDIR} ${STAGEDIR}${PREFIX}/etc/rc.conf.d .include Index: head/emulators/open-vm-tools/distinfo =================================================================== --- head/emulators/open-vm-tools/distinfo (revision 457022) +++ head/emulators/open-vm-tools/distinfo (revision 457023) @@ -1,3 +1,3 @@ -TIMESTAMP = 1503010753 -SHA256 (vmware-open-vm-tools-stable-10.1.10_GH0.tar.gz) = ce03c8827389ea272a5c072366b6bff381b2eddad94750c6a9433a0dea61c762 -SIZE (vmware-open-vm-tools-stable-10.1.10_GH0.tar.gz) = 3543342 +TIMESTAMP = 1513787562 +SHA256 (vmware-open-vm-tools-stable-10.2.0_GH0.tar.gz) = 40dccff0630034b4985ac7a0d3bfcf89025e9a57f518e561db8c6fd7322bf029 +SIZE (vmware-open-vm-tools-stable-10.2.0_GH0.tar.gz) = 3200084 Index: head/emulators/open-vm-tools/files/patch-lib_misc_hostinfoPosix.c =================================================================== --- head/emulators/open-vm-tools/files/patch-lib_misc_hostinfoPosix.c (revision 457022) +++ head/emulators/open-vm-tools/files/patch-lib_misc_hostinfoPosix.c (nonexistent) @@ -1,53 +0,0 @@ ---- lib/misc/hostinfoPosix.c.orig 2017-07-28 21:59:15 UTC -+++ lib/misc/hostinfoPosix.c -@@ -1,5 +1,5 @@ - /********************************************************* -- * Copyright (C) 1998-2016 VMware, Inc. All rights reserved. -+ * Copyright (C) 1998-2017 VMware, Inc. All rights reserved. - * - * This program is free software; you can redistribute it and/or modify it - * under the terms of the GNU Lesser General Public License as published -@@ -1080,28 +1080,32 @@ HostinfoOSData(void) - - Str_Strcpy(osName, distroShort, sizeof osName); - } else if (strstr(osNameFull, "FreeBSD")) { -- size_t nameLen = sizeof STR_OS_FREEBSD - 1; -- size_t releaseLen = 0; -- char *dashPtr; -+ char distroShort[DISTRO_BUF_SIZE]; -+ int majorVersion; - - /* -- * FreeBSD releases report their version as "x.y-RELEASE". We'll be -- * naive look for the first dash, and use everything before it as the -- * version number. -+ * FreeBSD releases report their version as "x.y-RELEASE". - */ - -- dashPtr = Str_Strchr(buf.release, '-'); -- if (dashPtr != NULL) { -- releaseLen = dashPtr - buf.release; -+ majorVersion = Hostinfo_OSVersion(0); -+ -+ /* -+ * FreeBSD 11 and later are identified using -+ * a different guestId. -+ */ -+ if (majorVersion >= 11) { -+ Str_Strcpy(distroShort, STR_OS_FREEBSD11, sizeof distroShort); -+ } else { -+ Str_Strcpy(distroShort, STR_OS_FREEBSD, sizeof distroShort); - } - -- if (nameLen + releaseLen + 1 > sizeof osName) { -+ if (strlen(distroShort) + 1 > sizeof osName) { - Warning("%s: Error: buffer too small\n", __FUNCTION__); - - return FALSE; - } - -- Str_Strcpy(osName, STR_OS_FREEBSD, sizeof osName); -+ Str_Strcpy(osName, distroShort, sizeof osName); - } else if (strstr(osNameFull, "SunOS")) { - size_t nameLen = sizeof STR_OS_SOLARIS - 1; - size_t releaseLen = 0; Property changes on: head/emulators/open-vm-tools/files/patch-lib_misc_hostinfoPosix.c ___________________________________________________________________ Deleted: fbsd:nokeywords ## -1 +0,0 ## -yes \ No newline at end of property Deleted: svn:eol-style ## -1 +0,0 ## -native \ No newline at end of property Deleted: svn:mime-type ## -1 +0,0 ## -text/plain \ No newline at end of property Index: head/emulators/open-vm-tools/files/patch-lib_include_vm__basic__defs.h =================================================================== --- head/emulators/open-vm-tools/files/patch-lib_include_vm__basic__defs.h (revision 457022) +++ head/emulators/open-vm-tools/files/patch-lib_include_vm__basic__defs.h (nonexistent) @@ -1,15 +0,0 @@ ---- lib/include/vm_basic_defs.h.orig 2017-02-24 22:15:37 UTC -+++ lib/include/vm_basic_defs.h -@@ -76,7 +76,11 @@ - #include "vm_basic_types.h" // For INLINE. - - /* Checks for FreeBSD, filtering out VMKERNEL. */ --#define __IS_FREEBSD__ (!defined(VMKERNEL) && defined(__FreeBSD__)) -+#if !defined(VMKERNEL) && defined(__FreeBSD__) -+#define __IS_FREEBSD__ 1 -+#else -+#define __IS_FREEBSD__ 0 -+#endif - #define __IS_FREEBSD_VER__(ver) (__IS_FREEBSD__ && __FreeBSD_version >= (ver)) - - #if defined _WIN32 && defined USERLEVEL Property changes on: head/emulators/open-vm-tools/files/patch-lib_include_vm__basic__defs.h ___________________________________________________________________ Deleted: fbsd:nokeywords ## -1 +0,0 ## -yes \ No newline at end of property Deleted: svn:eol-style ## -1 +0,0 ## -native \ No newline at end of property Deleted: svn:mime-type ## -1 +0,0 ## -text/plain \ No newline at end of property Index: head/emulators/open-vm-tools/files/patch-lib_include_guest__os.h =================================================================== --- head/emulators/open-vm-tools/files/patch-lib_include_guest__os.h (revision 457022) +++ head/emulators/open-vm-tools/files/patch-lib_include_guest__os.h (nonexistent) @@ -1,12 +0,0 @@ ---- lib/include/guest_os.h.orig 2017-07-28 21:59:15 UTC -+++ lib/include/guest_os.h -@@ -493,7 +493,8 @@ Bool Gos_InSetArray(uint32 gos, const uint32 *set); - #define STR_OS_WIN_64_BIT_EXTENSION ", 64-bit" - - /* FreeBSD */ --#define STR_OS_FREEBSD "freeBSD" -+#define STR_OS_FREEBSD "freeBSD" -+#define STR_OS_FREEBSD11 "freeBSD11" - - /* Solaris */ - #define STR_OS_SOLARIS "solaris" Property changes on: head/emulators/open-vm-tools/files/patch-lib_include_guest__os.h ___________________________________________________________________ Deleted: fbsd:nokeywords ## -1 +0,0 ## -yes \ No newline at end of property Deleted: svn:eol-style ## -1 +0,0 ## -native \ No newline at end of property Deleted: svn:mime-type ## -1 +0,0 ## -text/plain \ No newline at end of property Index: head/emulators/open-vm-tools/pkg-plist =================================================================== --- head/emulators/open-vm-tools/pkg-plist (revision 457022) +++ head/emulators/open-vm-tools/pkg-plist (revision 457023) @@ -1,77 +1,64 @@ bin/vmhgfs-fuse bin/vmtoolsd bin/vmware-checkvm bin/vmware-hgfsclient bin/vmware-namespace-cmd bin/vmware-rpctool bin/vmware-toolbox-cmd bin/vmware-vmblock-fuse +%%X11%%bin/vmware-user %%X11%%bin/vmware-user-suid-wrapper %%X11%%etc/xdg/autostart/vmware-user.desktop bin/vmware-xferlogs -include/libDeployPkg/guestcust-events.h -include/libDeployPkg/imgcust-api.h -include/libDeployPkg/includeCheck.h -include/libDeployPkg/linuxDeployment.h -include/libDeployPkg/log.h -include/libDeployPkg/process.h -include/libDeployPkg/rpcout.h -include/libDeployPkg/vm_basic_types.h include/vmGuestLib/includeCheck.h include/vmGuestLib/vmGuestLib.h include/vmGuestLib/vmSessionId.h include/vmGuestLib/vm_basic_types.h -lib/libDeployPkg.a -lib/libDeployPkg.so -lib/libDeployPkg.so.0 -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 @dir lib/vmware-tools/modules/input lib/open-vm-tools/plugins/common/libhgfsServer.so lib/open-vm-tools/plugins/common/libvix.so -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/libresolutionSet.so %%X11%%lib/open-vm-tools/plugins/vmusr/libdesktopEvents.so %%X11%%lib/open-vm-tools/plugins/vmusr/libdndcp.so lib/vmware-tools/modules/drivers/vmblock.ko lib/vmware-tools/modules/drivers/vmmemctl.ko lib/vmware-tools/modules/drivers/vmxnet.ko -libdata/pkgconfig/libDeployPkg.pc libdata/pkgconfig/vmguestlib.pc sbin/mount_vmblock 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 share/vmware-tools/vm-support %%DATADIR%%/messages/de/toolboxcmd.vmsg %%DATADIR%%/messages/de/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 @rmtry share/vmware-tools/tools.conf @rmtry etc/vmware-tools/plugins etc/pam.d/vmtoolsd @dir %%DATADIR%%/scripts/vmware @dir %%DATADIR%%/tests @preunexec %%PREFIX%%/bin/vmware-rpctool 'tools.set.version 0' ; service vmware-guestd stop 2>/dev/null || /usr/bin/true @postexec service vmware-kmod restart && service vmware-guestd restart || /usr/bin/true