Index: head/emulators/open-vm-tools/Makefile =================================================================== --- head/emulators/open-vm-tools/Makefile (revision 559766) +++ head/emulators/open-vm-tools/Makefile (revision 559767) @@ -1,97 +1,97 @@ # Created by: mbr@FreeBSD.org # $FreeBSD$ PORTNAME= open-vm-tools PORTVERSION= ${RELEASE_VER} DISTVERSIONPREFIX= stable- PORTREVISION= 1 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 \ libdnet.so:net/libdnet -RELEASE_VER= 11.1.5 -BUILD_VER= 16724464 +RELEASE_VER= 11.2.0 +BUILD_VER= 16938113 OPTIONS_DEFINE= DOCS LIBNOTIFY OPENSSL X11 OPTIONS_DEFAULT= DOCS LIBNOTIFY OPENSSL X11 OPTIONS_SUB= DOCS_BUILD_DEPENDS= doxygen:devel/doxygen DOCS_CONFIGURE_ENABLE= docs LIBNOTIFY_DESC= Desktop notification support X11_CONFIGURE_WITH= x gtk2 gtkmm X11_USES= gnome xorg X11_USE= xorg=ice,sm,x11,xext,xi,xinerama,xorgproto,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 OPENSSL_CONFIGURE_WITH= ssl WRKSRC_SUBDIR= open-vm-tools GNU_CONFIGURE= yes USES= autoreconf fuse gettext-runtime kmod libtool localbase pathfix pkgconfig gnome 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 ${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 559766) +++ head/emulators/open-vm-tools/distinfo (revision 559767) @@ -1,3 +1,3 @@ -TIMESTAMP = 1599247749 -SHA256 (vmware-open-vm-tools-stable-11.1.5_GH0.tar.gz) = 0bbc20d725cb2e15db5bd5e6a9cbab7fc98c2e3208f19a233a2308468cb2dc04 -SIZE (vmware-open-vm-tools-stable-11.1.5_GH0.tar.gz) = 2668828 +TIMESTAMP = 1606400181 +SHA256 (vmware-open-vm-tools-stable-11.2.0_GH0.tar.gz) = 280970a15dd8210b89e68df5fce64fa8bfb3ff7ca3737ce5ebf8634d8c1a2494 +SIZE (vmware-open-vm-tools-stable-11.2.0_GH0.tar.gz) = 2710170 Index: head/emulators/open-vm-tools/files/patch-scripts_linux_pam.d_vmtoolsd =================================================================== --- head/emulators/open-vm-tools/files/patch-scripts_linux_pam.d_vmtoolsd (revision 559766) +++ head/emulators/open-vm-tools/files/patch-scripts_linux_pam.d_vmtoolsd (nonexistent) @@ -1,12 +0,0 @@ ---- scripts/linux/pam.d/vmtoolsd.orig 2013-09-23 15:51:10 UTC -+++ scripts/linux/pam.d/vmtoolsd -@@ -1,7 +1,3 @@ - #%PAM-1.0 --auth required pam_shells.so --auth sufficient pam_unix.so shadow --auth required pam_unix_auth.so shadow --account required pam_shells.so --account sufficient pam_unix.so --account required pam_unix_acct.so -+auth include system -+account include system Property changes on: head/emulators/open-vm-tools/files/patch-scripts_linux_pam.d_vmtoolsd ___________________________________________________________________ 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_misc_util__misc.c =================================================================== --- head/emulators/open-vm-tools/files/patch-lib_misc_util__misc.c (revision 559766) +++ head/emulators/open-vm-tools/files/patch-lib_misc_util__misc.c (revision 559767) @@ -1,11 +1,11 @@ ---- lib/misc/util_misc.c.orig 2018-03-30 18:44:35 UTC +--- lib/misc/util_misc.c.orig 2020-10-16 23:15:58 UTC +++ lib/misc/util_misc.c -@@ -303,7 +303,7 @@ Util_CanonicalPathsIdentical(const char *path1, // IN +@@ -304,7 +304,7 @@ Util_CanonicalPathsIdentical(const char *path1, // IN return (strcmp(path1, path2) == 0); #elif defined(_WIN32) return (_stricmp(path1, path2) == 0); -#elif defined(__APPLE__) +#elif defined(__APPLE__) || defined(__FreeBSD__) return (strcasecmp(path1, path2) == 0); #else NOT_IMPLEMENTED(); Index: head/emulators/open-vm-tools/files/patch-lib_vmCheck_vmcheck.c =================================================================== --- head/emulators/open-vm-tools/files/patch-lib_vmCheck_vmcheck.c (revision 559766) +++ head/emulators/open-vm-tools/files/patch-lib_vmCheck_vmcheck.c (revision 559767) @@ -1,10 +1,10 @@ ---- lib/vmCheck/vmcheck.c.orig 2018-07-13 18:54:23 UTC +--- lib/vmCheck/vmcheck.c.orig 2020-10-16 23:15:58 UTC +++ lib/vmCheck/vmcheck.c -@@ -153,6 +153,7 @@ VmCheckSafe(SafeCheckFn checkFn) +@@ -144,6 +144,7 @@ VmCheckSafe(SafeCheckFn checkFn) #else do { int signals[] = { + SIGBUS, SIGILL, SIGSEGV, }; Index: head/emulators/open-vm-tools/files/patch-modules_Makefile.am =================================================================== --- head/emulators/open-vm-tools/files/patch-modules_Makefile.am (revision 559766) +++ head/emulators/open-vm-tools/files/patch-modules_Makefile.am (revision 559767) @@ -1,19 +1,19 @@ --- modules/Makefile.am.orig 2018-09-29 03:57:04 UTC +++ modules/Makefile.am @@ -65,11 +65,11 @@ if SOLARIS done endif if FREEBSD - for MOD in $(MODULES); do \ - $(INSTALL) -d $(DESTDIR)$(MODULES_DIR); \ -- $(INSTALL) -m644 $(modulesrc)/$(MODULES_OS)/$$MOD.ko \ +- $(INSTALL) -m 644 $(modulesrc)/$(MODULES_OS)/$$MOD.ko \ - $(DESTDIR)$(MODULES_DIR); \ - done +# for MOD in $(MODULES); do \ +# $(INSTALL) -d $(DESTDIR)$(MODULES_DIR); \ -+# $(INSTALL) -m644 $(modulesrc)/$(MODULES_OS)/$$MOD.ko \ ++# $(INSTALL) -m 644 $(modulesrc)/$(MODULES_OS)/$$MOD.ko \ +# $(DESTDIR)$(MODULES_DIR); \ +# done endif uninstall-hook: Index: head/emulators/open-vm-tools/files/patch-modules_freebsd_vmblock_Makefile =================================================================== --- head/emulators/open-vm-tools/files/patch-modules_freebsd_vmblock_Makefile (revision 559766) +++ head/emulators/open-vm-tools/files/patch-modules_freebsd_vmblock_Makefile (revision 559767) @@ -1,11 +1,11 @@ ---- modules/freebsd/vmblock/Makefile.orig +--- modules/freebsd/vmblock/Makefile.orig 2020-10-16 23:15:58 UTC +++ modules/freebsd/vmblock/Makefile -@@ -46,8 +46,6 @@ +@@ -46,8 +46,6 @@ SRCS := $(HEADERS) $(CSRCS) KMOD = vmblock PROG = ../$(KMOD).ko -NOMAN = t -NO_MAN = t KLDMOD = t VMBLOCK := $(MAINSRCROOT)/modules/vmblock Index: head/emulators/open-vm-tools/files/patch-pam_generic =================================================================== --- head/emulators/open-vm-tools/files/patch-pam_generic (nonexistent) +++ head/emulators/open-vm-tools/files/patch-pam_generic (revision 559767) @@ -0,0 +1,14 @@ +--- pam/generic.orig 2020-10-16 23:15:58 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 + # common authentication mechanisms. +-auth required pam_shells.so +-auth sufficient pam_unix.so shadow +-auth required pam_unix_auth.so shadow +-account required pam_shells.so +-account sufficient pam_unix.so +-account required pam_unix_acct.so ++auth include system ++account include system Property changes on: head/emulators/open-vm-tools/files/patch-pam_generic ___________________________________________________________________ Added: fbsd:nokeywords ## -0,0 +1 ## +yes \ No newline at end of property Added: svn:eol-style ## -0,0 +1 ## +native \ No newline at end of property Added: svn:mime-type ## -0,0 +1 ## +text/plain \ No newline at end of property Index: head/emulators/open-vm-tools/files/patch-services_vmtoolsd_Makefile.am =================================================================== --- head/emulators/open-vm-tools/files/patch-services_vmtoolsd_Makefile.am (revision 559766) +++ head/emulators/open-vm-tools/files/patch-services_vmtoolsd_Makefile.am (revision 559767) @@ -1,11 +1,11 @@ --- services/vmtoolsd/Makefile.am.orig 2017-04-25 03:59:07 UTC +++ services/vmtoolsd/Makefile.am -@@ -83,7 +83,7 @@ install-data-hook: +@@ -76,7 +76,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)/$(PAM_PREFIX)/pam.d/ + $(INSTALL) $(top_srcdir)/pam/generic $(DESTDIR)/$(PAM_PREFIX)/pam.d/vmtoolsd - uninstall-hook: - rm -rf $(DESTDIR)/etc/vmware-tools