Index: head/emulators/open-vm-tools/Makefile =================================================================== --- head/emulators/open-vm-tools/Makefile (revision 535237) +++ head/emulators/open-vm-tools/Makefile (revision 535238) @@ -1,94 +1,93 @@ # Created by: mbr@FreeBSD.org # $FreeBSD$ PORTNAME= open-vm-tools PORTVERSION= ${RELEASE_VER} DISTVERSIONPREFIX= stable- -PORTREVISION= 3 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.0.1 -BUILD_VER= 14773994 +RELEASE_VER= 11.1.0 +BUILD_VER= 16036546 OPTIONS_DEFINE= LIBNOTIFY OPENSSL X11 OPTIONS_DEFAULT= LIBNOTIFY OPENSSL X11 OPTIONS_SUB= 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 535237) +++ head/emulators/open-vm-tools/distinfo (revision 535238) @@ -1,3 +1,3 @@ -TIMESTAMP = 1571957704 -SHA256 (vmware-open-vm-tools-stable-11.0.1_GH0.tar.gz) = 99f1e3c5245bb002c1e66cbb7a1078e1c3567db5f92cc2e00ab08557e9df4758 -SIZE (vmware-open-vm-tools-stable-11.0.1_GH0.tar.gz) = 2791701 +TIMESTAMP = 1589112329 +SHA256 (vmware-open-vm-tools-stable-11.1.0_GH0.tar.gz) = 5930448c65cf298e3dded2a3670750f4affaf3a631500a1774eeb4cfe0a32b80 +SIZE (vmware-open-vm-tools-stable-11.1.0_GH0.tar.gz) = 2667232 Index: head/emulators/open-vm-tools/files/patch-modules_freebsd_vmmemctl_os.c =================================================================== --- head/emulators/open-vm-tools/files/patch-modules_freebsd_vmmemctl_os.c (revision 535237) +++ head/emulators/open-vm-tools/files/patch-modules_freebsd_vmmemctl_os.c (nonexistent) @@ -1,64 +0,0 @@ ---- modules/freebsd/vmmemctl/os.c.orig 2019-10-21 21:58:04 UTC -+++ modules/freebsd/vmmemctl/os.c -@@ -64,7 +64,11 @@ - - typedef struct { - /* system structures */ -+#if __FreeBSD_version >= 1300067 -+ struct callout callout_handle; -+#else - struct callout_handle callout_handle; -+#endif - - /* termination flag */ - volatile int stop; -@@ -678,7 +682,12 @@ vmmemctl_poll(void *data) // IN - if (!t->stop) { - /* invoke registered handler, rearm timer */ - Balloon_QueryAndExecute(); -+#if __FreeBSD_version >= 1300067 -+ callout_reset(&t->callout_handle, BALLOON_POLL_PERIOD * hz, vmmemctl_poll, -+ t); -+#else - t->callout_handle = timeout(vmmemctl_poll, t, BALLOON_POLL_PERIOD * hz); -+#endif - } - } - -@@ -712,15 +721,23 @@ vmmemctl_init(void) - } - - /* initialize timer state */ -+#if __FreeBSD_version >= 1300067 -+ callout_init(&state->timer.callout_handle, 0); -+#else - callout_handle_init(&state->timer.callout_handle); -+#endif - - os_pmap_init(pmap); - os_balloonobject_create(); - - /* Set up and start polling */ -- callout_handle_init(&t->callout_handle); - t->stop = FALSE; -+#if __FreeBSD_version >= 1300067 -+ callout_reset(&t->callout_handle, BALLOON_POLL_PERIOD * hz, vmmemctl_poll, -+ t); -+#else - t->callout_handle = timeout(vmmemctl_poll, t, BALLOON_POLL_PERIOD * hz); -+#endif - - vmmemctl_init_sysctl(); - -@@ -759,7 +776,11 @@ vmmemctl_cleanup(void) - - /* Stop polling */ - t->stop = TRUE; -+#if __FreeBSD_version >= 1300067 -+ callout_drain(&t->callout_handle); -+#else - untimeout(vmmemctl_poll, t, t->callout_handle); -+#endif - - os_balloonobject_delete(); - os_pmap_free(pmap); Property changes on: head/emulators/open-vm-tools/files/patch-modules_freebsd_vmmemctl_os.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-modules_freebsd_vmblock_vnops.c =================================================================== --- head/emulators/open-vm-tools/files/patch-modules_freebsd_vmblock_vnops.c (revision 535237) +++ head/emulators/open-vm-tools/files/patch-modules_freebsd_vmblock_vnops.c (nonexistent) @@ -1,53 +0,0 @@ ---- modules/freebsd/vmblock/vnops.c.orig 2019-10-21 21:58:04 UTC -+++ modules/freebsd/vmblock/vnops.c -@@ -532,17 +532,12 @@ struct vop_generic_args { - * Map the possible out-going vpp (Assumes that the lower layer always - * returns a VREF'ed vpp unless it gets an error.) - */ -- if (descp->vdesc_vpp_offset != VDESC_NO_OFFSET && -- !(descp->vdesc_flags & VDESC_NOMAP_VPP) && -- !error) { -+ if (descp->vdesc_vpp_offset != VDESC_NO_OFFSET && !error) { - /* - * XXX - even though some ops have vpp returned vp's, several ops - * actually vrele this before returning. We must avoid these ops. - * (This should go away when these ops are regularized.) - */ -- if (descp->vdesc_flags & VDESC_VPP_WILLRELE) { -- goto out; -- } - vppp = VOPARG_OFFSETTO(struct vnode***, descp->vdesc_vpp_offset,ap); - if (*vppp) { - /* FIXME: set proper name for the vnode */ -@@ -550,7 +545,6 @@ struct vop_generic_args { - } - } - --out: - return error; - } - -@@ -1262,12 +1256,15 @@ struct vop_unlock_args { - */ - { - struct vnode *vp = ap->a_vp; -+#if __FreeBSD_version < 1300074 - int flags = ap->a_flags; -+#endif - COMPAT_THREAD_VAR(td, ap->a_td); - struct VMBlockNode *nn; - struct vnode *lvp; - int error; - -+#if __FreeBSD_version < 1300074 - /* - * If caller already holds interlock, drop it. (Per VOP_UNLOCK() API.) - * Also strip LK_INTERLOCK from flags passed to lower layer. -@@ -1276,6 +1273,7 @@ struct vop_unlock_args { - VI_UNLOCK(vp); - ap->a_flags = flags &= ~LK_INTERLOCK; - } -+#endif - nn = VPTOVMB(vp); - if (nn != NULL && (lvp = VMBVPTOLOWERVP(vp)) != NULL) { - error = COMPAT_VOP_UNLOCK(lvp, flags, td); Property changes on: head/emulators/open-vm-tools/files/patch-modules_freebsd_vmblock_vnops.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-libDeployPkg_processPosix.c =================================================================== --- head/emulators/open-vm-tools/files/patch-libDeployPkg_processPosix.c (revision 535237) +++ head/emulators/open-vm-tools/files/patch-libDeployPkg_processPosix.c (nonexistent) @@ -1,11 +0,0 @@ ---- libDeployPkg/processPosix.c.orig 2017-02-24 22:15:37 UTC -+++ libDeployPkg/processPosix.c -@@ -28,6 +28,8 @@ - #include - #include - #include -+#include -+#include - - #include "util.h" - Property changes on: head/emulators/open-vm-tools/files/patch-libDeployPkg_processPosix.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-modules_freebsd_shared_compat__vop.h =================================================================== --- head/emulators/open-vm-tools/files/patch-modules_freebsd_shared_compat__vop.h (revision 535237) +++ head/emulators/open-vm-tools/files/patch-modules_freebsd_shared_compat__vop.h (nonexistent) @@ -1,14 +0,0 @@ ---- modules/freebsd/shared/compat_vop.h.orig 2019-10-21 21:58:04 UTC -+++ modules/freebsd/shared/compat_vop.h -@@ -47,7 +47,11 @@ - #if __FreeBSD_version >= 800011 - #define COMPAT_THREAD_VAR(varname, varval) - #define COMPAT_VOP_LOCK(vop, flags, threadvar) VOP_LOCK((vop), (flags)) -+#if __FreeBSD_version >= 1300074 -+#define COMPAT_VOP_UNLOCK(vop, flags, threadvar) VOP_UNLOCK((vop)) -+#else - #define COMPAT_VOP_UNLOCK(vop, flags, threadvar) VOP_UNLOCK((vop), (flags)) -+#endif - #define compat_lockstatus(lock, threadvar) lockstatus((lock)) - #define compat_lockmgr(lock, flags, randompointerparam, threadval) lockmgr((lock), (flags), (randompointerparam)) - #define compat_vn_lock(vp, flags, threadval) vn_lock((vp), (flags)) Property changes on: head/emulators/open-vm-tools/files/patch-modules_freebsd_shared_compat__vop.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